fixed navbar and icons

1 files changed, 14 insertions, 33 deletions

diff --git a/www/index.html b/www/index.html
index 5b5800d..7e6a5cc 100644
--- a/www/index.html
+++ b/www/index.html
@@ -52,14 +52,9 @@
 
     <div id="mainwindow">
 
-      <nav class="navbar navbar-inverse navbar-default navbar-fixed-top">
+      <nav class="navbar navbar-inverse navbar-fixed-top">
         <div class="container-fluid">
           <div class="navbar-header">
-            <!--<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-              <span class="icon-bar"></span>
-              <span class="icon-bar"></span>
-              <span class="icon-bar"></span>
-            </a>-->
             <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1" aria-expanded="false">
               <span class="sr-only">Toggle navigation</span>
               <span class="icon-bar"></span>
@@ -67,38 +62,24 @@
               <span class="icon-bar"></span>
             </button>
             <span class="navbar-brand">Radio Helsinki - Import</span>
+          </div>
 
-            <!--<div class="nav-collapse">
-              <ul class="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>
-              </ul>
-              <form id="logoutform" class="navbar-form pull-right">
-                <span class="navbar-text">angemeldet als <strong id="username-field">UNKNOWN</strong></span>&nbsp;&nbsp;
-                <button style="margin-top: 0;" type="button" class="btn btn-danger btn-sm" onclick="auth_logout()">
-                  <i class="icon-off icon-white"></i> Abmelden
-                </button>
-              </form>
-            </div>-->
-
-            <div class="collapse navbar-collapse navbar-right" id="navbar-collapse-1">
+          <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>
               </ul>
-
-              <form id="logoutform" class="navbar-form pull-right">
-                <p class="navbar-text">angemeldet als <strong id="username-field">UNKNOWN</strong></p>
-                <button type="button" class="btn btn-danger btn-sm" onclick="auth_logout()">
-                  <span class="glyphicon glyphicon-log-out" aria-hidden="true"></span> Abmelden
-                </button>
-              </form>
             </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()">
+                <span class="glyphicon glyphicon-log-out" aria-hidden="true"></span>&nbsp;&nbsp;Abmelden
+              </button>
+            </div>
           </div>
         </div>
       </nav>
@@ -331,7 +312,7 @@
             <tfoot>
             </tfoot>
           </table>
-          <button class="uploadButton btn btn-success"><i class="glyphicon glyphicon-upload glyphicon-white"></i> Importieren</button>
+          <button class="uploadButton btn btn-success"><span class="glyphicon glyphicon-upload"></span>&nbsp;&nbsp;Importieren</button>
         </div>
       </div>
 
@@ -355,7 +336,7 @@
             <tfoot>
             </tfoot>
           </table>
-          <button class="uploadButton btn btn-success"><i class="glyphicon glyphicon-upload glyphicon-white"></i> Importieren</button>
+          <button class="uploadButton btn btn-success"><span class="glyphicon glyphicon-upload"></span>&nbsp;&nbsp;Importieren</button>
         </div>
       </div>
 
@@ -368,7 +349,7 @@
             <div class="progress"><div class="bar" style="width: 0%;"></div></div>
           </td>
           <td>
-            <button class="btn btn-danger btn-xs"><i class="glyphicon glyphicon-remove glyphicon-white"></i> Abbrechen</button>
+            <button class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-remove"></span>&nbsp;&nbsp;Abbrechen</button>
           </td>
         </tr>
       </table>
@@ -388,7 +369,7 @@
             <div class="progress"><div class="bar" style="width: 0%;"></div></div>
           </td>
           <td>
-            <button class="btn btn-danger btn-xs"><i class="glyphicon glyphicon-remove glyphicon-white"></i> Abbrechen</button>
+            <button class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-remove"></span>&nbsp;&nbsp;Abbrechen</button>
           </td>
         </tr>
       </table>