Главная Обзор Помощь
Вход
yosoyhendrix
/
hestiacp
зеркало из https://github.com/hestiacp/hestiacp
1
0
Ответвить 0
Файлы Задачи 0 Вики
Просмотр исходного кода

Separate header include files

Kristan Kenney 5 лет назад
Родитель
223ae1716a
Сommit
3adef90f9d
10 измененных файлов с 26 добавлено и 21 удалено
Единый вид Показать статистику Diff
  1. 3 1
      web/css/src/themes/default.css
  2. 0 0
      web/css/themes/default.min.css
  3. 1 1
      web/inc/main.php
  4. 4 2
      web/templates/admin/list_server_info.html
  5. 4 3
      web/templates/admin/list_weblog.html
  6. 1 1
      web/templates/debug.html
  7. 9 8
      web/templates/header.html
  8. 1 5
      web/templates/includes/css.html
  9. 1 0
      web/templates/includes/js.html
  10. 2 0
      web/templates/includes/title.html

+ 3 - 1
web/css/src/themes/default.css
Просмотреть файл 

@@ -4192,12 +4192,14 @@ form#vstobjects.suspended {
 
 .debug-panel-contents {
 
 .debug-panel-contents {
 
   font-size:12px !important;
 
   font-size:12px !important;
 
   padding:18px;
 
   padding:18px;
 
-  position:sticky;
 
+  position: absolute;
 
   top:0;
 
   top:0;
 
   z-index:3000;
 
   z-index:3000;
 
   height:250px;
 
   height:250px;
 
   overflow-x: hidden;
 
   overflow-x: hidden;
 
   overflow-y: scroll;
 
   overflow-y: scroll;
 
+  border-bottom: 1px solid rgba(255,255,255,0.65);
 
+  box-shadow: 0px 2px 4px rgb(0 0 0 / 25%);
 
 }
 
 }
 
 
 
 .body-login .debug-panel-header, .debug-panel-contents {
 
 .body-login .debug-panel-header, .debug-panel-contents {

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
web/css/themes/default.min.css


+ 1 - 1
web/inc/main.php
Просмотреть файл 

@@ -152,7 +152,7 @@ function top_panel($user, $TAB) {
 
     $command = HESTIA_CMD."v-list-user ".escapeshellarg($user)." 'json'";
 
     $command = HESTIA_CMD."v-list-user ".escapeshellarg($user)." 'json'";
 
     exec ($command, $output, $return_var);
 
     exec ($command, $output, $return_var);
 
     if ( $return_var > 0 ) {
 
     if ( $return_var > 0 ) {
 
-        header("Location: /error/");
 
+        header("Location: /logout/");
 
         exit;
 
         exit;
 
     }
 
     }
 
     $panel = json_decode(implode('', $output), true);
 
     $panel = json_decode(implode('', $output), true);

+ 4 - 2
web/templates/admin/list_server_info.html
Просмотреть файл 

@@ -1,8 +1,10 @@
 
 <!doctype html>
 
 <!doctype html>
 
 <html lang="en">
 
 <html lang="en">
 
 <head>
 
 <head>
 
-  <!-- Load necessary CSS and JavaScript from init.html source -->
 
-  <?php require ''.$_SERVER['HESTIA'].'/web/templates/init.html'; ?>
 
+  <!-- Load necessary CSS and JavaScript from source -->
 
+  <?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/title.html'; ?>
 
+  <?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/css.html'; ?>
 
+  <?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/js.html'; ?>
 
   <script type="text/javascript" src="/js/jquery/jquery-1.7.2.min.js"></script>
 
   <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.cookie.js"></script>
 
   <script type="text/javascript" src="/js/jquery/jquery-ui-1.8.20.custom.min.js"></script>
 
   <script type="text/javascript" src="/js/jquery/jquery-ui-1.8.20.custom.min.js"></script>

+ 4 - 3
web/templates/admin/list_weblog.html
Просмотреть файл 

@@ -1,9 +1,10 @@
 
 <!doctype html>
 
 <!doctype html>
 
 <html lang="en">
 
 <html lang="en">
 
 <head>
 
 <head>
 
-  <meta charset="utf-8">
 
-  <!-- Load necessary CSS and JavaScript from init.html source -->
 
-  <?php require ''.$_SERVER['HESTIA'].'/web/templates/init.html'; ?>
 
+  <!-- Load necessary CSS and JavaScript from source -->
 
+  <?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/title.html'; ?>
 
+  <?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/css.html'; ?>
 
+  <?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/js.html'; ?>
 
   <script type="text/javascript" src="/js/jquery/jquery-1.7.2.min.js"></script>
 
   <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.cookie.js"></script>
 
   <script type="text/javascript" src="/js/jquery/jquery-ui-1.8.20.custom.min.js"></script>
 
   <script type="text/javascript" src="/js/jquery/jquery-ui-1.8.20.custom.min.js"></script>

+ 1 - 1
web/templates/debug.html
Просмотреть файл 

@@ -1,4 +1,4 @@
 
-<div class="debug-panel-header"><?=_('Debug mode is enabled.')?> <a href="javascript:elementHideShow('debug-panel')"><?=_('Hide / Show Panel')?></a></div>
 
+<div class="debug-panel-header"><?=_('Debug mode is enabled.')?> <a href="javascript:elementHideShow('debug-panel')"><?=_('Show / Hide Panel')?></a></div>
 
 <div class="debug-panel-contents animated fadeIn" id="debug-panel" style="display:none;">
 
 <div class="debug-panel-contents animated fadeIn" id="debug-panel" style="display:none;">
 
     <?php
 
     <?php
 
         echo "<h3>Server Variables</h3>";
 
         echo "<h3>Server Variables</h3>";

+ 9 - 8
web/templates/header.html
Просмотреть файл 

@@ -1,22 +1,23 @@
 
 <!doctype html>
 
 <!doctype html>
 
 <html lang="<?php echo $_SESSION['LANGUAGE'];?>">
 
 <html lang="<?php echo $_SESSION['LANGUAGE'];?>">
 
+
 
 <head>
 
 <head>
 
-  <!-- Load necessary CSS and JavaScript from init.html source -->
 
-  <?php require ''.$_SERVER['HESTIA'].'/web/templates/init.html'; ?>
 
+  <?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/title.html'; ?>
 
+  <?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/css.html'; ?>
 
+  <?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/js.html'; ?>
 
   <script>
 
   <script>
 
     //
 
     //
 
     //  GLOBAL SETTINGS
 
     //  GLOBAL SETTINGS
 
     //
 
     //
 
     var GLOBAL = {};
 
     var GLOBAL = {};
 
-    GLOBAL.FTP_USER_PREFIX  = 'admin_';
 
-    GLOBAL.DB_USER_PREFIX   = 'admin_';
 
+    GLOBAL.FTP_USER_PREFIX = 'admin_';
 
+    GLOBAL.DB_USER_PREFIX = 'admin_';
 
     GLOBAL.DB_DBNAME_PREFIX = 'admin_';
 
     GLOBAL.DB_DBNAME_PREFIX = 'admin_';
 
     GLOBAL.AJAX_URL = '';
 
     GLOBAL.AJAX_URL = '';
 
-
 
   </script>
 
   </script>
 
 </head>
 
 </head>
 
+
 
 <body class="body-<?=strtolower($TAB)?> lang-<?=$_SESSION['language']?>">
 
 <body class="body-<?=strtolower($TAB)?> lang-<?=$_SESSION['language']?>">
 
   <?php if (($_SESSION['DEBUG_MODE']) == "true" ) {?>
 
   <?php if (($_SESSION['DEBUG_MODE']) == "true" ) {?>
 
-    <?php require ''.$_SERVER['HESTIA'].'/web/templates/debug.html'; ?>
 
-  <?php } ?>
 
-
 
+  <?php require ''.$_SERVER['HESTIA'].'/web/templates/debug.html'; ?>
 
+  <?php } ?>

+ 1 - 5
web/templates/init.html → web/templates/includes/css.html
Просмотреть файл 

@@ -1,7 +1,4 @@
 
-<meta charset="utf-8">
 
 <link rel="icon" href="/images/favicon.ico" type="image/x-icon">
 
 <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" />
 
 <link type="text/css" rel="stylesheet" href="/css/themes/default.min.css?<?=JS_LATEST_UPDATE?>" rel="preload" />
 
 <? if (!empty($_SESSION['userTheme'])) {
 
 <? if (!empty($_SESSION['userTheme'])) {
 
       $selected_theme = $_SESSION['userTheme']; 
       $selected_theme = $_SESSION['userTheme']; 
@@ -18,5 +15,4 @@
 
 <? } ?>
 
 <? } ?>
 
 <link type="text/css" href="/css/dependencies/animate.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" 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/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> 
+<link type="text/css" href="/css/dependencies/fontawesome.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />

+ 1 - 0
web/templates/includes/js.html
Просмотреть файл 

@@ -0,0 +1 @@
 
+<script type="text/javascript" src="/inc/jquery/jquery-3.5.1.min.js"></script>

+ 2 - 0
web/templates/includes/title.html
Просмотреть файл 

@@ -0,0 +1,2 @@
 
+<meta charset="utf-8">
 
+<title><?php echo $_SERVER['HTTP_HOST']; ?> - <?=_($TAB)?> - <?=_('Hestia Control Panel');?></title>

Некоторые файлы не были показаны из-за большого количества измененных файлов