Merge branch 'menu-description' of https://github.com/navalkishore30/Platform into 3.0

Modules/Menu/Database/Migrations/2018_04_08_110347_add_description_column_to_menuitems_translation_table.php

+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddDescriptionColumnToMenuitemsTranslationTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('menu__menuitem_translations', function (Blueprint $table) {
+            $table->string('description')->after('uri')->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('menu__menuitem_translations', function (Blueprint $table) {
+            $table->dropColumn('description');
+        });
+    }
+}

Modules/Menu/Entities/Menuitem.php

@@ -27,6 +27,7 @@ class Menuitem extends Model
         'link_type',
         'locale',
         'class',
+        'description',
     ];
     protected $table = 'menu__menuitems';
 

Modules/Menu/Entities/MenuitemTranslation.php

@@ -6,6 +6,6 @@ use Illuminate\Database\Eloquent\Model;
 
 class MenuitemTranslation extends Model
 {
-    public $fillable = ['title', 'uri', 'url', 'status', 'locale'];
+    public $fillable = ['title', 'uri', 'url', 'status', 'locale', 'description'];
     protected $table = 'menu__menuitem_translations';
 }

Modules/Menu/Resources/views/admin/menuitems/partials/create-trans-fields.blade.php

@@ -16,6 +16,11 @@
     {!! Form::text("{$lang}[url]", old("{$lang}[url]"), ['class' => 'form-control', 'placeholder' => trans('menu::menu.form.url')]) !!}
     {!! $errors->first("{$lang}[url]", '<span class="help-block">:message</span>') !!}
 </div>
+<div class="form-group{{ $errors->has("{$lang}[description]") ? ' has-error' : '' }}">
+    {!! Form::label("{$lang}[description]", trans('menu::menu.form.description')) !!}
+    {!! Form::text("{$lang}[description]", old("{$lang}[description]"), ['class' => 'form-control', 'placeholder' => trans('menu::menu.form.description')]) !!}
+    {!! $errors->first("{$lang}[description]", '<span class="help-block">:message</span>') !!}
+</div>
 
 <div class="checkbox">
     <label for="{{$lang}}[status]">

Modules/Menu/Resources/views/admin/menuitems/partials/edit-trans-fields.blade.php

@@ -19,6 +19,12 @@
     {!! Form::text("{$lang}[url]", old("{$lang}[url]", $old), ['class' => 'form-control', 'placeholder' => trans('menu::menu.form.url')]) !!}
     {!! $errors->first("{$lang}[url]", '<span class="help-block">:message</span>') !!}
 </div>
+<div class="form-group{{ $errors->has("{$lang}[description]") ? ' has-error' : '' }}">
+    {!! Form::label("{$lang}[description]", trans('menu::menu.form.description')) !!}
+    <?php $old = $menuItem->hasTranslation($lang) ? $menuItem->translate($lang)->description : '' ?>
+    {!! Form::text("{$lang}[description]", old("{$lang}[description]", $old), ['class' => 'form-control', 'placeholder' => trans('menu::menu.form.description')]) !!}
+    {!! $errors->first("{$lang}[description]", '<span class="help-block">:message</span>') !!}
+</div>
 <div class="checkbox">
     <?php $old = $menuItem->hasTranslation($lang) ? $menuItem->translate($lang)->status : false ?>
     <label for="{{$lang}}[status]">

Modules/Translation/Resources/lang/menu/de/menu.php

