From 8e731be93268a96917614de45604e08e049bdde0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20V=C3=B6lkl?= Date: Thu, 1 Oct 2020 13:52:45 +0200 Subject: [PATCH] switched to master theme --- content/header.blade.php | 119 ------------------------ content/includes/css.blade.php | 1 + content/{ => includes}/footer.blade.php | 14 --- content/includes/header.blade.php | 0 content/includes/integrations.blade.php | 37 ++++++++ content/includes/scripts.blade.php | 3 + content/master.blade.php | 41 +++++++- 7 files changed, 79 insertions(+), 136 deletions(-) delete mode 100644 content/header.blade.php create mode 100644 content/includes/css.blade.php rename content/{ => includes}/footer.blade.php (64%) create mode 100644 content/includes/header.blade.php create mode 100644 content/includes/integrations.blade.php create mode 100644 content/includes/scripts.blade.php diff --git a/content/header.blade.php b/content/header.blade.php deleted file mode 100644 index 578c704..0000000 --- a/content/header.blade.php +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - - - - - @yield('stylesheet') - - @if(isset($title)) - {{$title}} - @else - {{ \Setting::get('name')}} - @endif - - @if(isset($description)) - - @else - - @endif - - - - - - - @if (\Route::currentRouteName() == 'nachrichten.get') - - - - - - - - - @if ($nach->image) - - - @else - @if ($nach->category->image) - - - @else - - - @endif - @endif - @endif - - @switch(\Setting::get('css', 1)) - @case(1) - - @break - - @case(2) - - @break - - @case(3) - - @break - - @case(4) - - @break - @endswitch - - @if(App::environment('production')) - - - @if (!empty(\Setting::get('facebook', ''))) - - - - - - @endif - - @if (!empty(\Setting::get('analytics', ''))) - - - - @endif - - @endif - - - - @if (!empty(\Setting::get('favicon_image', ''))) - - - - @endif - - @yield('styles') - - \ No newline at end of file diff --git a/content/includes/css.blade.php b/content/includes/css.blade.php new file mode 100644 index 0000000..d2994aa --- /dev/null +++ b/content/includes/css.blade.php @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/content/footer.blade.php b/content/includes/footer.blade.php similarity index 64% rename from content/footer.blade.php rename to content/includes/footer.blade.php index 3e13358..f1193e5 100644 --- a/content/footer.blade.php +++ b/content/includes/footer.blade.php @@ -13,17 +13,3 @@ - - - - - - - - - - -@yield('scripts') - - - \ No newline at end of file diff --git a/content/includes/header.blade.php b/content/includes/header.blade.php new file mode 100644 index 0000000..e69de29 diff --git a/content/includes/integrations.blade.php b/content/includes/integrations.blade.php new file mode 100644 index 0000000..16e9942 --- /dev/null +++ b/content/includes/integrations.blade.php @@ -0,0 +1,37 @@ +@if(App::environment('production')) + + + @if (!empty(\Setting::get('facebook', ''))) + + + + + + @endif + + @if (!empty(\Setting::get('analytics', ''))) + + + + @endif + +@endif \ No newline at end of file diff --git a/content/includes/scripts.blade.php b/content/includes/scripts.blade.php new file mode 100644 index 0000000..13774ab --- /dev/null +++ b/content/includes/scripts.blade.php @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/content/master.blade.php b/content/master.blade.php index d45d461..eb7d8cb 100644 --- a/content/master.blade.php +++ b/content/master.blade.php @@ -1,7 +1,42 @@ -@include('template.'.\Setting::get('template', 'default').'.content.header') + + + + + + + {{ \Setting::get('name')}} + + + + @if (!empty(\Setting::get('favicon_image', ''))) + + + + @endif + + @include('template.'.\Setting::get('template', 'default').'.content.includes.css') + + @include('template.'.\Setting::get('template', 'default').'.content.includes.integrations') + + + + + + +@include('template.'.\Setting::get('template', 'default').'.content.includes.header') + + -@include('template.'.\Setting::get('template', 'default').'.content.menu') @yield('content') -@include('template.'.\Setting::get('template', 'default').'.content.footer') \ No newline at end of file + + + + +@include('template.'.\Setting::get('template', 'default').'.content.includes.footer') + +@include('template.'.\Setting::get('template', 'default').'.content.includes.scripts') + + +