From a8f8e09360ae49931bfdec02275b51ff71c71c18 Mon Sep 17 00:00:00 2001
From: karl <karl@suma-ev.de>
Date: Tue, 28 Jun 2016 12:57:01 +0200
Subject: [PATCH] Die Startseite ist jetzt umformatiert und die
Navigationspunkte werden je nach aktueller Seite grau hinterlegt
---
app/Http/Controllers/StartpageController.php | 7 +-
app/Http/routes.php | 27 ++--
dump.rdb | 1 +
resources/views/datenschutz.blade.php | 2 +
resources/views/index.blade.php | 6 +-
resources/views/layouts/staticPages.blade.php | 119 ++++++------------
resources/views/layouts/subPages.blade.php | 4 +-
resources/views/spende.blade.php | 2 +
8 files changed, 71 insertions(+), 97 deletions(-)
create mode 100644 dump.rdb
diff --git a/app/Http/Controllers/StartpageController.php b/app/Http/Controllers/StartpageController.php
index 6627a7ebd..3c8cd0089 100644
--- a/app/Http/Controllers/StartpageController.php
+++ b/app/Http/Controllers/StartpageController.php
@@ -43,7 +43,9 @@ class StartpageController extends Controller
->with('time', $request->input('param_time', '1000'))
->with('sprueche', $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)
@@ -138,7 +140,8 @@ class StartpageController extends Controller
->with('foki', $foki)
->with('title', 'Einstellungen')
->with('css', 'settings.css')
- ->with('js', ['settings.js']);
+ ->with('js', ['settings.js'])
+ ->with('navbarFocus', 'suche');
die(var_dump($foki));
return $xml->saveXML();
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 23648ff86..9fa3dcf16 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -26,25 +26,29 @@
{
return view('impressum')
->with('title', trans('titles.impressum'))
- ->with('css', 'impressum.css');
+ ->with('css', 'impressum.css')
+ ->with('navbarFocus', 'kontakt');
});
Route::get('about', function()
{
return view('about')
->with('title', trans('titles.about'))
- ->with('css', 'about.css');
+ ->with('css', 'about.css')
+ ->with('navbarFocus', 'kontakt');
});
Route::get('team', function()
{
return view('team.team')
->with('title', trans('titles.team'))
- ->with('css', 'team.css');
+ ->with('css', 'team.css')
+ ->with('navbarFocus', 'kontakt');
});
Route::get('team/pubkey-wsb', function()
{
return view('team.pubkey-wsb')
- ->with('title', trans('titles.team'));
+ ->with('title', trans('titles.team'))
+ ->with('navbarFocus', 'kontakt');
});
Route::get('kontakt', function()
@@ -52,7 +56,8 @@
return view('kontakt.kontakt')
->with('title', trans('titles.kontakt'))
->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');
@@ -61,7 +66,8 @@
{
return view('spende')
->with('title', trans('titles.spende'))
- ->with('css', 'donation.css');
+ ->with('css', 'donation.css')
+ ->with('navbarFocus', 'foerdern');
});
Route::post('spende', 'MailController@donation');
@@ -69,21 +75,24 @@
{
return view('datenschutz')
->with('title', trans('titles.datenschutz'))
- ->with('css', 'privacy.css');
+ ->with('css', 'privacy.css')
+ ->with('navbarFocus', 'datenschutz');
});
Route::get('hilfe', function()
{
return view('hilfe')
->with('title', trans('titles.hilfe'))
- ->with('css', 'help.css');
+ ->with('css', 'help.css')
+ ->with('navbarFocus', 'dienste');
});
Route::get('widget', function()
{
return view('widget')
->with('title', trans('titles.widget'))
- ->with('css', 'widget.css');
+ ->with('css', 'widget.css')
+ ->with('navbarFocus', 'dienste');
});
Route::get('settings', 'StartpageController@loadSettings');
diff --git a/dump.rdb b/dump.rdb
new file mode 100644
index 000000000..56af04ea1
--- /dev/null
+++ b/dump.rdb
@@ -0,0 +1 @@
+REDIS0006ÿܳCðZÜòV
\ No newline at end of file
diff --git a/resources/views/datenschutz.blade.php b/resources/views/datenschutz.blade.php
index 0db0c2a86..33b316450 100644
--- a/resources/views/datenschutz.blade.php
+++ b/resources/views/datenschutz.blade.php
@@ -2,6 +2,8 @@
@section('title', $title )
+@section('navbarFocus.datenschutz', 'class="active"')
+
@section('content')
<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>
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index eba25528f..37d5faaf2 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -2,6 +2,10 @@
@section('title', $title )
+@section('navbarFocus.search', 'class="active"')
+
+@section('navbarFocus.donate', 'class="dropdown"')
+
@section('content')
<div class="modal fade" id="plugin-modal" tab-index="-1" role="dialog">
<div class="modal-dialog ">
@@ -20,7 +24,7 @@
</div>
</div>
<h1 id="mglogo">
- <a class="hidden-xs" href="/">MetaGer
+ <a class="hidden-xs" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer
</a>
</h1>
<figure>
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index 9fed8dc80..c6e5a41b6 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -28,12 +28,9 @@
<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>
- <span class="icon-bar">
- </span>
- <span class="icon-bar">
- </span>
- <span class="icon-bar">
- </span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
</button>
</div>
<div>
@@ -41,100 +38,59 @@
</div>
<div class="collapse navbar-collapse" id="navbar-collapse">
<ul class="nav navbar-nav navbar-right">
- <li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" id="navigationSuche">{{ trans('staticPages.nav1') }}
- </a>
- </li>
- <li class="dropdown">
+ <li @if ($navbarFocus === 'suche') class="active" @endif >
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" id="navigationSuche">{{ trans('staticPages.nav1') }}</a></li>
+ <li @if ($navbarFocus === 'foerdern') class="dropdown active" @else class="dropdown" @endif >
<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ trans('staticPages.nav16') }}
- <span class="caret">
- </span>
- </a>
+ <span class="caret"></span></a>
<ul class="dropdown-menu">
<li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spende/") }}">{{ trans('staticPages.nav2') }}
- </a>
- </li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spende/") }}">{{ trans('staticPages.nav2') }}</a></li>
<li>
- <a href="https://www.boost-project.com/de/shops?charity_id=1129&tag=bl">{{ trans('staticPages.nav17') }}
- </a>
- </li>
- </ul>
- </li>
- <li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/datenschutz/") }}" id="navigationPrivacy">{{ trans('staticPages.nav3') }}
- </a>
- </li>
- <li class="dropdown">
+ <a href="https://www.boost-project.com/de/shops?charity_id=1129&tag=bl">{{ trans('staticPages.nav17') }}</a></li>
+ </ul></li>
+ <li @if ($navbarFocus === 'datenschutz') class="active" @endif >
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/datenschutz/") }}" id="navigationPrivacy">{{ trans('staticPages.nav3') }}</a></li>
+ <li @if ($navbarFocus === 'kontakt') class="dropdown active" @else class="dropdown" @endif >
<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" id="navigationKontakt">{{ trans('staticPages.nav18') }}
- <span class="caret">
- </span>
- </a>
+ <span class="caret"></span></a>
<ul class="dropdown-menu">
<li>
- <a href="http://forum.suma-ev.de/">{{ trans('staticPages.nav4') }}
- </a>
- </li>
+ <a href="http://forum.suma-ev.de/">{{ trans('staticPages.nav4') }}</a></li>
<li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/kontakt/") }}">{{ trans('staticPages.nav5') }}
- </a>
- </li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/kontakt/") }}">{{ trans('staticPages.nav5') }}</a></li>
<li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/team/") }}">{{ trans('staticPages.nav6') }}
- </a>
- </li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/team/") }}">{{ trans('staticPages.nav6') }}</a></li>
<li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/about/") }}">{{ trans('staticPages.nav7') }}
- </a>
- </li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/about/") }}">{{ trans('staticPages.nav7') }}</a></li>
<li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/impressum/") }}">{{ trans('staticPages.nav8') }}
- </a>
- </li>
- </ul>
- </li>
- <li class="dropdown">
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/impressum/") }}">{{ trans('staticPages.nav8') }}</a></li>
+ </ul></li>
+ <li @if ($navbarFocus === 'dienste') class="dropdown active" @else class="dropdown" @endif >
<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ trans('staticPages.nav15') }}
- <span class="caret">
- </span>
- </a>
+ <span class="caret"></span></a>
<ul class="dropdown-menu">
<li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe/") }}">{{ trans('staticPages.nav9') }}
- </a>
- </li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe/") }}">{{ trans('staticPages.nav9') }}</a></li>
<li>
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/widget/") }}">{{ trans('staticPages.nav10') }}
- </a>
- </li>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/widget/") }}">{{ trans('staticPages.nav10') }}</a></li>
<li>
- <a href="https://metager.de/klassik/asso/" target="_blank">{{ trans('staticPages.nav11') }}
- </a>
- </li>
+ <a href="https://metager.de/klassik/asso/" target="_blank">{{ trans('staticPages.nav11') }}</a></li>
<li>
- <a href="http://code.metager.de/" target="_blank">{{ trans('staticPages.nav12') }}
- </a>
- </li>
+ <a href="http://code.metager.de/" target="_blank">{{ trans('staticPages.nav12') }}</a></li>
<li>
- <a href="https://metager.to/" target="_blank">{{ trans('staticPages.nav13') }}
- </a>
- </li>
+ <a href="https://metager.to/" target="_blank">{{ trans('staticPages.nav13') }}</a></li>
<li>
- <a href="http://forum.suma-ev.de/viewtopic.php?f=3&t=43" target="_blank">{{ trans('staticPages.nav14') }}
- </a>
- </li>
- </ul>
- </li>
- <li class="dropdown">
+ <a href="http://forum.suma-ev.de/viewtopic.php?f=3&t=43" target="_blank">{{ trans('staticPages.nav14') }}</a></li>
+ </ul></li>
+ <li class="dropdown" class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" id="navigationSprache">{{ trans('staticPages.nav19') }}
- <span class="caret"></span>
- </a>
+ <span class="caret"></span></a>
<ul class="dropdown-menu">
@foreach(LaravelLocalization::getSupportedLocales() as $localeCode => $properties)
<li><a rel="alternate" hreflang="{{$localeCode}}" href="{{LaravelLocalization::getLocalizedURL($localeCode) }}">{{{ $properties['native'] }}}</a></li>
@endforeach
- </ul>
- </li>
+ </ul></li>
</ul>
</div>
</div>
@@ -156,18 +112,13 @@
<ul class="list-inline hidden-xs">
<li>
<a href="https://www.suma-ev.de/" target="_blank">
- <img src="/img/suma_ev_logo-m1-greyscale.png" alt="SUMA-EV Logo">
- </a>
- </li>
+ <img src="/img/suma_ev_logo-m1-greyscale.png" alt="SUMA-EV Logo"></a></li>
<li id="info">
<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>
- </li>
+ {{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/" target="_blank" >{{ trans('staticPages.sumaev.2') }}</a></li>
<li>
<a href="https://www.uni-hannover.de/" target="_blank">
- <img src="/img/luh_metager.png" alt="LUH Logo">
- </a>
- </li>
+ <img src="/img/luh_metager.png" alt="LUH Logo"></a></li>
</ul>
</footer>
<script type="text/javascript" src="/js/jquery.js"></script>
diff --git a/resources/views/layouts/subPages.blade.php b/resources/views/layouts/subPages.blade.php
index c6ab157c5..093eff03f 100644
--- a/resources/views/layouts/subPages.blade.php
+++ b/resources/views/layouts/subPages.blade.php
@@ -1,7 +1,9 @@
@extends('layouts.staticPages')
+@section('navbarFocus.donate', 'class="dropdown"')
+
@section('homeIcon')
-<a class="navbar-brand" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"">
+<a class="navbar-brand" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">
<div class="logo">
<h1>MetaGer
</h1>
diff --git a/resources/views/spende.blade.php b/resources/views/spende.blade.php
index 2427faa98..7d211ac34 100644
--- a/resources/views/spende.blade.php
+++ b/resources/views/spende.blade.php
@@ -2,6 +2,8 @@
@section('title', $title )
+@section('navbarFocus.donate', 'class="dropdown active"')
+
@section('content')
<h1>{{ trans('spenden.headline.1') }}</h1>
<h2>{{ trans('spenden.headline.2') }}</h2>
--
GitLab