Skip to content

Commit 6ea314a

Browse files
author
Kristan Kenney
committed
Merge branch 'refactor/html' into feature/user-roles
2 parents 70f282a + 87e4c81 commit 6ea314a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+13878
-13884
lines changed

‎web/inc/main.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,9 @@ function top_panel($user, $TAB) {
181181
}
182182

183183
// Set preferred sort order
184-
$_SESSION['userSortOrder'] = $panel[$user]['PREF_UI_SORT'];
184+
if (!isset($_SESSION['look'])) {
185+
$_SESSION['userSortOrder'] = $panel[$user]['PREF_UI_SORT'];
186+
}
185187

186188
// Set home location URLs
187189
if (($_SESSION['userContext'] === 'admin') && (!isset($_SESSION['look']))) {

‎web/list/server/index.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
foreach($output as $file) {
2020
echo $file . "\n";
2121
}
22-
echo " </pre>\n</div>\n</body>\n</html>\n";
22+
echo " </pre>\n</div>\n</body>\n</html>\n";
2323
exit();
2424
}
2525

@@ -31,7 +31,7 @@
3131
foreach($output as $file) {
3232
echo $file . "\n";
3333
}
34-
echo " </pre>\n</div>\n</body>\n</html>\n";
34+
echo " </pre>\n</div>\n</body>\n</html>\n";
3535
exit();
3636
}
3737

@@ -43,7 +43,7 @@
4343
foreach($output as $file) {
4444
echo $file . "\n";
4545
}
46-
echo " </pre>\n</div>\n</body>\n</html>\n";
46+
echo " </pre>\n</div>\n</body>\n</html>\n";
4747
exit();
4848
}
4949

@@ -55,7 +55,7 @@
5555
foreach($output as $file) {
5656
echo $file . "\n";
5757
}
58-
echo " </pre>\n</div>\n</body>\n</html>\n";
58+
echo " </pre>\n</div>\n</body>\n</html>\n";
5959
exit();
6060
}
6161

@@ -71,7 +71,7 @@
7171

7272
echo $file . "\n";
7373
}
74-
echo " </pre>\n</div>\n</body>\n</html>\n";
74+
echo " </pre>\n</div>\n</body>\n</html>\n";
7575
exit();
7676
}
7777

@@ -83,7 +83,7 @@
8383
foreach($output as $file) {
8484
echo $file . "\n";
8585
}
86-
echo " </pre>\n</div>\n</body>\n</html>\n";
86+
echo " </pre>\n</div>\n</body>\n</html>\n";
8787
exit();
8888
}
8989

@@ -97,7 +97,7 @@
9797
echo $file . "\n";
9898
}
9999
}
100-
echo " </pre>\n</div>\n</body>\n</html>\n";
100+
echo " </pre>\n</div>\n</body>\n</html>\n";
101101
exit();
102102
}
103103

@@ -111,7 +111,7 @@
111111
echo $file . "\n";
112112
}
113113
}
114-
echo " </pre>\n</div>\n</body>\n</html>\n";
114+
echo " </pre>\n</div>\n</body>\n</html>\n";
115115
exit();
116116
}
117117

‎web/templates/footer.html‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
11
</div>
2-
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['POLICY_SYSTEM_HIDE_SERVICES'] !== 'yes')) {?>
3-
<? if ($_SESSION['UPDATE_AVAILABLE'] === 'yes') { ?>
2+
<?php if (($_SESSION['userContext'] === 'admin') && ($_SESSION['POLICY_SYSTEM_HIDE_SERVICES'] !== 'yes')) {?>
3+
<?php if ($_SESSION['UPDATE_AVAILABLE'] === 'yes') { ?>
44
<div class="footer-banner updates" id="banner">
55
<div>
66
<b>New updates are available!</b> To upgrade your server now, run <span style="font-family:'Courier New', Courier, monospace">apt update && apt upgrade</span> from a shell session.
77
</div>
88
<div style="margin-top: 4px;"></div><a href="javascript:elementHideShow('banner');">Hide</a></div>
99
</div>
10-
<?}?>
11-
<?}?>
12-
<div title="<?=_('Confirmation')?>" class="confirmation-text-redirect hidden">
13-
<p class="confirmation"><?=_('LEAVE_PAGE_CONFIRMATION')?></p>
10+
<?php } ?>
11+
<?php } ?>
12+
<div title="<?=_('Confirmation');?>" class="confirmation-text-redirect hidden">
13+
<p class="confirmation"><?=_('LEAVE_PAGE_CONFIRMATION');?></p>
1414
</div>
1515

1616
<div class="shortcuts animated fadeIn" style="display:none">
1717
<div class="header">
18-
<div class="title"><?=_('Shortcuts')?></div>
18+
<div class="title"><?=_('Shortcuts');?></div>
1919
<div class="close text-center">
2020
<i class="fas fa-times"></i>
2121
</div>
2222

