summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2016-02-05 06:07:12 (GMT)
committerChristian Pointner <equinox@helsinki.at>2016-02-05 06:07:12 (GMT)
commit58d574f5a77264a2052006964b8ba2c3116a46a3 (patch)
tree839b0fe336045ab7790b58ac198f2fd5bbfa62a3 /www
parented2534651cd10fa810ab921491a6653888bd1285 (diff)
some fixes for uploadmodal - still not working...
Diffstat (limited to 'www')
-rw-r--r--www/index.html68
-rw-r--r--www/js/importer.js4
-rw-r--r--www/js/musicgrid.js2
-rw-r--r--www/js/shows.js6
4 files changed, 44 insertions, 36 deletions
diff --git a/www/index.html b/www/index.html
index f76bcbf..d1bc9d8 100644
--- a/www/index.html
+++ b/www/index.html
@@ -84,39 +84,47 @@
</div>
</nav>
- <div class="modal hide fade" id="uploadModal">
- <div class="modal-header">
- <a class="close" data-dismiss="modal">&times;</a>
- <h3>Datei auswählen...</h3>
- </div>
- <div class="modal-body">
- </div>
- <div class="modal-footer">
- <button class="btn" data-dismiss="modal">Abbrechen</button>
- <button class="btn btn-primary" id="uploadModal-confirm" disabled="disabled">Importieren</button>
+ <div class="modal fade" id="uploadModal" tabindex="-1" role="dialog">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+ <h4 class="modal-title">Datei auswählen...</h4>
+ </div>
+ <div class="modal-body">
+ </div>
+ <div class="modal-footer">
+ <button class="btn btn-default" data-dismiss="modal">Abbrechen</button>
+ <button class="btn btn-primary" id="uploadModal-confirm" disabled="disabled">Importieren</button>
+ </div>
+ </div>
</div>
</div>
- <div class="modal hide fade" id="musicpoolModal">
- <div class="modal-header">
- <a class="close" data-dismiss="modal">&times;</a>
- <h3>Musikpool auswählen</h3>
- </div>
- <div class="modal-body">
- <table class="table table-striped">
- <thead>
- <tr>
- <th>Clock</th>
- <th>Title</th>
- <th>Ausgewählt</th>
- </tr>
- </thead>
- <tbody>
- </tbody>
- </table>
- </div>
- <div class="modal-footer">
- <button class="btn btn-default" data-dismiss="modal">Abbrechen</button>
+ <div class="modal fade" id="musicpoolModal" tabindex="-1" role="dialog">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+ <h4 class="modal-title">Musikpool auswählen...</h4>
+ </div>
+ <div class="modal-body">
+ <table class="table table-striped">
+ <thead>
+ <tr>
+ <th>Clock</th>
+ <th>Titel</th>
+ <th>Ausgewählt</th>
+ </tr>
+ </thead>
+ <tbody>
+ </tbody>
+ </table>
+ </div>
+ <div class="modal-footer">
+ <button class="btn btn-default" data-dismiss="modal">Abbrechen</button>
+ </div>
+ </div>
</div>
</div>
diff --git a/www/js/importer.js b/www/js/importer.js
index f2c3db3..c17c953 100644
--- a/www/js/importer.js
+++ b/www/js/importer.js
@@ -31,7 +31,7 @@ Rivendell.Importer = function() {
};
Rivendell.Importer.prototype.resetModal = function() {
- $('div.modal-header h3', this.$el).text("Datei auswählen...");
+ $('div.modal-header h4', this.$el).text("Datei auswählen...");
$('.modal-body', this.$el).css("background-image", "url('/img/dz-backdrop.png')");
$('#uploadModal-confirm', this.$el).attr('disabled','disabled').off('click');
};
@@ -79,7 +79,7 @@ Rivendell.Importer.prototype.importFileAdded = function(dropzone, file, group, g
});*/
$('div.modal-body', this.$el).css("background-image", "url('/img/audio_file.png')");
- $('div.modal-header h3', this.$el).text(file.name);
+ $('div.modal-header h4', this.$el).text(file.name);
var self = this;
$('#uploadModal-confirm', this.$el).off('click').on('click', function() {
diff --git a/www/js/musicgrid.js b/www/js/musicgrid.js
index e751b6c..2a5a742 100644
--- a/www/js/musicgrid.js
+++ b/www/js/musicgrid.js
@@ -105,7 +105,7 @@ Rivendell.MusicpoolModal.prototype.selectClock = function(dow, hour, clockName)
var $modalHeader = $('#musicpoolModal .modal-header');
var $modalBody = $('#musicpoolModal .modal-body');
- $('h3', $modalHeader).html('Musikpool auswählen für Tag: ' + dow + ' Stunde: ' + hour + '.');
+ $('h4', $modalHeader).html('Musikpool auswählen für Tag: ' + dow + ' Stunde: ' + hour + '.');
$('tbody', $modalBody).html('');
diff --git a/www/js/shows.js b/www/js/shows.js
index 5ea3c35..07a906d 100644
--- a/www/js/shows.js
+++ b/www/js/shows.js
@@ -119,12 +119,12 @@ function shows_createImportForm(cart) {
function shows_importFileAdded(dz, file, cart) {
$(dz.getAcceptedFiles()).each(function(idx, elem) { dz.removeFile(elem); });
$('#uploadModal div.modal-body').css("background-image", "url('/img/audio_file.png')")
- $('#uploadModal div.modal-header h3').text(file.name)
+ $('#uploadModal div.modal-header h4').text(file.name)
$('#uploadModal-confirm').removeAttr('disabled').unbind('click').click(function() { shows_importCartConfirm(cart, dz); });
}
function shows_importFileSelectError(dz, file, msg) {
- $('#uploadModal div.modal-header h3').text("Datei auswählen...")
+ $('#uploadModal div.modal-header h4').text("Datei auswählen...")
$('#uploadModal div.modal-body').css("background-image", "url('/img/dz-backdrop.png')");
$('#uploadModal-confirm').attr('disabled','disabled').unbind('click');
dz.removeFile(file);
@@ -132,7 +132,7 @@ function shows_importFileSelectError(dz, file, msg) {
function shows_importCart(cart) {
var form = shows_createImportForm(cart);
- $('#uploadModal div.modal-header h3').text("Datei auswählen...")
+ $('#uploadModal div.modal-header h4').text("Datei auswählen...")
$('#uploadModal div.modal-body').empty().append(form).css("background-image", "url('/img/dz-backdrop.png')");
$('#uploadModal-confirm').attr('disabled','disabled').unbind('click');
var dz = form.dropzone({ url: "/rd-bin/rdxport.cgi", parallelUploads: 1, maxFilesize: 2048, paramName: 'FILENAME',