diff options
| -rw-r--r-- | assets/css/_schedule.less | 14 | ||||
| -rw-r--r-- | template/assemblies/schedule.phtml | 61 |
2 files changed, 41 insertions, 34 deletions
diff --git a/assets/css/_schedule.less b/assets/css/_schedule.less index 0151154..72ea294 100644 --- a/assets/css/_schedule.less +++ b/assets/css/_schedule.less @@ -40,8 +40,16 @@ height: 75px; } + a:hover { + text-decoration: none; + } + + .inner { + display: block; + padding: 10px; + height: 100%; + } - padding: 10px; border: 1px solid @schedule-border; h3 { @@ -64,10 +72,6 @@ @media (max-width: @screen-xs-max) { font-size: 15px; } - - a { - color: @schedule-room; - } } h5 { diff --git a/template/assemblies/schedule.phtml b/template/assemblies/schedule.phtml index b749e0b..2d5fc21 100644 --- a/template/assemblies/schedule.phtml +++ b/template/assemblies/schedule.phtml @@ -10,46 +10,49 @@ data-start="<?=intval($event['start'])?>" data-end="<?=intval($event['end'])?>" > - <? if(@$event['special'] == 'daychange'): ?> + <? $scheduleRoom = Room::createIfExists($roomname) ?> + <? if($scheduleRoom): ?> + <a + class="inner" + href="<?=h($scheduleRoom->createTabObject()->getLink($roomname))?>" + title="Switch to <?=h($scheduleRoom->getDisplay())?>" + > + <? else: ?> + <div class="inner"> + <? endif ?> - <h3><?=h($event['title'])?></h3> + <? if(@$event['special'] == 'daychange'): ?> - <? elseif(@$event['special'] == 'gap'): ?> + <h3><?=h($event['title'])?></h3> - <!--h3>Gap</h3--> + <? elseif(@$event['special'] == 'gap'): ?> - <? elseif(@$event['special'] == 'pause'): ?> + <!--h3>Gap</h3--> - <h3><?=h($event['title'])?></h3> + <? elseif(@$event['special'] == 'pause'): ?> - <? else: ?> + <h3><?=h($event['title'])?></h3> + + <? else: ?> - <? $scheduleRoom = Room::createIfExists($roomname) ?> - <h4><?=h(strftime('%H:%M', $event['start']))?> - – - <?=h(strftime('%H:%M', $event['end']))?> - in - <? if($scheduleRoom): ?> - <a href="<?=h($scheduleRoom->createTabObject()->getLink($roomname))?>"> - <?=h($scheduleRoom->getDisplay())?> - </a> - <? else: ?> + <h4><?=h(strftime('%H:%M', $event['start']))?> + – + <?=h(strftime('%H:%M', $event['end']))?> + in <?=h($roomname) ?> - <? endif ?> - </h4> - <h3> - <? if($scheduleRoom): ?> - <a - href="<?=h($scheduleRoom->createTabObject()->getLink($roomname))?>" - title="Switch to <?=h($scheduleRoom->getDisplay())?>" - ><?=h($event['title'])?></a> - <? else: ?> + </h4> + <h3> <?=h($event['title'])?> + </h3> + <? if($event['speaker']): ?> + <h5>by <?=h($event['speaker'])?></h5> <? endif ?> - </h3> - <? if($event['speaker']): ?> - <h5>by <?=h($event['speaker'])?></h5> <? endif ?> + + <? if($scheduleRoom): ?> + </a> + <? else: ?> + </div> <? endif ?> </div> |