From 8c7ac203336714d5549eeb2412cf9e27d76abe61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20V=C3=B6lkl?= Date: Fri, 28 May 2021 11:01:54 +0200 Subject: [PATCH] updated theme to latest version --- content/errors/404.blade.php | 40 +++++++ content/head.blade.php | 2 +- content/index.blade.php | 113 +++++++++--------- content/master.blade.php | 7 +- content/pages/baeckerei.blade.php | 2 +- .../pages/bauernmarkt-vohenstrauss.blade.php | 2 +- content/pages/bauernmarkt-weiden.blade.php | 2 +- content/pages/donaumarkt-regensburg.blade.php | 2 +- content/pages/foerderung.blade.php | 2 +- content/pages/hofladen-pleystein.blade.php | 2 +- content/pages/huehnerhof.blade.php | 2 +- content/pages/impressum.blade.php | 2 +- content/pages/kontakt.blade.php | 2 +- content/pages/presse.blade.php | 2 +- content/pages/ueber-uns.blade.php | 2 +- content/pages/verkaufsstellen.blade.php | 2 +- .../wochenmarkt-burglengenfeld.blade.php | 2 +- .../pages/wochenmarkt-neutraubling.blade.php | 2 +- 18 files changed, 118 insertions(+), 72 deletions(-) create mode 100644 content/errors/404.blade.php diff --git a/content/errors/404.blade.php b/content/errors/404.blade.php new file mode 100644 index 0000000..d8de9df --- /dev/null +++ b/content/errors/404.blade.php @@ -0,0 +1,40 @@ +@extends('template.'.config('settings.template').'.content.master') +@section('content') + +
+

Seite nicht gefunden

+ +
+
+
+
+ + Zurück zur Startseite +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+ + + + +@stop \ No newline at end of file diff --git a/content/head.blade.php b/content/head.blade.php index c041c7e..c737034 100644 --- a/content/head.blade.php +++ b/content/head.blade.php @@ -8,6 +8,6 @@ -@include('template.'.config('settings.template').'.includes.integrations') +@include('template.'.config('settings.template').'.content.includes.integrations') diff --git a/content/index.blade.php b/content/index.blade.php index eb506ee..b0a3d49 100644 --- a/content/index.blade.php +++ b/content/index.blade.php @@ -1,75 +1,78 @@ @extends('template.'.config('settings.template').'.content.master') @section('content') - -
+ + +@section('content') + +
+
+
+

+ Wir verkaufen auf 5 verschiedenen Märkte unser +

+

+ Bio-Holzofenbrot +

+ +
+
+
+ + + + +
-
-

- Wir verkaufen auf 5 verschiedenen Märkte unser -

-

- Bio-Holzofenbrot -

+
+

Biohof Finkenhammer - Aktuelle Angebote und Informationen

+ + +
-
-
+
+
+

Aktuelles

+
+
+ @foreach($nachrichten as $nach) +
+
+ @if ($nach->image) + + @endif +
+

+ {{$nach->title}} +

+ + @if ($nach->user and $nach->user->public_author == 1) + + + {{ $nach->user->name }} - + @endif + {{date('d.m.Y H:i', strtotime($nach->created_at))}} - - -
-
-

Biohof Finkenhammer - Aktuelle Angebote und Informationen

- - - - -
-
-
-

Aktuelles

-
- -
- - @foreach($nachrichten as $nach) -
-
- @if ($nach->image) - - @endif -
-

- {{$nach->title}} -

