update

src/admin/views/dashboard/view.php

@@ -102,9 +102,10 @@
         <div class="list-group">
             <div class="list-group-item">
                 <span class="fa fa-paper-plane fa-fw"></span> <b><?php echo $lang->I18N('Quick Link'); ?></b>&nbsp;
-                <a href="settings.php" class="btn btn-danger btn-xs">Settings</a>&nbsp;&nbsp;
-                <a href="javascript:cleanRecord(1)" class="btn btn-xs btn-danger">删除1天前的记录</a>&nbsp;&nbsp;
-                <a href="javascript:cleanRecord(30)" class="btn btn-xs btn-danger">删除30天前的发送记录</a>&nbsp;&nbsp;
+                <a href="settings.php" class="btn btn-info btn-xs">Settings</a>&nbsp;&nbsp;
+                <a href="<?php echo $site_url; ?>" class="btn btn-xs btn-info" target="_blank"><?php echo $lang->I18N('home'); ?></a>&nbsp;&nbsp;
+                <a href="<?php echo setURL('contact'); ?>" class="btn btn-xs btn-info" target="_blank"><?php echo $lang->I18N('contact'); ?></a>&nbsp;&nbsp;
+                <a href="<?php echo setURL('news'); ?>" class="btn btn-xs btn-info" target="_blank"><?php echo $lang->I18N('News'); ?></a>
             </div>
         </div>
     </div>
@@ -115,63 +116,31 @@
                     <h3 class="panel-title">服务器信息</h3>
                 </div>
                 <ul class="list-group">
-                    <li class="list-group-item">
-                        <b>服务器时间：</b><?php echo $date; ?>
-                    </li>
-                    <li class="list-group-item">
-                        <b>PHP 版本：</b><?php echo PHP_VERSION; ?>-<?php echo ini_get('safe_mode') ? '线程安全' : '非线程安全'; ?>
-                    </li>
-                    <li class="list-group-item">
-                        <b>MySQL 版本：</b><?php echo $mysqlversion ?>
-                    </li>
-                    <li class="list-group-item">
-                        <b>WEB软件：</b><?php echo $_SERVER['SERVER_SOFTWARE'] ?>
-                    </li>
-                    <li class="list-group-item">
-                        <b>操作系统：</b><?php echo php_uname(); ?>
-                    </li>
-                    <li class="list-group-item">
-                        <b>POST许可：</b><?php echo ini_get('post_max_size'); ?>
-                    </li>
-                    <li class="list-group-item">
-                        <b>文件上传许可：</b><?php echo ini_get('upload_max_filesize'); ?>
-                    </li>
+                    <li class="list-group-item"><b>服务器时间：</b><?php echo $date; ?></li>
+                    <li class="list-group-item"><b>PHP 版本：</b><?php echo PHP_VERSION; ?>-<?php echo ini_get('safe_mode') ? '线程安全' : '非线程安全'; ?></li>
+                    <li class="list-group-item"><b>MySQL 版本：</b><?php echo $mysqlversion ?></li>
+                    <li class="list-group-item"><b>WEB软件：</b><?php echo $_SERVER['SERVER_SOFTWARE'] ?></li>
+                    <li class="list-group-item"><b>操作系统：</b><?php echo php_uname(); ?></li>
+                    <li class="list-group-item"><b>POST许可：</b><?php echo ini_get('post_max_size'); ?></li>
+                    <li class="list-group-item"><b>文件上传许可：</b><?php echo ini_get('upload_max_filesize'); ?></li>
                 </ul>
             </div>
         </div>
         <div class="col-md-4 col-sm-12">
             <div class="panel panel-success">
                 <div class="panel-heading">
