From 91549dbfea18f4a5240ae2b94ccb40b4246ec974 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Wed, 14 Dec 2022 17:16:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96CRUD=E5=9B=9E=E6=94=B6?=
 =?UTF-8?q?=E7=AB=99=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

优化前台多语言
优化组件样式
---
 application/admin/command/Crud/stubs/mixins/recyclebinjs.stub | 2 +-
 application/index/lang/zh-cn/user.php                         | 2 ++
 application/index/view/layout/default.html                    | 2 +-
 application/index/view/user/login.html                        | 2 +-
 application/index/view/user/register.html                     | 2 +-
 public/assets/css/backend.css                                 | 1 -
 public/assets/less/backend.less                               | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/application/admin/command/Crud/stubs/mixins/recyclebinjs.stub b/application/admin/command/Crud/stubs/mixins/recyclebinjs.stub
index 458a19dd..180b7194 100644
--- a/application/admin/command/Crud/stubs/mixins/recyclebinjs.stub
+++ b/application/admin/command/Crud/stubs/mixins/recyclebinjs.stub
@@ -27,7 +27,7 @@
                         },
                         {
                             field: 'operate',
-                            width: '130px',
+                            width: '140px',
                             title: __('Operate'),
                             table: table,
                             events: Table.api.events.operate,
diff --git a/application/index/lang/zh-cn/user.php b/application/index/lang/zh-cn/user.php
index c189b3de..26d1efd7 100755
--- a/application/index/lang/zh-cn/user.php
+++ b/application/index/lang/zh-cn/user.php
@@ -60,6 +60,8 @@ return [
     'Logged in successful'                       => '登录成功',
     'Logout successful'                          => '退出成功',
     'User center already closed'                 => '会员中心已经关闭',
+    'Don\'t have an account? Sign up'            => '还没有账号？点击注册',
+    'Already have an account? Sign in'            => '已经有账号？点击登录',
     'Operation failed'                           => '操作失败',
     'Invalid parameters'                         => '参数不正确',
     'Change password failure'                    => '修改密码失败',
diff --git a/application/index/view/layout/default.html b/application/index/view/layout/default.html
index 63aa7b1c..93f67612 100644
--- a/application/index/view/layout/default.html
+++ b/application/index/view/layout/default.html
@@ -28,7 +28,7 @@
                                 <span class="visible-xs-inline-block" style="padding:5px;">{$user.nickname} <b class="caret"></b></span>
                             </a>
                             {else /}
-                            <a href="{:url('user/index')}" class="dropdown-toggle" data-toggle="dropdown">{:__('User center')} <b class="caret"></b></a>
+                            <a href="{:url('user/index')}" class="dropdown-toggle" data-toggle="dropdown">{:__('Member center')} <b class="caret"></b></a>
                             {/if}
                             <ul class="dropdown-menu">
                                 {if $user}
diff --git a/application/index/view/user/login.html b/application/index/view/user/login.html
index f75237b8..792c65ac 100755
--- a/application/index/view/user/login.html
+++ b/application/index/view/user/login.html
@@ -31,7 +31,7 @@
                 </div>
                 <div class="form-group">
                     <button type="submit" class="btn btn-primary btn-lg btn-block">{:__('Sign in')}</button>
-                    <a href="{:url('user/register')}?url={$url|urlencode|htmlentities}" class="btn btn-default btn-lg btn-block mt-3 no-border">还没有账号？点击注册</a>
+                    <a href="{:url('user/register')}?url={$url|urlencode|htmlentities}" class="btn btn-default btn-lg btn-block mt-3 no-border">{:__("Don't have an account? Sign up")}</a>
                 </div>
                 <!--@IndexLoginFormEnd-->
             </form>
diff --git a/application/index/view/user/register.html b/application/index/view/user/register.html
index 14920372..d426ed85 100644
--- a/application/index/view/user/register.html
+++ b/application/index/view/user/register.html
@@ -52,7 +52,7 @@
 
                 <div class="form-group">
                     <button type="submit" class="btn btn-primary btn-lg btn-block">{:__('Sign up')}</button>
-                    <a href="{:url('user/login')}?url={$url|urlencode|htmlentities}" class="btn btn-default btn-lg btn-block mt-3 no-border">已经有账号？点击登录</a>
+                    <a href="{:url('user/login')}?url={$url|urlencode|htmlentities}" class="btn btn-default btn-lg btn-block mt-3 no-border">{:__('Already have an account? Sign in')}</a>
                 </div>
                 <!--@IndexRegisterFormEnd-->
             </form>
diff --git a/public/assets/css/backend.css b/public/assets/css/backend.css
index 88c30674..926c1940 100644
--- a/public/assets/css/backend.css
+++ b/public/assets/css/backend.css
@@ -1513,7 +1513,6 @@ table.table-nowrap thead > tr > th {
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
   display: inline-block;
   padding: 4px 6px;
-  margin-bottom: 10px;
   color: #555;
   vertical-align: middle;
   width: 100%;
diff --git a/public/assets/less/backend.less b/public/assets/less/backend.less
index 08aa8740..cc8eccfe 100644
--- a/public/assets/less/backend.less
+++ b/public/assets/less/backend.less
@@ -1531,7 +1531,7 @@ table.table-nowrap {
     box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
     display: inline-block;
     padding: 4px 6px;
-    margin-bottom: 10px;
+    //margin-bottom: 10px;
     color: #555;
     vertical-align: middle;
     //border-radius: 4px;