Mirrors/streaming-website
2
0
Fork 0
mirror of https://github.com/voc/streaming-website synced 2024-11-15 08:57:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'dedeibel-sched-link-and-overview-wide-fixes'

Browse source
This commit is contained in:
MaZderMind 2018-05-12 17:46:22 +02:00
commit 395f658373
3 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.editorconfig
View file

@ -6,7 +6,7 @@ end_of_line = lf
[*.{html,phtml,sh}]
indent_style = tab
[*.{php,js}]
[*.{php,js,less}]
indent_style = tab
trim_trailing_whitespace = true

6
template/assemblies/schedule.phtml
View file

@ -17,7 +17,11 @@
<? if($scheduleRoom): ?>
<a
class="inner"
href="<?=h($scheduleRoom->createTabObject()->getLink($roomname))?>"
<? if (isset($stream)): ?>
href="<?=h($scheduleRoom->createTabObject($stream->getSelection())->getLink($roomname))?>"
<? else: ?>
href="<?=h($scheduleRoom->createTabObject()->getLink($roomname))?>"
<? endif ?>
title="Switch to <?=h($scheduleRoom->getDisplay())?>"
>
<? else: ?>

29
template/overview.phtml
View file

@ -13,17 +13,29 @@
<? $count = count($rooms); $idx = 0 ?>
<? foreach($rooms as $room): ?>
<?
$is_wide = 0;
/* when the count is odd and this is the last item - make it full width */
if (($count % 2 == 1) && ($idx == $count - 1)) {
$is_wide = 1;
}
elseif ($room->requestsWide()) {
$is_wide = 1;
$count++;
/* Increase the index if we are using a whole line, this means when the room is
* an even entry. Odd entries on the other hand steal one index from the
* "previous" row which they originally belong to. */
if ($idx % 2 != 1) {
$idx++;
}
}
?>
<div class="
room
room-<?=h($room->getSlug())?>
clearfix
<? /* when the count is odd and this is the last item - make it full width */ ?>
<? if( ($count % 2 == 1) && ($idx == $count - 1) ): ?>
wide
col-xs-12
<? elseif($room->requestsWide()): ?>
<? $count++; $idx++ ?>
<? if ($is_wide): ?>
wide
col-xs-12
<? else: ?>
@ -83,6 +95,9 @@
</a>
</div>
<? $idx++ ?>
<? if ($is_wide): ?>
<div class="clearfix"></div>
<? endif ?>
<? endforeach ?>
</div>
<? endforeach ?>