优化前台样式

优化前台语言包
优化前台会员空方法数据处理

application/index/controller/User.php

@@ -60,7 +60,10 @@ class User extends Frontend
      */
     public function _empty($name)
     {
-        Hook::listen("user_request_empty", $name);
+        $data = Hook::listen("user_request_empty", $name);
+        foreach ($data as $index => $datum) {
+            $this->view->assign($datum);
+        }
         return $this->view->fetch('user/' . $name);
     }
 

application/index/lang/zh-cn.php

@@ -3,10 +3,8 @@
 return [
     'Keep login'                                             => '保持会话',
     'Forgot password'                                        => '忘记密码?',
-    'Sign in'                                                => '登入',
     'Username'                                               => '用户名',
     'User id'                                                => '会员ID',
-    'Username'                                               => '用户名',
     'Nickname'                                               => '昵称',
     'Password'                                               => '密码',
     'Sign up'                                                => '注 册',
@@ -43,7 +41,6 @@ return [
     'Next'                                                   => '下一页',
     'Last'                                                   => '末页',
     'None'                                                   => '无',
-    'Home'                                                   => '主页',
     'Online'                                                 => '在线',
     'Logout'                                                 => '注销',
     'Profile'                                                => '个人资料',
@@ -56,15 +53,10 @@ return [
     'Line'                                                   => '行号',
     'File'                                                   => '文件',
     'Menu'                                                   => '菜单',
-    'Name'                                                   => '名称',
-    'Weigh'                                                  => '权重',
     'Type'                                                   => '类型',
     'Title'                                                  => '标题',
     'Content'                                                => '内容',
-    'Status'                                                 => '状态',
-    'Operate'                                                => '操作',
     'Apply'                                                  => '应用',
-    'Cancel'                                                 => '取消',
     'Clear'                                                  => '清空',
     'Custom Range'                                           => '自定义',
     'Today'                                                  => '今天',
@@ -75,6 +67,7 @@ return [
     'This month'                                             => '本月',
     'Choose'                                                 => '选择',
     'Append'                                                 => '追加',
+    'Upload'                                                 => '上传',
     'Memo'                                                   => '备注',
     'Parent'                                                 => '父级',
     'Params'                                                 => '参数',
@@ -111,8 +104,8 @@ return [
     'Donation'                                               => '捐赠',
     'Forum'                                                  => '社区',
     'Docs'                                                   => '文档',
-    'Go back'                                                => '返回首页',
-    'Jump now'                                               => '立即跳转',
+    'User center'                                            => '会员中心',
+    'Change password'                                        => '修改密码',
     'Please login first'                                     => '请登录后再操作',
     'Send verification code'                                 => '发送验证码',
     'Redirect now'                                           => '立即跳转',

application/index/lang/zh-cn/user.php

@@ -32,7 +32,6 @@ return [
     'Email already exist'                   => '邮箱已经存在',
     'Mobile already exist'                  => '手机号已经存在',
     'Username is incorrect'                 => '用户名不正确',
-    'Email is incorrect'                    => '邮箱不正确',
     'Reset password'                        => '修改密码',
     'Reset password by email'               => '通过邮箱',
     'Reset password by mobile'              => '通过手机重置',
@@ -56,12 +55,10 @@ return [
     'Change password successful'            => '修改密码成功',
     'Captcha is incorrect'                  => '验证码不正确',
     'Upload successful'                     => '上传成功',
-    'Sign up successful'                    => '注册成功',
     'Logged in successful'                  => '登录成功',
     'Logout successful'                     => '注销成功',
     'User center already closed'            => '会员中心已经关闭',
     'Operation failed'                      => '操作失败',
     'Invalid parameters'                    => '参数不正确',
     'Change password failure'               => '修改密码失败',
-    'Change password successful'            => '修改密码成功',
 ];

public/assets/css/frontend.css

@@ -38,11 +38,11 @@ body {
 }
 /*预览区域*/
 .plupload-preview {
-  padding: 10px;
+  padding: 0 10px;
   margin-bottom: 0;
 }
 .plupload-preview li {
-  margin-bottom: 10px;
+  margin-top: 10px;
 }
 .plupload-preview .thumbnail {
   margin-bottom: 10px;
@@ -201,6 +201,23 @@ body {
   line-height: 1.5;
   padding: 4px 13px;
 }
+.fieldlist dd {
+  display: block;
+  margin: 5px 0;
+}
+.fieldlist dd input {
+  display: inline-block;
+  width: 300px;
+}
+.fieldlist dd input:first-child {
+  width: 110px;
+}
+.fieldlist dd ins {
+  width: 110px;
+  display: inline-block;
+  text-decoration: none;
+  font-weight: bold;
+}
 /* 弹窗中的表单 */
 .form-layer {
   height: 100%;
@@ -475,4 +492,25 @@ main.content {
     line-height: 30px;
   }
 }
+.pager .pagination {
+  margin: 0;
+}
+.pager li {
+  margin: 0 .4em;
+  display: inline-block;
+}
+.pager li:first-child > a,
+.pager li:last-child > a,
+.pager li:first-child > span,
+.pager li:last-child > span {
+  padding: .5em 1.2em;
+}
+.pager li > a,
+.pager li > span {
+  background: none;
+  border: 1px solid #e6e6e6;
+  border-radius: 0.25em;
+  padding: .5em .93em;
+  font-size: 14px;
+}
 /*# sourceMappingURL=../css/frontend.css.map */

public/assets/js/require-backend.min.js

@@ -8432,7 +8432,7 @@ define('validator',['validator-core', 'validator-lang'], function (Validator, un
 define('form',['jquery', 'bootstrap', 'upload', 'validator'], function ($, undefined, Upload, Validator) {
     var Form = {
         config: {
-            fieldlisttpl: '<dd class="form-inline"><input type="text" name="<%=name%>[<%=index%>][key]" class="form-control" value="<%=row.key%>" size="10" /> <input type="text" name="<%=name%>[<%=index%>][value]" class="form-control" value="<%=row.value%>" size="30" /> <span class="btn btn-sm btn-danger btn-remove"><i class="fa fa-times"></i></span> <span class="btn btn-sm btn-primary btn-dragsort"><i class="fa fa-arrows"></i></span></dd>'
+            fieldlisttpl: '<dd class="form-inline"><input type="text" name="<%=name%>[<%=index%>][key]" class="form-control" value="<%=row.key%>" size="10" /> <input type="text" name="<%=name%>[<%=index%>][value]" class="form-control" value="<%=row.value%>" size="40" /> <span class="btn btn-sm btn-danger btn-remove"><i class="fa fa-times"></i></span> <span class="btn btn-sm btn-primary btn-dragsort"><i class="fa fa-arrows"></i></span></dd>'
         },
         events: {
             validator: function (form, success, error, submit) {

public/assets/js/require-form.js

@@ -1,7 +1,7 @@
 define(['jquery', 'bootstrap', 'upload', 'validator'], function ($, undefined, Upload, Validator) {
     var Form = {
         config: {
-            fieldlisttpl: '<dd class="form-inline"><input type="text" name="<%=name%>[<%=index%>][key]" class="form-control" value="<%=row.key%>" size="10" /> <input type="text" name="<%=name%>[<%=index%>][value]" class="form-control" value="<%=row.value%>" size="30" /> <span class="btn btn-sm btn-danger btn-remove"><i class="fa fa-times"></i></span> <span class="btn btn-sm btn-primary btn-dragsort"><i class="fa fa-arrows"></i></span></dd>'
+            fieldlisttpl: '<dd class="form-inline"><input type="text" name="<%=name%>[<%=index%>][key]" class="form-control" value="<%=row.key%>" size="10" /> <input type="text" name="<%=name%>[<%=index%>][value]" class="form-control" value="<%=row.value%>" size="40" /> <span class="btn btn-sm btn-danger btn-remove"><i class="fa fa-times"></i></span> <span class="btn btn-sm btn-primary btn-dragsort"><i class="fa fa-arrows"></i></span></dd>'
         },
         events: {
             validator: function (form, success, error, submit) {

public/assets/less/frontend.less

@@ -58,10 +58,10 @@ body {
 
 /*预览区域*/
 .plupload-preview {
-    padding:10px;
+    padding:0 10px;
     margin-bottom:0;
     li {
-        margin-bottom:10px;
+        margin-top:10px;
     }
     .thumbnail {
         margin-bottom:10px;
@@ -214,6 +214,24 @@ body {
     padding: 4px 13px;
 }
 
+.fieldlist dd {
+    display: block;
+    margin: 5px 0;
+    input {
+        display: inline-block;
+        width: 300px;
+    }
+    input:first-child {
+        width: 110px;
+    }
+    ins {
+        width: 110px;
+        display: inline-block;
+        text-decoration: none;
+        font-weight: bold;
+    }
+}
+
 /* 弹窗中的表单 */
 .form-layer {
     height:100%;min-height:150px;min-width:300px;
@@ -435,3 +453,26 @@ main.content {
         .copyright{padding:10px;line-height:30px;}
     }
 }
+
+.pager {
+    .pagination {
+        margin: 0;
+    }
+    li {
+        margin: 0 .4em;
+        display: inline-block;
+        &:first-child, &:last-child {
+            > a, > span {
+                padding: .5em 1.2em;
+            }
+        }
+    }
+}
+
+.pager li > a, .pager li > span {
+    background: none;
+    border: 1px solid #e6e6e6;
+    border-radius: 0.25em;
+    padding: .5em .93em;
+    font-size: 14px;
+}