From 389fc21b6028d1c2bab510d66ed74f6bfcc105f5 Mon Sep 17 00:00:00 2001
From: Peter Grassberger <petertheone@gmail.com>
Date: Thu, 1 Sep 2016 14:43:28 +0200
Subject: upload: multi upload style, add file formats


diff --git a/www/index.html b/www/index.html
index 40dd44c..9773747 100644
--- a/www/index.html
+++ b/www/index.html
@@ -80,7 +80,8 @@
             <div class="modal-body">
               <div class="drop">
                 <form>
-                  <input id="file" name="file" type="file" accept=".flac,.wav,.ogg,.mp3" />
+                  <input id="file" name="file" type="file" accept=".flac,.wav,.ogg,.mp3,.m4a,.mp4,.opus,.mkv" />
+                  <ul></ul>
                 </form>
               </div>
               oder<br />
@@ -336,7 +337,7 @@
               <th>Cut #</th>
               <th>Titel</th>
               <th>Länge</th>
-              <th>importiert</th>
+              <th>zuletzt gespielt</th>
               <th class="text-center">Aktionen</th>
             </tr>
             </thead>
diff --git a/www/js/importer.js b/www/js/importer.js
index 9576768..3776aad 100644
--- a/www/js/importer.js
+++ b/www/js/importer.js
@@ -138,6 +138,7 @@ Rdxport.Importer.prototype.resetModal = function() {
   $('.modal-body #sourceUri', this.$el).val('');
   $('#uploadModal-confirm', this.$el).attr('disabled','disabled').off('click');
   $('form input[type="file"]', this.$el).removeAttr('multiple');
+  $('form ul', self.$el).empty();
 };
 
 Rdxport.Importer.prototype.openModal = function(group, groupView, cartNumber, useMetadata, multifiles) {
@@ -182,8 +183,13 @@ Rdxport.Importer.prototype.openModal = function(group, groupView, cartNumber, us
 
     if (multifiles && files.length > 1) {
       $('div.modal-header h4', self.$el).text(files.length + ' files.');
+      var $formUl = $('form ul', self.$el).empty();
+      $.each(files, function(index, file) {
+        //$formUl.append($('<li>').text(file.name));
+      });
     } else {
       $('div.modal-header h4', self.$el).text(files[0].name);
+      $('form ul', self.$el).empty();
     }
     $('div.modal-body .drop', self.$el).css("background-image", "url('/img/audio_file.png')");
     $('.modal-body #sourceUri', self.$el).val('');
diff --git a/www/js/jingles.js b/www/js/jingles.js
index ffaafcd..78c2675 100644
--- a/www/js/jingles.js
+++ b/www/js/jingles.js
@@ -272,7 +272,7 @@ Rdxport.JingleCutView.prototype.render = function() {
       .append($('<td>').text(this.model.name))
       .append($('<td>').text(this.model.description))
       .append($('<td>').text(msToTimeString(this.model.length)))
-      .append($('<td>').text(format_datetime(this.model.originDatetime)))
+      .append($('<td>').text(format_datetime(this.model.lastPlayDatetime)))
       .append(
           $('<td>').addClass('text-center')
               .append(moveButton)
diff --git a/www/styles/main-style.css b/www/styles/main-style.css
index 3c09e11..42a9efe 100644
--- a/www/styles/main-style.css
+++ b/www/styles/main-style.css
@@ -21,6 +21,7 @@
  */
 
 body {
+    margin-bottom: 200px;
     background-color: #eee;
 }
 
@@ -100,7 +101,7 @@ body {
     background-position: center center;
 }
 
-#uploadModal div.modal-body .drop form  input {
+#uploadModal div.modal-body .drop form input {
     display: none;
 }
 
@@ -115,6 +116,10 @@ body {
     display: none;
 }
 
+#uploadModal div.modal-body form ul {
+    text-align: left;
+}
+
 .text-center {
     text-align: center;
 }
-- 
cgit v0.10.2