Add "os" as browser default

joomla · Dec 12, 2023 · 954b6cd · 954b6cd
1 parent d12cf13
commit 954b6cd
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/administrator/templates/atum/component.php b/administrator/templates/atum/component.php
@@ -49,9 +49,9 @@
 $this->addHeadLink(HTMLHelper::_('image', 'favicon.ico', '', [], true, 1), 'alternate icon', 'rel', ['type' => 'image/vnd.microsoft.icon']);
 $this->addHeadLink(HTMLHelper::_('image', 'joomla-favicon-pinned.svg', '', [], true, 1), 'mask-icon', 'rel', ['color' => '#000']);
 
-$darkMode      = $app->getIdentity()->getParam('colorScheme', $this->params->get('colorScheme', 0));
+$darkMode      = $app->getIdentity()->getParam('colorScheme', $this->params->get('colorScheme', 'os'));
 $lastMode      = !$darkMode ? $app->getInput()->cookie->get('atumColorScheme', '') : false;
-$themeModes    = [0 => ' data-color-scheme-os', 'light' => ' data-bs-theme="light" data-color-scheme="light"', 'dark' => ' data-bs-theme="dark" data-color-scheme="dark"'];
+$themeModes    = ['os' => ' data-color-scheme-os', 'light' => ' data-bs-theme="light" data-color-scheme="light"', 'dark' => ' data-bs-theme="dark" data-color-scheme="dark"'];
 $themeModeAttr = ($themeModes[$darkMode] ?? '') . ($lastMode ? ($themeModes[$lastMode] ?? '') : '');
 ?>
 

diff --git a/administrator/templates/atum/error_full.php b/administrator/templates/atum/error_full.php
@@ -78,9 +78,9 @@
     $this->setMetaData('viewport', 'width=device-width, initial-scale=1');
 
     $monochrome    = (bool) $this->params->get('monochrome');
-    $darkMode      = $app->getIdentity()->getParam('colorScheme', $this->params->get('colorScheme', 0));
+    $darkMode      = $app->getIdentity()->getParam('colorScheme', $this->params->get('colorScheme', 'os'));
     $lastMode      = !$darkMode ? $app->getInput()->cookie->get('atumColorScheme', '') : false;
-    $themeModes    = [0 => ' data-color-scheme-os', 'light' => ' data-bs-theme="light" data-color-scheme="light"', 'dark' => ' data-bs-theme="dark" data-color-scheme="dark"'];
+    $themeModes    = ['os' => ' data-color-scheme-os', 'light' => ' data-bs-theme="light" data-color-scheme="light"', 'dark' => ' data-bs-theme="dark" data-color-scheme="dark"'];
     $themeModeAttr = ($themeModes[$darkMode] ?? '') . ($lastMode ? ($themeModes[$lastMode] ?? '') : '');
 
 // @see administrator/templates/atum/html/layouts/status.php

diff --git a/administrator/templates/atum/error_login.php b/administrator/templates/atum/error_login.php
@@ -82,9 +82,9 @@
 $this->setMetaData('viewport', 'width=device-width, initial-scale=1');
 
 $monochrome    = (bool) $this->params->get('monochrome');
-$darkMode      = $app->getIdentity()->getParam('colorScheme', $this->params->get('colorScheme', 0));
+$darkMode      = $app->getIdentity()->getParam('colorScheme', $this->params->get('colorScheme', 'os'));
 $lastMode      = !$darkMode ? $app->getInput()->cookie->get('atumColorScheme', '') : false;
-$themeModes    = [0 => ' data-color-scheme-os', 'light' => ' data-bs-theme="light" data-color-scheme="light"', 'dark' => ' data-bs-theme="dark" data-color-scheme="dark"'];
+$themeModes    = ['os' => ' data-color-scheme-os', 'light' => ' data-bs-theme="light" data-color-scheme="light"', 'dark' => ' data-bs-theme="dark" data-color-scheme="dark"'];
 $themeModeAttr = ($themeModes[$darkMode] ?? '') . ($lastMode ? ($themeModes[$lastMode] ?? '') : '');
 
 // @see administrator/templates/atum/html/layouts/status.php

diff --git a/administrator/templates/atum/index.php b/administrator/templates/atum/index.php
@@ -92,9 +92,9 @@
 $this->setMetaData('viewport', 'width=device-width, initial-scale=1');
 
 $monochrome    = (bool) $this->params->get('monochrome');
-$darkMode      = $app->getIdentity()->getParam('colorScheme', $this->params->get('colorScheme', 0));
+$darkMode      = $app->getIdentity()->getParam('colorScheme', $this->params->get('colorScheme', 'os'));
 $lastMode      = !$darkMode ? $app->getInput()->cookie->get('atumColorScheme', '') : false;
-$themeModes    = [0 => ' data-color-scheme-os', 'light' => ' data-bs-theme="light" data-color-scheme="light"', 'dark' => ' data-bs-theme="dark" data-color-scheme="dark"'];
+$themeModes    = ['os' => ' data-color-scheme-os', 'light' => ' data-bs-theme="light" data-color-scheme="light"', 'dark' => ' data-bs-theme="dark" data-color-scheme="dark"'];
 $themeModeAttr = ($themeModes[$darkMode] ?? '') . ($lastMode ? ($themeModes[$lastMode] ?? '') : '');
 
 Text::script('TPL_ATUM_MORE_ELEMENTS');

diff --git a/administrator/templates/atum/login.php b/administrator/templates/atum/login.php
@@ -76,9 +76,9 @@
 $this->setMetaData('viewport', 'width=device-width, initial-scale=1');
 
 $monochrome    = (bool) $this->params->get('monochrome');
-$darkMode      = $app->getIdentity()->getParam('colorScheme', $this->params->get('colorScheme', 0));
+$darkMode      = $app->getIdentity()->getParam('colorScheme', $this->params->get('colorScheme', 'os'));
 $lastMode      = !$darkMode ? $app->getInput()->cookie->get('atumColorScheme', '') : false;
-$themeModes    = [0 => ' data-color-scheme-os', 'light' => ' data-bs-theme="light" data-color-scheme="light"', 'dark' => ' data-bs-theme="dark" data-color-scheme="dark"'];
+$themeModes    = ['os' => ' data-color-scheme-os', 'light' => ' data-bs-theme="light" data-color-scheme="light"', 'dark' => ' data-bs-theme="dark" data-color-scheme="dark"'];
 $themeModeAttr = ($themeModes[$darkMode] ?? '') . ($lastMode ? ($themeModes[$lastMode] ?? '') : '');
 
 // Add cookie alert message

diff --git a/administrator/templates/atum/templateDetails.xml b/administrator/templates/atum/templateDetails.xml
@@ -115,9 +115,10 @@
 					name="colorScheme"
 					type="list"
 					label="TPL_ATUM_COLORSCHEME_LABEL"
-					default="0"
+					default="os"
 					>
-					<option value="0">TPL_ATUM_COLORSCHEME_OPTION_FOLLOW_OS</option>
+					<option value="0">JDISABLED</option>
+					<option value="os">TPL_ATUM_COLORSCHEME_OPTION_FOLLOW_OS</option>
 					<option value="light">TPL_ATUM_COLORSCHEME_OPTION_LIGHT</option>
 					<option value="dark">TPL_ATUM_COLORSCHEME_OPTION_DARK</option>
 				</field>