Merge branch 'master' of ssh://git@git.helsinki.at:2342/rhwebimport.git

author: Peter Grassberger <petertheone@gmail.com> 2016-06-27 23:08:15 (GMT)
committer: Peter Grassberger <petertheone@gmail.com> 2016-06-27 23:08:15 (GMT)
commit: d5d29c8889a9dc655044a1cf0926c1ac892b6696 (patch)
tree: a73ddad8bad0cf275e11886dac20e19bb6935522 /www/index.html
parent: dd5cd12cafa71f5d757642aec25c65dcceb3d02c (diff)
parent: 03af1fed48370ddc4772709207f064c16191f5c1 (diff)
1 files changed, 64 insertions, 54 deletions
diff --git a/www/index.html b/www/index.html
index eb8e3d2..56130cc 100644
--- a/www/index.html
+++ b/www/index.html
@@ -15,20 +15,6 @@
   <link href="/styles/jingles.css" rel="stylesheet">
   <link href="/styles/musicpools.css" rel="stylesheet">
   <link href="/styles/musicgrid.css" rel="stylesheet">
-  <script src="/javascript/jquery/jquery.min.js"></script>
-  <script src="/javascript/bootstrap/js/bootstrap.min.js"></script>
-  <script src="/js/dropzone.js"></script>
-  <script src="/js/rdxport.js"></script>
-  <script src="/js/rdxport.rh.js"></script>
-  <script src="/js/utils.js"></script>
-  <script src="/js/clock.js"></script>
-  <script src="/js/importer.js"></script>
-  <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>
-  <script src="/js/musicgrid.js"></script>
  </head>
  <body>
 
@@ -40,7 +26,7 @@
         <img class="visible-xs-block" src="/img/helsinki-small.png" alt="radio helsinki logo" />
         <div class="loginspacer hidden-xs">&nbsp;</div>
         <div class="loginspacer hidden-xs hidden-sm">&nbsp;</div>
-        <img class="hidden-xs" src="/img/helsinki.png" alt="radio helsinki logo" />
+        <img class="hidden-xs" src="/img/helsinki.png" alt="radio helsinki logo" width="176" height="176" />
         <h1 class="form-auth-heading">Radio Helsinki - Import</h1>
         <input id="username" type="text" class="form-control" placeholder="Benutzername" required autofocus>
         <input id="password" type="password" class="form-control" placeholder="Passwort" required>
@@ -67,16 +53,16 @@
           <div class="collapse navbar-collapse" id="navbar-collapse-1">
             <div class="navbar-left">
               <ul class="nav navbar-nav">
-                <li id="nav-btn-shows"><a href="/shows/" onclick="event.preventDefault(); apps_select('shows')">Sendungen</a></li>
-                <li id="nav-btn-jingles"><a href="/jingles/" onclick="event.preventDefault(); apps_select('jingles')">Jingles</a></li>
-                <li id="nav-btn-musicpools"><a href="/musicpools/" onclick="event.preventDefault(); apps_select('musicpools')">Musikpools</a></li>
-                <li id="nav-btn-musicgrid"><a href="/musicgrid/" onclick="event.preventDefault(); apps_select('musicgrid')">Musikgrid</a></li>
+                <li id="nav-btn-shows"><a href="/shows/">Sendungen</a></li>
+                <li id="nav-btn-jingles"><a href="/jingles/">Jingles</a></li>
+                <li id="nav-btn-musicpools"><a href="/musicpools/">Musikpools</a></li>
+                <li id="nav-btn-musicgrid"><a href="/musicgrid/">Musikgrid</a></li>
               </ul>
             </div>
 
             <div class="navbar-right">
               <p class="navbar-text">angemeldet als <strong id="username-field">UNKNOWN</strong></p>
-              <button type="button" class="btn btn-danger navbar-btn" onclick="auth_logout()">
+              <button type="button" class="btn btn-danger navbar-btn logout">
                 <span class="glyphicon glyphicon-log-out" aria-hidden="true"></span>&nbsp;&nbsp;Abmelden
               </button>
             </div>
@@ -128,18 +114,28 @@
         </div>
       </div>
 
-      <div id="app-shows" class="container-fluid">
+      <div id="app-shows" class="container-fluid app-tab">
         <div class="alertbox"></div>
         <div class="row">
           <div class="col-md-10">
-            <form class="well form-inline">
-              <!-- todo: fix html error: h3 is not allowed in label -->
-              <label class="control-label" for="show-selector">
-                <h3>Sendung auswählen</h3>
-              </label>&nbsp;&nbsp;
-              <select id="show-selector" class="main-selector">
-              </select>
-            </form>
+            <div class="row">
+              <div class="col-md-12" id="show-header-spacer">
+              </div>
+            </div>
+            <div class="row">
+              <div class="col-md-3">
+                <div class="dropdown">
+                  <button type="button" class="btn btn-lg btn-primary" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    Sendung auswählen <span class="caret"></span>
+                  </button>
+                  <ul class="dropdown-menu" id="show-selector">
+                  </ul>
+                </div>
+              </div>
+              <div class="col-md-9">
+                <h2 id="show-title"></h2>
+              </div>
+            </div>
           </div>
           <div class="col-md-2">
             <div id="clock">
