diff options
| author | MaZderMind | 2015-03-30 21:18:09 +0200 |
|---|---|---|
| committer | MaZderMind | 2015-03-30 21:18:09 +0200 |
| commit | fc4cf5793cbe6561347067eb7b25c60a6fc50f77 (patch) | |
| tree | 357e60e443244c3438e3a3d692c91868363712f0 /template | |
| parent | f7d9d592745d1cb5cb2de76ed6ae99be974f1807 (diff) | |
Rename program to schedule
Diffstat (limited to 'template')
| -rw-r--r-- | template/assemblies/schedule.phtml (renamed from template/assemblies/program.phtml) | 26 | ||||
| -rw-r--r-- | template/room.phtml | 4 |
2 files changed, 12 insertions, 18 deletions
diff --git a/template/assemblies/program.phtml b/template/assemblies/schedule.phtml index d7f7045..d2bb9e6 100644 --- a/template/assemblies/program.phtml +++ b/template/assemblies/schedule.phtml @@ -1,18 +1,12 @@ -<? - -foreach(reset($program) as $event) - $width += $event['duration']; - -?> -<div class="program scroll-container"> +<div class="schedule scroll-container"> <div class="scroll-element"> <div class="now"><span>now</span></div> - <? foreach($program as $roomname => $events): ?> - <div class="room <? if($roomname == get("ROOMS.$room.SCHEDULE_NAME", $room)): ?>highlight<? endif ?>" style="width: <?=$width / get('SCHEDULE.SCALE')?>px"> + <? foreach($schedule->getSchedule() as $roomname => $events): ?> + <div class="room <? if($roomname == $room->getSlug()): ?>highlight<? endif ?>" style="width: <?=ceil($schedule->getDurationSum() / $schedule->getScale())?>px"> <? foreach($events as $event): ?> <div class="block <?=h(@$event['special'] ?: 'event')?>" - style="width: <?=h($event['duration'] / get('SCHEDULE.SCALE'))?>px" + style="width: <?=h(round($event['duration'] / $schedule->getScale()))?>px" data-start="<?=intval($event['start'])?>" data-end="<?=intval($event['end'])?>" > @@ -34,23 +28,23 @@ foreach(reset($program) as $event) – <?=h(strftime('%H:%M', $event['end']))?> in - <? if(has("ROOMS.$roomname")): ?> + <? /*if(has("ROOMS.$roomname")): ?> <a href="<?=h(link_player($roomname))?>"> <?=h(get("ROOMS.$roomname.DISPLAY"))?> </a> - <? else: ?> + <? else:*/ ?> <?=h($roomname) ?> - <? endif ?> + <? /*endif*/ ?> </h4> <h3> - <? if(has("ROOMS.$roomname")): ?> + <? /*if(has("ROOMS.$roomname")): ?> <a href="<?=h(link_player($roomname))?>" title="Switch to <?=h(get("ROOMS.$roomname.DISPLAY"))?>" ><?=h($event['title'])?></a> - <? else: ?> + <? else:*/ ?> <?=h($event['title'])?> - <? endif ?> + <? /*endif*/ ?> </h3> <? if($event['speaker']): ?> <h5>by <?=h($event['speaker'])?></h5> diff --git a/template/room.phtml b/template/room.phtml index 25a7255..32b7d6c 100644 --- a/template/room.phtml +++ b/template/room.phtml @@ -54,8 +54,8 @@ </div> <? endif ?> <? if($room->hasSchedule()): ?> - <div role="tabpanel" class="tab-pane" id="program"> - <? require("$assemblies/program.phtml") ?> + <div role="tabpanel" class="tab-pane" id="schedule"> + <? require("$assemblies/schedule.phtml") ?> </div> <? endif ?> <? if($room->hasFeedback()): ?> |