Streamlined components in blade templates

aimeos · Jul 6, 2021 · a7240d0 · a7240d0
1 parent 0bd05ba
commit a7240d0
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 29 deletions.
diff --git a/src/config/shop.php b/src/config/shop.php
@@ -23,19 +23,19 @@
 	/*
 	'page' => [
 		// Docs: https://aimeos.org/docs/latest/laravel/extend/#adapt-pages
-		'account-index' => [ 'account/profile','account/review','account/subscription','account/history','account/favorite','account/watch','basket/mini','catalog/session','locale/select' ],
-		'basket-index' => [ 'basket/bulk','catalog/tree','catalog/search', 'basket/standard','basket/related' ],
+		'account-index' => [ 'locale/select', 'basket/mini','account/profile','account/review','account/subscription','account/history','account/favorite','account/watch','catalog/session' ],
+		'basket-index' => [ 'catalog/tree','catalog/search','basket/standard','basket/bulk','basket/related' ],
 		'catalog-count' => [ 'catalog/count' ],
-		'catalog-detail' => [ 'basket/mini','catalog/tree','catalog/search','catalog/stage','catalog/detail','catalog/session','locale/select' ],
-		'catalog-home' => [ 'basket/mini','catalog/tree','catalog/search','catalog/home','locale/select','cms/page' ],
-		'catalog-list' => [ 'basket/mini','catalog/tree','catalog/search','catalog/price','catalog/supplier','catalog/attribute','catalog/session','catalog/lists','locale/select' ],
+		'catalog-detail' => [ 'locale/select', 'basket/mini','catalog/tree','catalog/search','catalog/stage','catalog/detail','catalog/session' ],
+		'catalog-home' => [ 'locale/select','basket/mini','catalog/tree','catalog/search','catalog/home','cms/page' ],
+		'catalog-list' => [ 'locale/select','basket/mini','catalog/tree','catalog/search','catalog/price','catalog/supplier','catalog/attribute','catalog/session','catalog/stage','catalog/lists' ],
 		'catalog-stock' => [ 'catalog/stock' ],
 		'catalog-suggest' => [ 'catalog/suggest' ],
-		'catalog-tree' => [ 'basket/mini','catalog/tree','catalog/search','catalog/price','catalog/supplier','catalog/attribute','catalog/session','catalog/stage','catalog/lists','locale/select' ],
-		'checkout-confirm' => [ 'checkout/confirm','catalog/tree','catalog/search' ],
-		'checkout-index' => [ 'checkout/standard' ],
+		'catalog-tree' => [ 'locale/select','basket/mini','catalog/tree','catalog/search','catalog/price','catalog/supplier','catalog/attribute','catalog/session','catalog/stage','catalog/lists' ],
+		'checkout-confirm' => [ 'catalog/tree','catalog/search','checkout/confirm' ],
+		'checkout-index' => [ 'catalog/tree','catalog/search','checkout/standard' ],
 		'checkout-update' => [ 'checkout/update' ],
-		'supplier-detail' => ['basket/mini','catalog/tree','catalog/search','supplier/detail','catalog/lists'],
+		'supplier-detail' => [ 'locale/select','basket/mini','catalog/tree','catalog/search','supplier/detail','catalog/lists'],
 	],
 	*/
 

