From 68ad409c5c4c305500ce70184535dabad353252b Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@helsinki.at>
Date: Fri, 5 Feb 2016 06:35:36 +0100
Subject: fixed navbar and icons


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>
diff --git a/www/js/jingles.js b/www/js/jingles.js
index 8767095..e2de6da 100644
--- a/www/js/jingles.js
+++ b/www/js/jingles.js
@@ -170,14 +170,14 @@ Rivendell.JingleCutView = function(model) {
 };
 
 Rivendell.JingleCutView.prototype.render = function() {
-  var moveButton = $('<button class="btn btn-info btn-xs"><i class="icon-arrow-right icon-white"></i> Verschieben</button>');
+  var moveButton = $('<button class="btn btn-info btn-xs"><span class="glyphicon glyphicon-arrow-right"></span>&nbsp;&nbsp;Verschieben</button>');
   var activateButton;
   if (this.model.active) {
-    activateButton = $('<button class="btn btn-warning btn-xs"><i class="icon-minus icon-white"></i> Deactivieren</button>');
+    activateButton = $('<button class="btn btn-warning btn-xs"><span class="glyphicon glyphicon-minus"></span>&nbsp;&nbsp;Deactivieren</button>');
   } else {
-    activateButton = $('<button class="btn btn-warning btn-xs"><i class="icon-plus icon-white"></i> Aktivieren</button>');
+    activateButton = $('<button class="btn btn-warning btn-xs"><span class="glyphicon glyphicon-plus"></span>&nbsp;&nbsp;Aktivieren</button>');
   }
-  var deleteButton = $('<button class="btn btn-danger btn-xs"><i class="icon-trash icon-white"></i> Löschen</button>');
+  var deleteButton = $('<button class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-trash"></span>&nbsp;&nbsp;Löschen</button>');
 
   var self = this;
   moveButton.on('click', function() {
diff --git a/www/js/musicpools.js b/www/js/musicpools.js
index c63c5ae..a524072 100644
--- a/www/js/musicpools.js
+++ b/www/js/musicpools.js
@@ -209,7 +209,7 @@ Rivendell.MusicpoolCartView.prototype.render = function() {
     }
   }
 
-  var deleteButton = $('<button class="btn btn-danger btn-xs"><i class="icon-trash icon-white"></i> Löschen</button>');
+  var deleteButton = $('<button class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-trash"></span>&nbsp;&nbsp;Löschen</button>');
 
   var self = this;
   deleteButton.on('click', function() {
diff --git a/www/js/shows.js b/www/js/shows.js
index d18cd1b..5ea3c35 100644
--- a/www/js/shows.js
+++ b/www/js/shows.js
@@ -146,14 +146,14 @@ function shows_importCart(cart) {
 }
 
 // <td>
-//   <button class="btn btn-info btn-xs disabled"><i class="icon-arrow-up icon-white"></i></button>
-//   <button class="btn btn-info btn-xs disabled"><i class="icon-arrow-down icon-white"></i></button>
-//   <button class="btn btn-danger btn-xs"><i class="icon-trash icon-white"></i> Löschen</button>
+//   <button class="btn btn-info btn-xs disabled"><span class="glyphicon glyphicon-arrow-up"></span></button>
+//   <button class="btn btn-info btn-xs disabled"><span class="glyphicon glyphicon-arrow-down"></span></button>
+//   <button class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-trash"></span>&nbsp;&nbsp;Löschen</button>
 // </td>
 // <td>
-//   <button class="btn btn-info btn-xs"><i class="icon-arrow-up icon-white"></i></button>
-//   <button class="btn btn-info btn-xs disabled"><i class="icon-arrow-down icon-white"></i></button>
-//   <button class="btn btn-success btn-xs"><i class="icon-upload icon-white"></i> Importieren</button>
+//   <button class="btn btn-info btn-xs"><span class="glyphicon glyphicon-arrow-up"></span></button>
+//   <button class="btn btn-info btn-xs disabled"><span class="glyphicon glyphicon-arrow-down"></span></button>
+//   <button class="btn btn-success btn-xs"><span class="glyphicon glyphicon-upload"></span>&nbsp;&nbsp;Importieren</button>
 // </td>
 
 function shows_newCartEntry(elem) {
@@ -167,9 +167,9 @@ function shows_newCartEntry(elem) {
 
   var buttons = cart_exists ?
         '<button class="btn btn-danger btn-xs" onclick="shows_deleteCart(' + elem + ');">' +
-           '<i class="icon-trash icon-white"></i> Löschen</button>' :
+           '<span class="glyphicon glyphicon-trash"></span>&nbsp;&nbsp;Löschen</button>' :
         '<button class="btn btn-success btn-xs" onclick="shows_importCart(' + elem + ');">' +
-           '<i class="icon-upload icon-white"></i> Importieren</button>';
+           '<span class="glyphicon glyphicon-upload"></span>&nbsp;&nbsp;Importieren</button>';
 
   return $('<tr>').append($('<td>').text(elem))
                   .append($('<td>').text(cart.title))
@@ -184,7 +184,7 @@ function shows_newCartEntry(elem) {
 function shows_newImportingEntry(cart) {
   var progress_bar = '<div class="progress"><div class="bar" style="width: 0%;"></div></div>';
   var cancel_button = '<button class="btn btn-danger btn-xs">' +
-                      '<i class="icon-remove icon-white"></i> Abbrechen</button>';
+                      '<span class="glyphicon glyphicon-remove"></span>&nbsp;&nbsp;Abbrechen</button>';
 
   return $('<tr>').append($('<td>').text(cart))
                   .append($('<td>').addClass('file-name').text('-'))
@@ -196,7 +196,7 @@ function shows_newImportingEntry(cart) {
 
 function shows_newImportErrorEntry(cart, msg) {
   var dismiss_button = '<button class="btn btn-info btn-xs">' +
-                       '<i class="icon-remove icon-white"></i> Ok</button>';
+                       '<span class="glyphicon glyphicon-remove"></span>&nbsp;&nbsp;Ok</button>';
 
   var xmlDoc = $.parseXML(msg);
   msg = $(xmlDoc);
diff --git a/www/styles/main-style.css b/www/styles/main-style.css
index 319fb37..2ba7fe1 100644
--- a/www/styles/main-style.css
+++ b/www/styles/main-style.css
@@ -32,10 +32,6 @@ body {
     width: 100% !important;
 }
 
-.btn i[class*='icon-'] {
-    vertical-align: middle;
-}
-
 .progress {
     margin-bottom: 0;
 }
@@ -45,10 +41,6 @@ body {
     width: 100%;
 }
 
-.navbar-inner {
-    padding-bottom: 0.3em;
-}
-
 #clock {
     display: block;
     width: 100%;
-- 
cgit v0.10.2