Add possibility to choose dark countdown background

Change-Id: I86564d8aca632d929428b1844fbb60e12b90dfb1
andreknieriem · Dec 12, 2019 · 2219d2f · 2219d2f
1 parent 3b08033
commit 2219d2f
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
@@ -32,6 +32,7 @@
 $config['continuous_collage'] = false;
 $config['color_theme'] = 'default'; // possible values are default, blue-gray, or an array with the corresponding colors (e.g. ['primary' => '#fff', 'secondary'=>'#a1a1a1', 'font'=>'#000'])
 $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
@@ -179,6 +179,11 @@
 			],
 			'value' => $config['color_theme']
 		],
+		'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 @@ if (config.color_theme === 'blue-gray') {
     $('#wrapper').addClass('bluegray-bg');
 }
 
+if (config.dark_loader) {
+    $('#loader').addClass('darkloader');
+}
+
 $(function () {
     $('#wrapper').show();
 });
diff --git a/resources/lang/de.js b/resources/lang/de.js
@@ -130,5 +130,6 @@ const L10N = {
     'jpeg_quality_jpeg_quality_image': 'JPEG Qualität für Bilder (-1 ... 100)',
     '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'
+    'abort': 'Abbrechen',
+    'dark_loader': 'Dunkle Anzeige beim Countdown'
 }
diff --git a/resources/lang/en.js b/resources/lang/en.js
@@ -130,5 +130,6 @@ const L10N = {
     'jpeg_quality_jpeg_quality_image': 'JPEG quality for images (-1 ... 100)',
     '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'
+    'abort': 'Abort',
+    'dark_loader': 'Dark display while countdown'
 }
diff --git a/resources/lang/es.js b/resources/lang/es.js
@@ -130,5 +130,6 @@ const L10N = {
     'jpeg_quality_jpeg_quality_image': 'Calidad de JPEG para fotos (-1 ... 100)',
     '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'
+    'abort': 'Abortar',
+    'dark_loader': 'Dark display while countdown'
 }
diff --git a/resources/lang/fr.js b/resources/lang/fr.js
@@ -130,5 +130,6 @@ const L10N = {
     'jpeg_quality_jpeg_quality_image': 'JPEG qualité des images (-1 ... 100)',
     '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'
+    'abort': 'Avorter',
+    'dark_loader': 'Dark display while countdown'
 }
diff --git a/resources/lang/gr.js b/resources/lang/gr.js
@@ -129,5 +129,6 @@ const L10N = {
     'jpeg_quality_jpeg_quality_image': 'Ποιότητα JPEG για φωτογραφίες (-1 ... 100)',
     'jpeg_quality_jpeg_quality_chroma': 'Ποιότητα JPEG για chroma-keying (-1 ... 100)',
     'jpeg_quality_jpeg_quality_thumb': 'Ποιότητα JPEG για μικρογραφίες (-1 ... 100)',
-    'abort': 'Αποβάλλω'
+    'abort': 'Αποβάλλω',
+    'dark_loader': 'Dark display while countdown'
 }
diff --git a/resources/sass/style.scss b/resources/sass/style.scss
@@ -125,6 +125,15 @@
   .spinner {
     font-size: 80px;
   }
+
+  &.darkloader {
+    &:after {
+      background-color: #252525;
+    }
+    background: rgba(0,0,0,0.9);
+    color: #fff;
+  }
+
 }
 
 .homebtn {