From e8fdae83f73fc5510ec130843f33699ef9cc1ca1 Mon Sep 17 00:00:00 2001
From: Karl Hasselbring <Karl Hasselbring>
Date: Fri, 22 Jun 2018 09:33:55 +0200
Subject: [PATCH] =?UTF-8?q?Zusatzlink=20in=20Footer=20der=20Startseite=20e?=
=?UTF-8?q?ingef=C3=BCgt=20Scriptverweis=20f=C3=BCr=20Beitrittsformular=20?=
=?UTF-8?q?repariert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
resources/assets/less/metager/footer.less | 17 +++++++++--------
resources/lang/de/footer.php | 4 ++--
resources/views/index.blade.php | 5 ++++-
resources/views/layouts/indexPage.blade.php | 1 -
resources/views/parts/footer.blade.php | 13 ++++++++++---
resources/views/spende/beitritt.blade.php | 2 +-
webpack.mix.js | 1 +
7 files changed, 27 insertions(+), 16 deletions(-)
delete mode 100644 resources/views/layouts/indexPage.blade.php
diff --git a/resources/assets/less/metager/footer.less b/resources/assets/less/metager/footer.less
index 0fe236e28..347197d1b 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 e368a0fcc..aaebf6738 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 c653fb8da..027228fb3 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 fc3ee746b..000000000
--- 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 b1e488662..e2e438557 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 73a19bd66..dec186339 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 2f3bee78a..ccff195bd 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
--
GitLab