2323
</div>
2424
<ul>
25-
<li><span class="key">a</span><?=_('Add New object')?></li>
26-
<li><span class="key">Ctrl + Enter</span><?=_('Save Form')?></li>
27-
<li><span class="key">Ctrl + Backspace</span><?=_('Cancel saving form')?></li>
25+
<li><span class="key">a</span><?=_('Add New object');?></li>
26+
<li><span class="key">Ctrl + Enter</span><?=_('Save Form');?></li>
27+
<li><span class="key">Ctrl + Backspace</span><?=_('Cancel saving form');?></li>
2828

29-
<li class="step-top"><span class="key">1</span><?=_('Go to WEB list')?></li>
30-
<li><span class="key">2</span><?=_('Go to DNS list')?></li>
31-
<li><span class="key">3</span><?=_('Go to MAIL list')?></li>
32-
<li><span class="key">4</span><?=_('Go to DB list')?></li>
33-
<li><span class="key">5</span><?=_('Go to CRON list')?></li>
34-
<li><span class="key">6</span><?=_('Go to BACKUP list')?></li>
29+
<li class="step-top"><span class="key">1</span><?=_('Go to WEB list');?></li>
30+
<li><span class="key">2</span><?=_('Go to DNS list');?></li>
31+
<li><span class="key">3</span><?=_('Go to MAIL list');?></li>
32+
<li><span class="key">4</span><?=_('Go to DB list');?></li>
33+
<li><span class="key">5</span><?=_('Go to CRON list');?></li>
34+
<li><span class="key">6</span><?=_('Go to BACKUP list');?></li>
3535
</ul>
3636
<ul>
37-
<li><span class="key">f</span><?=_('Focus on search')?></li>
38-
<li class="step-top"><span class="key">h</span><?=_('Display/Close shortcuts')?></li>
37+
<li><span class="key">f</span><?=_('Focus on search');?></li>
38+
<li class="step-top"><span class="key">h</span><?=_('Display/Close shortcuts');?></li>
3939

40-
<li class="step-top"><span class="key bigger">&larr;</span><?=_('Move backward through top menu')?></li>
41-
<li><span class="key bigger">&rarr;</span><?=_('Move forward through top menu')?></li>
42-
<li><span class="key">Enter</span><?=_('Enter focused element')?></li>
40+
<li class="step-top"><span class="key bigger">&larr;</span><?=_('Move backward through top menu');?></li>
41+
<li><span class="key bigger">&rarr;</span><?=_('Move forward through top menu');?></li>
42+
<li><span class="key">Enter</span><?=_('Enter focused element');?></li>
4343

44-
<li class="step-top"><span class="key bigger">&uarr;</span><?=_('Move up through elements list')?></li>
45-
<li><span class="key bigger">&darr;</span><?=_('Move down through elements list')?></li>
44+
<li class="step-top"><span class="key bigger">&uarr;</span><?=_('Move up through elements list');?></li>
45+
<li><span class="key bigger">&darr;</span><?=_('Move down through elements list');?></li>
4646
</ul>
4747
</div>
4848
</body>

‎web/templates/header.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!doctype html>
2-
<html lang="<?php echo $_SESSION['LANGUAGE'];?>">
2+
<html lang="<?=$_SESSION['LANGUAGE'];?>">
33

44
<head>
55
<?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/title.html'; ?>

