From c0b885f2c16854bbdd1589913062baf7a0f5779c Mon Sep 17 00:00:00 2001 From: Gustavo Luigi Date: Tue, 30 Nov 2021 15:29:25 -0300 Subject: [PATCH] adapt themee to lumino version 2.2 --- config.json | 22 ++++++++++++++ content/contents/default.blade.php | 47 +++++++++++++++--------------- content/includes/meta.blade.php | 6 ++-- content/index.blade.php | 17 +---------- content/lists/default.blade.php | 14 ++++----- content/lists/faq.blade.php | 21 +++++++------ content/lists/produkte.blade.php | 14 ++++----- 7 files changed, 73 insertions(+), 68 deletions(-) diff --git a/config.json b/config.json index db7e8f0..0720397 100644 --- a/config.json +++ b/config.json @@ -59,5 +59,27 @@ } ] } + ], + "lists": [ + { + "name": "Produkte", + "slug": "produkte", + "description": "", + "search_terms": "", + "image": "", + "seo_title": "", + "seo_description": "", + "blade": "produkte" + }, + { + "name": "FAQ", + "slug": "faq", + "description": "", + "search_terms": "", + "image": "", + "seo_title": "", + "seo_description": "", + "blade": "faq" + } ] } \ No newline at end of file diff --git a/content/contents/default.blade.php b/content/contents/default.blade.php index d320153..45f10ab 100644 --- a/content/contents/default.blade.php +++ b/content/contents/default.blade.php @@ -23,32 +23,31 @@
-
- @if ($content->image) -
- -
- @endif -
- -
-
- {!! !empty($content->description)?$content->description:'keine Angaben' !!} -
-
-
-
+
+ @if ($content->image) +
+ +
+ @endif +
+ +
+
+ {!! isset($content->data_fields['beschreibung'])?$content->data_fields['beschreibung']:'keine Angaben' !!} +
+
+
+
- @stop @section('scripts') diff --git a/content/includes/meta.blade.php b/content/includes/meta.blade.php index b27e3c5..781e12f 100644 --- a/content/includes/meta.blade.php +++ b/content/includes/meta.blade.php @@ -9,8 +9,8 @@ -@if (Route::currentRouteName() == 'content' and isset($content)) - {{ $content->title}} +@if (Route::currentRouteName() == 'content' and !isset($list) and isset($content)) + {{$content->title}} @@ -22,7 +22,7 @@ @else @endif -@elseif (Route::currentRouteName() == 'content' and isset($list)) +@elseif (Route::currentRouteName() == 'content' and isset($list) and isset($content)) Aktuelle Stellenangebote in {{ $list->name }} diff --git a/content/index.blade.php b/content/index.blade.php index f140647..dfa9a54 100644 --- a/content/index.blade.php +++ b/content/index.blade.php @@ -126,7 +126,7 @@ {{ $content->created_at->diffForHumans() }}
- {!! !empty($content->description)?$content->description:'keine Angaben' !!} + {!! strIsset($content->data_fields['neuigkeit'], 'keine Angaben') !!}
@@ -178,29 +178,20 @@

Unsere Alpaka Produkte

- - -
- @foreach(filterByContentType($mdContents, "Produkte")->take(6) as $content) - - @endforeach - -
Mehr Produkte
@@ -208,13 +199,7 @@


-
- - - - - @stop \ No newline at end of file diff --git a/content/lists/default.blade.php b/content/lists/default.blade.php index 4598c9f..1205747 100644 --- a/content/lists/default.blade.php +++ b/content/lists/default.blade.php @@ -11,11 +11,11 @@
- @foreach($contents as $nach) + @foreach($contents as $content)
- @if ($nach->image) - + @if ($content->image) + @else @endif @@ -23,8 +23,8 @@
@@ -32,12 +32,12 @@ {{ $nach->created_at->diffForHumans() }}
- {!! !empty($nach->description)?$nach->description:'keine Angaben' !!} + {!! isset($content->data_fields['beschreibung'])?$content->data_fields['beschreibung']:'keine Angaben' !!}