浏览代码

优化CRUD回收站生成

优化前台多语言
优化组件样式
Karson 2 年之前
父节点
当前提交
91549dbfea

+ 1 - 1
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,

+ 2 - 0
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'                    => '修改密码失败',

+ 1 - 1
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}

+ 1 - 1
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>

+ 1 - 1
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>

+ 0 - 1
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%;

+ 1 - 1
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;