wip #2868 @2

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index a6d1cd8f425fc652ff969922ecee37b438425cea..a7edcbc90f8b113f540822f0f20486a86abc1fd5 100644 (file)
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -16,7 +16,7 @@ class PageController extends CubistFrontController
         }
 
         $this->data['title'] = $page->title;
-        $this->data['page'] = $page->withFakes();
+        $this->data['page'] = $page->withFakes()->getDecodedAttributes();
 
         return view('pages.' . $page->template, $this->data);
     }

diff --git a/app/Models/Locale.php b/app/Models/Locale.php
new file mode 100644 (file)
index 0000000..d616742
--- /dev/null
+++ b/app/Models/Locale.php
@@ -0,0 +1,9 @@
+<?php
+namespace App\Models;
+
+use Cubist\Backpack\app\Magic\Models\Locale as BaseLocale;
+
+class Locale extends BaseLocale
+{
+
+}

diff --git a/composer.json b/composer.json
index fc695b806ebc188e2408822fdaaec812d75e0f70..8f7adbf4262dc28a7532ee97924a3ce02b3d8d2a 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -10,10 +10,6 @@
         {
             "type": "composer",
             "url": "https://composer.cubedesigners.com/"
-        },
-        {
-            "type": "git",
-            "url": "https://github.com/EnhydraV/laravel-backpack-nestedmodels.git"
         }
     ],
     "license": "proprietary",

diff --git a/resources/views/pages/home.blade.php b/resources/views/pages/home.blade.php
index 8b28fa60cb6527fa6964cfa656eeaaa835169754..59e844578b79779fc741137a7ee65918f850c9fe 100644 (file)
--- a/resources/views/pages/home.blade.php
+++ b/resources/views/pages/home.blade.php
@@ -6,6 +6,7 @@
 
 @section('content')
 
+
     {{-- Slider --}}
     <full-width class="bg-navy text-white antialiased" padding="pt-1v">
         <content>

diff --git a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
index 81a03d738c49b1ecc0f7f3bcde621b7b3514f912..3e015653838f18a86d019f617655a799641aa032 100644 (file)
--- a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
+++ b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
@@ -12,6 +12,13 @@
         @can('backpack_settings')
             <li><a href='{{ backpack_url('settings') }}'><i class='fa fa-cog'></i> <span>Paramètres</span></a></li>
         @endcan
+        <li class="treeview">
+            <a href="#"><i class="fa fa-globe"></i> <span>Traductions</span> <i class="fa fa-angle-left pull-right"></i></a>
+            <ul class="treeview-menu">
+                <li><a href="{{ url(config('backpack.base.route_prefix', 'admin').'/locale') }}"><i class="fa fa-flag-checkered"></i> Langues</a></li>
+                <li><a href="{{ url(config('backpack.base.route_prefix', 'admin').'/translation') }}"><i class="fa fa-language"></i> Traductions</a></li>
+            </ul>
+        </li>
     @endcan
     <li class="header">Édition du catalogue de produits</li>
     <li><a href='{{ backpack_url('product') }}'><i class='fa fa-book'></i> <span>Produits</span></a></li>

diff --git a/routes/backpack/custom.php b/routes/backpack/custom.php
index 929101a37a99ccd4d3d32c8236a402e76ba8ddfe..05ca4952b4d511e8a021e2b98b0f6785186b0a19 100644 (file)
--- a/routes/backpack/custom.php
+++ b/routes/backpack/custom.php
@@ -14,6 +14,11 @@ Route::group([
         Route::match(['delete'], 'page/{id}/media/{mediaId}', 'PageCrudController@deleteMedia');
         Route::match(['post'], 'page/{id}/media/reorder', 'PageCrudController@reorderMedia');
     });
+    CRUD::resource('product', 'ProductCrudController')->with(function () {
+        Route::match(['post'], 'product/{id}/media', 'ProductCrudController@uploadMedia');
+        Route::match(['delete'], 'product/{id}/media/{mediaId}', 'ProductCrudController@deleteMedia');
+        Route::match(['post'], 'product/{id}/media/reorder', 'ProductCrudController@reorderMedia');
+    });
     CRUD::resource('producttype', 'ProductTypeCrudController')->with(function () {
         Route::match(['post'], 'producttype/{id}/media', 'ProductTypeCrudController@uploadMedia');
         Route::match(['delete'], 'producttype/{id}/media/{mediaId}', 'ProductTypeCrudController@deleteMedia');