@@ -149,18 +145,16 @@
             </div>
           </div>
         </div>
-        <div class="row">
-          <div class="col-md-12">
-            <h2 id="show-title"></h2>
-          </div>
-        </div>
         <div class="row" id="show-details">
           <div class="col-md-2">&nbsp;</div>
           <div class="col-md-2">
             <strong>Tag:</strong> <span id="show-dow"></span>
           </div>
           <div class="col-md-2">
-            <strong>Rythmus:</strong> <span id="show-rhythm"></span>
+            <strong>Rythmus:</strong> <span id="show-rhythm-w1" class="label label-default">1</span>
+                                      <span id="show-rhythm-w2" class="label label-default">2</span>
+                                      <span id="show-rhythm-w3" class="label label-default">3</span>
+                                      <span id="show-rhythm-w4" class="label label-default">4</span>
           </div>
           <div class="col-md-2">
             <strong>Startzeit:</strong> <span id="show-starttime"></span>
@@ -191,7 +185,7 @@
         </div>
       </div>
 
-      <div id="app-jingles" class="container-fluid">
+      <div id="app-jingles" class="container-fluid app-tab">
         <div class="alertbox"></div>
 
         <div class="groups">
@@ -200,26 +194,34 @@
 
       </div>
 
-      <div id="app-musicpools" class="container-fluid">
+      <div id="app-musicpools" class="container-fluid app-tab">
         <div class="alertbox"></div>
         <div class="row">
-          <form class="well form-inline">
-            <!-- todo: fix html error: h3 is not allowed in label -->
-            <label class="control-label" for="musicpool-selector">
-              <h3>Musikpool auswählen</h3>
-            </label>&nbsp;&nbsp;
-            <select id="musicpool-selector" class="main-selector">
-            </select>
-          </form>
+          <div class="col-md-12" id="musicpool-header-spacer">
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-md-3">
+            <div class="dropdown">
+              <button type="button" class="btn btn-lg btn-primary" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Musikpool auswählen <span class="caret"></span>
+              </button>
+              <ul class="dropdown-menu" id="musicpool-selector">
+              </ul>
+            </div>
+          </div>
+          <div class="col-md-9">
+            <h2 id="musicpool-title"></h2>
+          </div>
         </div>
         <div class="musicpoolContainer">
 
         </div>
       </div>
 
-      <div id="app-musicgrid" class="container-fluid">
+      <div id="app-musicgrid" class="container-fluid app-tab">
         <div class="alertbox"></div>
-        <h1>Musikgrid</h1>
+        <h2 id="musicgrid-title">Musikgrid</h2>
         <table class="table table-striped">
           <thead>
           <tr>
@@ -306,7 +308,7 @@
 
       <div class="row group jingleGroupTemplate">
         <div class="col-md-12">
-          <h2></h2>
+          <h2 class="jingle-title"></h2>
           <table class="table table-striped">
             <thead>
             <tr>
@@ -329,7 +331,6 @@
 
       <div class="row musicpool musicpoolTemplate">
         <div class="col-md-12">
-          <h2></h2>
           <table class="table table-striped">
             <thead>
             <tr>
@@ -427,11 +428,20 @@
 
   </div>
 
-  <script type="text/javascript">
-    auth_init();
-    apps_init();
-    clock_init();
-  </script>
+  <script src="/javascript/jquery/jquery.min.js"></script>
+  <script src="/javascript/bootstrap/js/bootstrap.min.js"></script>
+  <script src="/js/dropzone.js"></script>
+  <script src="/js/rdxport.js"></script>
+  <script src="/js/rdxport.rh.js"></script>
+  <script src="/js/utils.js"></script>
+  <script src="/js/clock.js"></script>
+  <script src="/js/importer.js"></script>
+  <script src="/js/auth.js"></script>
+  <script src="/js/shows.js"></script>
+  <script src="/js/jingles.js"></script>
+  <script src="/js/musicpools.js"></script>
+  <script src="/js/musicgrid.js"></script>
+  <script src="/js/router.js"></script>
 
  </body>
 </html>
author	Peter Grassberger <petertheone@gmail.com>	2016-06-27 23:08:15 (GMT)
committer	Peter Grassberger <petertheone@gmail.com>	2016-06-27 23:08:15 (GMT)
commit	d5d29c8889a9dc655044a1cf0926c1ac892b6696 (patch)
tree	a73ddad8bad0cf275e11886dac20e19bb6935522 /www/index.html
parent	dd5cd12cafa71f5d757642aec25c65dcceb3d02c (diff)
parent	03af1fed48370ddc4772709207f064c16191f5c1 (diff)