Browse Source

Fix navigation and styles

Kristan Kenney 5 years ago
parent
commit
c509696676

+ 1 - 1
web/css/src/themes/default.css

@@ -2861,7 +2861,7 @@ a.vst-text:active b{
 }
 
 .body-web .vst-advanced:focus {
-  background: none !inportant;
+  background: none !important;
 }
 
 .login-box .vst-advanced:hover {

File diff suppressed because it is too large
+ 0 - 0
web/css/themes/default.min.css


+ 8 - 5
web/login/index.php

@@ -32,6 +32,7 @@ if (isset($_SESSION['user'])) {
                 reset($data);
                 $_SESSION['look'] = key($data);
                 // Reset account details for File Manager to impersonated user
+                //unset($_SESSION['userTheme']);
                 unset($_SESSION['_sf2_attributes']);
                 unset($_SESSION['_sf2_meta']);
                 header("Location: /login/");
@@ -172,11 +173,7 @@ function authenticate_user($user, $password, $twofa = ''){
                         }
                 }
                 
-                $_SESSION['userContext'] = $data[$user]['ROLE'];
-                $_SESSION['userTheme'] = $data[$user]['THEME'];
-                if ($_SESSION['POLICY_USER_CHANGE_THEME'] === 'no') {
-                    unset($_SESSION['userTheme']);
-                }
+
                 
                 // Define session user
                 $_SESSION['user'] = key($data);
@@ -188,6 +185,12 @@ function authenticate_user($user, $password, $twofa = ''){
                 $_SESSION['LAST_ACTIVITY'] = time();
                 $_SESSION['MURMUR'] = $_POST['murmur'];
 
+                $_SESSION['userContext'] = $data[$user]['ROLE'];
+                $_SESSION['userTheme'] = $data[$user]['THEME'];
+                if ($_SESSION['POLICY_USER_CHANGE_THEME'] === 'no') {
+                    unset($_SESSION['userTheme']);
+                }
+
                 // Define language
                 $output = '';
                 exec (HESTIA_CMD."v-list-sys-languages json", $output, $return_var);

+ 1 - 1
web/templates/admin/list_firewall.html

@@ -1,7 +1,7 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <div class="l-unit-toolbar__buttonstrip">
-          <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back')?></a>
+          <a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/ip/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back')?></a>
           <a href="/add/firewall/" id="btn-create" class="ui-button cancel" dir="ltr"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add Rule')?></a>
           <?php if(!empty($_SESSION['FIREWALL_EXTENSION'])): ?>
             <a class="ui-button cancel" dir="ltr" href="/list/firewall/banlist/"><i class="fas fa-eye status-icon red"></i><?=_('list fail2ban')?></a>

+ 1 - 1
web/templates/admin/list_services.html

@@ -7,7 +7,7 @@
           <!-- Disable Updates Button 
           <a href="/list/updates/" class="ui-button cancel" dir="ltr"><i class="fas fa-sync status-icon green"></i><?=_('Updates')?></a>
           -->
-          <a href="/list/log/?user=admin&token=<?=$_SESSION['token']?>" class="ui-button cancel" dir="ltr"><i class="fas fa-book-reader status-icon lightblue"></i><?=_('Logs')?></a>
+          <a href="/list/log/?user=admin&token=<?=$_SESSION['token']?>" class="ui-button cancel" dir="ltr"><i class="fas fa-binoculars status-icon lightblue"></i><?=_('Logs')?></a>
           <div class="actions-panel display-inline-block" key-action="js">
               <a class="data-controls do_servicerestart ui-button danger cancel">
                 <i class="do_servicerestart fas fa-undo status-icon red"></i><?=_('Restart')?>

Some files were not shown because too many files changed in this diff