Merge pull request #125 from jr-k/develop

Release v2.2.3

data/www/js/fleet/node-player-groups.js

@@ -10,13 +10,24 @@ jQuery(document).ready(function ($) {
     });
 
     $(document).on('click', '.node-player-group-preview', function () {
-        const $iframe = $('<iframe>', {
-            src: $(this).attr('data-url'),
-            frameborder: 0
-        });
+        const $icon = $(this).find('i');
+        const isPlay = $icon.hasClass('fa-play');
+        const $holder = $(this).parents('.preview:eq(0)');
 
-        $(this).parents('.preview:eq(0)').append($iframe);
-        $(this).remove();
+        if (isPlay) {
+            const $iframe = $('<iframe>', {
+                src: $(this).attr('data-url'),
+                frameborder: 0
+            });
+
+            $holder.append($iframe);
+            $(this).addClass('hover-only');
+            $icon.removeClass('fa-play').addClass('fa-pause');
+        } else {
+            $holder.find('iframe').remove();
+            $(this).removeClass('hover-only');
+            $icon.removeClass('fa-pause').addClass('fa-play');
+        }
     });
 
     $(document).on('click', '.node-player-group-player-assign', function () {

data/www/js/playlist/playlists.js

@@ -21,13 +21,24 @@ jQuery(document).ready(function ($) {
     });
 
     $(document).on('click', '.playlist-preview', function () {
-        const $iframe = $('<iframe>', {
-            src: $(this).attr('data-url'),
-            frameborder: 0
-        });
+        const $icon = $(this).find('i');
+        const isPlay = $icon.hasClass('fa-play');
+        const $holder = $(this).parents('.preview:eq(0)');
 
-        $(this).parents('.preview:eq(0)').append($iframe);
-        $(this).remove();
+        if (isPlay) {
+            const $iframe = $('<iframe>', {
+                src: $(this).attr('data-url'),
+                frameborder: 0
+            });
+
+            $holder.append($iframe);
+            $(this).addClass('hover-only');
+            $icon.removeClass('fa-play').addClass('fa-pause');
+        } else {
+            $holder.find('iframe').remove();
+            $(this).removeClass('hover-only');
+            $icon.removeClass('fa-pause').addClass('fa-play');
+        }
     });
 
     main();

data/www/scss/pages/_player-group.scss

@@ -75,12 +75,27 @@
 						}
 					}
 
-
 					.preview-holder {
+						position: relative;
+
 						.form-group {
 							flex-grow: 0;
 							margin-bottom: 0;
 						}
+
+						.hover-only {
+							display: none;
+						}
+
+						&:hover {
+							.hover-only {
+								display: flex;
+								position: absolute;
+								&:hover {
+									background: $gkscaleC;
+								}
+							}
+						}
 					}
 
 					h4 {

data/www/scss/pages/_playlist.scss

@@ -97,13 +97,28 @@
 							margin-bottom: 5px;
 						}
 					}
-
-
+					
 					.preview-holder {
+						position: relative;
+
 						.form-group {
 							flex-grow: 0;
 							margin-bottom: 0;
 						}
+
+						.hover-only {
+							display: none;
+						}
+
+						&:hover {
+							.hover-only {
+								display: flex;
+								position: absolute;
+								&:hover {
+									background: $gkscaleC;
+								}
+							}
+						}
 					}
 
 					h4 {

docker-compose.dev.yml

@@ -12,9 +12,8 @@ services:
       - PORT=5000
       - PORT_HTTP_EXTERNAL_STORAGE=5001
     volumes:
-      - ./data/db:/app/data/db
-      - ./data/uploads:/app/data/uploads
-      - ./var/run/storage:/app/var/run/storage
+      - /etc/localtime:/etc/localtime:ro
+      - ./:/app/
     ports:
       - 5000:5000
       - 5001:5001

docker-compose.yml

@@ -10,6 +10,7 @@ services:
       - PORT=5000
       - PORT_HTTP_EXTERNAL_STORAGE=5001
     volumes:
+      - /etc/localtime:/etc/localtime:ro
       - ./data/db:/app/data/db
       - ./data/uploads:/app/data/uploads
       - ./var/run/storage:/app/var/run/storage

version.txt

@@ -1 +1 @@
-2.2.2
+2.2.3