From 68c2f5a963f0d69c2f29edd6d792553c6a66aa72 Mon Sep 17 00:00:00 2001
From: doudoudzj <doudoudzj@gmail.com>
Date: Fri, 12 Jul 2019 16:10:28 +0800
Subject: [PATCH] update

---
 admin/views/header.php               |  8 +++----
 admin/views/login.php                | 30 ++++++++++++-----------
 admin/views/main.php                 |  2 +-
 admin/views/navbar.php               |  2 +-
 assets/css/{style.css => common.css} |  0
 clientarea/views/header.php          |  6 ++---
 clientarea/views/login.php           | 11 ++++-----
 clientarea/views/main.php            | 36 +++++++++++++++++++++++-----
 clientarea/views/navbar.php          | 10 ++++----
 core/views/header.php                | 16 ++++++-------
 data/language/en-US/language.php     |  1 +
 data/language/ko/language.php        |  1 +
 data/language/zh-CN/language.php     |  1 +
 data/language/zh-TW/language.php     |  1 +
 14 files changed, 77 insertions(+), 48 deletions(-)
 rename assets/css/{style.css => common.css} (100%)

diff --git a/admin/views/header.php b/admin/views/header.php
index 4ffb041..f8953b4 100644
--- a/admin/views/header.php
+++ b/admin/views/header.php
@@ -14,12 +14,12 @@ 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><?php echo $title; ?> - Content Management System for Reseller of MyOwnFreeHost</title>
-    <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" />
-    <link href="assets/css/admin.css?_=<?php echo $static_release; ?>" rel="stylesheet" />
+    <title><?php echo $lang->I18N('managearea'); ?></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 href="assets/bootstrap/css/bootstrap.min.css?_=<?php echo $static_release; ?>" rel="stylesheet" />
+    <link href="assets/css/common.css?_=<?php echo $static_release; ?>" rel="stylesheet" />
+    <link href="assets/css/admin.css?_=<?php echo $static_release; ?>" rel="stylesheet" />
     <!--[if lt IE 9]>
     <script src="assets/html5shiv/html5shiv.min.js?_=<?php echo $static_release; ?>"></script>
     <script src="assets/respond/respond.min.js?_=<?php echo $static_release; ?>"></script>
