Skip to content
Snippets Groups Projects
Commit 20b3185b authored by Karl Hasselbring's avatar Karl Hasselbring
Browse files

Zusatzlink in Footer der Startseite eingefügt

Scriptverweis für Beitrittsformular repariert
parent 609bfcfc
No related branches found
No related tags found
2 merge requests!1262WIP: Resolve "Spendenseite Texte anpassen",!1244Resolve "Startseite überarbeiten"
...@@ -5,14 +5,19 @@ footer { ...@@ -5,14 +5,19 @@ footer {
width: 100%; width: 100%;
background-color: inherit; background-color: inherit;
display: flex; display: flex;
flex-direction: column;
justify-content: space-around; justify-content: space-around;
white-space: pre-line; white-space: pre-line;
align-items: center; align-items: center;
div { div {
text-align: center; display: flex;
margin-left: 10px; flex-direction: row;
&:first-child { &>* {
margin-left: 0px; padding: 0px 10px;
border-left: 1px solid #aaa;
}
&>:first-child {
border-left: none;
} }
} }
img { img {
...@@ -29,8 +34,4 @@ footer { ...@@ -29,8 +34,4 @@ footer {
display: none; display: none;
} }
} }
#info {
display: flex;
flex-direction: column;
}
} }
\ No newline at end of file
<?php <?php
return [ return [
'sumaev.1' => 'MetaGer wird entwickelt und betrieben vom ', 'sumaev.1' => 'Ein Projekt des',
'sumaev.2' => 'SUMA-EV - Verein für freien Wissenszugang.', 'sumaev.2' => 'SUMA-EV',
]; ];
@extends('layouts.indexPage') @extends('layouts.staticPages', ['page' => 'startpage'])
@section('title', $title ) @section('title', $title )
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer</a> <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer</a>
</h1> </h1>
@include('parts.searchbar', ['class' => 'startpage-searchbar']) @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/scriptStartPage.js') }}"></script>
<script type="text/javascript" src="{{ mix('js/searchbar.js') }}"></script> <script type="text/javascript" src="{{ mix('js/searchbar.js') }}"></script>
@endsection @endsection
......
@extends('layouts.staticPages', ['page' => 'startpage'])
@if ($type === 'startpage' || $type === 'subpage' || $type === 'resultpage') @if ($type === 'startpage' || $type === 'subpage' || $type === 'resultpage')
<footer class="{{ $id }} noprint"> <footer class="{{ $id }} noprint">
<div id="info"> <div>
<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> <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> <span class="hidden-xs">{{ trans('footer.sumaev.1') }} <a href="https://www.suma-ev.de/">{{ trans('footer.sumaev.2') }}</a></span>
</div> </div>
</footer> </footer>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
@section('content') @section('content')
<link type="text/css" rel="stylesheet" href="{{ mix('/css/beitritt.css') }}" /> <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"> <form id="donation-form">
<div class="card-heavy"> <div class="card-heavy">
<h1>{{ trans('beitritt.heading.1') }}</h1> <h1>{{ trans('beitritt.heading.1') }}</h1>
......
...@@ -35,6 +35,7 @@ mix ...@@ -35,6 +35,7 @@ mix
// utility // utility
.babel(['resources/assets/js/utility.js', 'resources/assets/js/translations.js'], 'public/js/utility.js') .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/widgets.js', 'public/js/widgets.js')
.babel('resources/assets/js/scriptJoinPage.js', 'public/js/scriptJoinPage.js')
// source maps // source maps
.sourceMaps(false, 'inline-source-map') .sourceMaps(false, 'inline-source-map')
// versioning // versioning
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment