From 48cc4ef0ab39976f64f746343b980dffd8e11571 Mon Sep 17 00:00:00 2001
From: Karl Hasselbring <Karl Hasselbring>
Date: Tue, 7 Nov 2017 09:45:25 +0100
Subject: [PATCH] Fortschritte mit dem Footer der Startseite
---
resources/views/index.blade.php | 1 +
resources/views/layouts/staticPages.blade.php | 8 +++---
resources/views/modals/plugin-modal.blade.php | 25 +++++++++++++------
3 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index a2ebc70de..70d7fb510 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -3,6 +3,7 @@
@section('title', $title )
@section('content')
+ @include('modals.plugin-modal')
@include('modals.create-focus-modal')
<h1 id="mglogo"><a class="hidden-xs" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer</a></h1>
<fieldset>
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index 7ba67be17..effcfc47f 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -53,10 +53,12 @@
@yield('content')
</main>
@yield('optionalContent')
- @if (isset($page) && $page === 'startpage') @include('layouts.footer', ['type' => 'startpage', 'id' => 'startPageFooter'])
- @else @include('layouts.footer', ['type' => 'subpage', 'id' => 'subPageFooter'])
- @endif
<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
</div>
+ @if (isset($page) && $page === 'startpage')
+ @include('layouts.footer', ['type' => 'startpage', 'id' => 'startPageFooter'])
+ @else
+ @include('layouts.footer', ['type' => 'subpage', 'id' => 'subPageFooter'])
+ @endif
</body>
</html>
diff --git a/resources/views/modals/plugin-modal.blade.php b/resources/views/modals/plugin-modal.blade.php
index 9c9147899..5b3f0e9a2 100644
--- a/resources/views/modals/plugin-modal.blade.php
+++ b/resources/views/modals/plugin-modal.blade.php
@@ -6,11 +6,23 @@
<span aria-hidden="true">×</span>
</button>
<h4>
- @if ($browser === 'Firefox' || $browser === 'Mozilla') {{ trans('index.plugin.head.1') }} @elseif ($browser === 'Chrome')
- {{ trans('index.plugin.head.2') }} @elseif ($browser === 'Opera') {{ trans('index.plugin.head.3') }} @elseif ($browser
- === 'IE') {{ trans('index.plugin.head.4') }} @elseif ($browser === 'Edge') {{ trans('index.plugin.head.5') }} @elseif
- ($browser === 'Safari') {{ trans('index.plugin.head.6') }} @elseif ($browser === 'Vivaldi') {{ trans('index.plugin.head.6')
- }} @else $(".seperator").addClass("hidden"); @endif
+ @if ($browser === 'Firefox' || $browser === 'Mozilla')
+ {{ trans('index.plugin.head.1') }}
+ @elseif ($browser === 'Chrome')
+ {{ trans('index.plugin.head.2') }}
+ @elseif ($browser === 'Opera')
+ {{ trans('index.plugin.head.3') }}
+ @elseif ($browser === 'IE')
+ {{ trans('index.plugin.head.4') }}
+ @elseif ($browser === 'Edge')
+ {{ trans('index.plugin.head.5') }}
+ @elseif ($browser === 'Safari')
+ {{ trans('index.plugin.head.6') }}
+ @elseif ($browser === 'Vivaldi')
+ {{ trans('index.plugin.head.6') }}
+ @else
+ $(".seperator").addClass("hidden");
+ @endif
</h4>
<p class="text-muted">{{ trans('index.plugin.head.info') }}</p>
</div>
@@ -120,8 +132,7 @@
@endif
<hr>
<p>@lang('index.plugin.faq.1')
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "
- /faq#mg-plugin ") }}">@lang('index.plugin.faq.2')</a>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), " /faq#mg-plugin ") }}">@lang('index.plugin.faq.2')</a>
</p>
</div>
</div>
--
GitLab