diff --git a/admin/views/login.php b/admin/views/login.php
index 6811c02..ef6b9a8 100644
--- a/admin/views/login.php
+++ b/admin/views/login.php
@@ -15,20 +15,22 @@ if (!defined('IN_SYS')) {
                 </div>
                 <div class="panel-body">
                     <?php if (!isAdminLoggedIn()) { ?>
-                        <form action="" method="POST" class="form-horizontal">
-                            <label>
-                                <span>Admin:</span>
-                                <input type="text" name="username" class="form-control" maxlength="18" placeholder="Username" autofocus required>
-                            </label>
-                            <label>
-                                <span><?php echo $lang->I18N('password'); ?>:</span>
-                                <input type="password" name="password" class="form-control" maxlength="35" placeholder="<?php echo $lang->I18N('password'); ?>" required>
-                            </label>
-                            <label>
-                                <span>Captcha:</span>
-                                <input type="text" name="captcha" class="form-control" maxlength="18" placeholder="CAPTCHA" required autocomplete="off" style="background-image: url(library/captcha.php);">
-                            </label>
-                            <button type="submit" name="do_login" class="btn btn-primary"><?php echo $lang->I18N('login'); ?></button>
+                        <form action="" method="POST">
+                            <div class="form-group">
+                                <label for="username"><?php echo $lang->I18N('username'); ?>: <sup>*</sup></label>
+                                <input type="text" name="username" class="form-control" maxlength="18" placeholder="<?php echo $lang->I18N('input_username'); ?>" autofocus required>
+                            </div>
+                            <div class="form-group">
+                                <label for="password"><?php echo $lang->I18N('password'); ?>: <sup>*</sup></label>
+                                <input type="password" name="password" class="form-control" maxlength="35" placeholder="<?php echo $lang->I18N('input_password'); ?>" required>
+                            </div>
+                            <div class="form-group">
+                                <label for="captcha">Captcha: <sup>*</sup></label>
+                                <input type="text" name="captcha" class="form-control" maxlength="4" placeholder="CAPTCHA" required autocomplete="off" style="background-image: url(library/captcha.php);">
+                            </div>
+                            <div class="form-group">
+                                <button type="submit" name="do_login" class="btn btn-primary"><?php echo $lang->I18N('login'); ?></button>
+                            </div>
                         </form>
                     <?php } elseif (isAdminLoggedIn() && !isset($message[0])) { ?>
                         <div class="alert alert-success">You have logged in</div>
diff --git a/admin/views/main.php b/admin/views/main.php
index e39f7a4..645ecb4 100644
--- a/admin/views/main.php
+++ b/admin/views/main.php
@@ -12,7 +12,7 @@ if (file_exists("{$ROOT}/install.php")) {
 
 <div class="container">
     <div class="page-header">
-        <h1><?php echo $lang->I18N('managearea'); ?></h1>
+        <h1><?php echo $lang->I18N('managearea'); ?> (BATE Version)</h1>
     </div>
 </div>
 
diff --git a/admin/views/navbar.php b/admin/views/navbar.php
index 8cb1d1f..e06bfe5 100644
--- a/admin/views/navbar.php
+++ b/admin/views/navbar.php
@@ -52,7 +52,7 @@ if (!defined('IN_SYS')) {
                                 <li role="separator" class="divider"></li>
                                 <li><a href="<?php echo setRouter('clientarea'); ?>" target="_blank"><?php echo $lang->I18N('clientarea'); ?></a></li>
                                 <li role="separator" class="divider"></li>
-                                <li><a href="<?php echo setRouter('admin', 'logout'); ?>"><?php echo $lang->I18N('Logout'); ?></a></li>
+                                <li><a href="<?php echo setRouter('admin', 'logout'); ?>"><?php echo $lang->I18N('logout'); ?></a></li>
                             </ul>
                         </li>
                     <?php } else { ?>
diff --git a/assets/css/style.css b/assets/css/common.css
similarity index 100%
rename from assets/css/style.css
rename to assets/css/common.css
diff --git a/clientarea/views/header.php b/clientarea/views/header.php
index da37235..b66e070 100644
--- a/clientarea/views/header.php
+++ b/clientarea/views/header.php
@@ -17,9 +17,9 @@ if (!defined('IN_SYS')) {
     <title><?php echo $lang->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?_=<?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; ?>">
+    <link href="assets/bootstrap/css/bootstrap.min.css?_=<?php echo $static_release; ?>" rel="stylesheet" />
+    <link href="assets/css/common.css?_=<?php echo $static_release; ?>" rel="stylesheet" />
+    <link href="assets/css/clientarea.css?_=<?php echo $static_release; ?>" rel="stylesheet" />
     <!--[if lt IE 9]>
     <script src="assets/html5shiv/html5shiv.min.js?_=<?php echo $static_release; ?>"></script>
     <script src="assets/respond/respond.min.js?_=<?php echo $static_release; ?>"></script>
diff --git a/clientarea/views/login.php b/clientarea/views/login.php
index d0c5e8e..dbeda78 100644
--- a/clientarea/views/login.php
+++ b/clientarea/views/login.php
@@ -15,20 +15,19 @@ if (!defined('IN_SYS')) {
                     <h3 class="panel-title"><?php echo $lang->I18N('login'); ?></h3>
                 </div>
                 <div class="panel-body">
-                    <p>Please fill in credentials to log in.</p>
                     <form action="" method="POST">
                         <div class="form-group">
-                            <label for="username">Username: <sup>*</sup></label>
-                            <input type="text" name="username" id="username" value="<?php echo ($data['username']); ?>" class="form-control <?php echo (isset($err['username_err'])) ? 'is-invalid' : ''; ?>">
+                            <label for="username"><?php echo $lang->I18N('username'); ?>: <sup>*</sup></label>
+                            <input type="text" name="username" id="username" placeholder="<?php echo $lang->I18N('input_username'); ?>" autofocus value="<?php echo ($data['username']); ?>" class="form-control <?php echo (isset($err['username_err'])) ? 'is-invalid' : ''; ?>">
                             <span class="text-warning"><?php echo isset($err["username_err"]) ? $err["username_err"] : ""; ?></span>
                         </div>
                         <div class="form-group">
-                            <label for="password">Password: <sup>*</sup></label>
-                            <input type="password" name="password" id="password" value="<?php echo ($data['password']); ?>" class="form-control <?php echo (isset($err['password_err'])) ? 'is-invalid' : ''; ?>">
+                            <label for="password"><?php echo $lang->I18N('password'); ?>: <sup>*</sup></label>
+                            <input type="password" name="password" id="password" placeholder="<?php echo $lang->I18N('input_password'); ?>" value="<?php echo ($data['password']); ?>" class="form-control <?php echo (isset($err['password_err'])) ? 'is-invalid' : ''; ?>">
                             <span class="text-warning"><?php echo isset($err["password_err"]) ? $err["password_err"] : ""; ?></span>
                         </div>
                         <div class="form-group">
-                            <button type="submit" name="login" class="btn btn-default">Login</button>
+                            <button type="submit" name="login" class="btn btn-primary"><?php echo $lang->I18N('login'); ?></button>
                             <label class="form-check-label text-primary"><input type="checkbox" class="form-check-input" name="remember-me"> Remember Me</label>
                         </div>
                     </form>
diff --git a/clientarea/views/main.php b/clientarea/views/main.php
index 841b2ec..5574973 100644
--- a/clientarea/views/main.php
+++ b/clientarea/views/main.php
@@ -7,19 +7,43 @@ if (!defined('IN_SYS')) {
 ?>
 
 <div class="container">
+    <div class="page-header">
+        <h1><?php echo $lang->I18N('clientarea'); ?> (BATE Version)</h1>
+    </div>
+</div>
+
+<div class="container">
+    <?php echo getMsg("msg_notify"); ?>
     <div class="row">
-        <div class="col-md-12">
-            <?php echo getMsg("msg_notify"); ?>
+        <div class="col-md-6">
             <div class="panel panel-default">
                 <div class="panel-heading">
-                    <h3 class="panel-title"><?php echo $lang->I18N('clientarea'); ?></h3>
+                    <h3 class="panel-title"><?php echo $lang->I18N('我的服务'); ?></h3>
                 </div>
                 <div class="panel-body">
-                    <p>Please fill in credentials to log in.</p>
+                    <p>产品/服务数量: <a href="" class="btn btn-link">1 (1) - 查看 »</a></p>
+                    <p>我的工单数量: <a href="" class="btn btn-link">处理中 1 个（总共：1000 个） - 查看 »</a></p>
+                    <p>推广注册数量: <a href="" class="btn btn-link">1 (1) - 查看 »</a></p>
+                    <p>付款方式: 使用默认（设置每张订单）</p>
+                    <p>工单：待处理 100 个（总共：1000 个）</p>
+                </div>
+                <div class="panel-footer"></div>
+            </div>
+        </div>
+        <div class="col-md-6">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <h3 class="panel-title"><?php echo $lang->I18N('账户信息'); ?></h3>
+                </div>
+                <div class="panel-body">
+                    <p>登录账号：<?php echo ($user->username); ?></p>
+                    <p>姓名：<?php echo ($user->name); ?></p>
+                    <p>我的站点：<?php echo ($user->website); ?></p>
+                    <p>邮箱地址：<?php echo ($user->email); ?></p>
                 </div>
                 <div class="panel-footer">
-                    <a href="<?php echo setRouter('clientarea', 'forget_password'); ?>" class="btn btn-link">Forget Passsword?</a>
-                    <a href="<?php echo setRouter('clientarea', 'register'); ?>" class="btn btn-link">No account? Register</a>
+                    <a href="<?php echo setRouter('clientarea', 'edit_details'); ?>">Edit Account Details</a>
+                    <a href="<?php echo setRouter('clientarea', 'change_password'); ?>">Change password</a>
                 </div>
             </div>
         </div>
diff --git a/clientarea/views/navbar.php b/clientarea/views/navbar.php
index 16cda0b..dd7e27a 100644
--- a/clientarea/views/navbar.php
+++ b/clientarea/views/navbar.php
@@ -20,7 +20,7 @@ if (!defined('IN_SYS')) {
             </div>
             <div id="navbar" class="navbar-collapse collapse">
                 <ul class="nav navbar-nav">
-                    <li><a href="<?php echo setRouter('clientarea'); ?>">Home</a>
+                    <li><a href="<?php echo setRouter('clientarea'); ?>"><?php echo $lang->I18N('home'); ?></a>
                     <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Service&nbsp;<span class="caret"></span></a>
                         <ul class="dropdown-menu">
                             <li><a href="#">My Services</a></li>
@@ -40,7 +40,7 @@ if (!defined('IN_SYS')) {
                     </li>
                     <li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" href="#">Support&nbsp;<b class="caret"></b></a>
                         <ul class="dropdown-menu">
-                            <li><a href="<?php echo setRouter('clientarea', 'tickets'); ?>">Tickets</a></li>
+                            <li><a href="<?php echo setRouter('clientarea', 'tickets'); ?>"><?php echo $lang->I18N('tickets'); ?></a></li>
                             <li><a href="#">Knowledgebase</a></li>
                         </ul>
                     </li>
@@ -55,13 +55,13 @@ if (!defined('IN_SYS')) {
                                 <li><a href="<?php echo setRouter('clientarea', 'emails'); ?>">Email History</a></li>
                                 <li><a href="<?php echo setRouter('clientarea', 'change_password'); ?>">Change password</a></li>
                                 <li role="separator" class="divider"></li>
-                                <li><a href="<?php echo setRouter('clientarea', 'logout'); ?>">Logout</a></li>
+                                <li><a href="<?php echo setRouter('clientarea', 'logout'); ?>"><?php echo $lang->I18N('logout'); ?></a></li>
                             </ul>
                         <?php } else { ?>
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo $lang->I18N('clientarea'); ?>&nbsp;<span class="caret"></span></a>
                             <ul class="dropdown-menu">
-                                <li><a href="<?php echo setRouter('clientarea', 'login'); ?>">Login</a></li>
-                                <li><a href="<?php echo setRouter('clientarea', 'register'); ?>">Register </a></li>
+                                <li><a href="<?php echo setRouter('clientarea', 'login'); ?>"><?php echo $lang->I18N('login'); ?></a></li>
+                                <li><a href="<?php echo setRouter('clientarea', 'register'); ?>"><?php echo $lang->I18N('register'); ?></a></li>
                                 <li role="separator" class="divider"></li>
                                 <li><a href="<?php echo setRouter('clientarea', 'forget_password'); ?>">Forget Passsword</a></li>
                             </ul>
diff --git a/core/views/header.php b/core/views/header.php
index 4289136..352824a 100644
--- a/core/views/header.php
+++ b/core/views/header.php
@@ -9,18 +9,18 @@ if (!defined('IN_SYS')) {
 <html lang="<?php echo $lang->get_lang(); ?>">
 
 <head>
-    <meta charset="utf-8">
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <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><?php echo $title; ?></title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <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">
-    <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">
+    <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/common.css?_=<?php echo $static_release; ?>" rel="stylesheet" />
     <!--[if lt IE 9]>
     <script src="assets/html5shiv/html5shiv.min.js?_=<?php echo $static_release; ?>"></script>
     <script src="assets/respond/respond.min.js?_=<?php echo $static_release; ?>"></script>
diff --git a/data/language/en-US/language.php b/data/language/en-US/language.php
index 6ec71b1..0d621ed 100644
--- a/data/language/en-US/language.php
+++ b/data/language/en-US/language.php
@@ -7,6 +7,7 @@ $LANG = [
     'contact_us' => 'Contact Us',
     'help' => 'Help',
     'login' => 'Login',
+    'logout' => 'Logout',
     'register' => 'Register',
     'username' => 'Username',
     'input_username' => 'Please Input Username',
diff --git a/data/language/ko/language.php b/data/language/ko/language.php
index 8ce1a74..e4cb4d2 100644
--- a/data/language/ko/language.php
+++ b/data/language/ko/language.php
@@ -7,6 +7,7 @@ $LANG = [
     'contact_us' => '문의하기',
     'help' => '도움',
     'login' => '로그인',
+    'logout' => '로그 아웃',
     'register' => '레지스터',
     'username' => '사용자 이름',
     'input_username' => '사용자 이름을 입력하십시오.',
diff --git a/data/language/zh-CN/language.php b/data/language/zh-CN/language.php
index 78f065c..a167031 100644
--- a/data/language/zh-CN/language.php
+++ b/data/language/zh-CN/language.php
@@ -7,6 +7,7 @@ $LANG = [
     "contact_us"        => "联系我们",
     "help"              => "帮助",
     "login"             => "登录",
+    'logout'            => '退出登录',
     "register"          => "注册",
     "username"          => "用户名",
     "input_username"    => "请输入用户名",
diff --git a/data/language/zh-TW/language.php b/data/language/zh-TW/language.php
index 1df944e..8b21a24 100644
--- a/data/language/zh-TW/language.php
+++ b/data/language/zh-TW/language.php
@@ -7,6 +7,7 @@ $LANG = [
     'contact_us' => '聯繫我們',
     'help' => '幫助',
     'login' => '登錄',
+    'logout' => '退出登錄',
     'register' => '註冊',
     'username' => '用戶名',
     'input_username' => '請輸入用戶名',