diff options
| author | MaZderMind | 2016-12-18 13:32:10 +0100 |
|---|---|---|
| committer | MaZderMind | 2016-12-18 13:32:10 +0100 |
| commit | 340fdecd903fedee4dc39cfc60c166122f2451e1 (patch) | |
| tree | be89253bbf80fc8383311137761a8a472e5d8b40 /template | |
| parent | 46634852dc1af3fe53136a2d48bc3157e3bbad62 (diff) | |
| parent | 35e7a2b2adad42b077de60d1566c22da62edeb77 (diff) | |
Merge branch 'feature/33-remove-schedule-ajax-from-startpage'
fixes #33
Diffstat (limited to '')
| -rw-r--r-- | template/overview.phtml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/template/overview.phtml b/template/overview.phtml index 02f0b5f..39cca02 100644 --- a/template/overview.phtml +++ b/template/overview.phtml @@ -1,6 +1,6 @@ <? include("$assemblies/banner.phtml") ?> -<div class="container" data-schedule-url="<?=h($conference->getScheduleJsonUrl())?>"> +<div class="container"> <div class="row headline"> <div class="col-xs-12"> <h1><?=h($title)?></h1> @@ -78,15 +78,16 @@ </a> <? if($room->hasSchedule()): ?> + <? $upcoming = @$upcomingTalksPerRoom[ $room->getScheduleName() ] ?: [] ?> <div class="program-schedule"> <div class="talk current-talk"> <strong>Now:</strong> - <span class="t">none</span> + <span class="t"><?=h(@$upcoming['current']['title'] ?: 'none') ?></span> </div> <div class="talk next-talk"> <strong>Next Talk:</strong> - <span class="t">none</span> + <span class="t"><?=h(@$upcoming['next']['title'] ?: 'none') ?></span> </div> </div> <? endif ?> |