Add possibility to choose dark countdown background

Change-Id: I86564d8aca632d929428b1844fbb60e12b90dfb1
andi34 · Dec 9, 2019 · 07f0f10 · andi34 · Dec 9, 2019 · 07f0f10
1 parent 885f368
commit 07f0f10
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 5 deletions.
diff --git a/config/config.inc.php b/config/config.inc.php
@@ -38,6 +38,7 @@
 $config['background_admin'] = null;
 $config['background_chroma'] = null;
 $config['force_buzzer'] = false;
+$config['dark_loader'] = false;
 
 // specify key id to use that key to take a picture or collage (e.g. 13 is the enter key)
 // use for example https://keycode.info to get the key code

diff --git a/lib/configsetup.inc.php b/lib/configsetup.inc.php
@@ -208,6 +208,11 @@
 			'placeholder' => 'url(../img/bg.jpg)',
 			'value' => $config['background_chroma']
 		],
+		'dark_loader' => [
+			'type' => 'checkbox',
+			'name' => 'dark_loader',
+			'value' => $config['dark_loader']
+		],
 		'show_fork' => [
 			'type' => 'checkbox',
 			'name' => 'show_fork',

diff --git a/resources/js/theme.js b/resources/js/theme.js
@@ -8,6 +8,10 @@ style.setProperty('--background-default', config.background_image);
 style.setProperty('--background-admin', config.background_admin);
 style.setProperty('--background-chroma', config.background_chroma);
 
+if (config.dark_loader) {
+    $('#loader').addClass('darkloader');
+}
+
 $(function () {
     $('#wrapper').show();
 });
diff --git a/resources/lang/de.js b/resources/lang/de.js
@@ -135,5 +135,6 @@ const L10N = {
     'jpeg_quality_jpeg_quality_chroma': 'JPEG Qualität für Chroma-Keying (-1 ... 100)',
     'jpeg_quality_jpeg_quality_thumb': 'JPEG Qualität für Thumbnails (-1 ... 100)',
     'abort': 'Abbrechen',
-    'gallery_pictureTime': 'Millisekunden die ein Bild in der Diashow angezeigt wird'
+    'gallery_pictureTime': 'Millisekunden die ein Bild in der Diashow angezeigt wird',
+    'dark_loader': 'Dunkle Anzeige beim Countdown'
 }
diff --git a/resources/lang/en.js b/resources/lang/en.js
@@ -135,5 +135,6 @@ const L10N = {
     'jpeg_quality_jpeg_quality_chroma': 'JPEG quality for chroma-keying (-1 ... 100)',
     'jpeg_quality_jpeg_quality_thumb': 'JPEG quality for thumbnails (-1 ... 100)',
     'abort': 'Abort',
-    'gallery_pictureTime': 'Milliseconds an image is displayed at slideshow'
+    'gallery_pictureTime': 'Milliseconds an image is displayed at slideshow',
+    'dark_loader': 'Dark display while countdown'
 }
diff --git a/resources/lang/es.js b/resources/lang/es.js
@@ -135,5 +135,6 @@ const L10N = {
     'jpeg_quality_jpeg_quality_chroma': 'Calidad de JPEG para chroma-keying (-1 ... 100)',
     'jpeg_quality_jpeg_quality_thumb': 'Calidad de JPEG para thumbnails (-1 ... 100)',
     'abort': 'Abortar',
-    'slideshow_pictureTime': 'Milisegundos se muestra una imagen en la presentación de diapositivas'
+    'slideshow_pictureTime': 'Milisegundos se muestra una imagen en la presentación de diapositivas',
+    'dark_loader': 'Dark display while countdown'
 }
diff --git a/resources/lang/fr.js b/resources/lang/fr.js
@@ -135,5 +135,6 @@ const L10N = {
     'jpeg_quality_jpeg_quality_chroma': 'JPEG qualité pour chroma-keying (-1 ... 100)',
     'jpeg_quality_jpeg_quality_thumb': 'JPEG qualité des thumbnails (-1 ... 100)',
     'abort': 'Avorter',
-    'gallery_pictureTime': 'Millisecondes une image est affichée au diaporama'
+    'gallery_pictureTime': 'Millisecondes une image est affichée au diaporama',
+    'dark_loader': 'Dark display while countdown'
 }
diff --git a/resources/lang/gr.js b/resources/lang/gr.js
@@ -134,5 +134,6 @@ const L10N = {
     'jpeg_quality_jpeg_quality_chroma': 'Ποιότητα JPEG για chroma-keying (-1 ... 100)',
     'jpeg_quality_jpeg_quality_thumb': 'Ποιότητα JPEG για μικρογραφίες (-1 ... 100)',
     'abort': 'Αποβάλλω',
-    'gallery_pictureTime': 'Σε χιλιοστά του δευτερολέπτου μια εικόνα προβάλλεται στην παρουσίαση διαφανειών'
+    'gallery_pictureTime': 'Σε χιλιοστά του δευτερολέπτου μια εικόνα προβάλλεται στην παρουσίαση διαφανειών',
+    'dark_loader': 'Dark display while countdown'
 }
diff --git a/resources/sass/style.scss b/resources/sass/style.scss
@@ -129,6 +129,15 @@
   .spinner {
     font-size: 80px;
   }
+
+  &.darkloader {
+    &:after {
+      background-color: #252525;
+    }
+    background: rgba(0,0,0,0.9);
+    color: #fff;
+  }
+
 }
 
 .homebtn {