Skip to content

Commit 43ff779

Browse files
author
Kristan Kenney
committed
Move main header includes & debug panel to separate source files
1 parent b1aae2d commit 43ff779

File tree

5 files changed

+54
-76
lines changed

5 files changed

+54
-76
lines changed

‎web/templates/admin/list_server_info.html‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,8 @@
11
<!doctype html>
22
<html lang="en">
33
<head>
4-
<meta charset="utf-8">
5-
<link rel="icon" href="/images/favicon.ico" type="image/x-icon">
6-
<title><?php echo $_SERVER['HTTP_HOST']; ?> - <?=_($TAB)?> - <?=_('Hestia Control Panel');?></title>
7-
<!-- Load base theme-->
8-
<link type="text/css" rel="stylesheet" href="/css/themes/default.min.css?<?=JS_LATEST_UPDATE?>" />
9-
<? if ($_SESSION['THEME'] !== 'default') {?>
10-
<!-- Load provided theme -->
11-
<link type="text/css" rel="stylesheet" href="/css/themes/<?php echo $_SESSION['THEME']; ?>.min.css?<?php echo rand(); ?>" />
12-
<!-- Load custom theme -->
13-
<link type="text/css" rel="stylesheet" href="/css/themes/custom/<?php echo $_SESSION['THEME']; ?>.css?<?php echo rand(); ?>" />
14-
<? } ?>
15-
<link type="text/css" href="/css/dependencies/animate.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" />
16-
<link type="text/css" href="/css/dependencies/jquery-custom-dialogs.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" />
17-
<link type="text/css" href="/css/dependencies/fontawesome.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" />
18-
<script src="/inc/jquery/jquery-3.4.1.min.js"></script>
4+
<!-- Load necessary CSS and JavaScript from init.html source -->
5+
<?php require ''.$_SERVER['HESTIA'].'/web/templates/init.html'; ?>
196
<script type="text/javascript" src="/js/jquery/jquery-1.7.2.min.js"></script>
207
<script type="text/javascript" src="/js/jquery/jquery.cookie.js"></script>
218
<script type="text/javascript" src="/js/jquery/jquery-ui-1.8.20.custom.min.js"></script>

‎web/templates/admin/list_weblog.html‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,8 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8">
5-
<link rel="icon" href="/images/favicon.ico" type="image/x-icon">
6-
<title><?=_('Web Log Manager')?> - <?=_('Hestia Control Panel');?></title>
7-
<!-- Load base theme-->
8-
<link type="text/css" rel="stylesheet" href="/css/themes/default.min.css?<?=JS_LATEST_UPDATE?>" />
9-
<? if ($_SESSION['THEME'] !== 'default') {?>
10-
<!-- Load provided theme -->
11-
<link type="text/css" rel="stylesheet" href="/css/themes/<?php echo $_SESSION['THEME']; ?>.min.css?<?php echo rand(); ?>" />
12-
<!-- Load custom theme -->
13-
<link type="text/css" rel="stylesheet" href="/css/themes/custom/<?php echo $_SESSION['THEME']; ?>.css?<?php echo rand(); ?>" />
14-
<? } ?>
15-
<link type="text/css" href="/css/dependencies/animate.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" />
16-
<link type="text/css" href="/css/dependencies/jquery-custom-dialogs.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" />
17-
<link type="text/css" href="/css/dependencies/fontawesome.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" />
18-
<script src="/inc/jquery/jquery-3.4.1.min.js"></script>
5+
<!-- Load necessary CSS and JavaScript from init.html source -->
6+
<?php require ''.$_SERVER['HESTIA'].'/web/templates/init.html'; ?>
197
<script type="text/javascript" src="/js/jquery/jquery-1.7.2.min.js"></script>
208
<script type="text/javascript" src="/js/jquery/jquery.cookie.js"></script>
219
<script type="text/javascript" src="/js/jquery/jquery-ui-1.8.20.custom.min.js"></script>

‎web/templates/debug.html‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<div class="debug-panel-header"><?=_('Debug mode is enabled.')?> <a href="javascript:elementHideShow('debug-panel')"><?=_('Hide / Show Panel')?></a></div>
2+
<div class="debug-panel-contents animated fadeIn" id="debug-panel" style="display:none;">
3+
<?php
4+
echo "<h3>Server Variables</h3>";
5+
foreach ($_SERVER as $key=>$val)
6+
echo "<b>".$key."= </b> ".$val." ";
7+
?>
8+
<?php
9+
echo "<h3>Session Variables</h3>";
10+
foreach ($_SESSION as $key=>$val)
11+
echo "<b>".$key."= </b> ".$val." ";
12+
?>
13+
<?php
14+
echo "<h3>POST Variables</h3>";
15+
foreach ($_POST as $key=>$val)
16+
echo "<b>".$key."= </b> ".$val." ";
17+
?>
18+
<?php
19+
echo "<h3>GET Variables</h3>";
20+
foreach ($_GET as $key=>$val)
21+
echo "<b>".$key."= </b> ".$val." ";
22+
?>
23+
</div>

‎web/templates/header.html‎

