From 343b1d19196734a2aa88557a64af98763208e650 Mon Sep 17 00:00:00 2001
From: karl <karl@suma-ev.de>
Date: Tue, 28 Jun 2016 13:20:53 +0200
Subject: [PATCH] =?UTF-8?q?Leider=20kann=20man=20anscheinend=20den=20Code?=
=?UTF-8?q?=20nur=20entweder=20so=20einr=C3=BCcken,=20dass=20man=20ihn=20g?=
=?UTF-8?q?u=20lesen=20kann,=20oder=20dass=20er=20sp=C3=A4ter=20gut=20auss?=
=?UTF-8?q?ieht=20und=20keine=20zusatzabst=C3=A4nde=20erzeugt,=20aber=20ni?=
=?UTF-8?q?cht=20beides.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
resources/views/layouts/staticPages.blade.php | 244 ++++++++----------
resources/views/layouts/subPages.blade.php | 7 +-
2 files changed, 116 insertions(+), 135 deletions(-)
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index c6e5a41b6..54b0db48b 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -1,134 +1,116 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>@yield('title')</title>
- <meta charset="utf-8" />
- <meta name="description" content="Sicher suchen und finden unter Wahrung der Privatsphäre. Das digitale Wissen der Welt muss ohne Bevormundung durch Staaten oder Konzerne frei zugänglich sein und bleiben." />
- <meta name="keywords" content="Internetsuche, privatsphäre, privacy, Suchmaschine, Datenschutz, Anonproxy, anonym suchen, Bildersuche, Suchmaschine, anonym, MetaGer, metager, metager.de" />
- <meta name="page-topic" content="Dienstleistung" />
- <meta name="robots" content="index,follow" />
- <meta name="revisit-after" content="7 days" />
- <meta name="audience" content="all" />
- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
- <meta rel="icon" type="image/x-icon" href="/favicon.ico" />
- <meta rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
- <link rel="search" type="application/opensearchdescription+xml" title="MetaGer: Sicher suchen & finden, Privatsphäre schützen" href="{{ action('StartpageController@loadPlugin', Request::all()) }}">
- <link href="/css/bootstrap.css" rel="stylesheet" />
- <link href="/css/style.css" rel="stylesheet" />
- @if (isset($css))
- <link href="/css/{{ $css }}" rel="stylesheet" />
- @endif
- <link id="theme" href="/css/theme.css.php" rel="stylesheet" />
- </head>
- <body>
- <header>
- <nav class="navbar navbar-default">
- <div class="container">
- <div class="navbar-header">
- <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>
- </button>
- </div>
- <div>
- @yield('homeIcon')
- </div>
- <div class="collapse navbar-collapse" id="navbar-collapse">
- <ul class="nav navbar-nav navbar-right">
- <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>
- <ul class="dropdown-menu">
- <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 @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>
- <ul class="dropdown-menu">
- <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>
- <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>
- <li>
- <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>
- <ul class="dropdown-menu">
- <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>
- <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>
- <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" 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>
- <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>
- </div>
- </div>
- </nav>
- </header>
-
- <div class="wrapper">
- <main class="mg-panel container">
- @if (isset($success))
- <div class="alert alert-success" role="alert">{{ $success }}</div>
- @endif
- @if (isset($error))
- <div class="alert alert-danger" role="alert">{{ $error }}</div>
- @endif
- @yield('content')
- </main>
- @yield('optionalContent')
- <footer>
- <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>
- <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>
- <li>
- <a href="https://www.uni-hannover.de/" target="_blank">
- <img src="/img/luh_metager.png" alt="LUH Logo"></a></li>
- </ul>
- </footer>
- <script type="text/javascript" src="/js/jquery.js"></script>
- <script type="text/javascript" src="/js/bootstrap.js"></script>
- <script type="text/javascript" src="/js/scriptStartPage.js"></script>
- @if (isset($js))
- @foreach ($js as $script)
- <script type="text/javascript" src="/js/{{ $script }}"></script>
- @endforeach
- @endif
- <!--[if lte IE 8]><script type="text/javascript" src="/js/html5shiv.min.js"></script><![endif]-->
- </body>
+ <head>
+ <title>@yield('title')</title>
+ <meta charset="utf-8" />
+ <meta name="description" content="Sicher suchen und finden unter Wahrung der Privatsphäre. Das digitale Wissen der Welt muss ohne Bevormundung durch Staaten oder Konzerne frei zugänglich sein und bleiben." />
+ <meta name="keywords" content="Internetsuche, privatsphäre, privacy, Suchmaschine, Datenschutz, Anonproxy, anonym suchen, Bildersuche, Suchmaschine, anonym, MetaGer, metager, metager.de" />
+ <meta name="page-topic" content="Dienstleistung" />
+ <meta name="robots" content="index,follow" />
+ <meta name="revisit-after" content="7 days" />
+ <meta name="audience" content="all" />
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
+ <meta rel="icon" type="image/x-icon" href="/favicon.ico" />
+ <meta rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
+ <link rel="search" type="application/opensearchdescription+xml" title="MetaGer: Sicher suchen & finden, Privatsphäre schützen" href="{{ action('StartpageController@loadPlugin', Request::all()) }}">
+ <link href="/css/bootstrap.css" rel="stylesheet" />
+ <link href="/css/style.css" rel="stylesheet" />
+ @if (isset($css))<link href="/css/{{ $css }}" rel="stylesheet" />
+ @endif<link id="theme" href="/css/theme.css.php" rel="stylesheet" />
+ </head>
+ <body>
+ <header>
+ <nav class="navbar navbar-default">
+ <div class="container">
+ <div class="navbar-header">
+ <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>
+ </button>
+ </div>
+ <div>
+ @yield('homeIcon')
+ </div>
+ <div class="collapse navbar-collapse" id="navbar-collapse">
+ <ul class="nav navbar-nav navbar-right">
+ <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>
+ <ul class="dropdown-menu">
+ <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 @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>
+ <ul class="dropdown-menu">
+ <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>
+ <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>
+ <li><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>
+ <ul class="dropdown-menu">
+ <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>
+ <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>
+ <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 class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" id="navigationSprache">{{ trans('staticPages.nav19') }}
+ <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>
+ </div>
+ </div>
+ </nav>
+ </header>
+ <div class="wrapper">
+ <main class="mg-panel container">
+ @if (isset($success))
+ <div class="alert alert-success" role="alert">{{ $success }}</div>
+ @endif
+ @if (isset($error))
+ <div class="alert alert-danger" role="alert">{{ $error }}</div>
+ @endif
+ @yield('content')
+ </main>
+ @yield('optionalContent')
+ <footer>
+ <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>
+ <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>
+ <li><a href="https://www.uni-hannover.de/" target="_blank">
+ <img src="/img/luh_metager.png" alt="LUH Logo"></a></li>
+ </ul>
+ </footer>
+ <script type="text/javascript" src="/js/jquery.js"></script>
+ <script type="text/javascript" src="/js/bootstrap.js"></script>
+ <script type="text/javascript" src="/js/scriptStartPage.js"></script>
+ @if (isset($js))
+ @foreach ($js as $script)
+ <script type="text/javascript" src="/js/{{ $script }}"></script>
+ @endforeach
+ @endif
+ <!--[if lte IE 8]><script type="text/javascript" src="/js/html5shiv.min.js"></script><![endif]-->
+ </div>
+ </body>
</html>
diff --git a/resources/views/layouts/subPages.blade.php b/resources/views/layouts/subPages.blade.php
index 093eff03f..e95076519 100644
--- a/resources/views/layouts/subPages.blade.php
+++ b/resources/views/layouts/subPages.blade.php
@@ -4,9 +4,8 @@
@section('homeIcon')
<a class="navbar-brand" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">
- <div class="logo">
- <h1>MetaGer
- </h1>
- </div>
+ <div class="logo">
+ <h1>MetaGer</h1>
+ </div>
</a>
@endsection
\ No newline at end of file
--
GitLab