‎web/templates/includes/css.html‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
<link rel="icon" href="/images/favicon.ico" type="image/x-icon">
22
<link type="text/css" rel="stylesheet" href="/css/themes/default.min.css?<?=JS_LATEST_UPDATE?>" rel="preload" />
3-
<? if (!empty($_SESSION['userTheme'])) {
4-
$selected_theme = $_SESSION['userTheme'];
5-
} else {
6-
$selected_theme = $_SESSION['THEME'];
7-
}
3+
<?php
4+
if (!empty($_SESSION['userTheme'])) {
5+
$selected_theme = $_SESSION['userTheme'];
6+
} else {
7+
$selected_theme = $_SESSION['THEME'];
8+
}
89
?>
910
<!-- Load custom theme -->
10-
<? if ($selectedTheme !== 'default') {?>
11+
<?php if ($selectedTheme !== 'default') {?>
1112
<!-- Load HestiaCP-shipped themes (minified, updated/overwritten with updates) - ($HESTIA/web/css/themes/*.min.css) -->
12-
<link type="text/css" rel="stylesheet" href="/css/themes/<?php echo $selected_theme; ?>.min.css?<?php echo rand(); ?>" rel="preload" />
13+
<link type="text/css" rel="stylesheet" href="/css/themes/<?=$selected_theme; ?>.min.css?<?=rand(); ?>" rel="preload" />
1314
<!-- Load custom theme files ($HESTIA/web/css/themes/custom/*.css) -->
14-
<link type="text/css" rel="stylesheet" href="/css/themes/custom/<?php echo $selected_theme; ?>.css?<?php echo rand(); ?>" rel="preload" />
15-
<? } ?>
15+
<link type="text/css" rel="stylesheet" href="/css/themes/custom/<?=$selected_theme; ?>.css?<?=rand(); ?>" rel="preload" />
16+
<?php } ?>
1617
<link type="text/css" href="/css/dependencies/animate.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />
1718
<link type="text/css" href="/css/dependencies/jquery-custom-dialogs.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />
1819
<link type="text/css" href="/css/dependencies/fontawesome.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />

‎web/templates/includes/end_js.html‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
1-
<script type="text/javascript" src="/js/jquery/jquery-1.7.2.min.js?<?=JS_LATEST_UPDATE?>"></script>
2-
<script type="text/javascript" src="/js/jquery/jquery.cookie.js?<?=JS_LATEST_UPDATE?>"></script>
3-
<script type="text/javascript" src="/js/jquery/jquery-ui-1.8.20.custom.min.js?<?=JS_LATEST_UPDATE?>"></script>
4-
<script type="text/javascript" src="/js/jquery/jquery.finder.js?<?=JS_LATEST_UPDATE?>"></script>
5-
<script type="text/javascript" src="/js/hotkeys.js?<?=JS_LATEST_UPDATE?>"></script>
6-
<script type="text/javascript" src="/js/events.js?<?=JS_LATEST_UPDATE?>"></script>
7-
<script type="text/javascript" src="/js/app.js?<?=JS_LATEST_UPDATE?>"></script>
8-
<script type="text/javascript" src="/js/init.js?<?=JS_LATEST_UPDATE?>"></script>
9-
<script type="text/javascript" src="/js/i18n.js.php?<?=JS_LATEST_UPDATE?>"></script>
10-
<script type="text/javascript" src="/js/templates.js?<?=JS_LATEST_UPDATE?>"></script>
11-
<script>
12-
$(function() {
13-
hover_menu();
14-
});
15-
</script>
1+
<script type="text/javascript" src="/js/jquery/jquery-1.7.2.min.js?<?=JS_LATEST_UPDATE?>"></script>
2+
<script type="text/javascript" src="/js/jquery/jquery.cookie.js?<?=JS_LATEST_UPDATE?>"></script>
3+
<script type="text/javascript" src="/js/jquery/jquery-ui-1.8.20.custom.min.js?<?=JS_LATEST_UPDATE?>"></script>
4+
<script type="text/javascript" src="/js/jquery/jquery.finder.js?<?=JS_LATEST_UPDATE?>"></script>
5+
<script type="text/javascript" src="/js/hotkeys.js?<?=JS_LATEST_UPDATE?>"></script>
6+
<script type="text/javascript" src="/js/events.js?<?=JS_LATEST_UPDATE?>"></script>
7+
<script type="text/javascript" src="/js/app.js?<?=JS_LATEST_UPDATE?>"></script>
8+
<script type="text/javascript" src="/js/init.js?<?=JS_LATEST_UPDATE?>"></script>
9+
<script type="text/javascript" src="/js/i18n.js.php?<?=JS_LATEST_UPDATE?>"></script>
10+
<script type="text/javascript" src="/js/templates.js?<?=JS_LATEST_UPDATE?>"></script>
11+
<script>
12+
$(function() {
13+
hover_menu();
14+
});
15+
</script>
1616

1717
<?php
18-
if (!empty($_SESSION['error_msg'])):
19-
?>
20-
<div>
21-
<script>
22-
$(function() {
23-
$('#dialog:ui-dialog').dialog('destroy');
24-
$('#dialog-message').dialog({
25-
modal: true,
26-
buttons: {
27-
Ok: function() {
28-
$(this).dialog('close');
29-
}
30-
},
31-
create: function() {
32-
$(this)
33-
.closest('.ui-dialog')
34-
.find('.ui-button:first')
35-
.addClass('submit');
36-
}
37-
});
38-
});
39-
</script>
40-
<div id="dialog-message" title="">
41-
<p><?=htmlentities($_SESSION['error_msg'])?></p>
42-
</div>
43-
</div>
18+
if (!empty($_SESSION['error_msg'])):
19+
?>
20+
<div>
21+
<script>
22+
$(function() {
23+
$('#dialog:ui-dialog').dialog('destroy');
24+
$('#dialog-message').dialog({
25+
modal: true,
26+
buttons: {
27+
Ok: function() {
28+
$(this).dialog('close');
29+
}
30+
},
31+
create: function() {
32+
$(this)
33+
.closest('.ui-dialog')
34+
.find('.ui-button:first')
35+
.addClass('submit');
36+
}
37+
});
38+
});
39+
</script>
40+
<div id="dialog-message" title="">
41+
<p><?=htmlentities($_SESSION['error_msg'])?></p>
42+
</div>
43+
</div>
4444
<?php
45-
unset($_SESSION['error_msg']);
46-
endif;
45+
unset($_SESSION['error_msg']);
46+
endif;
4747
?>

0 commit comments

Comments
 (0)