-                    <h3 class="panel-title">版本信息</h3>
+                    <h3 class="panel-title">应用信息</h3>
                 </div>
                 <ul class="list-group text-dark">
                     <li class="list-group-item">当前版本：V<?php echo APP_VERSION; ?> (Build <?php echo APP_BUILD; ?>, DB <?php echo DB_VERSION; ?>）</li>
+                    <li class="list-group-item"><?php echo $lang->I18N('App Status'); ?>&nbsp;:&nbsp;<?php if ($SiteConfig['site_status'] == 1) {echo '<span class="label label-success">Live</span>';} elseif ($SiteConfig['site_status'] == 0) {echo '<span class="label label-danger">Maintaince</span>';}?></li>
+                    <li class="list-group-item"><?php echo $lang->I18N('App URL'); ?>&nbsp;:&nbsp;<?php echo $site_url; ?></li>
                     <li class="list-group-item">官网网站：<a href="https://uiisc.org/" target="_blank">https://uiisc.org</a></li>
                     <li class="list-group-item">Github：<a href="https://github.com/uiisc/uiisc/" target="_blank">https://github.com/uiisc/uiisc</a></li>
-                    <li class="list-group-item"><span class="fa fa-copyright fa-fw"></span> Powered by <a href="https://uiisc.org/" target="_blank">UIISC</a></li>
+                    <li class="list-group-item">&copy; 2013-<?php echo date("Y") ?> <a href="https://uiisc.org/" target="_blank">UIISC</a>, Powered by <a href="https://crogram.org/" target="_blank">CROGRAM</a></li>
                 </ul>
                 <ul class="list-group text-dark" id="checkupdate"></ul>
             </div>
         </div>
     </div>
-    <div class="row">
-        <div class="col-md-12 col-sm-12">
-            <div class="panel panel-primary">
-                <div class="panel-heading">
-                    <h3 class="panel-title">配置信息</h3>
-                </div>
-                <ul class="list-group">
-                    <li class="list-group-item"><b><?php echo $lang->I18N('Site Status'); ?></b>&nbsp;:&nbsp;<?php if ($SiteConfig['site_status'] == 1) {echo '<span class="label label-success">Live</span>';} elseif ($SiteConfig['site_status'] == 0) {echo '<span class="label label-danger">Maintaince</span>';}?></li>
-                    <li class="list-group-item"><b><?php echo $lang->I18N('Site Name'); ?></b>&nbsp;:&nbsp;<?php echo $SiteConfig['site_name']; ?></li>
-                    <li class="list-group-item"><b><?php echo $lang->I18N('Brand Name'); ?></b>&nbsp;:&nbsp;<?php echo $SiteConfig['site_brand']; ?></li>
-                    <li class="list-group-item"><b><?php echo $lang->I18N('Company Name'); ?></b>&nbsp;:&nbsp;<?php echo $SiteConfig['site_company']; ?></li>
-                    <li class="list-group-item"><b><?php echo $lang->I18N('Contact Email'); ?></b>&nbsp;:&nbsp;<?php echo $SiteConfig['site_email']; ?></li>
-                    <li class="list-group-item"><b><?php echo $lang->I18N('Server Protocol'); ?></b>&nbsp;:&nbsp;<?php echo strtoupper(HTTP_PROTOCOL); ?></li>
-                    <li class="list-group-item"><b><?php echo $lang->I18N('Site URL'); ?></b>&nbsp;:&nbsp;<?php echo $site_url; ?></li>
-                    <li class="list-group-item"><b><?php echo $lang->I18N('Site Path'); ?></b>&nbsp;:&nbsp;<?php echo $SiteConfig['site_path']; ?></li>
-                    <li class="list-group-item"><b><?php echo $lang->I18N('Site Root'); ?></b>&nbsp;:&nbsp;<?php echo $_SERVER['DOCUMENT_ROOT'] ?></li>
-                </ul>
-            </div>
-        </div>
-    </div>
 </div>

src/admin/views/footer.php

@@ -1,33 +1,8 @@
-</div><!-- col-sm-9 col-md-9 col-lg-10 end -->
-</div><!-- row page-wrapper end -->
+
+        </div><!-- col-sm-9 col-md-9 col-lg-10 end -->
+    </div><!-- row page-wrapper end -->
 </div><!-- container-fluid end -->
 
-    <footer class="footer navbar navbar-default navbar-fixed-bottom">
-        <div class="container">
-            <div class="navbar-inner navbar-content-center" style="padding-top:15px;">
-                <ul class="navbar-left list-inline text-center text-muted credit">
-                    <li>
-                        <span class="co">&copy;&nbsp;<?php echo $SiteConfig['site_build_year']; ?>-<?php echo date("Y"); ?>&nbsp;<a href="<?php echo $site_url; ?>" target="_blank"><?php echo $SiteConfig['site_brand']; ?></a>&nbsp;</span>
-                        <span class="co">&nbsp;Powered by <a href="https://uiisc.org" target="_blank">UIISC</a>&nbsp;</span>
-                        <span class="co hidden-xs">&nbsp;Partnered with <a href="https://ifastnet.com/" name="jump-ifastnet" target="_blank">iFastNet</a>&nbsp;</span>
-                        <span class="hidden-xs">time: <?php echo get_execution_time();?>s</span>
-                    </li>
-                </ul>
-                <ul class="legal navbar-right list-inline text-center">
-                    <li class="dropup">
-                        <div class="dropdown-toggle" id="changelanguage" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            <span class="fa fa-language"></span>
-                            <a href="#"><?php echo $lang->get_language_name(); ?></a>
-                        </div>
-                        <ul class="dropdown-menu language-change"><?php echo $lang->get_languages_tags(); ?></ul>
-                    </li>
-                    <li><a href="<?php echo $site_url; ?>" target="_blank"><?php echo $lang->I18N('home'); ?></a></li>
-                    <li class="hidden-xs"><a href="<?php echo $site_url; ?>/contact.php" target="_blank"><?php echo $lang->I18N('contact'); ?></a></li>
-                    <li class="hidden-xs"><a href="<?php echo $site_url; ?>/news.php" target="_blank"><?php echo $lang->I18N('News'); ?></a></li>
-                </ul>
-            </div>
-        </div>
-    </footer>
     <div id="hidden-area"><?php getMessage(); ?></div>
 
     <script src="<?php echo $site_url; ?>/assets/jquery/jquery.min.js"></script>

src/admin/views/navbar.php

@@ -24,21 +24,11 @@
                     <li class="<?php echo checkIfActive('tickets') ?>">
                         <a href="tickets.php"><i class="fa fa-ticket-alt" aria-hidden="true"></i> <?php echo $lang->I18N('Tickets List'); ?></a>
                     </li>
-                    <li class="<?php echo checkIfActive('ssl') ?>">
-                        <a href="ssl.php"><i class="fa fa-shield-alt" aria-hidden="true"></i> <?php echo $lang->I18N('SSL Certificates'); ?></a>
-                    </li>
-                    <li class="<?php echo checkIfActive('settings'); ?>">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                            <i class="fa fa-cog fa-fw"></i> <?php echo $lang->I18N('Settings'); ?> <b class="caret"></b>
+                    <li class="dropdown">
+                        <a href="#" class="dropdown-toggle" id="changelanguage" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                            <span class="fa fa-language"></span> <?php echo $lang->get_language_name(); ?> <b class="caret"></b>
                         </a>
-                        <ul class="dropdown-menu">
-                            <li><a href="knowledgebase.php"><i class="fa fa-book fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('Knowledgebase'); ?></a></li>
-                            <li><a href="news.php"><i class="fa fa-newspaper fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('News List'); ?></a></li>
-                            <li><a href="hosting-provider.php"><i class="fa fa-server fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('Hosting Provider'); ?></a></li>
-                            <li><a href="ssl-provider.php"><i class="fa fa-server fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('SSL Provider'); ?></a></li>
-                            <li><a href="domain-provider.php"><i class="fa fa-globe fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('Domain Provider'); ?></a></li>
-                            <li><a href="settings.php"><i class="fa fa-cog fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('System Settings'); ?></a></li>
-                        </ul>
+                        <ul class="dropdown-menu language-change"><?php echo $lang->get_languages_tags(); ?></ul>
                     </li>
                     <li class="<?php echo checkIfActive('profile'); ?>">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">

src/admin/views/settings/view.php

@@ -17,7 +17,7 @@ if (!defined('IN_CRONLITE')) {
         <div class="panel-heading">
             <div class="pull-right">
                 <a href="./" class="btn btn-primary btn-xs">
-                    <i class="fa fa-home"></i> <?php echo $lang->I18N('Return'); ?>
+                    <i class="fa fa-tachometer-alt"></i> <?php echo $lang->I18N('Return'); ?>
                 </a>
             </div>
             <span class="panel-title"><?php echo $lang->I18N('System Settings'); ?></span>

src/admin/views/sidebar.php

@@ -7,9 +7,9 @@
             <?php echo $AdminInfo['admin_fname'] . " " . $AdminInfo['admin_lname']; ?>
         </a>
     </div> -->
-    <div class="sidebar">
+    <div class="sidebar hidden-sm hidden-xs">
         <div class="panel panel-default">
-            <div class="panel-heading"><span class="panel-title">菜单</span></div>
+            <!-- <div class="panel-heading"><span class="panel-title">菜单</span></div> -->
             <div class="list-group">
                 <a class="list-group-item <?php echo checkIfActive('index,') ?>" href="index.php"><i class="fa fa-tachometer-alt" aria-hidden="true"></i> <?php echo $lang->I18N('Dashboard'); ?></a>
                 <a class="list-group-item <?php echo checkIfActive('clients') ?>" href="clients.php"><i class="fa fa-users fa-fw"></i> <?php echo $lang->I18N('Clients List'); ?></a>
@@ -22,15 +22,18 @@
                 <a class="list-group-item <?php echo checkIfActive('ssl-provider') ?>" href="ssl-provider.php"><i class="fa fa-server fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('SSL Provider'); ?></a>
                 <a class="list-group-item <?php echo checkIfActive('domain-provider') ?>" href="domain-provider.php"><i class="fa fa-globe fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('Domain Provider'); ?></a>
                 <a class="list-group-item <?php echo checkIfActive('settings') ?>" href="settings.php"><i class="fa fa-cog fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('System Settings'); ?></a>
+            </div>
+        </div>
+        <div class="panel panel-default">
+            <div class="list-group">
                 <a class="list-group-item" href="#" onclick="return logout();"><i class="fa fa-sign-out-alt fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('logout'); ?></a>
             </div>
         </div>
-    </div>
-
-    <div class="sidebar-footer">
-        <p class="copyright text-center">
-            &copy; <?php echo date("Y") ?> <a target="_blank" href="https://uiisc.org">UIISC</a> All rights reserved.
-        </p>
+        <div class="panel panel-default sidebar-footer">
+            <div class="list-group">
+                <div class="list-group-item copyright text-center">&copy; <?php echo date("Y") ?> <a target="_blank" href="https://uiisc.org">UIISC</a></div>
+            </div>
+        </div>
     </div>
 </div>
 <div class="col-sm-9 col-md-9 col-lg-10">

src/assets/js/common.js

@@ -1,4 +1,5 @@
 $(".language-change-click").click(function (x) {
+    // console.log('language-change-click');
     change_language(x.target.dataset.language);
 })
 
@@ -12,9 +13,9 @@ if (document.getElementsByName("jump-ifastnet").length) {
 
 function change_language(lang) {
     setCookie('lang', lang, 10, '/', site_domain, false);
-    console.log(cur_lang, lang)
+    // console.log(cur_lang, lang);
     if (cur_lang != lang) {
-        // to reload after changed
+        // console.log('to reload after changed');
         window.location.href = window.location.href;
     }
 }

src/public/controllers/news/list.php

@@ -22,7 +22,7 @@ $status_types = array(
 
 $page_title = $page_title . ' - ' . $lang->I18N('News List');
 
-require ROOT . '/public/views/header.php';
-require ROOT . '/public/views/navbar.php';
+require ROOT . '/public/views/common/header.php';
+require ROOT . '/public/views/common/navbar.php';
 require ROOT . '/public/views/news/list.php';
-require ROOT . '/public/views/footer.php';
+require ROOT . '/public/views/common/footer.php';

src/public/controllers/news/view.php

@@ -22,7 +22,7 @@ if ($id > 0) {
 
 $page_title = $page_title . ' - ' . $lang->I18N('News Details');
 
-require ROOT . '/public/views/header.php';
-require ROOT . '/public/views/navbar.php';
+require ROOT . '/public/views/common/header.php';
+require ROOT . '/public/views/common/navbar.php';
 require ROOT . '/public/views/news/view.php';
-require ROOT . '/public/views/footer.php';
+require ROOT . '/public/views/common/footer.php';