Persist selected theme in dropdown

7 years ago · 8a501c075f
parent f6c983d8ff
commit 8a501c075f
3 changed files with 27 additions and 10 deletions
--- a/dist/js/sb-admin-2.js
+++ b/dist/js/sb-admin-2.js
@ -6,7 +6,7 @@ $(function() {
 });

 function set_theme(theme) {
-    $('link[title="main"]').attr('href', theme);
+    $('link[title="main"]').attr('href', 'dist/css/' + theme);

    // persist selected theme in cookie 
    setCookie('theme',theme,90);
@ -20,9 +20,9 @@ function setCookie(cname, cvalue, exdays) {
 }

 var themes = {
-    "default": "dist/css/custom.css",
-    "hackernews" : "dist/css/hackernews.css",
-    "terminal" : "dist/css/terminal.css",
+    "default": "custom.css",
+    "hackernews" : "hackernews.css",
+    "terminal" : "terminal.css",
 }

 //Loads the correct sidebar on window load,
--- a/includes/themes.php
+++ b/includes/themes.php
@ -5,6 +5,22 @@
 */
 function DisplayThemeConfig(){

+  $cselected = '';
+  $hselected = '';
+  $tselected = '';
+
+  switch( $_COOKIE['theme'] ) {
+    case "custom.css":
+      $cselected = "selected";
+      break;
+    case "hackernews.css":
+      $hselected = "selected";
+      break;
+    case "terminal.css":
+      $tselected = "selected";
+      break;
+  }
+
  ?>
  <div class="row">
  <div class="col-lg-12">
@ -20,10 +36,10 @@ function DisplayThemeConfig(){
  <div class="row">
          <div class="form-group col-md-6">
            <label for="code">Select a theme</label>  
-              <select class="form-control" id="theme-select">Select a Theme</a>
-                <option value="default" class="theme-link">RaspAP (default)</option>
-                <option value="hackernews" class="theme-link">HackerNews</option>
-                <option value="terminal" class="theme-link">Terminal</option>
+              <select class="form-control" id="theme-select">Select a Theme
+                <option value="default" class="theme-link" <?php echo $cselected; ?>>RaspAP (default)</option>
+                <option value="hackernews" class="theme-link"<?php echo $hselected; ?>>HackerNews</option>
+                <option value="terminal" class="theme-link" <?php echo $tselected; ?>>Terminal</option>
              </select>
          </div>
        </div>
--- a/index.php
+++ b/index.php
@ -66,10 +66,11 @@ if (empty($_SESSION['csrf_token'])) {
 $csrf_token = $_SESSION['csrf_token'];

 if(!isset($_COOKIE['theme'])) {
-    $theme_url = "dist/css/custom.css";
+    $theme = "custom.css";
 } else {
-    $theme_url = $_COOKIE['theme'];
+    $theme = $_COOKIE['theme'];
 }
+$theme_url = 'dist/css/' . $theme;
 ?>

 <!DOCTYPE html>