Skip to content
Snippets Groups Projects
Commit a8f8e093 authored by karl's avatar karl
Browse files

Die Startseite ist jetzt umformatiert und die Navigationspunkte werden je nach... 

Die Startseite ist jetzt umformatiert und die Navigationspunkte werden je nach aktueller Seite grau hinterlegt
parent c1a0ff3f
No related branches found
No related tags found
1 merge request!94Resolve "Einrückungsreperaturen"
Hide whitespace changes
Inline Side-by-side
Showing
with 71 additions and 97 deletions
app/Http/Controllers/StartpageController.php
+ 5
− 2
View file @ a8f8e093
...@@ -43,7 +43,9 @@ class StartpageController extends Controller ...@@ -43,7 +43,9 @@ class StartpageController extends Controller
->with('time', $request->input('param_time', '1000')) ->with('time', $request->input('param_time', '1000'))
->with('sprueche', $request->input('param_sprueche', 'off')) ->with('sprueche', $request->input('param_sprueche', 'off'))
->with('tab', $request->input('param_sprueche', 'off')) ->with('tab', $request->input('param_sprueche', 'off'))
->with('focusPages', $focusPages); ->with('focusPages', $focusPages)
->with('navbarFocus', 'suche');
} }
public function loadPage($subpage) public function loadPage($subpage)
...@@ -138,7 +140,8 @@ class StartpageController extends Controller ...@@ -138,7 +140,8 @@ class StartpageController extends Controller
->with('foki', $foki) ->with('foki', $foki)
->with('title', 'Einstellungen') ->with('title', 'Einstellungen')
->with('css', 'settings.css') ->with('css', 'settings.css')
->with('js', ['settings.js']); ->with('js', ['settings.js'])
->with('navbarFocus', 'suche');
die(var_dump($foki)); die(var_dump($foki));
return $xml->saveXML(); return $xml->saveXML();
......
app/Http/routes.php
+ 18
− 9
View file @ a8f8e093
...@@ -26,25 +26,29 @@ ...@@ -26,25 +26,29 @@
{ {
return view('impressum') return view('impressum')
->with('title', trans('titles.impressum')) ->with('title', trans('titles.impressum'))
->with('css', 'impressum.css'); ->with('css', 'impressum.css')
->with('navbarFocus', 'kontakt');
}); });
Route::get('about', function() Route::get('about', function()
{ {
return view('about') return view('about')
->with('title', trans('titles.about')) ->with('title', trans('titles.about'))
->with('css', 'about.css'); ->with('css', 'about.css')
->with('navbarFocus', 'kontakt');
}); });
Route::get('team', function() Route::get('team', function()
{ {
return view('team.team') return view('team.team')
->with('title', trans('titles.team')) ->with('title', trans('titles.team'))
->with('css', 'team.css'); ->with('css', 'team.css')
->with('navbarFocus', 'kontakt');
}); });
Route::get('team/pubkey-wsb', function() Route::get('team/pubkey-wsb', function()
{ {
return view('team.pubkey-wsb') return view('team.pubkey-wsb')
->with('title', trans('titles.team')); ->with('title', trans('titles.team'))
->with('navbarFocus', 'kontakt');
}); });
Route::get('kontakt', function() Route::get('kontakt', function()
...@@ -52,7 +56,8 @@ ...@@ -52,7 +56,8 @@
return view('kontakt.kontakt') return view('kontakt.kontakt')
->with('title', trans('titles.kontakt')) ->with('title', trans('titles.kontakt'))
->with('css', 'kontakt.css') ->with('css', 'kontakt.css')
->with('js', ['openpgp.min.js','kontakt.js']); ->with('js', ['openpgp.min.js','kontakt.js'])
->with('navbarFocus', 'kontakt');
}); });
Route::post('kontakt', 'MailController@contactMail'); Route::post('kontakt', 'MailController@contactMail');
...@@ -61,7 +66,8 @@ ...@@ -61,7 +66,8 @@
{ {
return view('spende') return view('spende')
->with('title', trans('titles.spende')) ->with('title', trans('titles.spende'))
->with('css', 'donation.css'); ->with('css', 'donation.css')
->with('navbarFocus', 'foerdern');
}); });
Route::post('spende', 'MailController@donation'); Route::post('spende', 'MailController@donation');
...@@ -69,21 +75,24 @@ ...@@ -69,21 +75,24 @@
{ {
return view('datenschutz') return view('datenschutz')
->with('title', trans('titles.datenschutz')) ->with('title', trans('titles.datenschutz'))
->with('css', 'privacy.css'); ->with('css', 'privacy.css')
->with('navbarFocus', 'datenschutz');
}); });
Route::get('hilfe', function() Route::get('hilfe', function()
{ {
return view('hilfe') return view('hilfe')
->with('title', trans('titles.hilfe')) ->with('title', trans('titles.hilfe'))
->with('css', 'help.css'); ->with('css', 'help.css')
->with('navbarFocus', 'dienste');
}); });
Route::get('widget', function() Route::get('widget', function()
{ {
return view('widget') return view('widget')
->with('title', trans('titles.widget')) ->with('title', trans('titles.widget'))
->with('css', 'widget.css'); ->with('css', 'widget.css')
->with('navbarFocus', 'dienste');
}); });
Route::get('settings', 'StartpageController@loadSettings'); Route::get('settings', 'StartpageController@loadSettings');
......
dump.rdb 0 → 100644
+ 1
− 0
View file @ a8f8e093
REDIS0006ܳCZV
\ No newline at end of file
resources/views/datenschutz.blade.php
+ 2
− 0
View file @ a8f8e093
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
@section('title', $title ) @section('title', $title )
@section('navbarFocus.datenschutz', 'class="active"')
@section('content') @section('content')
<h1>{{ trans('datenschutz.head') }}</h1> <h1>{{ trans('datenschutz.head') }}</h1>
<p>{{ trans('datenschutz.general.1') }} <a href="https://suma-ev.de/presse/Sicher-suchen-UND-finden-mit-MetaGer.html">{{ trans('datenschutz.general.2') }}</a></p> <p>{{ trans('datenschutz.general.1') }} <a href="https://suma-ev.de/presse/Sicher-suchen-UND-finden-mit-MetaGer.html">{{ trans('datenschutz.general.2') }}</a></p>
......
resources/views/index.blade.php
+ 5
− 1
View file @ a8f8e093
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
@section('title', $title ) @section('title', $title )
@section('navbarFocus.search', 'class="active"')
@section('navbarFocus.donate', 'class="dropdown"')
@section('content') @section('content')
<div class="modal fade" id="plugin-modal" tab-index="-1" role="dialog"> <div class="modal fade" id="plugin-modal" tab-index="-1" role="dialog">
<div class="modal-dialog "> <div class="modal-dialog ">
...@@ -20,7 +24,7 @@ ...@@ -20,7 +24,7 @@
</div> </div>
</div> </div>
<h1 id="mglogo"> <h1 id="mglogo">
<a class="hidden-xs" href="/">MetaGer <a class="hidden-xs" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer
</a> </a>
</h1> </h1>
<figure> <figure>
......
resources/views/layouts/staticPages.blade.php
+ 35
− 84
View file @ a8f8e093
...@@ -28,12 +28,9 @@ ...@@ -28,12 +28,9 @@
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false">
<span class="sr-only">{{ trans('staticPages.navigationToggle') }} <span class="sr-only">{{ trans('staticPages.navigationToggle') }}
</span> </span>
<span class="icon-bar"> <span class="icon-bar"></span>
</span> <span class="icon-bar"></span>
<span class="icon-bar"> <span class="icon-bar"></span>
</span>
<span class="icon-bar">
</span>
</button> </button>
</div> </div>
<div> <div>
...@@ -41,100 +38,59 @@ ...@@ -41,100 +38,59 @@
</div> </div>
<div class="collapse navbar-collapse" id="navbar-collapse"> <div class="collapse navbar-collapse" id="navbar-collapse">
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li> <li @if ($navbarFocus === 'suche') class="active" @endif >
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" id="navigationSuche">{{ trans('staticPages.nav1') }} <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" id="navigationSuche">{{ trans('staticPages.nav1') }}</a></li>
</a> <li @if ($navbarFocus === 'foerdern') class="dropdown active" @else class="dropdown" @endif >
</li>
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ trans('staticPages.nav16') }} <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ trans('staticPages.nav16') }}
<span class="caret"> <span class="caret"></span></a>
</span>
</a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li> <li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spende/") }}">{{ trans('staticPages.nav2') }} <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spende/") }}">{{ trans('staticPages.nav2') }}</a></li>
</a>
</li>
<li> <li>
<a href="https://www.boost-project.com/de/shops?charity_id=1129&amp;tag=bl">{{ trans('staticPages.nav17') }} <a href="https://www.boost-project.com/de/shops?charity_id=1129&amp;tag=bl">{{ trans('staticPages.nav17') }}</a></li>
</a> </ul></li>
</li> <li @if ($navbarFocus === 'datenschutz') class="active" @endif >
</ul> <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/datenschutz/") }}" id="navigationPrivacy">{{ trans('staticPages.nav3') }}</a></li>
</li> <li @if ($navbarFocus === 'kontakt') class="dropdown active" @else class="dropdown" @endif >
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/datenschutz/") }}" id="navigationPrivacy">{{ trans('staticPages.nav3') }}
</a>
</li>
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" id="navigationKontakt">{{ trans('staticPages.nav18') }} <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" id="navigationKontakt">{{ trans('staticPages.nav18') }}
<span class="caret"> <span class="caret"></span></a>
</span>
</a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li> <li>
<a href="http://forum.suma-ev.de/">{{ trans('staticPages.nav4') }} <a href="http://forum.suma-ev.de/">{{ trans('staticPages.nav4') }}</a></li>
</a>
</li>
<li> <li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/kontakt/") }}">{{ trans('staticPages.nav5') }} <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/kontakt/") }}">{{ trans('staticPages.nav5') }}</a></li>
</a>
</li>
<li> <li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/team/") }}">{{ trans('staticPages.nav6') }} <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/team/") }}">{{ trans('staticPages.nav6') }}</a></li>
</a>
</li>
<li> <li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/about/") }}">{{ trans('staticPages.nav7') }} <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/about/") }}">{{ trans('staticPages.nav7') }}</a></li>
</a>
</li>
<li> <li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/impressum/") }}">{{ trans('staticPages.nav8') }} <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/impressum/") }}">{{ trans('staticPages.nav8') }}</a></li>
</a> </ul></li>
</li> <li @if ($navbarFocus === 'dienste') class="dropdown active" @else class="dropdown" @endif >
</ul>
</li>
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ trans('staticPages.nav15') }} <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ trans('staticPages.nav15') }}
<span class="caret"> <span class="caret"></span></a>
</span>
</a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li> <li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe/") }}">{{ trans('staticPages.nav9') }} <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe/") }}">{{ trans('staticPages.nav9') }}</a></li>
</a>
</li>
<li> <li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/widget/") }}">{{ trans('staticPages.nav10') }} <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/widget/") }}">{{ trans('staticPages.nav10') }}</a></li>
</a>
</li>
<li> <li>
<a href="https://metager.de/klassik/asso/" target="_blank">{{ trans('staticPages.nav11') }} <a href="https://metager.de/klassik/asso/" target="_blank">{{ trans('staticPages.nav11') }}</a></li>
</a>
</li>
<li> <li>
<a href="http://code.metager.de/" target="_blank">{{ trans('staticPages.nav12') }} <a href="http://code.metager.de/" target="_blank">{{ trans('staticPages.nav12') }}</a></li>
</a>
</li>
<li> <li>
<a href="https://metager.to/" target="_blank">{{ trans('staticPages.nav13') }} <a href="https://metager.to/" target="_blank">{{ trans('staticPages.nav13') }}</a></li>
</a>
</li>
<li> <li>
<a href="http://forum.suma-ev.de/viewtopic.php?f=3&amp;t=43" target="_blank">{{ trans('staticPages.nav14') }} <a href="http://forum.suma-ev.de/viewtopic.php?f=3&amp;t=43" target="_blank">{{ trans('staticPages.nav14') }}</a></li>
</a> </ul></li>
</li> <li class="dropdown" class="dropdown">
</ul>
</li>
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" id="navigationSprache">{{ trans('staticPages.nav19') }} <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" id="navigationSprache">{{ trans('staticPages.nav19') }}
<span class="caret"></span> <span class="caret"></span></a>
</a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
@foreach(LaravelLocalization::getSupportedLocales() as $localeCode => $properties) @foreach(LaravelLocalization::getSupportedLocales() as $localeCode => $properties)
<li><a rel="alternate" hreflang="{{$localeCode}}" href="{{LaravelLocalization::getLocalizedURL($localeCode) }}">{{{ $properties['native'] }}}</a></li> <li><a rel="alternate" hreflang="{{$localeCode}}" href="{{LaravelLocalization::getLocalizedURL($localeCode) }}">{{{ $properties['native'] }}}</a></li>
@endforeach @endforeach
</ul> </ul></li>
</li>
</ul> </ul>
</div> </div>
</div> </div>
...@@ -156,18 +112,13 @@ ...@@ -156,18 +112,13 @@
<ul class="list-inline hidden-xs"> <ul class="list-inline hidden-xs">
<li> <li>
<a href="https://www.suma-ev.de/" target="_blank"> <a href="https://www.suma-ev.de/" target="_blank">
<img src="/img/suma_ev_logo-m1-greyscale.png" alt="SUMA-EV Logo"> <img src="/img/suma_ev_logo-m1-greyscale.png" alt="SUMA-EV Logo"></a></li>
</a>
</li>
<li id="info"> <li id="info">
<a href="/kontakt/">{{ trans('staticPages.nav5') }}</a> - <a href="/impressum/">{{ trans('staticPages.nav8') }}</a> <a href="/kontakt/">{{ trans('staticPages.nav5') }}</a> - <a href="/impressum/">{{ trans('staticPages.nav8') }}</a>
{{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/" target="_blank" >{{ trans('staticPages.sumaev.2') }}</a> {{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/" target="_blank" >{{ trans('staticPages.sumaev.2') }}</a></li>
</li>
<li> <li>
<a href="https://www.uni-hannover.de/" target="_blank"> <a href="https://www.uni-hannover.de/" target="_blank">
<img src="/img/luh_metager.png" alt="LUH Logo"> <img src="/img/luh_metager.png" alt="LUH Logo"></a></li>
</a>
</li>
</ul> </ul>
</footer> </footer>
<script type="text/javascript" src="/js/jquery.js"></script> <script type="text/javascript" src="/js/jquery.js"></script>
......
resources/views/layouts/subPages.blade.php
+ 3
− 1
View file @ a8f8e093
@extends('layouts.staticPages') @extends('layouts.staticPages')
@section('navbarFocus.donate', 'class="dropdown"')
@section('homeIcon') @section('homeIcon')
<a class="navbar-brand" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}""> <a class="navbar-brand" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">
<div class="logo"> <div class="logo">
<h1>MetaGer <h1>MetaGer
</h1> </h1>
......
resources/views/spende.blade.php
+ 2
− 0
View file @ a8f8e093
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
@section('title', $title ) @section('title', $title )
@section('navbarFocus.donate', 'class="dropdown active"')
@section('content') @section('content')
<h1>{{ trans('spenden.headline.1') }}</h1> <h1>{{ trans('spenden.headline.1') }}</h1>
<h2>{{ trans('spenden.headline.2') }}</h2> <h2>{{ trans('spenden.headline.2') }}</h2>
......
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