Просмотр исходного кода

Move main header includes & debug panel to separate source files

Kristan Kenney 5 лет назад
Родитель
Сommit
43ff779132

+ 2 - 15
web/templates/admin/list_server_info.html

@@ -1,21 +1,8 @@
 <!doctype html>
 <html lang="en">
 <head>
-  <meta charset="utf-8">
-  <link rel="icon" href="/images/favicon.ico" type="image/x-icon">
-  <title><?php echo $_SERVER['HTTP_HOST']; ?> - <?=_($TAB)?> - <?=_('Hestia Control Panel');?></title>
-  <!-- Load base theme-->
-  <link type="text/css" rel="stylesheet" href="/css/themes/default.min.css?<?=JS_LATEST_UPDATE?>" />
-  <? if ($_SESSION['THEME'] !== 'default') {?>
-    <!-- Load provided theme -->
-    <link type="text/css" rel="stylesheet" href="/css/themes/<?php echo $_SESSION['THEME']; ?>.min.css?<?php echo rand(); ?>" />
-    <!-- Load custom theme -->
-    <link type="text/css" rel="stylesheet" href="/css/themes/custom/<?php echo $_SESSION['THEME']; ?>.css?<?php echo rand(); ?>" />
-  <? } ?>
-  <link type="text/css" href="/css/dependencies/animate.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" />
-  <link type="text/css" href="/css/dependencies/jquery-custom-dialogs.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" />
-  <link type="text/css" href="/css/dependencies/fontawesome.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" />
-  <script src="/inc/jquery/jquery-3.4.1.min.js"></script>
+  <!-- Load necessary CSS and JavaScript from init.html source -->
+  <?php require ''.$_SERVER['HESTIA'].'/web/templates/init.html'; ?>
   <script type="text/javascript" src="/js/jquery/jquery-1.7.2.min.js"></script>
   <script type="text/javascript" src="/js/jquery/jquery.cookie.js"></script>
   <script type="text/javascript" src="/js/jquery/jquery-ui-1.8.20.custom.min.js"></script>

+ 2 - 14
web/templates/admin/list_weblog.html

@@ -2,20 +2,8 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <link rel="icon" href="/images/favicon.ico" type="image/x-icon">
-  <title><?=_('Web Log Manager')?> - <?=_('Hestia Control Panel');?></title>
-  <!-- Load base theme-->
-  <link type="text/css" rel="stylesheet" href="/css/themes/default.min.css?<?=JS_LATEST_UPDATE?>" />
-  <? if ($_SESSION['THEME'] !== 'default') {?>
-    <!-- Load provided theme -->
-    <link type="text/css" rel="stylesheet" href="/css/themes/<?php echo $_SESSION['THEME']; ?>.min.css?<?php echo rand(); ?>" />
-    <!-- Load custom theme -->
-    <link type="text/css" rel="stylesheet" href="/css/themes/custom/<?php echo $_SESSION['THEME']; ?>.css?<?php echo rand(); ?>" />
-  <? } ?>
-  <link type="text/css" href="/css/dependencies/animate.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" />
-  <link type="text/css" href="/css/dependencies/jquery-custom-dialogs.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" />
-  <link type="text/css" href="/css/dependencies/fontawesome.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" />
-  <script src="/inc/jquery/jquery-3.4.1.min.js"></script>
+  <!-- Load necessary CSS and JavaScript from init.html source -->
+  <?php require ''.$_SERVER['HESTIA'].'/web/templates/init.html'; ?>
   <script type="text/javascript" src="/js/jquery/jquery-1.7.2.min.js"></script>
   <script type="text/javascript" src="/js/jquery/jquery.cookie.js"></script>
   <script type="text/javascript" src="/js/jquery/jquery-ui-1.8.20.custom.min.js"></script>

+ 23 - 0
web/templates/debug.html

@@ -0,0 +1,23 @@
+<div class="debug-panel-header"><?=_('Debug mode is enabled.')?> <a href="javascript:elementHideShow('debug-panel')"><?=_('Hide / Show Panel')?></a></div>
+<div class="debug-panel-contents animated fadeIn" id="debug-panel" style="display:none;">
+    <?php
+        echo "<h3>Server Variables</h3>";
+        foreach ($_SERVER as $key=>$val)
+        echo "<b>".$key."= </b> ".$val."  ";
+    ?>
+    <?php
+        echo "<h3>Session Variables</h3>";
+        foreach ($_SESSION as $key=>$val)
+        echo "<b>".$key."= </b> ".$val."  ";
+    ?>
+    <?php
+        echo "<h3>POST Variables</h3>";
+        foreach ($_POST as $key=>$val)
+        echo "<b>".$key."= </b> ".$val."  ";  
+    ?>
+    <?php
+        echo "<h3>GET Variables</h3>";
+        foreach ($_GET as $key=>$val)
+        echo "<b>".$key."= </b> ".$val."  ";
+    ?>
+</div>

+ 5 - 47
web/templates/header.html

@@ -1,28 +1,8 @@
 <!doctype html>
 <html lang="<?php echo $_SESSION['LANGUAGE'];?>">
 <head>
