fixed navbar and icons

3 files changed, 15 insertions, 15 deletions

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);