Merge branch '8.8RC'8.8

1 files changed, 22 insertions, 3 deletions

diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index 0ac580f0e..cb81165b1 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -1,15 +1,34 @@
 <?php
+require_once('view/php/theme_init.php');
 
 head_add_css('/library/fork-awesome/css/fork-awesome.min.css');
 head_add_css('/vendor/twbs/bootstrap/dist/css/bootstrap.min.css');
 head_add_css('/library/bootstrap-tagsinput/bootstrap-tagsinput.css');
 head_add_css('/view/css/bootstrap-red.css');
-head_add_css('/library/datetimepicker/jquery.datetimepicker.css');
 head_add_css('/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
-require_once('view/php/theme_init.php');
 
 head_add_js('/vendor/twbs/bootstrap/dist/js/bootstrap.bundle.min.js');
 head_add_js('/library/bootbox/bootbox.min.js');
 head_add_js('/library/bootstrap-tagsinput/bootstrap-tagsinput.js');
-head_add_js('/library/datetimepicker/jquery.datetimepicker.js');
 head_add_js('/library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js');
+
+$redbasic_mode = '';
+$redbasic_navbar_mode = '';
+
+if (local_channel()) {
+	$redbasic_mode = ((get_pconfig(local_channel(), 'redbasic', 'dark_mode')) ? 'dark' : 'light');
+	$redbasic_navbar_mode = ((get_pconfig(local_channel(), 'redbasic', 'navbar_dark_mode')) ? 'dark' : 'light');
+}
+
+if (App::$profile_uid) {
+	$redbasic_mode = ((get_pconfig(App::$profile_uid, 'redbasic', 'dark_mode')) ? 'dark' : 'light');
+	$redbasic_navbar_mode = ((get_pconfig(App::$profile_uid, 'redbasic', 'navbar_dark_mode')) ? 'dark' : 'light');
+}
+
+if (!$redbasic_mode) {
+	$redbasic_mode = ((get_config('redbasic', 'dark_mode')) ? 'dark' : 'light');
+	$redbasic_navbar_mode = ((get_config('redbasic', 'navbar_dark_mode')) ? 'dark' : 'light');
+}
+
+App::$page['color_mode'] = 'data-bs-theme="' . $redbasic_mode . '"';
+App::$page['navbar_color_mode'] = (($redbasic_navbar_mode === 'dark') ? 'data-bs-theme="' . $redbasic_navbar_mode . '"' : '');