Merge pull request #81 from jr-k/develop

Release v1.20

data/www/js/slideshow/slides.js

@@ -225,5 +225,10 @@ jQuery(document).ready(function ($) {
         }
     });
 
+    $(document).on('submit', '.modal-slide-add form', function () {
+        $(this).find('button[type=submit]').addClass('hidden');
+        $(this).find('.btn-loading').removeClass('hidden');
+    });
+
     main();
 });

lang/en.json

@@ -204,6 +204,7 @@
     "basic_month_11": "November",
     "basic_month_12": "December",
 
+    "common_loading": "Loading...",
     "common_default_node_player_group": "Default player group",
     "common_default_playlist": "Default playlist",
     "common_unknown_ipaddr": "Unknown IP address",

lang/fr.json

@@ -204,6 +204,7 @@
     "basic_month_11": "Novembre",
     "basic_month_12": "Décembre",
 
+    "common_loading": "Chargement...",
     "common_default_node_player_group": "Groupe de lecteur par défaut",
     "common_default_playlist": "Playlist par défaut",
     "common_unknown_ipaddr": "Adresse IP inconnue",

src/controller/PlaylistController.py

@@ -41,7 +41,7 @@ class PlaylistController(ObController):
     def playlist_add(self):
         playlist = Playlist(
             name=request.form['name'],
-            time_sync=request.form['time_sync'],
+            time_sync=False if request.form['time_sync'] == '0' else True,
         )
 
         self._model_store.playlist().add_form(playlist)

views/slideshow/modal/add.jinja.html

@@ -86,6 +86,9 @@
             <button type="submit" class="green">
                 <i class="fa fa-plus icon-left"></i> {{ l.slideshow_slide_form_add_submit }}
             </button>
+            <button type="button" disabled="disabled" class="green hidden btn-loading">
+                {{ l.common_loading }}
+            </button>
         </div>
     </form>
 </div>