Skip to content

Commit 3adef90

Browse files
author
Kristan Kenney
committed
Separate header include files
1 parent 223ae17 commit 3adef90

File tree

10 files changed

+27
-22
lines changed

10 files changed

+27
-22
lines changed

‎web/css/src/themes/default.css‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4192,12 +4192,14 @@ form#vstobjects.suspended {
41924192
.debug-panel-contents {
41934193
font-size:12px !important;
41944194
padding:18px;
4195-
position:sticky;
4195+
position: absolute;
41964196
top:0;
41974197
z-index:3000;
41984198
height:250px;
41994199
overflow-x: hidden;
42004200
overflow-y: scroll;
4201+
border-bottom: 1px solid rgba(255,255,255,0.65);
4202+
box-shadow: 0px 2px 4px rgb(0 0 0 / 25%);
42014203
}
42024204

42034205
.body-login .debug-panel-header, .debug-panel-contents {

‎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/inc/main.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ function top_panel($user, $TAB) {
152152
$command = HESTIA_CMD."v-list-user ".escapeshellarg($user)." 'json'";
153153
exec ($command, $output, $return_var);
154154
if ( $return_var > 0 ) {
155-
header("Location: /error/");
155+
header("Location: /logout/");
156156
exit;
157157
}
158158
$panel = json_decode(implode('', $output), true);

‎web/templates/admin/list_server_info.html‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<!doctype html>
22
<html lang="en">
33
<head>
4-
<!-- Load necessary CSS and JavaScript from init.html source -->
5-
<?php require ''.$_SERVER['HESTIA'].'/web/templates/init.html'; ?>
4+
<!-- Load necessary CSS and JavaScript from source -->
5+
<?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/title.html'; ?>
6+
<?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/css.html'; ?>
7+
<?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/js.html'; ?>
68
<script type="text/javascript" src="/js/jquery/jquery-1.7.2.min.js"></script>
79
<script type="text/javascript" src="/js/jquery/jquery.cookie.js"></script>
810
<script type="text/javascript" src="/js/jquery/jquery-ui-1.8.20.custom.min.js"></script>

‎web/templates/admin/list_weblog.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<!doctype html>
22
<html lang="en">
33
<head>
4-
<meta charset="utf-8">
5-
<!-- Load necessary CSS and JavaScript from init.html source -->
6-
<?php require ''.$_SERVER['HESTIA'].'/web/templates/init.html'; ?>
4+
<!-- Load necessary CSS and JavaScript from source -->
5+
<?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/title.html'; ?>
6+
<?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/css.html'; ?>
7+
<?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/js.html'; ?>
78
<script type="text/javascript" src="/js/jquery/jquery-1.7.2.min.js"></script>
89
<script type="text/javascript" src="/js/jquery/jquery.cookie.js"></script>
910
<script type="text/javascript" src="/js/jquery/jquery-ui-1.8.20.custom.min.js"></script>

‎web/templates/debug.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="debug-panel-header"><?=_('Debug mode is enabled.')?> <a href="javascript:elementHideShow('debug-panel')"><?=_('Hide / Show Panel')?></a></div>
1+
<div class="debug-panel-header"><?=_('Debug mode is enabled.')?> <a href="javascript:elementHideShow('debug-panel')"><?=_('Show / Hide Panel')?></a></div>
22
<div class="debug-panel-contents animated fadeIn" id="debug-panel" style="display:none;">
33
<?php
44
echo "<h3>Server Variables</h3>";

‎web/templates/header.html‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
<!doctype html>
22
<html lang="<?php echo $_SESSION['LANGUAGE'];?>">
3+
34
<head>
4-
<!-- Load necessary CSS and JavaScript from init.html source -->
5-
<?php require ''.$_SERVER['HESTIA'].'/web/templates/init.html'; ?>
5+
<?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/title.html'; ?>
6+
<?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/css.html'; ?>
7+
<?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/js.html'; ?>
68
<script>
79
//
810
// GLOBAL SETTINGS
911
//
1012
var GLOBAL = {};
11-
GLOBAL.FTP_USER_PREFIX = 'admin_';
12-
GLOBAL.DB_USER_PREFIX = 'admin_';
13+
GLOBAL.FTP_USER_PREFIX = 'admin_';
14+
GLOBAL.DB_USER_PREFIX = 'admin_';
1315
GLOBAL.DB_DBNAME_PREFIX = 'admin_';
1416
GLOBAL.AJAX_URL = '';
15-
1617
</script>
1718
</head>
19+
1820
<body class="body-<?=strtolower($TAB)?> lang-<?=$_SESSION['language']?>">
1921
<?php if (($_SESSION['DEBUG_MODE']) == "true" ) {?>
20-
<?php require ''.$_SERVER['HESTIA'].'/web/templates/debug.html'; ?>
21-
<?php } ?>
22-
22+
<?php require ''.$_SERVER['HESTIA'].'/web/templates/debug.html'; ?>
23+
<?php } ?>

web/templates/init.html renamed to web/templates/includes/css.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
<meta charset="utf-8">
21
<link rel="icon" href="/images/favicon.ico" type="image/x-icon">
3-
<title><?php echo $_SERVER['HTTP_HOST']; ?> - <?=_($TAB)?> - <?=_('Hestia Control Panel');?></title>
4-
<!-- Load base system theme-->
52
<link type="text/css" rel="stylesheet" href="/css/themes/default.min.css?<?=JS_LATEST_UPDATE?>" rel="preload" />
63
<? if (!empty($_SESSION['userTheme'])) {
74
$selected_theme = $_SESSION['userTheme'];
@@ -18,5 +15,4 @@
1815
<? } ?>
1916
<link type="text/css" href="/css/dependencies/animate.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />
2017
<link type="text/css" href="/css/dependencies/jquery-custom-dialogs.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />
21-
<link type="text/css" href="/css/dependencies/fontawesome.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />
22-
<script type="text/javascript" src="/inc/jquery/jquery-3.5.1.min.js"></script>
18+
<link type="text/css" href="/css/dependencies/fontawesome.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />

‎web/templates/includes/js.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<script type="text/javascript" src="/inc/jquery/jquery-3.5.1.min.js"></script>

‎web/templates/includes/title.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<meta charset="utf-8">
2+
<title><?php echo $_SERVER['HTTP_HOST']; ?> - <?=_($TAB)?> - <?=_('Hestia Control Panel');?></title>

0 commit comments

Comments
 (0)