diff --git a/src/default.php b/src/default.php
@@ -17,19 +17,19 @@
 	'uploaddir' => '/',
 
 	'page' => [
-		'account-index' => ['account/profile', 'account/review', 'account/subscription', 'account/history', 'account/favorite', 'account/watch', 'basket/mini', 'catalog/session', 'locale/select'],
-		'basket-index' => ['basket/bulk', 'catalog/tree', 'catalog/search', 'basket/standard', 'basket/related'],
-		'catalog-count' => ['catalog/count'],
-		'catalog-detail' => ['basket/mini', 'catalog/tree', 'catalog/search', 'catalog/stage', 'catalog/detail', 'catalog/session', 'locale/select'],
-		'catalog-home' => ['basket/mini', 'catalog/tree', 'catalog/search', 'catalog/home', 'locale/select', 'cms/page'],
-		'catalog-list' => ['basket/mini', 'catalog/tree', 'catalog/search', 'catalog/price', 'catalog/supplier', 'catalog/attribute', 'catalog/session', 'catalog/lists', 'locale/select'],
-		'catalog-stock' => ['catalog/stock'],
-		'catalog-suggest' => ['catalog/suggest'],
-		'catalog-tree' => ['basket/mini', 'catalog/tree', 'catalog/search', 'catalog/price', 'catalog/supplier', 'catalog/attribute', 'catalog/session', 'catalog/stage', 'catalog/lists', 'locale/select'],
-		'checkout-confirm' => ['checkout/confirm', 'catalog/tree', 'catalog/search'],
-		'checkout-index' => ['checkout/standard'],
-		'checkout-update' => ['checkout/update'],
-		'supplier-detail' => ['basket/mini', 'catalog/tree', 'catalog/search', 'supplier/detail', 'catalog/lists'],
+		'account-index' => [ 'locale/select', 'basket/mini','account/profile','account/review','account/subscription','account/history','account/favorite','account/watch','catalog/session' ],
+		'basket-index' => [ 'catalog/tree','catalog/search','basket/standard','basket/bulk','basket/related' ],
+		'catalog-count' => [ 'catalog/count' ],
+		'catalog-detail' => [ 'locale/select', 'basket/mini','catalog/tree','catalog/search','catalog/stage','catalog/detail','catalog/session' ],
+		'catalog-home' => [ 'locale/select','basket/mini','catalog/tree','catalog/search','catalog/home','cms/page' ],
+		'catalog-list' => [ 'locale/select','basket/mini','catalog/tree','catalog/search','catalog/price','catalog/supplier','catalog/attribute','catalog/session','catalog/stage','catalog/lists' ],
+		'catalog-stock' => [ 'catalog/stock' ],
+		'catalog-suggest' => [ 'catalog/suggest' ],
+		'catalog-tree' => [ 'locale/select','basket/mini','catalog/tree','catalog/search','catalog/price','catalog/supplier','catalog/attribute','catalog/session','catalog/stage','catalog/lists' ],
+		'checkout-confirm' => [ 'catalog/tree','catalog/search','checkout/confirm' ],
+		'checkout-index' => [ 'catalog/tree','catalog/search','checkout/standard' ],
+		'checkout-update' => [ 'checkout/update' ],
+		'supplier-detail' => [ 'locale/select','basket/mini','catalog/tree','catalog/search','supplier/detail','catalog/lists'],
 	],
 
 	'resource' => [

diff --git a/src/views/catalog/list.blade.php b/src/views/catalog/list.blade.php
@@ -3,12 +3,12 @@
 @section('aimeos_header')
     <?= $aiheader['locale/select'] ?? '' ?>
     <?= $aiheader['basket/mini'] ?? '' ?>
-    <?= $aiheader['catalog/filter'] ?? '' ?>
     <?= $aiheader['catalog/search'] ?? '' ?>
     <?= $aiheader['catalog/tree'] ?? '' ?>
     <?= $aiheader['catalog/price'] ?? '' ?>
     <?= $aiheader['catalog/supplier'] ?? '' ?>
     <?= $aiheader['catalog/attribute'] ?? '' ?>
+    <?= $aiheader['catalog/stage'] ?? '' ?>
     <?= $aiheader['catalog/lists'] ?? '' ?>
 @stop
 
@@ -23,6 +23,7 @@
 @stop
 
 @section('aimeos_body')
+    <?= $aibody['catalog/stage'] ?? '' ?>
     <div class="container-fluid">
         <div class="row">
             <aside class="col-lg-3">
@@ -31,9 +32,6 @@
                     <?= $aibody['catalog/supplier'] ?? '' ?>
                     <?= $aibody['catalog/attribute'] ?? '' ?>
                 </div>
-                <div class="advert">
-                    <?= $aibody['cms/page'] ?? '' ?>
-                </div>
                 <div class="shop-tools">
                     <?= $aibody['catalog/session'] ?? '' ?>
                 </div>

diff --git a/src/views/catalog/tree.blade.php b/src/views/catalog/tree.blade.php
@@ -35,9 +35,6 @@
                     <?= $aibody['catalog/supplier'] ?? '' ?>
                     <?= $aibody['catalog/attribute'] ?? '' ?>
                 </div>
-                <div class="advert">
-                    <?= $aibody['cms/page'] ?? '' ?>
-                </div>
                 <div class="shop-tools">
                     <?= $aibody['catalog/session'] ?? '' ?>
                 </div>

diff --git a/src/views/checkout/confirm.blade.php b/src/views/checkout/confirm.blade.php
@@ -3,6 +3,13 @@
 @section('aimeos_header')
     <title>{{ __( 'Thank you') }}</title>
     <?= $aiheader['checkout/confirm'] ?>
+    <?= $aiheader['catalog/search'] ?? '' ?>
+    <?= $aiheader['catalog/tree'] ?? '' ?>
+@stop
+
+@section('aimeos_nav')
+    <?= $aibody['catalog/tree'] ?? '' ?>
+    <?= $aibody['catalog/search'] ?? '' ?>
 @stop
 
 @section('aimeos_body')

diff --git a/src/views/checkout/index.blade.php b/src/views/checkout/index.blade.php
@@ -3,6 +3,13 @@
 @section('aimeos_header')
     <title>{{ __( 'Checkout') }}</title>
     <?= $aiheader['checkout/standard'] ?>
+    <?= $aiheader['catalog/search'] ?? '' ?>
+    <?= $aiheader['catalog/tree'] ?? '' ?>
+@stop
+
+@section('aimeos_nav')
+    <?= $aibody['catalog/tree'] ?? '' ?>
+    <?= $aibody['catalog/search'] ?? '' ?>
 @stop
 
 @section('aimeos_body')