From da7cbcb1c2cd57d2ec7816a7865313ccfed65bf0 Mon Sep 17 00:00:00 2001
From: doudoudzj <doudoudzj@gmail.com>
Date: Wed, 10 Jul 2019 20:28:07 +0800
Subject: [PATCH] update

---
 admin.php                     |  7 +--
 admin/views/footer.php        |  4 +-
 admin/views/header.php        |  4 +-
 assets/css/style.css          | 88 ++---------------------------------
 clientarea/views/details.php  |  2 +-
 clientarea/views/footer.php   |  4 +-
 clientarea/views/header.php   |  6 +--
 core/views/about_crogram.php  |  2 +-
 core/views/about_ifastnet.php |  2 +-
 core/views/about_uiisc.php    |  2 +-
 core/views/footer.php         |  8 ++--
 core/views/header.php         | 10 ++--
 data/config.php               |  2 +-
 13 files changed, 27 insertions(+), 114 deletions(-)

diff --git a/admin.php b/admin.php
index 024c631..1d13451 100644
--- a/admin.php
+++ b/admin.php
@@ -20,12 +20,7 @@ include_once "{$ROOT}/admin/library.php";
 //     }
 // }
 
-if (isAdminLoggedIn()) {
-    $section = (empty($_GET["s"]) ? "main" : $_GET["s"]);
-} else {
-    $section = "login";
-}
-
+$section = isAdminLoggedIn() ? (empty($_GET["s"]) ? "main" : $_GET["s"]) : "login";
 $section_page = "{$ROOT}/admin/views/{$section}.php";
 if (!is_file($section_page)) {
     exit('Page Not Found!');
diff --git a/admin/views/footer.php b/admin/views/footer.php
index 43c4d80..73ddae3 100644
--- a/admin/views/footer.php
+++ b/admin/views/footer.php
@@ -31,8 +31,8 @@ if (!defined('IN_SYS')) {
             </div>
         </div>
     </footer>
-    <script src="assets/jquery/jquery.min.js"></script>
-    <script src="assets/bootstrap/js/bootstrap.min.js"></script>
+    <script src="assets/jquery/jquery.min.js?_=<?php echo $static_release; ?>"></script>
+    <script src="assets/bootstrap/js/bootstrap.min.js?_=<?php echo $static_release; ?>"></script>
     <script src="assets/js/common.js?_=<?php echo $static_release; ?>"></script>
 
 </body>
diff --git a/admin/views/header.php b/admin/views/header.php
index e6a7efb..95e379a 100644
--- a/admin/views/header.php
+++ b/admin/views/header.php
@@ -21,8 +21,8 @@ if (!defined('IN_SYS')) {
     <link href="favicon.ico?_=<?php echo $static_release; ?>" type="image/x-icon" rel="icon" />
     <link href="favicon.ico?_=<?php echo $static_release; ?>" type="image/x-icon" rel="shortcut icon" />
     <!--[if lt IE 9]>
-    <script src="assets/html5shiv/html5shiv.min.js"></script>
-    <script src="assets/respond/respond.min.js"></script>
+    <script src="assets/html5shiv/html5shiv.min.js?_=<?php echo $static_release; ?>"></script>
+    <script src="assets/respond/respond.min.js?_=<?php echo $static_release; ?>"></script>
     <![endif]-->
     <script type="text/javascript">
         var domain = "<?php echo $lang->getDomain(); ?>";
diff --git a/assets/css/style.css b/assets/css/style.css
index 1dd465a..6fb59f9 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -20,6 +20,9 @@ button {
     outline-width: 0 !important;
 }
 
+.page-header {
+    margin-top: 20px;
+}
 
 .section-wrap {
     padding: 10px 0;
@@ -44,91 +47,6 @@ button {
     background-size: cover;
 }
 
-body.fixed-header-on {
-    padding-top: 0;
-}
-
-.fixed-header-on .navbar-nav>li>a,
-.fixed-header-on .navbar-brand {
-    color: #fff;
-}
-
-.fixed-header-on .navbar-nav>li>a:hover,
-.fixed-header-on .navbar-brand:hover {
-    color: #ffc400;
-}
-
-.fixed-header-on .header {
-    background-color: rgba(0, 0, 0, 0);
-    border-color: rgba(0, 0, 0, 0);
-}
-
-.fixed-header-on .footer {
-    border-color: transparent;
-    background-color: transparent;
-    background: transparent;
-}
-
-
-.home-banner {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    z-index: 20;
-    text-align: center;
-    -webkit-transform: translate(-50%, -50%);
-    -moz-transform: translate(-50%, -50%);
-    transform: translate(-50%, -50%);
-}
-
-.bs-docs-header {
-    position: relative;
-    padding: 30px 0;
-    color: #cdbfe3;
-    text-align: center;
-    text-shadow: 0 1px 0 rgba(0, 0, 0, .1);
-    background-color: #6f5499;
-    background-image: -webkit-gradient(linear, left top, left bottom, from(#563d7c), to(#6f5499));
-    background-image: -webkit-linear-gradient(top, #563d7c 0%, #6f5499 100%);
-    background-image: -o-linear-gradient(top, #563d7c 0%, #6f5499 100%);
-    background-image: linear-gradient(to bottom, #563d7c 0%, #6f5499 100%);
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#563d7c', endColorstr='#6F5499', GradientType=0);
-    background-repeat: repeat-x;
-}
-
-.bs-docs-header {
-    margin-bottom: 40px;
-    font-size: 20px;
-}
-
-.bs-docs-header h1 {
-    margin-top: 0;
-    color: #fff;
-}
-
-.bs-docs-header p {
-    margin-bottom: 0;
-    font-weight: 300;
-    line-height: 1.4;
-}
-
-.bs-docs-header .container {
-    position: relative;
-}
-
-@media (min-width: 768px) {
-    .bs-docs-header {
-        padding-top: 60px;
-        padding-bottom: 60px;
-        font-size: 24px;
-    }
-
-    .bs-docs-header h1 {
-        font-size: 60px;
-        line-height: 1;
-    }
-}
-
 .form-account {
     max-width: 300px;
     padding: 15px;
diff --git a/clientarea/views/details.php b/clientarea/views/details.php
index e9fb257..bc714cf 100644
--- a/clientarea/views/details.php
+++ b/clientarea/views/details.php
@@ -63,7 +63,7 @@ if (!defined('IN_SYS')) {
             <div class="modal-footer">
                 <form action="<?php echo setRouter('clientarea', 'account_deactivation'); ?>" method="POST">
                     <input type="submit" value="Yes" class="btn btn-danger" name="deactivate">
-                    <button type="button" class="btn btn-default" data-dismiss="modal"">Cancel</button>
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
                 </form>
             </div>
         </div>
diff --git a/clientarea/views/footer.php b/clientarea/views/footer.php
index f0d8319..fa5e33f 100644
--- a/clientarea/views/footer.php
+++ b/clientarea/views/footer.php
@@ -30,8 +30,8 @@ if (!defined('IN_SYS')) {
     </div>
 </footer>
 
-<script src="assets/jquery/jquery.min.js"></script>
-<script src="assets/bootstrap/js/bootstrap.min.js"></script>
+<script src="assets/jquery/jquery.min.js?_=<?php echo $static_release; ?>"></script>
+<script src="assets/bootstrap/js/bootstrap.min.js?_=<?php echo $static_release; ?>"></script>
 <script src="assets/js/common.js?_=<?php echo $static_release; ?>"></script>
 <script src="assets/js/clientarea.js?_=<?php echo $static_release; ?>"></script>
 
diff --git a/clientarea/views/header.php b/clientarea/views/header.php
index c7c51fe..0393bb3 100644
--- a/clientarea/views/header.php
+++ b/clientarea/views/header.php
@@ -17,12 +17,12 @@ if (!defined('IN_SYS')) {
     <title><?php echo I18N('clientarea'); ?></title>
     <link href="favicon.ico?_=<?php echo $static_release; ?>" type="image/x-icon" rel="icon" />
     <link href="favicon.ico?_=<?php echo $static_release; ?>" type="image/x-icon" rel="shortcut icon" />
-    <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css?_=<?php echo $static_release; ?>">
     <link rel="stylesheet" href="assets/css/style.css?_=<?php echo $static_release; ?>">
     <link rel="stylesheet" href="assets/css/clientarea.css?_=<?php echo $static_release; ?>">
     <!--[if lt IE 9]>
-    <script src="assets/html5shiv/html5shiv.min.js"></script>
-    <script src="assets/respond/respond.min.js"></script>
+    <script src="assets/html5shiv/html5shiv.min.js?_=<?php echo $static_release; ?>"></script>
+    <script src="assets/respond/respond.min.js?_=<?php echo $static_release; ?>"></script>
     <![endif]-->
     <script type="text/javascript">
         var domain = "<?php echo $lang->getDomain(); ?>";
diff --git a/core/views/about_crogram.php b/core/views/about_crogram.php
index 02c79a4..04cf532 100644
--- a/core/views/about_crogram.php
+++ b/core/views/about_crogram.php
@@ -7,7 +7,7 @@ if (!defined('IN_SYS')) {
 ?>
 
 <div class="container">
-    <div class="bs-docs-header">
+    <div>
         <h1><?php echo I18N('about'); ?> Crogram</h1>
     </div>
 </div>
diff --git a/core/views/about_ifastnet.php b/core/views/about_ifastnet.php
index d875548..0436d9f 100644
--- a/core/views/about_ifastnet.php
+++ b/core/views/about_ifastnet.php
@@ -8,7 +8,7 @@ if (!defined('IN_SYS')) {
 ?>
 
 <div class="container">
-    <div class="bs-docs-header">
+    <div>
         <h1><?php echo I18N('about'); ?> iFastNet</h1>
     </div>
 </div>
diff --git a/core/views/about_uiisc.php b/core/views/about_uiisc.php
index d3626ec..41cc309 100644
--- a/core/views/about_uiisc.php
+++ b/core/views/about_uiisc.php
@@ -8,7 +8,7 @@ if (!defined('IN_SYS')) {
 ?>
 
 <div class="container">
-    <div class="bs-docs-header">
+    <div>
         <h1><?php echo I18N('about'); ?> UIISC</h1>
     </div>
 </div>
diff --git a/core/views/footer.php b/core/views/footer.php
index 32009e2..5e23708 100644
--- a/core/views/footer.php
+++ b/core/views/footer.php
@@ -31,12 +31,10 @@ if (!defined('IN_SYS')) {
         </div>
     </div>
 </footer>
-<script src="assets/jquery/jquery.min.js"></script>
-<script src="assets/bootstrap/js/bootstrap.min.js"></script>
+<script src="assets/jquery/jquery.min.js?_=<?php echo $static_release; ?>"></script>
+<script src="assets/bootstrap/js/bootstrap.min.js?_=<?php echo $static_release; ?>"></script>
 <script src="assets/js/common.js?_=<?php echo $static_release; ?>"></script>
-<?php
-// include("google_analytics.php");
-?>
+<?php if (!empty($google_site_verification)) { include("google_analytics.php");} ?>
 
 </body>
 
diff --git a/core/views/header.php b/core/views/header.php
index 46f033d..1256b48 100644
--- a/core/views/header.php
+++ b/core/views/header.php
@@ -15,13 +15,15 @@ if (!defined('IN_SYS')) {
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
     <meta name="description" content="<?php echo $description; ?>">
     <meta name="author" content="<?php echo $author; ?>">
-    <?php if (!empty($google_site_verification)) { ?><meta name="google-site-verification" content="<?php echo $google_site_verification; ?>" />
-    <?php } ?><link href="favicon.ico?_=<?php echo $static_release; ?>" rel="icon">
+<?php if (!empty($google_site_verification)) { ?>
+    <meta name="google-site-verification" content="<?php echo $google_site_verification; ?>" />
+<?php } ?>
+    <link href="favicon.ico?_=<?php echo $static_release; ?>" rel="icon">
     <link href="assets/bootstrap/css/bootstrap.min.css?_=<?php echo $static_release; ?>" rel="stylesheet">
     <link href="assets/css/style.css?_=<?php echo $static_release; ?>" rel="stylesheet">
     <!--[if lt IE 9]>
-    <script src="assets/html5shiv/html5shiv.min.js"></script>
-    <script src="assets/respond/respond.min.js"></script>
+    <script src="assets/html5shiv/html5shiv.min.js?_=<?php echo $static_release; ?>"></script>
+    <script src="assets/respond/respond.min.js?_=<?php echo $static_release; ?>"></script>
     <![endif]-->
     <script type="text/javascript">
         var domain = "<?php echo $lang->getDomain(); ?>";
diff --git a/data/config.php b/data/config.php
index 0b1d002..9194e40 100644
--- a/data/config.php
+++ b/data/config.php
@@ -25,7 +25,7 @@ $title = "UIISC";
 $title_s = "UIISC";
 $author = 'Crogram Inc.';
 $description = "uiisc, freewebhost, webhost, Crogram, iFastNet";
-$google_site_verification = "5O6Wxt0gIyGb7btMuXiQqddZJ516n-xBOW_9RLMBeSY";
+// $google_site_verification = "5O6Wxt0gIyGb7btMuXiQqddZJ516n-xBOW_9RLMBeSY";
 $siteURL = "http://crogroup.cn";
 
 $admin = [