moshaorui 4 mesiacov pred
rodič
commit
54e7ff2225

+ 2 - 1
app/Distributor/Controllers/DistAppearanceController.php

@@ -19,7 +19,7 @@ class DistAppearanceController extends AdminDistController
     public function index(Content $content)
     {
         return $content
-            ->header(admin_trans( 'admin.appearance'))
+            ->header(admin_trans( 'admin.site_appearance'))
             ->description('')
             ->breadcrumb(['text'=>'list','url'=>''])
             ->body($this->grid());
@@ -57,6 +57,7 @@ class DistAppearanceController extends AdminDistController
             $grid->disableCreateButton();
             $grid->disableDeleteButton();
             $grid->disableBatchDelete();
+            $grid->tools('<a href="'.getDistributorDomain().'" target="_blank"><button  class="btn btn-primary grid-refresh btn-mini" style="margin-right:3px"><i class="feather icon-chrome"></i><span class="d-none d-sm-inline">&nbsp; '.admin_trans_label('browse').'</span></button></a>');
             // 操作
             $grid->actions(function (Grid\Displayers\Actions $actions) {
                 $actions->disableDelete();

+ 1 - 1
app/Distributor/Controllers/DistProductController.php

@@ -31,7 +31,7 @@ class DistProductController extends AdminDistController
         return $content
             ->header(admin_trans( 'admin.products_list'))
             ->description(admin_trans('admin.all'))
-            ->description('all')
+            ->description('')
             //->breadcrumb(['text'=>'Product Management','url'=>''])
 
             ->body($this->grid());

+ 0 - 1
app/Distributor/Controllers/DistVideoCategoryController.php

@@ -22,7 +22,6 @@ class DistVideoCategoryController extends AdminDistController
     {
         return $content
             ->header(admin_trans('admin.video_category'))
-            ->description(admin_trans('admin.all'))
             ->breadcrumb(['text'=>'Video Category','url'=>''])
             ->body($this->grid());
     }

+ 0 - 1
app/Distributor/Controllers/DistVideoController.php

@@ -27,7 +27,6 @@ class DistVideoController extends AdminDistController
     {
         return $content
             ->header(admin_trans('admin.video_list'))
-            ->description(admin_trans('admin.all'))
             ->breadcrumb(['text'=>admin_trans('admin.video_list'),'url'=>''])
             ->body($this->grid());
     }

+ 1 - 1
app/Distributor/Controllers/ImportProductController.php

@@ -25,7 +25,7 @@ class ImportProductController extends AdminDistController
     public function index(Content $content)
     {
         return $content
-            ->header('Product Import')
+            ->header(admin_trans( 'admin.product_import'))
             ->description('<span style="color: red; font-weight: bold;">'.admin_trans_label('select_products_to_import').'</span>')
             ->breadcrumb(['text'=>'list','url'=>''])
             ->body($this->grid());

+ 2 - 1
lang/en/admin.php

@@ -237,7 +237,7 @@ return [
     'dist_product_import'=>'Dist Product Import',
     'settings'              => 'Settings',
     'inquiry_management'     => 'Inquiry Management',
-    'appearance' => 'Appearance',
+    'site_appearance' => 'Site Appearance',
     'distro_management' => 'Distro Management',
     'users_management'  => 'Users Management',
     'domain'  => 'Domain',
@@ -245,4 +245,5 @@ return [
     'footer_menu'  => 'Footer Menu',
     'pages'  => 'Pages',
     'pages_tag'  => 'Pages Tag',
+    'product_import'  => 'Product Import',
 ];

+ 2 - 1
lang/en/global.php

@@ -131,7 +131,8 @@ return [
         'init_appearance'         => 'Init Appearance',
         'cache'                 => 'Cache',
         'clear_cache'           => 'Clear Cache',
-        'site_url'                  => 'Site URL',
+        'site_url'              => 'Site URL',
+        'browse'                => 'Browse',
     ],
     'options' => [
         //

+ 2 - 1
lang/zh_CN/admin.php

@@ -239,7 +239,7 @@ return [
     'import'                => '产品导入',
     'settings'              => '设置',
     'inquiry_management'     => '询价管理',
-    'appearance' => '外观',
+    'site_appearance' => '站点外观',
     'distro_management' => '分销商管理',
     'users_management'  => '用户管理',
     'domain'  => '域名',
@@ -247,4 +247,5 @@ return [
     'footer_menu'  => '底部菜单',
     'pages'  => '文章',
     'pages_tag'  => '标签',
+    'product_import'  => '产品导入',
 ];

+ 1 - 0
lang/zh_CN/global.php

@@ -147,6 +147,7 @@ return [
         'cache'                 => '缓存',
         'clear_cache'           => '清除缓存',
         'site_url'                  => '站点URL',
+        'browse'                => '浏览',
     ],
     'options' => [
         //

+ 1 - 1
resources/views/admin/layouts/content.blade.php

@@ -9,7 +9,7 @@
             <div>&nbsp;</div>
         @endif
 
-        @include('admin::partials.breadcrumb')
+        @include('admin.partials.breadcrumb')
 
     </section>
 @endsection

+ 2 - 0
resources/views/admin/partials/breadcrumb.blade.php

@@ -2,6 +2,7 @@
     <div class="breadcrumb-wrapper col-12">
     <ol class="breadcrumb float-right text-capitalize">
         <li class="breadcrumb-item"><a href="{{ admin_url('/') }}"><i class="fa fa-dashboard"></i> {{admin_trans('admin.home')}}</a></li>
+        <!--
         @foreach($breadcrumb as $item)
             @if($loop->last)
                 <li class="active breadcrumb-item">
@@ -21,6 +22,7 @@
                 </li>
             @endif
         @endforeach
+        -->
     </ol>
     </div>
 @elseif(config('admin.enable_default_breadcrumb'))

+ 1 - 1
resources/views/distributor/partials/navbar.blade.php

@@ -40,7 +40,7 @@
                 <div class="navbar-right d-flex align-items-center">
                     {!! Dcat\Admin\Admin::navbar()->render() !!}
 
-                    <a href="{{getDistributorDomain()}}" target="_blank" class="nav-link"><i class="fa fa-home f18"></i></a>
+                    <a href="{{getDistributorDomain()}}" target="_blank" class="nav-link"><i class="fa fa-chrome f18"></i></a>
 
                     <!--
                     @if(!empty($configData['home_url']))