@@ -31,6 +31,7 @@ return [
         'uri' => 'URI',
         'url' => 'URL',
         'primary' => 'Hauptmenü (für das Frontend-Routing)',
+        'description' => 'Menü Beschreibung (Kann für zusätzliche Informationen verwendet werden)',
     ],
     'navigation' => [
         'back to index' => 'Zurück zur Übersicht',

Modules/Translation/Resources/lang/menu/en/menu.php

@@ -31,6 +31,7 @@ return [
         'uri' => 'URI',
         'url' => 'URL',
         'primary' => 'Primary menu (used for front-end routing)',
+        'description' => 'Menu Description (Can be used to provide extra information)',
     ],
     'navigation' => [
         'back to index' => 'Go back to the menu index',

Modules/Translation/Resources/lang/menu/es/menu.php

@@ -31,6 +31,7 @@ return [
         'uri' => 'URI',
         'url' => 'URL',
         'primary' => 'Menú principal (usado para rutas del sitio)',
+        'description' => 'Descripción del menú (Se puede usar para proporcionar información adicional)',
     ],
     'navigation' => [
         'back to index' => 'Regresar',

Modules/Translation/Resources/lang/menu/fr/menu.php

@@ -31,6 +31,7 @@ return [
         'uri' => 'URI',
         'url' => 'URL',
         'primary' => 'Menu principal (utilisé pour le routage frontal)',
+        'description' => 'Description du menu (peut être utilisé pour fournir des informations supplémentaires)',
     ],
     'navigation' => [
         'back to index' => 'Retour vers l\'index des menus',

Modules/Translation/Resources/lang/menu/it/menu.php

@@ -31,6 +31,7 @@ return [
         'uri' => 'URI',
         'url' => 'URL',
         'primary' => 'Menu primario (usato per il routing front-end)',
+        'description' => 'Descrizione del menu (può essere usato per fornire informazioni extra)',
     ],
     'navigation' => [
         'back to index' => 'Indietro all\'indice dei menu',

Modules/Translation/Resources/lang/menu/ko/menu.php

@@ -31,6 +31,7 @@ return [
         'uri' => 'URI',
         'url' => 'URL',
         'primary' => '주 메뉴 (프론트엔드 라우팅에 사용됨)',
+        'description' => '메뉴 설명 (추가 정보를 제공하는 데 사용할 수 있음)',
     ],
     'navigation' => [
         'back to index' => '메뉴 목록으로 돌아가기',

Modules/Translation/Resources/lang/menu/nl/menu.php

@@ -31,6 +31,7 @@ return [
         'uri' => 'URI',
         'url' => 'URL',
         'primary' => 'Primair menu (gebruikt voor front-end routing)',
+        'description' => 'Menu Beschrijving (kan worden gebruikt om extra informatie te geven)',
     ],
     'navigation' => [
         'back to index' => 'Ga terug naar het menu overzicht',

Modules/Translation/Resources/lang/menu/pl/menu.php

@@ -31,6 +31,7 @@ return [
         'uri' => 'URI',
         'url' => 'URL',
         'primary' => 'Menu główne (używane jako nawigacja na stronie głównej)',
+        'description' => 'Opis menu (może być wykorzystany do dostarczenia dodatkowych informacji)',
     ],
     'navigation' => [
         'back to index' => 'Powrót do zarządzania menu',

Modules/Translation/Resources/lang/menu/pt/menu.php

@@ -31,6 +31,7 @@ return [
         'uri' => 'URI',
         'url' => 'URL',
         'primary' => 'Menu principal (usado para as rotas do site)',
+        'description' => 'Menu Descrição (pode ser usado para fornecer informações extras)',
     ],
     'navigation' => [
         'back to index' => 'Voltar para a listagem',

Modules/Translation/Resources/lang/menu/ru/menu.php

@@ -31,6 +31,7 @@ return [
         'uri' => 'URI',
         'url' => 'URL',
         'primary' => 'Начальное меню (используется для маршрутизации внешнего интерфейса)',
+        'description' => 'Описание меню (может использоваться для предоставления дополнительной информации)',
     ],
     'navigation' => [
         'back to index' => 'Вернуться к списку меню',

Modules/Translation/Resources/lang/menu/tr/menu.php

@@ -31,6 +31,7 @@ return [
         'uri' => 'URI',
         'url' => 'URL',
         'primary' => 'Birincil menü (frond-end yönlendirmesi için kullanılır)',
+        'description' => 'Menü Açıklama (Ek bilgi sağlamak için kullanılabilir)',
     ],
     'navigation' => [
         'back to index' => 'Menüye geri dön',

Modules/Translation/Resources/lang/menu/zh/menu.php

@@ -31,6 +31,7 @@ return [
         'uri' => 'URI',
         'url' => 'URL',
         'primary' => '主菜单 (用于前台导航)',
+        'description' => '菜单说明（可用于提供额外的信息）',
     ],
     'navigation' => [
         'back to index' => '返回菜单首页',