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

Die Unterseiten haben ein einheitliches Kartendesign und auf dem Weg noch ein... 

Die Unterseiten haben ein einheitliches Kartendesign und auf dem Weg noch ein paar kleinere Änderungen und Vereinheitlichungen bekommen.
parent ec9f2f63
No related branches found
No related tags found
4 merge requests!1262WIP: Resolve "Spendenseite Texte anpassen",!1207WIP: Resolve "Rechtschreibfehler",!1198Meta ger redesign,!1170Kartendesign #680
Hide whitespace changes
Inline Side-by-side
Showing
with 340 additions and 264 deletions
resources/assets/less/metager/cards.less 0 → 100644
+ 11
− 0
View file @ 24469fad
.card {
border: 1px solid #ccc;
background-color: white;
box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24);
margin: 8px;
padding: 15px;
}
.card-heavy {
.card;
box-shadow: 0px 4px 5px 0px rgba(0, 0, 0, 0.12), 4px 0px 5px 0px rgba(0, 0, 0, 0.24);
}
\ No newline at end of file
resources/assets/less/metager/general.less
+ 42
− 0
View file @ 24469fad
......@@ -40,6 +40,48 @@ body {
margin-top: 50px;
}
.first-last-child-margin-fix() {
&:first-child {
margin-top: 0px;
}
&:last-child {
margin-bottom: 0px;
}
}
/* General font sizing */
@default-font-size: 15px;
h1 {
font-size: @default-font-size * 1.6;
.first-last-child-margin-fix;
}
h2 {
font-size: @default-font-size * 1.4;
.first-last-child-margin-fix;
}
h3 {
font-size: @default-font-size * 1.2;
.first-last-child-margin-fix;
}
p {
font-size: @default-font-size;
.first-last-child-margin-fix;
}
* {
font-size: @default-font-size;
.first-last-child-margin-fix;
}
.page-title {
font-size: @default-font-size * 3;
text-align: center;
}
.page-subtitle {
font-size: @default-font-size;
text-align: center;
}
/* Logo */
......
resources/assets/less/metager/metager.less
+ 2
− 1
View file @ 24469fad
......@@ -8,4 +8,5 @@
@import "./foki.less";
@import "./footer.less";
@import "./searchbar.less";
@import "./aufruf-winter.less";
\ No newline at end of file
@import "./aufruf-winter.less";
@import "./cards.less";
\ No newline at end of file
resources/assets/less/metager/result.less
+ 1
− 3
View file @ 24469fad
......@@ -4,12 +4,10 @@
@result-font-medium: 16px;
@result-font-small: 14px;
.result {
.card;
margin: @resultpage-leftbox-min-dist-top-bottom 0px @resultpage-leftbox-min-dist-top-bottom 0px;
padding: 15px;
width: 100%;
border: 1px solid #ccc;
background-color: white;
box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24);
.result-header {
.result-title {
margin: 0px;
......
resources/assets/less/metager/specific.less
+ 0
− 1
View file @ 24469fad
......@@ -134,7 +134,6 @@ a.navbar-brand {
.dotlist li {
margin-bottom: 5px !important;
font-size: 16px;
}
.emphasize {
......
resources/views/about.blade.php
+ 33
− 27
View file @ 24469fad
......@@ -3,32 +3,38 @@
@section('title', $title )
@section('content')
<h1>{{ trans('about.head.1') }}</h1>
<h2>{{ trans('about.head.3') }}</h2>
<p class="lead">{!! trans('about.3.0') !!}</p>
<ul class="dotlist">
<li>{!! trans('about.3.1') !!}</li>
<li>{!! trans('about.3.2') !!}</li>
<li>{!! trans('about.3.3') !!}</li>
<li>{!! trans('about.3.4') !!}</li>
<li>{!! trans('about.3.5') !!}</li>
<li>{!! trans('about.3.6') !!}</li>
<li>{!! trans('about.3.7') !!}</li>
</ul>
<h2>{{ trans('about.head.2') }}</h2>
<ul class="dotlist">
<li>{!! trans('about.list.1') !!}</li>
<li>{!! trans('about.list.2') !!}</li>
<li>{!! trans('about.list.3') !!}</li>
<li>{!! trans('about.list.4') !!}</li>
<li>{!! trans('about.list.5') !!}</li>
<li>{!! trans('about.list.6') !!}</li>
<li>{!! trans('about.list.7') !!}</li>
</ul>
<h1 class="page-title">{{ trans('about.head.1') }}</h1>
<div class="card-heavy">
<h2>{{ trans('about.head.3') }}</h2>
<p class="lead">{!! trans('about.3.0') !!}</p>
<ul class="dotlist">
<li>{!! trans('about.3.1') !!}</li>
<li>{!! trans('about.3.2') !!}</li>
<li>{!! trans('about.3.3') !!}</li>
<li>{!! trans('about.3.4') !!}</li>
<li>{!! trans('about.3.5') !!}</li>
<li>{!! trans('about.3.6') !!}</li>
<li>{!! trans('about.3.7') !!}</li>
</ul>
</div>
<div class="card-heavy">
<h2>{{ trans('about.head.2') }}</h2>
<ul class="dotlist">
<li>{!! trans('about.list.1') !!}</li>
<li>{!! trans('about.list.2') !!}</li>
<li>{!! trans('about.list.3') !!}</li>
<li>{!! trans('about.list.4') !!}</li>
<li>{!! trans('about.list.5') !!}</li>
<li>{!! trans('about.list.6') !!}</li>
<li>{!! trans('about.list.7') !!}</li>
</ul>
</div>
<div class="card-heavy">
<h2>{{ trans('about.head.4') }}</h2>
<ul class="dotlist">
<li><p>{!! trans('spende.about.3') !!}</p></li>
<li><p>{!! trans('spende.about.4') !!}</p></li>
<li><p>{!! trans('spende.about.5') !!}</p></li>
</ul>
<ul class="dotlist">
<li><p>{!! trans('spende.about.3') !!}</p></li>
<li><p>{!! trans('spende.about.4') !!}</p></li>
<li><p>{!! trans('spende.about.5') !!}</p></li>
</ul>
</div>
@endsection
resources/views/app.blade.php
+ 31
− 25
View file @ 24469fad
......@@ -3,29 +3,35 @@
@section('title', $title )
@section('content')
<h1>{{ trans('app.head.1') }}</h1>
<p>{{ trans('app.disclaimer.1')}}</p>
<h2>{{ trans('app.head.2') }}</h2>
<p>{{ trans('app.metager.1') }}</p>
<p>{{ trans('app.metager.2') }}</p>
<p><a href="https://play.google.com/store/apps/details?id=de.metager.metagerapp">{{ trans('app.metager.playstore') }}</a></p>
<p><a href="{!! url('app/metager') !!}">{{ trans('app.metager.manuell') }}</a></p>
<h2>{{ trans('app.head.3') }}</h2>
<p>{!! trans('app.maps.1') !!}</p>
<p>{{ trans('app.maps.2') }}</p>
<p><a href="https://play.google.com/store/apps/details?id=de.suma_ev.dominik.metagermaps">{{ trans('app.maps.playstore') }}</a></p>
<p><a href="{!! url('app/maps') !!}">{{ trans('app.metager.manuell') }}</a></p>
<p>{{ trans('app.maps.3') }}</p>
<ul>
<li>{!! trans('app.maps.list.1') !!}</li>
<li>{!! trans('app.maps.list.2') !!}</li>
</ul>
<h2>{{ trans('app.head.4') }}</h2>
<p>{{ trans('app.installation.1') }}</p>
<p>{{ trans('app.installation.2') }}</p>
<ol>
<li>{!! trans('app.list.1') !!}</li>
<li>{!! trans('app.list.2') !!}</li>
<li>{!! trans('app.list.3') !!}</li>
</ol>
<h1 class="page-title">{{ trans('app.head.1') }}</h1>
<p class="page-subtitle">{{ trans('app.disclaimer.1')}}</p>
<div class="card-heavy">
<h2>{{ trans('app.head.2') }}</h2>
<p>{{ trans('app.metager.1') }}</p>
<p>{{ trans('app.metager.2') }}</p>
<p><a href="https://play.google.com/store/apps/details?id=de.metager.metagerapp">{{ trans('app.metager.playstore') }}</a></p>
<p><a href="{!! url('app/metager') !!}">{{ trans('app.metager.manuell') }}</a></p>
</div>
<div class="card-heavy">
<h2>{{ trans('app.head.3') }}</h2>
<p>{!! trans('app.maps.1') !!}</p>
<p>{{ trans('app.maps.2') }}</p>
<p><a href="https://play.google.com/store/apps/details?id=de.suma_ev.dominik.metagermaps">{{ trans('app.maps.playstore') }}</a></p>
<p><a href="{!! url('app/maps') !!}">{{ trans('app.metager.manuell') }}</a></p>
<p>{{ trans('app.maps.3') }}</p>
<ul>
<li>{!! trans('app.maps.list.1') !!}</li>
<li>{!! trans('app.maps.list.2') !!}</li>
</ul>
</div>
<div class="card-heavy">
<h2>{{ trans('app.head.4') }}</h2>
<p>{{ trans('app.installation.1') }}</p>
<p>{{ trans('app.installation.2') }}</p>
<ol>
<li>{!! trans('app.list.1') !!}</li>
<li>{!! trans('app.list.2') !!}</li>
<li>{!! trans('app.list.3') !!}</li>
</ol>
</div>
@endsection
resources/views/datenschutz.blade.php deleted 100644 → 0
+ 0
− 40
View file @ ec9f2f63
@extends('layouts.subPages')
@section('title', $title )
@section('navbarFocus.datenschutz', 'class="active"')
@section('content')
<h1>{!! trans('datenschutz.head') !!}</h1>
<p class="emphasize">{!! trans('datenschutz.general.1') !!}</p>
<p class="emphasize">{!! trans('datenschutz.general.3') !!}</p>
<h2>{!! trans('datenschutz.policy.1') !!}</h2>
<ul class="dotlist">
<li>{!! trans('datenschutz.policy.2') !!}</li>
<li>{!! trans('datenschutz.policy.5') !!}</li>
<li>{!! trans('datenschutz.policy.6') !!}</li>
<li>{!! trans('datenschutz.policy.7') !!}</li>
<li>{!! trans('datenschutz.policy.9') !!}</li>
<li>{!! trans('datenschutz.policy.10') !!}</li>
<li>{!! trans('datenschutz.policy.13') !!}</li>
<li>{!! trans('datenschutz.policy.17') !!}</li>
<li>{!! trans('datenschutz.policy.18') !!}</li>
<li>{!! trans('datenschutz.policy.19') !!}</li>
</ul>
<h2>{!! trans('datenschutz.twitter') !!}</h2>
<pre><p>&gt; 7.4.2014 C. Schulzki-Haddouti @kooptech
&gt; MetaGer dürfte im Moment die sicherste Suchmaschine weltweit sein</p>
<p>&gt; 8.4.2014 Stiftung Datenschutz @DS_Stiftung
&gt; Wenn das Suchergebnis anonym bleiben soll: @MetaGer, die gemeinnützige
&gt; Suchmaschine aus #Hannover</p>
<p>&gt; 8.4.2014 Markus Käkenmeister @markus2009
&gt; Suchmaschine ohne Tracking</p>
<p>&gt; 8.4.2014 Marko [~sHaKaL~] @mobilef0rensics
&gt; Nice; anonymous Search and find with MetaGer</p>
<p>&gt; 7.4.2014 Anfahrer @anfahrer
&gt; Websuche mit #Datenschutz dank #MetaGer : Anonyme Suche und
&gt; Ergebnisse via Proxy</p>
<p>&gt; 8.4.2014 stupidit&eacute; pue @dummheitstinkt
&gt; wow, is this the MetaGer I used in the end 90s in internet cafes???
&gt; "Anonymes Suchen und Finden mit MetaGer | heise"</p></pre>
@endsection
\ No newline at end of file
resources/views/datenschutz/datenschutz.blade.php 0 → 100644
+ 32
− 0
View file @ 24469fad
@extends('layouts.subPages')
@section('title', $title )
@section('navbarFocus.datenschutz', 'class="active"')
@section('content')
<div class="card-heavy">
<h1>{!! trans('datenschutz.head') !!}</h1>
<p>{!! trans('datenschutz.general.1') !!}</p>
<p>{!! trans('datenschutz.general.3') !!}</p>
</div>
<div class="card-heavy">
<h1>{!! trans('datenschutz.policy.1') !!}</h2>
<ul class="dotlist">
<li>{!! trans('datenschutz.policy.2') !!}</li>
<li>{!! trans('datenschutz.policy.5') !!}</li>
<li>{!! trans('datenschutz.policy.6') !!}</li>
<li>{!! trans('datenschutz.policy.7') !!}</li>
<li>{!! trans('datenschutz.policy.9') !!}</li>
<li>{!! trans('datenschutz.policy.10') !!}</li>
<li>{!! trans('datenschutz.policy.13') !!}</li>
<li>{!! trans('datenschutz.policy.17') !!}</li>
<li>{!! trans('datenschutz.policy.18') !!}</li>
<li>{!! trans('datenschutz.policy.19') !!}</li>
</ul>
</div>
<div class="card-heavy">
<h1>{!! trans('datenschutz.twitter') !!}</h2>
<pre>@include('datenschutz/twitter-comments')</pre>
</div>
@endsection
\ No newline at end of file
resources/views/datenschutz/twitter-comments.blade.php 0 → 100644
+ 15
− 0
View file @ 24469fad
<p>&gt; 7.4.2014 C. Schulzki-Haddouti @kooptech
&gt; MetaGer dürfte im Moment die sicherste Suchmaschine weltweit sein</p>
<p>&gt; 8.4.2014 Stiftung Datenschutz @DS_Stiftung
&gt; Wenn das Suchergebnis anonym bleiben soll: @MetaGer, die gemeinnützige
&gt; Suchmaschine aus #Hannover</p>
<p>&gt; 8.4.2014 Markus Käkenmeister @markus2009
&gt; Suchmaschine ohne Tracking</p>
<p>&gt; 8.4.2014 Marko [~sHaKaL~] @mobilef0rensics
&gt; Nice; anonymous Search and find with MetaGer</p>
<p>&gt; 7.4.2014 Anfahrer @anfahrer
&gt; Websuche mit #Datenschutz dank #MetaGer : Anonyme Suche und
&gt; Ergebnisse via Proxy</p>
<p>&gt; 8.4.2014 stupidit&eacute; pue @dummheitstinkt
&gt; wow, is this the MetaGer I used in the end 90s in internet cafes???
&gt; "Anonymes Suchen und Finden mit MetaGer | heise"</p>
\ No newline at end of file
resources/views/faq.blade.php
+ 1
− 1
View file @ 24469fad
......@@ -4,7 +4,7 @@
@section('content')
<div class="alert alert-warning" role="alert">{!! trans('faq.achtung') !!}</div>
<h1>{!! trans('faq.title') !!}</h1>
<h1 class="page-title">{!! trans('faq.title') !!}</h1>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">{!! trans('faq.faq.1.h') !!}</h3>
......
resources/views/hilfe.blade.php
+ 1
− 1
View file @ 24469fad
......@@ -4,7 +4,7 @@
@section('content')
<div class="alert alert-warning" role="alert">{!! trans('hilfe.achtung') !!}</div>
<h1>{!! trans('hilfe.title') !!}</h1>
<h1 class="page-title">{!! trans('hilfe.title') !!}</h1>
<h2>{!! trans('hilfe.einstellungen') !!}</h2>
<div class="panel panel-default">
<div class="panel-heading">
......
resources/views/impressum.blade.php
+ 18
− 13
View file @ 24469fad
......@@ -3,17 +3,22 @@
@section('title', $title )
@section('content')
<h1>{!! trans('impressum.title') !!}</h1>
<h2 class="subheading">{!! trans('impressum.headline.1') !!}
</h2>
<p>{!! trans('impressum.info.1') !!}</p>
<address>{!! trans('impressum.info.2') !!}</address>
<address>{!! trans('impressum.info.3') !!}</address>
<p>{!! trans('impressum.info.4') !!}</p>
<p>{!! trans('impressum.info.5') !!}</p>
<p>{!! trans('impressum.info.6') !!}</p>
<p>{!! trans('impressum.info.7') !!}</p>
<p>{!! trans('impressum.info.8') !!}</p>
<h2>{!! trans('impressum.info.9') !!}</h2>
<p>{!! trans('impressum.info.10') !!}</p>
<h1 class="page-title">{!! trans('impressum.title') !!}</h1>
<div class="card-heavy">
<h2 class="subheading">{!! trans('impressum.headline.1') !!}</h2>
<p>{!! trans('impressum.info.1') !!}</p>
<address>{!! trans('impressum.info.2') !!}</address>
<address>{!! trans('impressum.info.3') !!}</address>
</div>
<div class="card-heavy">
<p>{!! trans('impressum.info.4') !!}</p>
<p>{!! trans('impressum.info.5') !!}</p>
<p>{!! trans('impressum.info.6') !!}</p>
<p>{!! trans('impressum.info.7') !!}</p>
<p>{!! trans('impressum.info.8') !!}</p>
</div>
<div class="card-heavy">
<h2>{!! trans('impressum.info.9') !!}</h2>
<p>{!! trans('impressum.info.10') !!}</p>
</div>
@endsection
resources/views/kontakt/kontakt.blade.php
+ 40
− 98
View file @ 24469fad
......@@ -3,105 +3,47 @@
@section('title', $title )
@section('content')
<h1>{!! trans('kontakt.headline.1') !!}</h1>
<h2>{!! trans('kontakt.form.1') !!}</h2>
<p>{!! trans('kontakt.form.2') !!}</p>
@if(isset($formerrors))
@foreach($formerrors->errors()->all() as $errormessage)
<div class="alert alert-danger" role="alert">{{$errormessage}}</div>
@endforeach
@endif
<form class="contact" name="contact" method="post" action="{{ LaravelLocalization::getLocalizedURL() }}">
{{ csrf_field() }}
<div class="form-group kontakt-form-group">
<input class="form-control" name="name" placeholder="{!!trans('kontakt.form.name')!!}" type="text" required @if(isset($formerrors) && Request::has('name'))value="{{Request::input('name')}}"@endif>
</div>
<div class="form-group kontakt-form-group">
<input class="form-control" name="email" placeholder="{!! trans('kontakt.form.5') !!}" type="email" required @if(isset($formerrors) && Request::has('email'))value="{{Request::input('email')}}"@endif>
</div>
<div class="form-group kontakt-form-group">
<input class="form-control" name="subject" placeholder="{!! trans('kontakt.form.7') !!}" type="text" required @if(isset($formerrors) && Request::has('subject'))value="{{Request::input('subject')}}"@endif>
</div>
<div class="card-heavy">
<h1>{!! trans('kontakt.headline.1') !!}</h1>
<h2>{!! trans('kontakt.form.1') !!}</h2>
<p>{!! trans('kontakt.form.2') !!}</p>
@if(isset($formerrors))
@foreach($formerrors->errors()->all() as $errormessage)
<div class="alert alert-danger" role="alert">{{$errormessage}}</div>
@endforeach
@endif
<form class="contact" name="contact" method="post" action="{{ LaravelLocalization::getLocalizedURL() }}">
{{ csrf_field() }}
<div class="form-group kontakt-form-group">
@if(isset($url) && $url !== "")
<label for="message">Wenn MetaGer bestimmte Webseiten nicht angezeigt hat, von denen Sie wissen, dass es sie gibt: Bitte nennen Sie deren Adresse/n (http:// ...???...). Wir werden das detailliert untersuchen.</label>
@endif
<textarea class="form-control" id="message" name="message" placeholder="{!! trans('kontakt.form.6') !!}" required>@if(isset($formerrors) && Request::has('message')){{Request::input('message')}}@endif</textarea>
<input class="form-control" name="name" placeholder="{!!trans('kontakt.form.name')!!}" type="text" required @if(isset($formerrors) && Request::has('name'))value="{{Request::input('name')}}"@endif>
</div>
<div class="form-group kontakt-form-group">
<button title="" data-original-title="" class="btn btn-default encrypt-btn" type="submit">{!! trans('kontakt.form.8') !!}</button>
</div>
</form>
<h2>{!! trans('kontakt.mail.1') !!}</h2>
<p>{!! trans('kontakt.mail.2') !!}</p>
<p>{!! trans('kontakt.mail.3') !!}</p>
<textarea id="pubkey" style="width:50%" rows="8" readonly>-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1
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
=LZAA
-----END PGP PUBLIC KEY BLOCK-----</textarea>
<h2>{!! trans('kontakt.letter.1') !!}</h2>
<p>{!! trans('kontakt.letter.2') !!}</p>
<address>{!! trans('kontakt.letter.3') !!}</address>
<script type="text/javascript" src="{{ elixir('js/lib.js') }}"></script>
<input class="form-control" name="email" placeholder="{!! trans('kontakt.form.5') !!}" type="email" required @if(isset($formerrors) && Request::has('email'))value="{{Request::input('email')}}"@endif>
</div>
<div class="form-group kontakt-form-group">
<input class="form-control" name="subject" placeholder="{!! trans('kontakt.form.7') !!}" type="text" required @if(isset($formerrors) && Request::has('subject'))value="{{Request::input('subject')}}"@endif>
</div>
<div class="form-group kontakt-form-group">
@if(isset($url) && $url !== "")
<label for="message">Wenn MetaGer bestimmte Webseiten nicht angezeigt hat, von denen Sie wissen, dass es sie gibt: Bitte nennen Sie deren Adresse/n (http:// ...???...). Wir werden das detailliert untersuchen.</label>
@endif
<textarea class="form-control" id="message" name="message" placeholder="{!! trans('kontakt.form.6') !!}" required>@if(isset($formerrors) && Request::has('message')){{Request::input('message')}}@endif</textarea>
</div>
<div class="form-group kontakt-form-group">
<button title="" data-original-title="" class="btn btn-default encrypt-btn" type="submit">{!! trans('kontakt.form.8') !!}</button>
</div>
</form>
</div>
<div class="card-heavy">
<h2>{!! trans('kontakt.mail.1') !!}</h2>
<p>{!! trans('kontakt.mail.2') !!}</p>
<p>{!! trans('kontakt.mail.3') !!}</p>
<textarea id="pubkey" style="width:50%" rows="8" readonly>@include('kontakt/pgp')</textarea>
</div>
<div class="card-heavy">
<h2>{!! trans('kontakt.letter.1') !!}</h2>
<p>{!! trans('kontakt.letter.2') !!}</p>
<address>{!! trans('kontakt.letter.3') !!}</address>
</div>
<script type="text/javascript" src="{{ elixir('js/lib.js') }}"></script>
@endsection
resources/views/kontakt/pgp.blade.php 0 → 100644
+ 63
− 0
View file @ 24469fad
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1
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
=LZAA
-----END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file
resources/views/team/team.blade.php
+ 43
− 39
View file @ 24469fad
......@@ -3,43 +3,47 @@
@section('title', $title )
@section('content')
<h1>Team</h1>
<ul class="dotlist">
<li>
<p><a href="https://de.wikipedia.org/wiki/Wolfgang_Sander-Beuermann" target="_blank" rel="noopener">Sander-Beuermann, Wolfgang</a>, Dr.-Ing. - {!! trans('team.role.1') !!} -
<a href="mailto:wsb@suma-ev.de">wsb@suma-ev.de</a> -
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/team/pubkey-wsb") }}">Public Key</a></p>
</li>
<li>
<p>Becker, Georg - {!! trans('team.role.2') !!} -
<a href="mailto:georg.becker@suma-ev.de">georg.becker@suma-ev.de</a></p>
</li>
<li>
<p>Branz, Manuela - {!! trans('team.role.3') !!} -
<a href="mailto:manuela.branz@suma-ev.de">manuela.branz@suma-ev.de</a></p>
</li>
<li>
<p>Pfennig, Dominik - {!! trans('team.role.4') !!} -
<a href="mailto:dominik@suma-ev.de">dominik@suma-ev.de</a></p>
</li>
<li>
<p>Höfer, Phil - {!! trans('team.role.5') !!} -
<a href="mailto:phil@suma-ev.de">phil@suma-ev.de</a></p>
</li>
<li>
<p>Hasselbring, Karl - {!! trans('team.role.6') !!} -
<a href="mailto:karl@suma-ev.de">karl@suma-ev.de</a></p>
</li>
<li>
<p>Givi, Aria - {!! trans('team.role.6') !!} -
<a href="mailto:aria@suma-ev.de">aria@suma-ev.de</a></p>
</li>
<li>
<p>Riel, Carsten - {!! trans('team.role.7') !!} -
<a href="carsten@suma-ev.de">carsten@suma-ev.de</a></p>
</li>
</ul>
<p>{!! trans('team.contact.1') !!}</p>
<p>{!! trans('team.contact.2') !!}</p>
<p>{!! trans('team.contact.3') !!}</p>
<div class="card-heavy">
<h1>Team</h1>
<ul class="dotlist">
<li>
<p><a href="https://de.wikipedia.org/wiki/Wolfgang_Sander-Beuermann" target="_blank" rel="noopener">Sander-Beuermann, Wolfgang</a>, Dr.-Ing. - {!! trans('team.role.1') !!} -
<a href="mailto:wsb@suma-ev.de">wsb@suma-ev.de</a> -
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/team/pubkey-wsb") }}">Public Key</a></p>
</li>
<li>
<p>Becker, Georg - {!! trans('team.role.2') !!} -
<a href="mailto:georg.becker@suma-ev.de">georg.becker@suma-ev.de</a></p>
</li>
<li>
<p>Branz, Manuela - {!! trans('team.role.3') !!} -
<a href="mailto:manuela.branz@suma-ev.de">manuela.branz@suma-ev.de</a></p>
</li>
<li>
<p>Pfennig, Dominik - {!! trans('team.role.4') !!} -
<a href="mailto:dominik@suma-ev.de">dominik@suma-ev.de</a></p>
</li>
<li>
<p>Höfer, Phil - {!! trans('team.role.5') !!} -
<a href="mailto:phil@suma-ev.de">phil@suma-ev.de</a></p>
</li>
<li>
<p>Hasselbring, Karl - {!! trans('team.role.6') !!} -
<a href="mailto:karl@suma-ev.de">karl@suma-ev.de</a></p>
</li>
<li>
<p>Givi, Aria - {!! trans('team.role.6') !!} -
<a href="mailto:aria@suma-ev.de">aria@suma-ev.de</a></p>
</li>
<li>
<p>Riel, Carsten - {!! trans('team.role.7') !!} -
<a href="carsten@suma-ev.de">carsten@suma-ev.de</a></p>
</li>
</ul>
</div>
<div class="card-heavy">
<p>{!! trans('team.contact.1') !!}</p>
<p>{!! trans('team.contact.2') !!}</p>
<p>{!! trans('team.contact.3') !!}</p>
</div>
@endsection
resources/views/widget.blade.php deleted 100644 → 0
+ 0
− 10
View file @ ec9f2f63
@extends('layouts.subPages')
@section('title', $title )
@section('content')
<h1>{{ trans('widget.head') }}</h1>
<p>{{ trans('widget.body.1') }}</p>
<p id="widgetLinks" class="btn-group"><a class="btn btn-default" href="websearch/">{{ trans('widget.body.2') }}</a><a class="btn btn-default" href="sitesearch/">{{ trans('widget.body.3') }}</a></p>
<p>{{ trans('widget.body.4') }}</p>
@endsection
\ No newline at end of file
resources/views/widget/widget.blade.php
+ 6
− 4
View file @ 24469fad
......@@ -3,8 +3,10 @@
@section('title', $title )
@section('content')
<h1>{{ trans('widget.head') }}</h1>
<p>{{ trans('widget.body.1') }}</p>
<p id="widgetLinks" class="btn-group"><a class="btn btn-default mutelink" href="websearch/">{{ trans('widget.body.2') }}</a><a class="btn btn-default mutelink" href="sitesearch/">{{ trans('widget.body.3') }}</a></p>
<p>{{ trans('widget.body.4') }}</p>
<h1 class="page-title">{{ trans('widget.head') }}</h1>
<div class="card-heavy">
<p>{{ trans('widget.body.1') }}</p>
<p id="widgetLinks" class="btn-group"><a class="btn btn-default mutelink" href="websearch/">{{ trans('widget.body.2') }}</a><a class="btn btn-default mutelink" href="sitesearch/">{{ trans('widget.body.3') }}</a></p>
<p>{{ trans('widget.body.4') }}</p>
</div>
@endsection
routes/web.php
+ 1
− 1
View file @ 24469fad
......@@ -97,7 +97,7 @@ Route::group(
Route::post('spende', 'MailController@donation');
Route::get('datenschutz', function () {
return view('datenschutz')
return view('datenschutz/datenschutz')
->with('title', trans('titles.datenschutz'))
->with('navbarFocus', 'datenschutz');
});
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment