From 432bb60570c3e04a73be473aa1db6537db18bcd0 Mon Sep 17 00:00:00 2001
From: "shubhammehrotra.symfony@webkul.com"
 <shubhammehrotra.symfony@webkul.com>
Date: Fri, 7 Feb 2020 16:01:52 +0530
Subject: [PATCH] velocity admin panel bugs

---
 .../Velocity/src/Resources/lang/en/app.php    |  6 +++---
 .../content/content-type/category.blade.php   |  7 +++++--
 .../views/admin/meta-info/meta-data.blade.php | 21 ++++++++++---------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/packages/Webkul/Velocity/src/Resources/lang/en/app.php b/packages/Webkul/Velocity/src/Resources/lang/en/app.php
index dce373543..49d7de204 100644
--- a/packages/Webkul/Velocity/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Velocity/src/Resources/lang/en/app.php
@@ -47,9 +47,9 @@ return [
             'category-menu' => 'Category Menu',
         ],
         'contents' => [
-            'title' => 'Content Pages List',
+            'title' => 'Content List',
             'add-title' => 'Add Content',
-            'btn-add-content' => 'Add New Content',
+            'btn-add-content' => 'Add Content',
             'save-btn-title' => 'Save Content',
             'active' => 'Active',
             'inactive' => 'Inactive',
@@ -82,7 +82,7 @@ return [
                 'static-description' => 'Content Description',
             ],
             'datagrid' => [
-                'id' => 'Content Id',
+                'id' => 'Id',
                 'title' => 'Title',
                 'position' => 'Position',
                 'status' => 'Status',
diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/category.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/category.blade.php
index 279257cfe..087d37296 100644
--- a/packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/category.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/category.blade.php
@@ -13,7 +13,7 @@
         name="page_link"
         v-validate="'required|max:150'"
         value="{{ isset($locale) ? (old($locale)['page_link'] ?? $content->translate($locale)['page_link']) : '' }}"
-        data-vv-as="&quot;{{ __('velocity::app.admin.contents.content.page-link') }}&quot;" />
+        data-vv-as="&quot;{{ __('velocity::app.admin.contents.content.category-slug') }}&quot;" />
 
     <span class="control-error" v-if="errors.has('page_link')">
         @{{ errors.first('page_link') }}
@@ -29,7 +29,10 @@
        $linkTarget = isset($locale) ? (old($locale)['link_target'] ?? $content->translate($locale)['link_target']) : '';
     @endphp
 
-    <select class="control" id="link_target" name="{{$locale}}[link_target]" value="">
+    <select
+        class="control"
+        id="link_target"
+        name="{{ isset($locale) ? $locale . '[link_target]': 'link_target' }}">
         <option value="0">
             {{ __('velocity::app.admin.contents.self') }}
         </option>
diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
index a6a465f0d..35f9d5e0c 100644
--- a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
@@ -6,12 +6,6 @@
 
 @section('content')
     <div class="content">
-        <div class="page-header">
-            <div class="page-title">
-                <h1>{{ __('velocity::app.admin.meta-data.title') }}</h1>
-            </div>
-        </div>
-
         <form
             method="POST"
             @submit.prevent="onSubmit"
@@ -25,6 +19,17 @@
 
             @csrf
 
+            <div class="page-header">
+                <div class="page-title">
+                    <h1>{{ __('velocity::app.admin.meta-data.title') }}</h1>
+                </div>
+                <div class="page-action">
+                    <button type="submit" class="btn btn-lg btn-primary">
+                        {{ __('velocity::app.admin.meta-data.update-meta-data') }}
+                    </button>
+                </div>
+            </div>
+
             <accordian :title="'{{ __('admin::app.catalog.attributes.general') }}'" :active="false">
                 <div slot="body">
                     <div class="control-group">
@@ -185,10 +190,6 @@
                     </div>
                 </div>
             </accordian>
-
-            <button class="btn btn-lg btn-primary" style="margin-top: 20px">
-                {{ __('velocity::app.admin.meta-data.update-meta-data') }}
-            </button>
         </form>
     </div>
 @stop