-  <meta charset="utf-8">
-  <link rel="icon" href="/images/favicon.ico" type="image/x-icon">
-  <title><?php echo $_SERVER['HTTP_HOST']; ?> - <?=_($TAB)?> - <?=_('Hestia Control Panel');?></title>
-  <!-- Load base system theme-->
-  <link type="text/css" rel="stylesheet" href="/css/themes/default.min.css?<?=JS_LATEST_UPDATE?>" rel="preload" />
-  <? if (!empty($_SESSION['userTheme'])) {
-        $selected_theme = $_SESSION['userTheme']; 
-     } else {
-        $selected_theme = $_SESSION['THEME'];
-     } 
-  ?>
-  <!-- Load custom theme -->
-  <? if ($selectedTheme !== 'default') {?>
-    <!-- Load HestiaCP-shipped themes (minified, updated/overwritten with updates) - ($HESTIA/web/css/themes/*.min.css) -->
-    <link type="text/css" rel="stylesheet" href="/css/themes/<?php echo $selected_theme; ?>.min.css?<?php echo rand(); ?>" rel="preload" />
-    <!-- Load custom theme files ($HESTIA/web/css/themes/custom/*.css) -->
-    <link type="text/css" rel="stylesheet" href="/css/themes/custom/<?php echo $selected_theme; ?>.css?<?php echo rand(); ?>" rel="preload" />
-  <? } ?>
-  <link type="text/css" href="/css/dependencies/animate.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />
-  <link type="text/css" href="/css/dependencies/jquery-custom-dialogs.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />
-  <link type="text/css" href="/css/dependencies/fontawesome.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />
-  <script type="text/javascript" src="/inc/jquery/jquery-3.5.1.min.js"></script> 
+  <!-- Load necessary CSS and JavaScript from init.html source -->
+  <?php require ''.$_SERVER['HESTIA'].'/web/templates/init.html'; ?>
   <script>
     //
     //  GLOBAL SETTINGS
@@ -36,29 +16,7 @@
   </script>
 </head>
 <body class="body-<?=strtolower($TAB)?> lang-<?=$_SESSION['language']?>">
-    <?php if (($_SESSION['DEBUG_MODE']) == "true" ) {?>
-    <div class="debug-panel-header"><?=_('Debug mode is enabled.')?> <a href="javascript:elementHideShow('debug-panel')"><?=_('Hide / Show Panel')?></a></div>
-    <div class="debug-panel-contents animated fadeIn" id="debug-panel" style="display:none;">
-        <?php
-            echo "<h3>Server Variables</h3>";
-            foreach ($_SERVER as $key=>$val)
-            echo "<b>".$key."= </b> ".$val."  ";
-        ?>
-        <?php
-            echo "<h3>Session Variables</h3>";
-            foreach ($_SESSION as $key=>$val)
-            echo "<b>".$key."= </b> ".$val."  ";
-        ?>
-        <?php
-            echo "<h3>POST Variables</h3>";
-            foreach ($_POST as $key=>$val)
-            echo "<b>".$key."= </b> ".$val."  ";  
-        ?>
-        <?php
-            echo "<h3>GET Variables</h3>";
-            foreach ($_GET as $key=>$val)
-            echo "<b>".$key."= </b> ".$val."  ";
-        ?>
-    </div>
-<?php } ?>
+  <?php if (($_SESSION['DEBUG_MODE']) == "true" ) {?>
+    <?php require ''.$_SERVER['HESTIA'].'/web/templates/debug.html'; ?>
+  <?php } ?>
 

+ 22 - 0
web/templates/init.html

@@ -0,0 +1,22 @@
+<meta charset="utf-8">
+<link rel="icon" href="/images/favicon.ico" type="image/x-icon">
+<title><?php echo $_SERVER['HTTP_HOST']; ?> - <?=_($TAB)?> - <?=_('Hestia Control Panel');?></title>
+<!-- Load base system theme-->
+<link type="text/css" rel="stylesheet" href="/css/themes/default.min.css?<?=JS_LATEST_UPDATE?>" rel="preload" />
+<? if (!empty($_SESSION['userTheme'])) {
+      $selected_theme = $_SESSION['userTheme']; 
+   } else {
+      $selected_theme = $_SESSION['THEME'];
+   } 
+?>
+<!-- Load custom theme -->
+<? if ($selectedTheme !== 'default') {?>
+  <!-- Load HestiaCP-shipped themes (minified, updated/overwritten with updates) - ($HESTIA/web/css/themes/*.min.css) -->
+  <link type="text/css" rel="stylesheet" href="/css/themes/<?php echo $selected_theme; ?>.min.css?<?php echo rand(); ?>" rel="preload" />
+  <!-- Load custom theme files ($HESTIA/web/css/themes/custom/*.css) -->
+  <link type="text/css" rel="stylesheet" href="/css/themes/custom/<?php echo $selected_theme; ?>.css?<?php echo rand(); ?>" rel="preload" />
+<? } ?>
+<link type="text/css" href="/css/dependencies/animate.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />
+<link type="text/css" href="/css/dependencies/jquery-custom-dialogs.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />
+<link type="text/css" href="/css/dependencies/fontawesome.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />
+<script type="text/javascript" src="/inc/jquery/jquery-3.5.1.min.js"></script>