diff options
author | Peter Grassberger <petertheone@gmail.com> | 2016-01-20 23:08:33 (GMT) |
---|---|---|
committer | Peter Grassberger <petertheone@gmail.com> | 2016-01-20 23:08:33 (GMT) |
commit | a9224f7dc48420330341b08b3e387d571d5e9ab4 (patch) | |
tree | 76ffe9edecbf94fc21d1d600fc921bc5695587c3 | |
parent | d14e1c29570092fb55699534b5401bb710121f4e (diff) |
fix musicgrid dow bug, add missing hours, style fullWidth
-rw-r--r-- | www/index.html | 153 | ||||
-rw-r--r-- | www/js/apps.js | 3 | ||||
-rw-r--r-- | www/js/musicpools.js | 3 | ||||
-rw-r--r-- | www/styles/main-style.css | 4 | ||||
-rw-r--r-- | www/styles/musicgrid.css | 3 |
5 files changed, 92 insertions, 74 deletions
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 @@ <link href="/styles/shows.css" rel="stylesheet"> <link href="/styles/jingles.css" rel="stylesheet"> <link href="/styles/musicpools.css" rel="stylesheet"> + <link href="/styles/musicgrid.css" rel="stylesheet"> <link href="/javascript/twitter-bootstrap/css/bootstrap-responsive.css" rel="stylesheet"> <script src="/javascript/jquery/jquery.min.js"></script> <script src="/javascript/twitter-bootstrap/js/bootstrap.min.js"></script> @@ -201,79 +202,85 @@ <div id="app-musicgrid" class="container-fluid"> <div class="alertbox"></div> - <div class="span12"> - <h1>Musikgrid</h1> - <table class="table table-striped"> - <thead> - <tr> - <th></th> - <th>00:00</th><th>01:00</th><th>02:00</th><th>03:00</th> - <th>04:00</th><th>05:00</th><th>06:00</th><th>07:00</th> - <th>08:00</th><th>09:00</th><th>10:00</th><th>11:00</th> - <th>16:00</th><th>17:00</th><th>18:00</th><th>19:00</th> - <th>20:00</th><th>21:00</th><th>22:00</th><th>23:00</th> - </tr> - </thead> - <tbody> - <tr data-dow="0"> - <th>Montag</th> - <td data-hour="0"></td><td data-hour="1"></td><td data-hour="2"></td><td data-hour="3"></td> - <td data-hour="4"></td><td data-hour="5"></td><td data-hour="6"></td><td data-hour="7"></td> - <td data-hour="8"></td><td data-hour="9"></td><td data-hour="10"></td><td data-hour="11"></td> - <td data-hour="16"></td><td data-hour="17"></td><td data-hour="18"></td><td data-hour="19"></td> - <td data-hour="20"></td><td data-hour="21"></td><td data-hour="22"></td><td data-hour="23"></td> - </tr> - <tr data-dow="1"> - <th>Dienstag</th> - <td data-hour="0"></td><td data-hour="1"></td><td data-hour="2"></td><td data-hour="3"></td> - <td data-hour="4"></td><td data-hour="5"></td><td data-hour="6"></td><td data-hour="7"></td> - <td data-hour="8"></td><td data-hour="9"></td><td data-hour="10"></td><td data-hour="11"></td> - <td data-hour="16"></td><td data-hour="17"></td><td data-hour="18"></td><td data-hour="19"></td> - <td data-hour="20"></td><td data-hour="21"></td><td data-hour="22"></td><td data-hour="23"></td> - </tr> - <tr data-dow="2"> - <th>Mittwoch</th> - <td data-hour="0"></td><td data-hour="1"></td><td data-hour="2"></td><td data-hour="3"></td> - <td data-hour="4"></td><td data-hour="5"></td><td data-hour="6"></td><td data-hour="7"></td> - <td data-hour="8"></td><td data-hour="9"></td><td data-hour="10"></td><td data-hour="11"></td> - <td data-hour="16"></td><td data-hour="17"></td><td data-hour="18"></td><td data-hour="19"></td> - <td data-hour="20"></td><td data-hour="21"></td><td data-hour="22"></td><td data-hour="23"></td> - </tr> - <tr data-dow="3"> - <th>Donnerstag</th> - <td data-hour="0"></td><td data-hour="1"></td><td data-hour="2"></td><td data-hour="3"></td> - <td data-hour="4"></td><td data-hour="5"></td><td data-hour="6"></td><td data-hour="7"></td> - <td data-hour="8"></td><td data-hour="9"></td><td data-hour="10"></td><td data-hour="11"></td> - <td data-hour="16"></td><td data-hour="17"></td><td data-hour="18"></td><td data-hour="19"></td> - <td data-hour="20"></td><td data-hour="21"></td><td data-hour="22"></td><td data-hour="23"></td> - </tr> - <tr data-dow="4"> - <th>Freitag</th> - <td data-hour="0"></td><td data-hour="1"></td><td data-hour="2"></td><td data-hour="3"></td> - <td data-hour="4"></td><td data-hour="5"></td><td data-hour="6"></td><td data-hour="7"></td> - <td data-hour="8"></td><td data-hour="9"></td><td data-hour="10"></td><td data-hour="11"></td> - <td data-hour="16"></td><td data-hour="17"></td><td data-hour="18"></td><td data-hour="19"></td> - <td data-hour="20"></td><td data-hour="21"></td><td data-hour="22"></td><td data-hour="23"></td> - </tr> - <tr data-dow="5"> - <th>Samstag</th> - <td data-hour="0"></td><td data-hour="1"></td><td data-hour="2"></td><td data-hour="3"></td> - <td data-hour="4"></td><td data-hour="5"></td><td data-hour="6"></td><td data-hour="7"></td> - <td data-hour="8"></td><td data-hour="9"></td><td data-hour="10"></td><td data-hour="11"></td> - <td data-hour="16"></td><td data-hour="17"></td><td data-hour="18"></td><td data-hour="19"></td> - <td data-hour="20"></td><td data-hour="21"></td><td data-hour="22"></td><td data-hour="23"></td> - </tr> - <tr data-dow="6"> - <th>Sonntag</th> - <td data-hour="0"></td><td data-hour="1"></td><td data-hour="2"></td><td data-hour="3"></td> - <td data-hour="4"></td><td data-hour="5"></td><td data-hour="6"></td><td data-hour="7"></td> - <td data-hour="8"></td><td data-hour="9"></td><td data-hour="10"></td><td data-hour="11"></td> - <td data-hour="16"></td><td data-hour="17"></td><td data-hour="18"></td><td data-hour="19"></td> - <td data-hour="20"></td><td data-hour="21"></td><td data-hour="22"></td><td data-hour="23"></td> - </tr> - </tbody> - </table> - </div> + <h1>Musikgrid</h1> + <table class="table table-striped"> + <thead> + <tr> + <th></th> + <th>00:00</th><th>01:00</th><th>02:00</th><th>03:00</th> + <th>04:00</th><th>05:00</th><th>06:00</th><th>07:00</th> + <th>08:00</th><th>09:00</th><th>10:00</th><th>11:00</th> + <th>12:00</th><th>13:00</th><th>14:00</th><th>15:00</th> + <th>16:00</th><th>17:00</th><th>18:00</th><th>19:00</th> + <th>20:00</th><th>21:00</th><th>22:00</th><th>23:00</th> + </tr> + </thead> + <tbody> + <tr data-dow="1"> + <th>Montag</th> + <td data-hour="0"></td><td data-hour="1"></td><td data-hour="2"></td><td data-hour="3"></td> + <td data-hour="4"></td><td data-hour="5"></td><td data-hour="6"></td><td data-hour="7"></td> + <td data-hour="8"></td><td data-hour="9"></td><td data-hour="10"></td><td data-hour="11"></td> + <td data-hour="12"></td><td data-hour="13"></td><td data-hour="14"></td><td data-hour="15"></td> + <td data-hour="16"></td><td data-hour="17"></td><td data-hour="18"></td><td data-hour="19"></td> + <td data-hour="20"></td><td data-hour="21"></td><td data-hour="22"></td><td data-hour="23"></td> + </tr> + <tr data-dow="2"> + <th>Dienstag</th> + <td data-hour="0"></td><td data-hour="1"></td><td data-hour="2"></td><td data-hour="3"></td> + <td data-hour="4"></td><td data-hour="5"></td><td data-hour="6"></td><td data-hour="7"></td> + <td data-hour="8"></td><td data-hour="9"></td><td data-hour="10"></td><td data-hour="11"></td> + <td data-hour="12"></td><td data-hour="13"></td><td data-hour="14"></td><td data-hour="15"></td> + <td data-hour="16"></td><td data-hour="17"></td><td data-hour="18"></td><td data-hour="19"></td> + <td data-hour="20"></td><td data-hour="21"></td><td data-hour="22"></td><td data-hour="23"></td> + </tr> + <tr data-dow="3"> + <th>Mittwoch</th> + <td data-hour="0"></td><td data-hour="1"></td><td data-hour="2"></td><td data-hour="3"></td> + <td data-hour="4"></td><td data-hour="5"></td><td data-hour="6"></td><td data-hour="7"></td> + <td data-hour="8"></td><td data-hour="9"></td><td data-hour="10"></td><td data-hour="11"></td> + <td data-hour="12"></td><td data-hour="13"></td><td data-hour="14"></td><td data-hour="15"></td> + <td data-hour="16"></td><td data-hour="17"></td><td data-hour="18"></td><td data-hour="19"></td> + <td data-hour="20"></td><td data-hour="21"></td><td data-hour="22"></td><td data-hour="23"></td> + </tr> + <tr data-dow="4"> + <th>Donnerstag</th> + <td data-hour="0"></td><td data-hour="1"></td><td data-hour="2"></td><td data-hour="3"></td> + <td data-hour="4"></td><td data-hour="5"></td><td data-hour="6"></td><td data-hour="7"></td> + <td data-hour="8"></td><td data-hour="9"></td><td data-hour="10"></td><td data-hour="11"></td> + <td data-hour="12"></td><td data-hour="13"></td><td data-hour="14"></td><td data-hour="15"></td> + <td data-hour="16"></td><td data-hour="17"></td><td data-hour="18"></td><td data-hour="19"></td> + <td data-hour="20"></td><td data-hour="21"></td><td data-hour="22"></td><td data-hour="23"></td> + </tr> + <tr data-dow="5"> + <th>Freitag</th> + <td data-hour="0"></td><td data-hour="1"></td><td data-hour="2"></td><td data-hour="3"></td> + <td data-hour="4"></td><td data-hour="5"></td><td data-hour="6"></td><td data-hour="7"></td> + <td data-hour="8"></td><td data-hour="9"></td><td data-hour="10"></td><td data-hour="11"></td> + <td data-hour="12"></td><td data-hour="13"></td><td data-hour="14"></td><td data-hour="15"></td> + <td data-hour="16"></td><td data-hour="17"></td><td data-hour="18"></td><td data-hour="19"></td> + <td data-hour="20"></td><td data-hour="21"></td><td data-hour="22"></td><td data-hour="23"></td> + </tr> + <tr data-dow="6"> + <th>Samstag</th> + <td data-hour="0"></td><td data-hour="1"></td><td data-hour="2"></td><td data-hour="3"></td> + <td data-hour="4"></td><td data-hour="5"></td><td data-hour="6"></td><td data-hour="7"></td> + <td data-hour="8"></td><td data-hour="9"></td><td data-hour="10"></td><td data-hour="11"></td> + <td data-hour="12"></td><td data-hour="13"></td><td data-hour="14"></td><td data-hour="15"></td> + <td data-hour="16"></td><td data-hour="17"></td><td data-hour="18"></td><td data-hour="19"></td> + <td data-hour="20"></td><td data-hour="21"></td><td data-hour="22"></td><td data-hour="23"></td> + </tr> + <tr data-dow="0"> + <th>Sonntag</th> + <td data-hour="0"></td><td data-hour="1"></td><td data-hour="2"></td><td data-hour="3"></td> + <td data-hour="4"></td><td data-hour="5"></td><td data-hour="6"></td><td data-hour="7"></td> + <td data-hour="8"></td><td data-hour="9"></td><td data-hour="10"></td><td data-hour="11"></td> + <td data-hour="12"></td><td data-hour="13"></td><td data-hour="14"></td><td data-hour="15"></td> + <td data-hour="16"></td><td data-hour="17"></td><td data-hour="18"></td><td data-hour="19"></td> + <td data-hour="20"></td><td data-hour="21"></td><td data-hour="22"></td><td data-hour="23"></td> + </tr> + </tbody> + </table> </div> </div> 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; +} |