- - @if ($nach->user and $nach->user->public_author == 1) - - - {{ $nach->user->name }} - - @endif - {{date('d.m.Y H:i', strtotime($nach->created_at))}} - - + {!!Str::limit( $nach->nachrichten ,600)!!} +
-
- @endforeach + @endforeach + + + +
+
- - - - -
-@stop +@stop \ No newline at end of file diff --git a/content/master.blade.php b/content/master.blade.php index 8b5595f..d6791a7 100644 --- a/content/master.blade.php +++ b/content/master.blade.php @@ -6,11 +6,14 @@ +@include('template.'.config('settings.template').'.content.includes.header') + + @yield('content') -@include('template.'.config('settings.template').'.includes.footer') -@include('template.'.config('settings.template').'.includes.scripts') +@include('template.'.config('settings.template').'.content.includes.footer') +@include('template.'.config('settings.template').'.content.includes.scripts') diff --git a/content/pages/baeckerei.blade.php b/content/pages/baeckerei.blade.php index 8be9319..fc148ab 100644 --- a/content/pages/baeckerei.blade.php +++ b/content/pages/baeckerei.blade.php @@ -1,4 +1,4 @@ -@extends('template.'.\Setting::get('template', 'default').'.content.master') +@extends('template.'.config('settings.template').'.content.master') @section('content')
diff --git a/content/pages/bauernmarkt-vohenstrauss.blade.php b/content/pages/bauernmarkt-vohenstrauss.blade.php index 0bc65a6..cd03a19 100644 --- a/content/pages/bauernmarkt-vohenstrauss.blade.php +++ b/content/pages/bauernmarkt-vohenstrauss.blade.php @@ -1,4 +1,4 @@ -@extends('template.'.\Setting::get('template', 'default').'.content.master') +@extends('template.'.config('settings.template').'.content.master') @section('content')
diff --git a/content/pages/bauernmarkt-weiden.blade.php b/content/pages/bauernmarkt-weiden.blade.php index 5a33f7c..cd2a2de 100644 --- a/content/pages/bauernmarkt-weiden.blade.php +++ b/content/pages/bauernmarkt-weiden.blade.php @@ -1,4 +1,4 @@ -@extends('template.'.\Setting::get('template', 'default').'.content.master') +@extends('template.'.config('settings.template').'.content.master') @section('content')
diff --git a/content/pages/donaumarkt-regensburg.blade.php b/content/pages/donaumarkt-regensburg.blade.php index ba185e2..9d76377 100644 --- a/content/pages/donaumarkt-regensburg.blade.php +++ b/content/pages/donaumarkt-regensburg.blade.php @@ -1,4 +1,4 @@ -@extends('template.'.\Setting::get('template', 'default').'.content.master') +@extends('template.'.config('settings.template').'.content.master') @section('content')
diff --git a/content/pages/foerderung.blade.php b/content/pages/foerderung.blade.php index d89f6a2..55e5b86 100644 --- a/content/pages/foerderung.blade.php +++ b/content/pages/foerderung.blade.php @@ -1,4 +1,4 @@ -@extends('template.'.\Setting::get('template', 'default').'.content.master') +@extends('template.'.config('settings.template').'.content.master') @section('content') diff --git a/content/pages/hofladen-pleystein.blade.php b/content/pages/hofladen-pleystein.blade.php index 5615525..f2f9b67 100644 --- a/content/pages/hofladen-pleystein.blade.php +++ b/content/pages/hofladen-pleystein.blade.php @@ -1,4 +1,4 @@ -@extends('template.'.\Setting::get('template', 'default').'.content.master') +@extends('template.'.config('settings.template').'.content.master') @section('content')
diff --git a/content/pages/huehnerhof.blade.php b/content/pages/huehnerhof.blade.php index c9d9374..5b1ad42 100644 --- a/content/pages/huehnerhof.blade.php +++ b/content/pages/huehnerhof.blade.php @@ -1,4 +1,4 @@ -@extends('template.'.\Setting::get('template', 'default').'.content.master') +@extends('template.'.config('settings.template').'.content.master') @section('content')
diff --git a/content/pages/impressum.blade.php b/content/pages/impressum.blade.php index afb4a94..c994199 100644 --- a/content/pages/impressum.blade.php +++ b/content/pages/impressum.blade.php @@ -1,4 +1,4 @@ -@extends('template.'.\Setting::get('template', 'default').'.content.master') +@extends('template.'.config('settings.template').'.content.master') @section('content')
diff --git a/content/pages/kontakt.blade.php b/content/pages/kontakt.blade.php index 4095833..9ce1b8b 100644 --- a/content/pages/kontakt.blade.php +++ b/content/pages/kontakt.blade.php @@ -1,4 +1,4 @@ -@extends('template.'.\Setting::get('template', 'default').'.content.master') +@extends('template.'.config('settings.template').'.content.master') @section('content')
diff --git a/content/pages/presse.blade.php b/content/pages/presse.blade.php index 718b94c..6f665d4 100644 --- a/content/pages/presse.blade.php +++ b/content/pages/presse.blade.php @@ -1,4 +1,4 @@ -@extends('template.'.\Setting::get('template', 'default').'.content.master') +@extends('template.'.config('settings.template').'.content.master') @section('content') diff --git a/content/pages/ueber-uns.blade.php b/content/pages/ueber-uns.blade.php index afe2a12..d846057 100644 --- a/content/pages/ueber-uns.blade.php +++ b/content/pages/ueber-uns.blade.php @@ -1,4 +1,4 @@ -@extends('template.'.\Setting::get('template', 'default').'.content.master') +@extends('template.'.config('settings.template').'.content.master') @section('content') diff --git a/content/pages/verkaufsstellen.blade.php b/content/pages/verkaufsstellen.blade.php index af124c8..cff88d0 100644 --- a/content/pages/verkaufsstellen.blade.php +++ b/content/pages/verkaufsstellen.blade.php @@ -1,4 +1,4 @@ -@extends('template.'.\Setting::get('template', 'default').'.content.master') +@extends('template.'.config('settings.template').'.content.master') @section('content')
diff --git a/content/pages/wochenmarkt-burglengenfeld.blade.php b/content/pages/wochenmarkt-burglengenfeld.blade.php index b6fe582..0e05687 100644 --- a/content/pages/wochenmarkt-burglengenfeld.blade.php +++ b/content/pages/wochenmarkt-burglengenfeld.blade.php @@ -1,4 +1,4 @@ -@extends('template.'.\Setting::get('template', 'default').'.content.master') +@extends('template.'.config('settings.template').'.content.master') @section('content')
diff --git a/content/pages/wochenmarkt-neutraubling.blade.php b/content/pages/wochenmarkt-neutraubling.blade.php index 9023cdd..7780442 100644 --- a/content/pages/wochenmarkt-neutraubling.blade.php +++ b/content/pages/wochenmarkt-neutraubling.blade.php @@ -1,4 +1,4 @@ -@extends('template.'.\Setting::get('template', 'default').'.content.master') +@extends('template.'.config('settings.template').'.content.master') @section('content')