Lines changed: 5 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,8 @@
11
<!doctype html>
22
<html lang="<?php echo $_SESSION['LANGUAGE'];?>">
33
<head>
4-
<meta charset="utf-8">
5-
<link rel="icon" href="/images/favicon.ico" type="image/x-icon">
6-
<title><?php echo $_SERVER['HTTP_HOST']; ?> - <?=_($TAB)?> - <?=_('Hestia Control Panel');?></title>
7-
<!-- Load base system theme-->
8-
<link type="text/css" rel="stylesheet" href="/css/themes/default.min.css?<?=JS_LATEST_UPDATE?>" rel="preload" />
9-
<? if (!empty($_SESSION['userTheme'])) {
10-
$selected_theme = $_SESSION['userTheme'];
11-
} else {
12-
$selected_theme = $_SESSION['THEME'];
13-
}
14-
?>
15-
<!-- Load custom theme -->
16-
<? if ($selectedTheme !== 'default') {?>
17-
<!-- Load HestiaCP-shipped themes (minified, updated/overwritten with updates) - ($HESTIA/web/css/themes/*.min.css) -->
18-
<link type="text/css" rel="stylesheet" href="/css/themes/<?php echo $selected_theme; ?>.min.css?<?php echo rand(); ?>" rel="preload" />
19-
<!-- Load custom theme files ($HESTIA/web/css/themes/custom/*.css) -->
20-
<link type="text/css" rel="stylesheet" href="/css/themes/custom/<?php echo $selected_theme; ?>.css?<?php echo rand(); ?>" rel="preload" />
21-
<? } ?>
22-
<link type="text/css" href="/css/dependencies/animate.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />
23-
<link type="text/css" href="/css/dependencies/jquery-custom-dialogs.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />
24-
<link type="text/css" href="/css/dependencies/fontawesome.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />
25-
<script type="text/javascript" src="/inc/jquery/jquery-3.5.1.min.js"></script>
4+
<!-- Load necessary CSS and JavaScript from init.html source -->
5+
<?php require ''.$_SERVER['HESTIA'].'/web/templates/init.html'; ?>
266
<script>
277
//
288
// GLOBAL SETTINGS
@@ -36,29 +16,7 @@
3616
</script>
3717
</head>
3818
<body class="body-<?=strtolower($TAB)?> lang-<?=$_SESSION['language']?>">
39-
<?php if (($_SESSION['DEBUG_MODE']) == "true" ) {?>
40-
<div class="debug-panel-header"><?=_('Debug mode is enabled.')?> <a href="javascript:elementHideShow('debug-panel')"><?=_('Hide / Show Panel')?></a></div>
41-
<div class="debug-panel-contents animated fadeIn" id="debug-panel" style="display:none;">
42-
<?php
43-
echo "<h3>Server Variables</h3>";
44-
foreach ($_SERVER as $key=>$val)
45-
echo "<b>".$key."= </b> ".$val." ";
46-
?>
47-
<?php
48-
echo "<h3>Session Variables</h3>";
49-
foreach ($_SESSION as $key=>$val)
50-
echo "<b>".$key."= </b> ".$val." ";
51-
?>
52-
<?php
53-
echo "<h3>POST Variables</h3>";
54-
foreach ($_POST as $key=>$val)
55-
echo "<b>".$key."= </b> ".$val." ";
56-
?>
57-
<?php
58-
echo "<h3>GET Variables</h3>";
59-
foreach ($_GET as $key=>$val)
60-
echo "<b>".$key."= </b> ".$val." ";
61-
?>
62-
</div>
63-
<?php } ?>
19+
<?php if (($_SESSION['DEBUG_MODE']) == "true" ) {?>
20+
<?php require ''.$_SERVER['HESTIA'].'/web/templates/debug.html'; ?>
21+
<?php } ?>
6422

‎web/templates/init.html‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<meta charset="utf-8">
2+
<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-->
5+
<link type="text/css" rel="stylesheet" href="/css/themes/default.min.css?<?=JS_LATEST_UPDATE?>" rel="preload" />
6+
<? if (!empty($_SESSION['userTheme'])) {
7+
$selected_theme = $_SESSION['userTheme'];
8+
} else {
9+
$selected_theme = $_SESSION['THEME'];
10+
}
11+
?>
12+
<!-- Load custom theme -->
13+
<? if ($selectedTheme !== 'default') {?>
14+
<!-- Load HestiaCP-shipped themes (minified, updated/overwritten with updates) - ($HESTIA/web/css/themes/*.min.css) -->
15+
<link type="text/css" rel="stylesheet" href="/css/themes/<?php echo $selected_theme; ?>.min.css?<?php echo rand(); ?>" rel="preload" />
16+
<!-- Load custom theme files ($HESTIA/web/css/themes/custom/*.css) -->
17+
<link type="text/css" rel="stylesheet" href="/css/themes/custom/<?php echo $selected_theme; ?>.css?<?php echo rand(); ?>" rel="preload" />
18+
<? } ?>
19+
<link type="text/css" href="/css/dependencies/animate.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />
20+
<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>

0 commit comments

Comments
 (0)