From ce811ee001a7f8f4e30148d73cccdd33edf942de Mon Sep 17 00:00:00 2001
From: dedeibel
Date: Sat, 12 May 2018 14:53:16 +0200
Subject: Add current stream selection to schedule link if present. Meaning:
 Stay in the current stream type when switching rooms.

---
 template/assemblies/schedule.phtml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'template')

diff --git a/template/assemblies/schedule.phtml b/template/assemblies/schedule.phtml
index 62eb077..461353c 100644
--- a/template/assemblies/schedule.phtml
+++ b/template/assemblies/schedule.phtml
@@ -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: ?>
-- 
cgit v1.2.3


From 7dc56fec2d7724b6dc909936ad63d6888bbdd309 Mon Sep 17 00:00:00 2001
From: dedeibel
Date: Sat, 12 May 2018 17:28:04 +0200
Subject: Fix handling of wide room entries which causes problems on small
 screens because of missing clearfix entries. Additionally fixing handling of
 the last line when declaring odd room indizes as wide entries.

---
 template/overview.phtml | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

(limited to 'template')

diff --git a/template/overview.phtml b/template/overview.phtml
index 513f8e5..410c835 100644
--- a/template/overview.phtml
+++ b/template/overview.phtml
@@ -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 ?>
-- 
cgit v1.2.3