diff --git a/resources/assets/less/metager/footer.less b/resources/assets/less/metager/footer.less index 0fe236e28a102a790eb23a195a06903123693b3f..347197d1bc218f39d3a73bdea88515ac0d5b6776 100644 --- a/resources/assets/less/metager/footer.less +++ b/resources/assets/less/metager/footer.less @@ -5,14 +5,19 @@ footer { width: 100%; background-color: inherit; display: flex; + flex-direction: column; justify-content: space-around; white-space: pre-line; align-items: center; div { - text-align: center; - margin-left: 10px; - &:first-child { - margin-left: 0px; + display: flex; + flex-direction: row; + &>* { + padding: 0px 10px; + border-left: 1px solid #aaa; + } + &>:first-child { + border-left: none; } } img { @@ -29,8 +34,4 @@ footer { display: none; } } - #info { - display: flex; - flex-direction: column; - } } \ No newline at end of file diff --git a/resources/lang/de/footer.php b/resources/lang/de/footer.php index e368a0fcc85378a74563e528faee9f93329d29ca..aaebf673810792a4d8c89e81bb03a5e3b91f35d3 100644 --- a/resources/lang/de/footer.php +++ b/resources/lang/de/footer.php @@ -1,6 +1,6 @@ <?php return [ - 'sumaev.1' => 'MetaGer wird entwickelt und betrieben vom ', - 'sumaev.2' => 'SUMA-EV - Verein für freien Wissenszugang.', + 'sumaev.1' => 'Ein Projekt des', + 'sumaev.2' => 'SUMA-EV', ]; diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index c653fb8da62fcdc0182ece8bf9266a9d2e1c3461..027228fb363f15704bd71f2a69a549a976eaa508 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.indexPage') +@extends('layouts.staticPages', ['page' => 'startpage']) @section('title', $title ) @@ -9,6 +9,9 @@ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer</a> </h1> @include('parts.searchbar', ['class' => 'startpage-searchbar']) + <div> + + </div> <script type="text/javascript" src="{{ mix('js/scriptStartPage.js') }}"></script> <script type="text/javascript" src="{{ mix('js/searchbar.js') }}"></script> @endsection diff --git a/resources/views/layouts/indexPage.blade.php b/resources/views/layouts/indexPage.blade.php deleted file mode 100644 index fc3ee746b88e63df92ae17c22f4aaab4e0dd05b4..0000000000000000000000000000000000000000 --- a/resources/views/layouts/indexPage.blade.php +++ /dev/null @@ -1 +0,0 @@ -@extends('layouts.staticPages', ['page' => 'startpage']) diff --git a/resources/views/parts/footer.blade.php b/resources/views/parts/footer.blade.php index b1e488662cd3bd915c3c4fb27970cc41336d5b1f..e2e4385574efd024f648667a09ea359b707947b9 100644 --- a/resources/views/parts/footer.blade.php +++ b/resources/views/parts/footer.blade.php @@ -1,8 +1,15 @@ @if ($type === 'startpage' || $type === 'subpage' || $type === 'resultpage') <footer class="{{ $id }} noprint"> - <div id="info"> - <span><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">{{ trans('sidebar.nav5') }}</a> - <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">{{ trans('sidebar.nav8') }}</a>@if(LaravelLocalization::getCurrentLocale() == "de") - <a href="https://shop.spreadshirt.de/metager/" rel="noopener" target="_blank">{{ trans('sidebar.nav26') }}</a>@endif</span> - <span class="hidden-xs">{{ trans('footer.sumaev.1') }}<a href="https://www.suma-ev.de/">{{ trans('footer.sumaev.2') }}</a></span> + <div> + <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">{{ trans('sidebar.nav5') }}</a> + <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">{{ trans('sidebar.nav8') }}</a> + <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "datenschutz") }}">{{ trans('sidebar.nav3') }}</a> + @if(LaravelLocalization::getCurrentLocale() == "de") + <a href="https://shop.spreadshirt.de/metager/" rel="noopener" target="_blank">{{ trans('sidebar.nav26') }}</a> + @endif + </div> + <div> + <span class="hidden-xs">{{ trans('footer.sumaev.1') }} <a href="https://www.suma-ev.de/">{{ trans('footer.sumaev.2') }}</a></span> </div> </footer> @endif \ No newline at end of file diff --git a/resources/views/spende/beitritt.blade.php b/resources/views/spende/beitritt.blade.php index 73a19bd66195faa85c6603fcde6919293361f478..dec186339343d1033a92619d610f27756b61738d 100644 --- a/resources/views/spende/beitritt.blade.php +++ b/resources/views/spende/beitritt.blade.php @@ -6,7 +6,7 @@ @section('content') <link type="text/css" rel="stylesheet" href="{{ mix('/css/beitritt.css') }}" /> - <script src="{{ mix('js/scriptJoinPage.js') }}"></script> + <script type="text/javascript" src="{{ mix('js/scriptJoinPage.js') }}"></script> <form id="donation-form"> <div class="card-heavy"> <h1>{{ trans('beitritt.heading.1') }}</h1> diff --git a/webpack.mix.js b/webpack.mix.js index 2f3bee78a9575f74464dd1e1a5475c53d4eb8046..ccff195bdab4461ef4a345dc2e2e05cd1b6b74df 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -35,6 +35,7 @@ mix // utility .babel(['resources/assets/js/utility.js', 'resources/assets/js/translations.js'], 'public/js/utility.js') .babel('resources/assets/js/widgets.js', 'public/js/widgets.js') + .babel('resources/assets/js/scriptJoinPage.js', 'public/js/scriptJoinPage.js') // source maps .sourceMaps(false, 'inline-source-map') // versioning