summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
authorPeter Grassberger <petertheone@gmail.com>2016-02-04 21:49:47 (GMT)
committerPeter Grassberger <petertheone@gmail.com>2016-02-04 21:49:47 (GMT)
commite288025886589c7d30ba1c1a656adbf1550f130c (patch)
tree4abb68e7b2eea4cc56cf27606e206f189f30d884 /www/js
parentf8ee82cd94a3fb16a392e6734f0e4c8f1ca3bf67 (diff)
use bootstrap 3 (navbar is somewhat broken)
Diffstat (limited to 'www/js')
-rw-r--r--www/js/jingles.js8
-rw-r--r--www/js/musicpools.js2
-rw-r--r--www/js/shows.js20
3 files changed, 15 insertions, 15 deletions
diff --git a/www/js/jingles.js b/www/js/jingles.js
index 3b3b176..8767095 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-mini"><i class="icon-arrow-right icon-white"></i> Verschieben</button>');
+ var moveButton = $('<button class="btn btn-info btn-xs"><i class="icon-arrow-right icon-white"></i> Verschieben</button>');
var activateButton;
if (this.model.active) {
- activateButton = $('<button class="btn btn-warning btn-mini"><i class="icon-minus icon-white"></i> Deactivieren</button>');
+ activateButton = $('<button class="btn btn-warning btn-xs"><i class="icon-minus icon-white"></i> Deactivieren</button>');
} else {
- activateButton = $('<button class="btn btn-warning btn-mini"><i class="icon-plus icon-white"></i> Aktivieren</button>');
+ activateButton = $('<button class="btn btn-warning btn-xs"><i class="icon-plus icon-white"></i> Aktivieren</button>');
}
- var deleteButton = $('<button class="btn btn-danger btn-mini"><i class="icon-trash icon-white"></i> Löschen</button>');
+ var deleteButton = $('<button class="btn btn-danger btn-xs"><i class="icon-trash icon-white"></i> Löschen</button>');
var self = this;
moveButton.on('click', function() {
diff --git a/www/js/musicpools.js b/www/js/musicpools.js
index 8fd59f4..c63c5ae 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-mini"><i class="icon-trash icon-white"></i> Löschen</button>');
+ var deleteButton = $('<button class="btn btn-danger btn-xs"><i class="icon-trash icon-white"></i> Löschen</button>');
var self = this;
deleteButton.on('click', function() {
diff --git a/www/js/shows.js b/www/js/shows.js
index c325e01..d18cd1b 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-mini disabled"><i class="icon-arrow-up icon-white"></i></button>
-// <button class="btn btn-info btn-mini disabled"><i class="icon-arrow-down icon-white"></i></button>
-// <button class="btn btn-danger btn-mini"><i class="icon-trash icon-white"></i> Löschen</button>
+// <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>
// </td>
// <td>
-// <button class="btn btn-info btn-mini"><i class="icon-arrow-up icon-white"></i></button>
-// <button class="btn btn-info btn-mini disabled"><i class="icon-arrow-down icon-white"></i></button>
-// <button class="btn btn-success btn-mini"><i class="icon-upload icon-white"></i> Importieren</button>
+// <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>
// </td>
function shows_newCartEntry(elem) {
@@ -166,9 +166,9 @@ function shows_newCartEntry(elem) {
cart.lastplayed = cart_exists ? format_datetime(shows_group_carts[elem].lastplayed) : '-';
var buttons = cart_exists ?
- '<button class="btn btn-danger btn-mini" onclick="shows_deleteCart(' + elem + ');">' +
+ '<button class="btn btn-danger btn-xs" onclick="shows_deleteCart(' + elem + ');">' +
'<i class="icon-trash icon-white"></i> Löschen</button>' :
- '<button class="btn btn-success btn-mini" onclick="shows_importCart(' + elem + ');">' +
+ '<button class="btn btn-success btn-xs" onclick="shows_importCart(' + elem + ');">' +
'<i class="icon-upload icon-white"></i> Importieren</button>';
return $('<tr>').append($('<td>').text(elem))
@@ -183,7 +183,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-mini">' +
+ var cancel_button = '<button class="btn btn-danger btn-xs">' +
'<i class="icon-remove icon-white"></i> Abbrechen</button>';
return $('<tr>').append($('<td>').text(cart))
@@ -195,7 +195,7 @@ function shows_newImportingEntry(cart) {
}
function shows_newImportErrorEntry(cart, msg) {
- var dismiss_button = '<button class="btn btn-info btn-mini">' +
+ var dismiss_button = '<button class="btn btn-info btn-xs">' +
'<i class="icon-remove icon-white"></i> Ok</button>';
var xmlDoc = $.parseXML(msg);