diff options
| author | Christian Pointner <equinox@helsinki.at> | 2015-04-24 18:02:09 (GMT) |
|---|---|---|
| committer | Christian Pointner <equinox@helsinki.at> | 2015-04-24 18:02:09 (GMT) |
| commit | f53ae9263c55d0c4f447b86fbf8b31d3bbd3beb7 (patch) | |
| tree | 7bd4de36c6395170c6792abfe28517a6c43a9192 | |
| parent | c4458b541e00fdc31cad3ff272b8ad6e0fb1d234 (diff) | |
added jingles app
| -rw-r--r-- | www/index.html | 15 | ||||
| -rw-r--r-- | www/js/apps.js | 23 | ||||
| -rw-r--r-- | www/js/jingles.js | 5 | ||||
| -rw-r--r-- | www/styles/jingles.css | 0 |
4 files changed, 40 insertions, 3 deletions
diff --git a/www/index.html b/www/index.html index 772e2e5..68cb017 100644 --- a/www/index.html +++ b/www/index.html @@ -10,6 +10,7 @@ <link href="/javascript/twitter-bootstrap/css/bootstrap.css" rel="stylesheet"> <link href="/styles/auth.css" rel="stylesheet"> <link href="/styles/shows.css" rel="stylesheet"> + <link href="/styles/jingles.css" rel="stylesheet"> <link href="/styles/musicpools.css" rel="stylesheet"> <style type="text/css"> body { @@ -36,6 +37,7 @@ <script src="/js/auth.js"></script> <script src="/js/apps.js"></script> <script src="/js/shows.js"></script> + <script src="/js/jingles.js"></script> <script src="/js/musicpools.js"></script> </head> <body> @@ -69,7 +71,8 @@ <div class="nav-collapse"> <ul class="nav"> <li id="nav-btn-shows"><a href="#" onclick="apps_select('shows')">Sendungen</a></li> -<!-- <li id="nav-btn-musicpools"><a href="#" onclick="apps_select('musicpools')">Musikpools</a></li> --> + <li id="nav-btn-jingles"><a href="#" onclick="apps_select('jingles')">Jingles</a></li> + <li id="nav-btn-musicpools"><a href="#" onclick="apps_select('musicpools')">Musikpools</a></li> </ul> <form id="logoutform" class="navbar-form pull-right"> <span class="navbar-text">angmeldet als <strong id="username-field">UNKNOWN</strong></span> @@ -153,6 +156,16 @@ </div> </div> + <div id="app-jingles" class="container-fluid"> + <div class="alertbox"></div> + <div class="span12"> + <h1>Jingles</h1> + <p> + coming soon! + </p> + </div> + </div> + <div id="app-musicpools" class="container-fluid"> <div class="alertbox"></div> <div class="span12"> diff --git a/www/js/apps.js b/www/js/apps.js index 12c9f76..69f55f1 100644 --- a/www/js/apps.js +++ b/www/js/apps.js @@ -5,15 +5,33 @@ function apps_select(app) { case "musicpools": $('#app-shows').hide(); $('#nav-btn-shows').removeClass('active'); + $('#app-jingles').hide(); + $('#nav-btn-jingles').removeClass('active'); + $('#app-musicpools').show(); $('#nav-btn-musicpools').addClass('active'); musicpools_init(); break; + case "jingles": + $('#app-shows').hide(); + $('#nav-btn-shows').removeClass('active'); + $('#app-musicpools').hide(); + $('#nav-btn-musicpools').removeClass('active'); + + $('#app-jingles').show(); + $('#nav-btn-jingles').addClass('active'); + + musicpools_init(); + break; default: - $('#app-shows').show(); - $('#nav-btn-shows').addClass('active'); + $('#app-jingles').hide(); + $('#nav-btn-jingles').removeClass('active'); $('#app-musicpools').hide(); $('#nav-btn-musicpools').removeClass('active'); + + $('#app-shows').show(); + $('#nav-btn-shows').addClass('active'); + apps_current = 'shows'; shows_init(); } @@ -27,6 +45,7 @@ function apps_init() { function apps_cleanup() { shows_cleanup(); + jingles_cleanup(); musicpools_cleanup(); sessionStorage.removeItem("apps_current"); diff --git a/www/js/jingles.js b/www/js/jingles.js new file mode 100644 index 0000000..7034df9 --- /dev/null +++ b/www/js/jingles.js @@ -0,0 +1,5 @@ +function jingles_init() { +} + +function jingles_cleanup() { +} diff --git a/www/styles/jingles.css b/www/styles/jingles.css new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/www/styles/jingles.css |