doudoudzj пре 6 година
родитељ
комит
421d79cc5c

+ 1 - 1
admin/views/footer.php

@@ -11,7 +11,7 @@ if (!defined('IN_SYS')) {
             <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 $CopyRightYear; ?>&nbsp;<a href="index.php"><?php echo $title_s;?></a>&nbsp;</span>
+                        <span class="co">&copy;&nbsp;<?php echo $CopyRightYear; ?>&nbsp;<a href="<?php echo setRouter('index');?>"><?php echo $brandName; ?></a>&nbsp;</span>
                         <span class="co">&nbsp;Powered by <a href="https://crogram.com" target="blank">Crogram</a>&nbsp;</span>
                         <span class="co">&nbsp;Partnered with <a href="https://ifastnet.com/" name="jump-ifastnet" target="blank">iFastNet</a>&nbsp;</span>
                     </li>

+ 2 - 2
admin/views/news.php

@@ -22,7 +22,7 @@ if (!defined('IN_SYS')) {
                         <table class="table table-bordered table-striped table-hover">
                             <thead>
                                 <tr>
-                                    <th>Date</th>
+                                    <th style="width: 150px;">Date</th>
                                     <th>Title</th>
                                     <th>Status</th>
                                     <th></th>
@@ -32,7 +32,7 @@ if (!defined('IN_SYS')) {
                                 <?php if ($news["total"] && $news["list"]) {
                                     foreach ($news["list"] as $key => $value) { ?>
                                         <tr>
-                                            <td><?php echo cTime($value["date"]); ?></td>
+                                            <td style="width: 150px;"><?php echo cTime($value["date"]); ?></td>
                                             <td><?php echo $value["title"]; ?></td>
                                             <td><?php echo $status_types[$value['status']]; ?></td>
                                             <td><a class="btn btn-default btn-xs pull-right" href="<?php echo setRouter('admin', 'news_details', ['id' => $value['id']]); ?>">Details</a></td>

+ 4 - 4
admin/views/tickets.php

@@ -19,11 +19,11 @@ if (!defined('IN_SYS')) {
                         <table class="table table-bordered table-striped table-hover">
                             <thead>
                                 <tr>
-                                    <th>Date</th>
+                                    <th style="width: 150px;">Date</th>
                                     <th>Department</th>
                                     <th>Subject</th>
                                     <th>Status</th>
-                                    <th>Last Updated</th>
+                                    <th style="width: 150px;">Last Updated</th>
                                     <th></th>
                                 </tr>
                             </thead>
@@ -31,11 +31,11 @@ if (!defined('IN_SYS')) {
                                 <?php if ($tickets["total"]) {
                                     foreach ($tickets["list"] as $key => $value) { ?>
                                         <tr>
-                                            <td><?php echo cTime($value["date"]); ?></td>
+                                            <td style="width: 150px;"><?php echo cTime($value["date"]); ?></td>
                                             <td><?php echo $ticket_types[$value["department"]]; ?></td>
                                             <td><?php echo $value["subject"]; ?></td>
                                             <td><?php echo $status_types[$value["status"]]; ?></td>
-                                            <td><?php echo cTime($value["lastupdated"]); ?></td>
+                                            <td style="width: 150px;"><?php echo cTime($value["lastupdated"]); ?></td>
                                             <td><a class="btn btn-default btn-xs pull-right" href="<?php echo setRouter('admin', 'tickets_details', ['id' => $value['id']]); ?>">Details</a></td>
                                         </tr>
                                     <?php }

+ 7 - 0
clientarea/controllers/tickets.php

@@ -14,6 +14,13 @@ if (!isUserLoggedIn()) {
 $err = getMsg("errors");
 $data = getMsg("form_data");
 
+$ticket_types = [
+    "技术支持", "销售财务", "管理员信箱"
+];
+$status_types = [
+    "关闭",
+    "打开"
+];
 $tickets = [
     "total" => 10,
     "pages" => 4,

+ 4 - 0
clientarea/controllers/tickets_add.php

@@ -17,6 +17,10 @@ $data = getMsg("form_data");
 $ticket_types = [
     "技术支持", "销售财务", "管理员信箱"
 ];
+$status_types = [
+    "关闭",
+    "打开"
+];
 
 if (isset($_POST["do_add_tickets"])) {
     $department = filter_input(INPUT_POST, "department", FILTER_SANITIZE_STRING);

+ 4 - 1
clientarea/controllers/tickets_details.php

@@ -17,7 +17,10 @@ $data = getMsg("form_data");
 $ticket_types = [
     "技术支持", "销售财务", "管理员信箱"
 ];
-
+$status_types = [
+    "关闭",
+    "打开"
+];
 if (empty($_GET["id"])) {
     redirect("clientarea", "tickets");
 }

+ 3 - 3
clientarea/views/emails.php

@@ -20,8 +20,8 @@ if (!defined('IN_SYS')) {
                             <thead>
                                 <tr>
                                     <th style="width: 100px;">ID</th>
-                                    <th>Date Sent</th>
-                                    <th>Message Subject</th>
+                                    <th style="width: 150px;">Date Sent</th>
+                                    <th>Subject</th>
                                     <th style="width: 100px;">Operate</th>
                                 </tr>
                             </thead>
@@ -30,7 +30,7 @@ if (!defined('IN_SYS')) {
                                     foreach ($emails["list"] as $key => $value) { ?>
                                         <tr>
                                             <th style="width: 100px;"><?php echo $value["id"]; ?></th>
-                                            <td><?php echo $value["date"]; ?></td>
+                                            <td style="width: 150px;"><?php echo $value["date"]; ?></td>
                                             <td><?php echo $value["subject"]; ?></td>
                                             <td style="width: 100px;">
                                                 <button class="btn btn-info btn-xs" type="submit">View Message</button>

+ 1 - 1
clientarea/views/footer.php

@@ -11,7 +11,7 @@ if (!defined('IN_SYS')) {
         <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 $CopyRightYear; ?>&nbsp;<a href="index.php">UIISC</a>&nbsp;</span>
+                    <span class="co">&copy;&nbsp;<?php echo $CopyRightYear; ?>&nbsp;<a href="<?php echo setRouter('index');?>"><?php echo $brandName; ?></a>&nbsp;</span>
                     <span class="co">&nbsp;Powered by <a href="https://crogram.com" target="blank">Crogram</a>&nbsp;</span>
                     <span class="co">&nbsp;Partnered with <a href="https://ifastnet.com/" name="jump-ifastnet" target="blank">iFastNet</a>&nbsp;</span>
                 </li>

+ 1 - 1
clientarea/views/header.php

@@ -14,7 +14,7 @@ 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; ?>">
-    <title>Client Area</title>
+    <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">

+ 0 - 25
clientarea/views/main.php

@@ -7,7 +7,6 @@ if (!defined('IN_SYS')) {
 ?>
 
 <div class="container">
-    <p><h1><?php echo I18N('clientarea'); ?></h1></p>
     <div class="row">
         <div class="col-md-12">
             <?php echo getMsg("msg_notify"); ?>
@@ -25,28 +24,4 @@ if (!defined('IN_SYS')) {
             </div>
         </div>
     </div>
-</div>
-
-<div class="container">
-    <div class="text-center">
-        <h1>Project Client Area Features</h1>
-        <p class="lead">Create the complete login and register form</p>
-    </div>
-    <div class="row">
-        <div class="col-md-6">
-            <ul class="list-group text-center">
-                <li class="list-group-item"><a href="clientarea.php?s=login">Login</a> / <a href="clientarea.php?s=register">Register</a></li>
-                <li class="list-group-item"><a href="clientarea.php?s=details">Account Details</a></li>
-                <li class="list-group-item"><a href="clientarea.php?s=forget_password">Forget</a> / <a href="clientarea.php?s=reset_password">Reset</a> Password</li>
-                <li class="list-group-item">Remember me Option</li>
-            </ul>
-        </div>
-        <div class="col-md-6 ">
-            <ul class="list-group text-center">
-                <li class="list-group-item">Deactivate Account</li>
-                <li class="list-group-item">Email Verification</li>
-                <li class="list-group-item"><a href="clientarea.php?s=request-account-activate">Account Verification</a></li>
-            </ul>
-        </div>
-    </div>
 </div>

+ 1 - 1
clientarea/views/navbar.php

@@ -16,7 +16,7 @@ if (!defined('IN_SYS')) {
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a class="navbar-brand" href="<?php echo $siteURL; ?>"><?php echo $brandName; ?></a>
+                <a class="navbar-brand" href="<?php echo setRouter('index');?>"><?php echo $brandName; ?></a>
             </div>
             <div id="navbar" class="navbar-collapse collapse">
                 <ul class="nav navbar-nav">

+ 5 - 5
clientarea/views/tickets.php

@@ -22,7 +22,7 @@ if (!defined('IN_SYS')) {
                         <table class="table table-bordered table-striped table-hover">
                             <thead>
                                 <tr>
-                                    <th>Date</th>
+                                    <th style="width: 150px;">Date</th>
                                     <th>Department</th>
                                     <th>Subject</th>
                                     <th>Status</th>
@@ -34,11 +34,11 @@ if (!defined('IN_SYS')) {
                                 <?php if ($tickets["total"]) {
                                     foreach ($tickets["list"] as $key => $value) { ?>
                                         <tr>
-                                            <th><?php echo cTime($value["date"]); ?></th>
-                                            <td><?php echo $value["department"]; ?></td>
+                                            <td style="width: 150px;"><?php echo cTime($value["date"]); ?></td>
+                                            <td><?php echo $ticket_types[$value['department']]; ?></td>
                                             <td><?php echo $value["subject"]; ?></td>
-                                            <td><?php echo $value["status"]; ?></td>
-                                            <td><?php echo cTime($value["lastupdated"]); ?></td>
+                                            <td><?php echo $status_types[$value["status"]]; ?></td>
+                                            <td style="width: 150px;"><?php echo cTime($value["lastupdated"]); ?></td>
                                             <td><a class="btn btn-default btn-xs pull-right" href="<?php echo setRouter('clientarea', 'tickets_details', ['id' => $value['id']]); ?>">Details</a></td>
                                         </tr>
                                     <?php }

+ 1 - 1
clientarea/views/tickets_add.php

@@ -14,7 +14,7 @@ if (!defined('IN_SYS')) {
                 <div class="panel-heading">
                     <span class="panel-title">Tickets Add</span>
                     <div class="pull-right">
-                        <a class="btn btn-default btn-xs" href="<?php echo setRouter('clientarea', 'tickets'); ?>"><?php echo I18N('add'); ?></a>
+                        <a class="btn btn-default btn-xs" href="<?php echo setRouter('clientarea', 'tickets'); ?>"><?php echo I18N('list'); ?></a>
                     </div>
                 </div>
                 <div class="panel-body">

+ 1 - 0
clientarea/views/tickets_details.php

@@ -20,6 +20,7 @@ if (!defined('IN_SYS')) {
                 </div>
                 <div class="panel-body">
                     <p>Type: <?php echo $ticket_types[$data['department']]; ?></p>
+                    <p>Subject: <?php echo $status_types[$data['status']]; ?></p>
                     <p>Subject: <?php echo $data['subject']; ?></p>
                     <p>Content: <?php echo $data['content']; ?></p>
                     <form action="" method="POST">

+ 1 - 1
core/views/footer.php

@@ -11,7 +11,7 @@ if (!defined('IN_SYS')) {
         <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 $CopyRightYear; ?>&nbsp;<a href="index.php"><?=$title_s?></a>&nbsp;</span>
+                    <span class="co">&copy;&nbsp;<?php echo $CopyRightYear; ?>&nbsp;<a href="<?php echo setRouter('index');?>"><?php echo $brandName; ?></a>&nbsp;</span>
                     <span class="co">&nbsp;Powered by <a href="https://crogram.com" target="blank">Crogram</a>&nbsp;</span>
                     <span class="co">&nbsp;Partnered with <a href="https://ifastnet.com/" name="jump-ifastnet" target="blank">iFastNet</a>&nbsp;</span>
                 </li>

+ 2 - 4
core/views/header.php

@@ -15,10 +15,8 @@ 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]>

+ 6 - 7
core/views/navbar.php

@@ -16,14 +16,13 @@ if (!defined('IN_SYS')) {
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a class="navbar-brand" href="javascript:void(0);"><?php echo $title_s; ?></a>
+                <a class="navbar-brand" href="<?php echo setRouter('index');?>"><?php echo $brandName; ?></a>
             </div>
             <div id="navbar" class="navbar-collapse collapse">
                 <ul class="nav navbar-nav">
-                    <li><a href="index.php"><?php echo $LANG['home']; ?></a></li>
-                    <li><a href="solution.php"><?php echo $LANG['solution']; ?></a></li>
-                    <li><a href="support.php"><?php echo $LANG['support']; ?></a></li>
-
+                    <li><a href="<?php echo setRouter('index');?>"><?php echo $LANG['home']; ?></a></li>
+                    <li><a href="<?php echo setRouter('solution');?>"><?php echo $LANG['solution']; ?></a></li>
+                    <li><a href="<?php echo setRouter('support');?>"><?php echo $LANG['support']; ?></a></li>
                     <li class="dropdown">
                         <a href="javascript:void(0)" class="dropdown-toggle" data-toggle="dropdown"><?php echo $LANG['more']; ?>&nbsp;<span class="caret"></span></a>
                         <ul class="dropdown-menu" role="menu">
@@ -47,8 +46,8 @@ if (!defined('IN_SYS')) {
                     </li>
                 </ul>
                 <ul class="nav navbar-nav navbar-right">
-                    <li><a href="login.php"><?php echo $LANG['login']; ?></a></li>
-                    <li><a href="register.php"><?php echo $LANG['register']; ?></a></li>
+                    <li><a href="<?php echo setRouter('login');?>"><?php echo $LANG['login']; ?></a></li>
+                    <li><a href="<?php echo setRouter('register');?>"><?php echo $LANG['register']; ?></a></li>
                     <li><a href="<?php echo setRouter('clientarea'); ?>"><?php echo I18N('clientarea'); ?></a></li>
                 </ul>
             </div>