From a9224f7dc48420330341b08b3e387d571d5e9ab4 Mon Sep 17 00:00:00 2001 From: Peter Grassberger Date: Thu, 21 Jan 2016 00:08:33 +0100 Subject: fix musicgrid dow bug, add missing hours, style fullWidth diff --git a/www/index.html b/www/index.html index 15b7619..0bd7725 100644 --- a/www/index.html +++ b/www/index.html @@ -14,6 +14,7 @@ + @@ -201,79 +202,85 @@
-
-

Musikgrid

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
00:0001:0002:0003:0004:0005:0006:0007:0008:0009:0010:0011:0016:0017:0018:0019:0020:0021:0022:0023:00
Montag
Dienstag
Mittwoch
Donnerstag
Freitag
Samstag
Sonntag
-
+

Musikgrid

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
00:0001:0002:0003:0004:0005:0006:0007:0008:0009:0010:0011:0012:0013:0014:0015:0016:0017:0018:0019:0020:0021:0022:0023:00
Montag
Dienstag
Mittwoch
Donnerstag
Freitag
Samstag
Sonntag
diff --git a/www/js/apps.js b/www/js/apps.js index 50e6ee5..4f71a9c 100644 --- a/www/js/apps.js +++ b/www/js/apps.js @@ -23,6 +23,8 @@ var apps_current; function apps_select(app) { + $('.container').removeClass('fullWidth'); + switch(app) { case "musicgrid": $('#app-shows').hide(); @@ -32,6 +34,7 @@ function apps_select(app) { $('#app-musicpools').hide(); $('#nav-btn-musicpools').removeClass('active'); + $('.container').addClass('fullWidth'); $('#app-musicgrid').show(); $('#nav-btn-musicgrid').addClass('active'); diff --git a/www/js/musicpools.js b/www/js/musicpools.js index e2eea41..6b46981 100644 --- a/www/js/musicpools.js +++ b/www/js/musicpools.js @@ -38,7 +38,8 @@ function musicpools_cleanup() { // this and jinglegroups are basicly the same var Musicpools = function() { // todo: get current Pool Id from session like shows? - this.currentPoolId = null; + this.currentPoolId = sessionStorage.getItem("currentPoolId"); + this.currentPoolId = this.currentPoolId === null ? 0 : this.currentPoolId; this.musicpools = []; this.fetch(); }; diff --git a/www/styles/main-style.css b/www/styles/main-style.css index 41e1575..443d68e 100644 --- a/www/styles/main-style.css +++ b/www/styles/main-style.css @@ -26,6 +26,10 @@ body { padding-bottom: 40px; } +.container.fullWidth { + width: 100% !important; +} + .btn i[class*='icon-'] { vertical-align: middle; } diff --git a/www/styles/musicgrid.css b/www/styles/musicgrid.css new file mode 100644 index 0000000..e260228 --- /dev/null +++ b/www/styles/musicgrid.css @@ -0,0 +1,3 @@ +#app-musicgrid { + padding: 0; +} -- cgit v0.10.2