diff --git a/resources/assets/less/metager/footer.less b/resources/assets/less/metager/footer.less
index 508afadc86d4c5d8aaffed73d94b468fea4c087a..456b611de99caa3b00293928dd36b54e1ffb831f 100644
--- a/resources/assets/less/metager/footer.less
+++ b/resources/assets/less/metager/footer.less
@@ -1,6 +1,5 @@
footer {
- margin: 30px 0px;
- bottom: 0;
+ margin: 10px 0px 30px 0px;
width: 100%;
display: flex;
justify-content: space-around;
@@ -16,4 +15,14 @@ footer {
img {
max-width: 100%;
}
+ &.startPageFooter {
+ position: absolute;
+ bottom: 0;
+ }
+ &.footer-resultpage {
+ justify-content: center;
+ a {
+ color: @result-page-color-black;
+ }
+ }
}
\ No newline at end of file
diff --git a/resources/assets/less/metager/result-page.less b/resources/assets/less/metager/result-page.less
index 6fa5bd1f6199d700a2787bda9ab96c95cb84e3e8..bc99cb711cf0f3347be8c4e5401cf8d1d1aefed2 100644
--- a/resources/assets/less/metager/result-page.less
+++ b/resources/assets/less/metager/result-page.less
@@ -1,5 +1,4 @@
@body-background-color: @result-page-body-background-color;
-@footer-a-color: @result-page-color-black!important;
@hostlabel-a-link-or-visited-color: @result-page-color-white;
@hostlabel-background-color: @result-page-color-strong-grey;
@navbar-resultpage-background-color: @result-page-color-white;
@@ -38,13 +37,6 @@ body {
background-color: white;
}
-.footer-resultpage {
- justify-content: center;
- a {
- color: @footer-a-color;
- }
-}
-
.sideBar {
border-left: none;
input#nav0:checked~& {
diff --git a/resources/assets/less/metager/static-pages.less b/resources/assets/less/metager/static-pages.less
index 752418c012263a454c322c46a7ee1317b2efde8e..357a3ee1d1df762267a0c3ad17ac087df1358ede 100644
--- a/resources/assets/less/metager/static-pages.less
+++ b/resources/assets/less/metager/static-pages.less
@@ -32,12 +32,7 @@
font-family: Liberation Sans, sans-serif;
}
-html {
- height: 100%;
-}
-
body {
- height: 100%;
margin: 0;
&>div {
padding-top: 70px;
diff --git a/resources/views/layouts/footer.blade.php b/resources/views/layouts/footer.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..6775079e500e36cf1e8ccb5a655aa703773f7c8a
--- /dev/null
+++ b/resources/views/layouts/footer.blade.php
@@ -0,0 +1,25 @@
+@if ($type === 'startpage' || $type === 'subpage')
+<footer class="{{ $id }} noprint">
+ <div>
+ <a href="https://www.suma-ev.de/" >
+ <img src="/img/suma_ev_logo-m1-greyscale.png" alt="SUMA-EV Logo"></a>
+ </div>
+ <div id="info">
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">{{ trans('staticPages.nav5') }}</a> - <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">{{ trans('staticPages.nav8') }}</a>
+ {{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/">{{ trans('staticPages.sumaev.2') }}</a>
+ </div>
+ <div>
+ <a href="https://www.uni-hannover.de/" >
+ <img src="/img/luh_metager.png" alt="LUH Logo"></a>
+ </div>
+</footer>
+@elseif ($type === 'resultpage')
+<footer class="footer-resultpage">
+ <div>
+ <a class="btn btn-default" href="/">{!! trans('resultPage.startseite') !!}</a>
+ </div>
+ <div>
+ <a class="btn btn-default" href="/impressum/">{!! trans('resultPage.impressum') !!}</a>
+ </div>
+</footer>
+@endif
\ No newline at end of file
diff --git a/resources/views/layouts/indexPage.blade.php b/resources/views/layouts/indexPage.blade.php
index c60504bf710cfb371a0c403d3531087e385cc9fd..b5a78599aff8c2cb64fbcde95ac8e0aadbb910da 100644
--- a/resources/views/layouts/indexPage.blade.php
+++ b/resources/views/layouts/indexPage.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.staticPages')
+@extends('layouts.staticPages', ['page' => 'startpage'])
@section('homeIcon')
<a class="navbar-brand visible-xs" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">
diff --git a/resources/views/layouts/resultPage.blade.php b/resources/views/layouts/resultPage.blade.php
index 5af0d88795bb810e4f7a6024754501a680e934e2..060f9ac4464dec9cc805fb74ab83e25d3e7b57dc 100644
--- a/resources/views/layouts/resultPage.blade.php
+++ b/resources/views/layouts/resultPage.blade.php
@@ -33,14 +33,7 @@
{!! trans('kontakt.form.1') !!}</a>
</strong>
</div>
- <footer class="footer-resultpage">
- <div>
- <a class="btn btn-default" href="/">{!! trans('resultPage.startseite') !!}</a>
- </div>
- <div>
- <a class="btn btn-default" href="/impressum/">{!! trans('resultPage.impressum') !!}</a>
- </div>
- </footer>
+ @include('layouts.footer', ['type' => 'resultpage', 'id' => 'resultPageFooter'])
<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
<script type="text/javascript" src="{{ elixir('js/lib.js') }}"></script>
<script type="text/javascript" src="{{ elixir('js/scriptResultPage.js') }}"></script>
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index e6db19bb04face359fdcd6406a53914bb406f632..c79425ec41b2060584538e24dda7027278dfd274 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -51,20 +51,9 @@
@yield('content')
</main>
@yield('optionalContent')
- <footer class="footer-static-pages noprint">
- <div>
- <a href="https://www.suma-ev.de/" >
- <img src="/img/suma_ev_logo-m1-greyscale.png" alt="SUMA-EV Logo"></a>
- </div>
- <div id="info">
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">{{ trans('staticPages.nav5') }}</a> - <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">{{ trans('staticPages.nav8') }}</a>
- {{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/">{{ trans('staticPages.sumaev.2') }}</a>
- </div>
- <div>
- <a href="https://www.uni-hannover.de/" >
- <img src="/img/luh_metager.png" alt="LUH Logo"></a>
- </div>
- </footer>
+ @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>
</body>