Skip to content

Commit c509696

Browse files
author
Kristan Kenney
committed
Fix navigation and styles
1 parent 3a0fb9a commit c509696

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

web/css/src/themes/default.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2861,7 +2861,7 @@ a.vst-text:active b{
28612861
}
28622862

28632863
.body-web .vst-advanced:focus {
2864-
background: none !inportant;
2864+
background: none !important;
28652865
}
28662866

28672867
.login-box .vst-advanced:hover {

web/css/themes/default.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/login/index.php

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
reset($data);
3333
$_SESSION['look'] = key($data);
3434
// Reset account details for File Manager to impersonated user
35+
//unset($_SESSION['userTheme']);
3536
unset($_SESSION['_sf2_attributes']);
3637
unset($_SESSION['_sf2_meta']);
3738
header("Location: /login/");
@@ -172,11 +173,7 @@ function authenticate_user($user, $password, $twofa = ''){
172173
}
173174
}
174175

175-
$_SESSION['userContext'] = $data[$user]['ROLE'];
176-
$_SESSION['userTheme'] = $data[$user]['THEME'];
177-
if ($_SESSION['POLICY_USER_CHANGE_THEME'] === 'no') {
178-
unset($_SESSION['userTheme']);
179-
}
176+
180177

181178
// Define session user
182179
$_SESSION['user'] = key($data);
@@ -188,6 +185,12 @@ function authenticate_user($user, $password, $twofa = ''){
188185
$_SESSION['LAST_ACTIVITY'] = time();
189186
$_SESSION['MURMUR'] = $_POST['murmur'];
190187

188+
$_SESSION['userContext'] = $data[$user]['ROLE'];
189+
$_SESSION['userTheme'] = $data[$user]['THEME'];
190+
if ($_SESSION['POLICY_USER_CHANGE_THEME'] === 'no') {
191+
unset($_SESSION['userTheme']);
192+
}
193+
191194
// Define language
192195
$output = '';
193196
exec (HESTIA_CMD."v-list-sys-languages json", $output, $return_var);

web/templates/admin/list_firewall.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="l-center">
22
<div class="l-sort clearfix noselect">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<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>
4+
<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>
55
<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>
66
<?php if(!empty($_SESSION['FIREWALL_EXTENSION'])): ?>
77
<a class="ui-button cancel" dir="ltr" href="/list/firewall/banlist/"><i class="fas fa-eye status-icon red"></i><?=_('list fail2ban')?></a>

web/templates/admin/list_services.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!-- Disable Updates Button
88
<a href="/list/updates/" class="ui-button cancel" dir="ltr"><i class="fas fa-sync status-icon green"></i><?=_('Updates')?></a>
99
-->
10-
<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>
10+
<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>
1111
<div class="actions-panel display-inline-block" key-action="js">
1212
<a class="data-controls do_servicerestart ui-button danger cancel">
1313
<i class="do_servicerestart fas fa-undo status-icon red"></i><?=_('Restart')?>

0 commit comments

Comments
 (0)