5 files changed, 135 insertions, 100 deletions
diff --git a/public/css/theme0.css b/public/css/theme0.css
index 49f928e9..daba1eba 100644
--- a/public/css/theme0.css
+++ b/public/css/theme0.css
@@ -6730,38 +6730,46 @@ body {
 .footer a {
   color: #777777;
 }
-#shifts td.free {
-  border: 1px solid #d9534f;
-  background-color: #f2dede;
-}
-a#shifts td.free:hover,
-a#shifts td.free:focus {
-  background-color: #e4b9b9;
+.shift-calendar {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-itmes: stretch;
+  width: 100%;
 }
-#shifts td.occupied {
-  border: 1px solid #5cb85c;
-  background-color: #dff0d8;
+.shift-calendar .lane {
+  background: #f9f9f9;
+  min-width: 300px;
+  width: 300px;
+  flex-grow: 1;
 }
-a#shifts td.occupied:hover,
-a#shifts td.occupied:focus {
-  background-color: #c1e2b3;
+.shift-calendar .lane .header {
+  background: #fff;
+  height: 30px;
+  padding: 5px;
 }
-#shifts td.collides {
-  border: 1px solid #f0ad4e;
-  background-color: #fcf8e3;
+.shift-calendar .lane .tick {
+  height: 30px;
+  border-top: 1px solid #f4f4f4;
 }
-a#shifts td.collides:hover,
-a#shifts td.collides:focus {
-  background-color: #f7ecb5;
+.shift-calendar .lane .tick.hour {
+  border-top: 2px solid #dddddd;
+  font-size: 0.9em;
+  padding-left: 5px;
 }
-#shifts td.own {
-  border: 1px solid #777777;
+.shift-calendar .lane .tick.day {
+  border-top: 2px solid #337ab7;
+  font-size: 0.9em;
+  padding-left: 5px;
 }
-.row-day {
-  border-top: 2px solid #777777;
+.shift-calendar .lane.time {
+  min-width: 100px;
+  width: 100px;
+  flex-grow: 0;
 }
-.row-header {
-  min-width: 90px;
+.shift-calendar .shift {
+  margin: 0 5px 5px 0;
+  overflow: hidden;
 }
 .space-top {
   margin-top: 15px;
diff --git a/public/css/theme1.css b/public/css/theme1.css
index 379f53e4..e9b6b4cd 100644
--- a/public/css/theme1.css
+++ b/public/css/theme1.css
@@ -6753,38 +6753,46 @@ body {
 .footer a {
   color: #888888;
 }
-#shifts td.free {
-  border: 1px solid #d9534f;
-  background-color: #d9534f;
-}
-a#shifts td.free:hover,
-a#shifts td.free:focus {
-  background-color: #c9302c;
+.shift-calendar {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-itmes: stretch;
+  width: 100%;
 }
-#shifts td.occupied {
-  border: 1px solid #5cb85c;
-  background-color: #5cb85c;
+.shift-calendar .lane {
+  background: #080808;
+  min-width: 300px;
+  width: 300px;
+  flex-grow: 1;
 }
-a#shifts td.occupied:hover,
-a#shifts td.occupied:focus {
-  background-color: #449d44;
+.shift-calendar .lane .header {
+  background: #fff;
+  height: 30px;
+  padding: 5px;
 }
-#shifts td.collides {
-  border: 1px solid #f0ad4e;
-  background-color: #f0ad4e;
+.shift-calendar .lane .tick {
+  height: 30px;
+  border-top: 1px solid #030303;
 }
-a#shifts td.collides:hover,
-a#shifts td.collides:focus {
-  background-color: #ec971f;
+.shift-calendar .lane .tick.hour {
+  border-top: 2px solid #282828;
+  font-size: 0.9em;
+  padding-left: 5px;
 }
-#shifts td.own {
-  border: 1px solid #888888;
+.shift-calendar .lane .tick.day {
+  border-top: 2px solid #428bca;
+  font-size: 0.9em;
+  padding-left: 5px;
 }
-.row-day {
-  border-top: 2px solid #888888;
+.shift-calendar .lane.time {
+  min-width: 100px;
+  width: 100px;
+  flex-grow: 0;
 }
-.row-header {
-  min-width: 90px;
+.shift-calendar .shift {
+  margin: 0 5px 5px 0;
+  overflow: hidden;
 }
 .space-top {
   margin-top: 15px;
diff --git a/public/css/theme2.css b/public/css/theme2.css
index e73daad3..7646f08b 100644
--- a/public/css/theme2.css
+++ b/public/css/theme2.css
@@ -6730,38 +6730,46 @@ body {
 .footer a {
   color: #777777;
 }
-#shifts td.free {
-  border: 1px solid #7f528b;
-  background-color: #f1eaf2;
-}
-a#shifts td.free:hover,
-a#shifts td.free:focus {
-  background-color: #dbcadf;
+.shift-calendar {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-itmes: stretch;
+  width: 100%;
 }
-#shifts td.occupied {
-  border: 1px solid #7b9c41;
-  background-color: #f0f5e7;
+.shift-calendar .lane {
+  background: #f9f9f9;
+  min-width: 300px;
+  width: 300px;
+  flex-grow: 1;
 }
-a#shifts td.occupied:hover,
-a#shifts td.occupied:focus {
-  background-color: #d9e6c3;
+.shift-calendar .lane .header {
+  background: #fff;
+  height: 30px;
+  padding: 5px;
 }
-#shifts td.collides {
-  border: 1px solid #e3a14d;
-  background-color: #ffffff;
+.shift-calendar .lane .tick {
+  height: 30px;
+  border-top: 1px solid #f4f4f4;
 }
-a#shifts td.collides:hover,
-a#shifts td.collides:focus {
-  background-color: #e6e6e6;
+.shift-calendar .lane .tick.hour {
+  border-top: 2px solid #dddddd;
+  font-size: 0.9em;
+  padding-left: 5px;
 }
-#shifts td.own {
-  border: 1px solid #777777;
+.shift-calendar .lane .tick.day {
+  border-top: 2px solid #758499;
+  font-size: 0.9em;
+  padding-left: 5px;
 }
-.row-day {
-  border-top: 2px solid #777777;
+.shift-calendar .lane.time {
+  min-width: 100px;
+  width: 100px;
+  flex-grow: 0;
 }
-.row-header {
-  min-width: 90px;
+.shift-calendar .shift {
+  margin: 0 5px 5px 0;
+  overflow: hidden;
 }
 .space-top {
   margin-top: 15px;
diff --git a/public/css/theme3.css b/public/css/theme3.css
index 82228db5..014fee12 100644
--- a/public/css/theme3.css
+++ b/public/css/theme3.css
@@ -6739,38 +6739,46 @@ body {
 .footer a {
   color: #777777;
 }
-#shifts td.free {
-  border: 1px solid #da1639;
-  background-color: #f9c3cd;
-}
-a#shifts td.free:hover,
-a#shifts td.free:focus {
-  background-color: #f495a6;
+.shift-calendar {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-itmes: stretch;
+  width: 100%;
 }
-#shifts td.occupied {
-  border: 1px solid #39ab50;
-  background-color: #c4eccc;
+.shift-calendar .lane {
+  background: #f9f9f9;
+  min-width: 300px;
+  width: 300px;
+  flex-grow: 1;
 }
-a#shifts td.occupied:hover,
-a#shifts td.occupied:focus {
-  background-color: #9edfab;
+.shift-calendar .lane .header {
+  background: #fff;
+  height: 30px;
+  padding: 5px;
 }
-#shifts td.collides {
-  border: 1px solid #dad216;
-  background-color: #f9f7c3;
+.shift-calendar .lane .tick {
+  height: 30px;
+  border-top: 1px solid #f4f4f4;
 }
-a#shifts td.collides:hover,
-a#shifts td.collides:focus {
-  background-color: #f4f095;
+.shift-calendar .lane .tick.hour {
+  border-top: 2px solid #dddddd;
+  font-size: 0.9em;
+  padding-left: 5px;
 }
-#shifts td.own {
-  border: 1px solid #777777;
+.shift-calendar .lane .tick.day {
+  border-top: 2px solid #f19224;
+  font-size: 0.9em;
+  padding-left: 5px;
 }
-.row-day {
-  border-top: 2px solid #777777;
+.shift-calendar .lane.time {
+  min-width: 100px;
+  width: 100px;
+  flex-grow: 0;
 }
-.row-header {
-  min-width: 90px;
+.shift-calendar .shift {
+  margin: 0 5px 5px 0;
+  overflow: hidden;
 }
 .space-top {
   margin-top: 15px;
diff --git a/public/index.php b/public/index.php
index 996c2b77..e1af1000 100644
--- a/public/index.php
+++ b/public/index.php
@@ -9,6 +9,7 @@ $free_pages = [
     'credits',
     'ical',
     'login',
+    'rooms',
     'shifts',
     'shifts_json_export',
     'shifts_json_export_all',
@@ -68,6 +69,8 @@ if (isset($_REQUEST['p']) && preg_match("/^[a-z0-9_]*$/i", $_REQUEST['p']) && (i
     list($title, $content) = shifttypes_controller();
   } elseif ($page == "admin_event_config") {
     list($title, $content) = event_config_edit_controller();
+  } elseif ($page == "rooms") {
+    list($title, $content) = rooms_controller();
   } elseif ($page == "news") {
     $title = news_title();
     $content = user_news();