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

Merge branch '599' into 'MetaGer-Redesign' 

Die neue Sidebar ist jetzt auch auf der Ergebnisseite

See merge request !1064
parents 4fafce86 b735af90
No related branches found
No related tags found
1 merge request!1365Resolve "Filter Options for MetaGer"
Hide whitespace changes
Inline Side-by-side
resources/assets/less/metager/metager.less
+ 2
− 1
View file @ 8bc9937a
......@@ -4,4 +4,5 @@
@import "./quicktips.less";
@import "./start-page.less";
@import "./settings.less";
@import "./variables.less";
\ No newline at end of file
@import "./variables.less";
@import "./sidebar.less";
\ No newline at end of file
resources/assets/less/metager/sidebar.less 0 → 100644
+ 52
− 0
View file @ 8bc9937a
.sideBar {
position: fixed;
display: block;
right: -140px;
top: 0;
width: 200px;
height: 100%;
background-color: #FFF;
overflow: hidden;
overflow-y: auto;
transition: 0.3s;
z-index: 999;
border-left: 1px solid LightGray;
&>label {
position: fixed;
font-size: 36px;
top: 0px;
right: 20px;
&:after {
content: "≡";
}
}
&>ul {
padding-top: 20%;
padding-left: 0%;
}
& a {
font-size: 12px;
line-height: 20px;
text-decoration: none;
text-indent: 12px;
width: 160px;
&:visited {
color: blue;
}
}
}
.sideBar *:not(label) {
display: none;
}
input#nav0:checked~.sideBar {
right: 0px;
& * {
display: inline-block;
}
}
input#nav0:checked~.sideBar label:after {
content: "×";
}
\ No newline at end of file
resources/assets/less/metager/static-pages.less
+ 0
− 55
View file @ 8bc9937a
......@@ -121,61 +121,6 @@ ul.metager-dropdown-menu {
}
}
.sideBar {
position: fixed;
display: block;
right: -140px;
top: 0;
width: 200px;
height: 100%;
background-color: #FFF;
overflow: hidden;
overflow-y: auto;
transition: 0.3s;
z-index: 999;
border-left: 1px solid LightGray;
&>label {
position: fixed;
font-size: 36px;
top: 0px;
right: 20px;
&:after {
content: "≡";
}
}
&>ul {
padding-top: 20%;
padding-left: 0%;
}
& a {
font-size: 12px;
line-height: 20px;
text-decoration: none;
text-indent: 12px;
width: 160px;
&:visited {
color: blue;
}
}
}
.sideBar *:not(label) {
display:none;
}
input#nav0:checked ~ .sideBar {
right:0px;
& * {
display: inline-block;
}
}
input#nav0:checked ~ .sideBar label:after {
content: "×";
}
#mglogo {
width: 100%;
text-align: center;
......
resources/views/layouts/researchandtabs.blade.php
+ 1
− 0
View file @ 8bc9937a
......@@ -34,6 +34,7 @@
</div>
</nav>
</header>
@include('layouts.sidebar')
<main id="main-content-tabs" class="row">
<div>
<div class="row">
......
resources/views/layouts/sidebar.blade.php 0 → 100644
+ 101
− 0
View file @ 8bc9937a
<input name="nav" id="nav0" style="display: none;" type="checkbox">
<div class="sideBar">
<label role="button" for="nav0"></label>
<ul id="metager-static-nav-list" class="list-inline pull-right">
<li @if ( !isset($navbarFocus) || $navbarFocus === 'suche') class="active" @endif >
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" tabindex="200" id="navigationSuche">{{ trans('staticPages.nav1') }}</a>
</li>
<li @if (isset($navbarFocus) && $navbarFocus === 'foerdern') class="metager-dropdown active" @else class="metager-dropdown" @endif >
<a class="metager-dropdown-toggle" role="button" aria-expanded="false" tabindex="201">{{ trans('staticPages.nav16') }}
<span class="caret"></span></a>
<ul class="metager-dropdown-menu">
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spende/") }}" tabindex="202">{{ trans('staticPages.nav2') }}</a>
</li>
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/beitritt/") }}" tabindex="203">{{ trans('staticPages.nav23') }}</a>
</li>
<li>
<a href="https://www.boost-project.com/de/shops?charity_id=1129&amp;tag=bl" tabindex="204">{{ trans('staticPages.nav17') }}</a>
</li>
</ul>
</li>
<li @if (isset($navbarFocus) && $navbarFocus === 'datenschutz') class="active" @endif >
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/datenschutz/") }}" id="navigationPrivacy" tabindex="215">{{ trans('staticPages.nav3') }}</a>
</li>
<li @if (isset($navbarFocus) && $navbarFocus === 'hilfe') class="metager-dropdown active" @else class="metager-dropdown" @endif >
<a class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" id="navigationHilfe" tabindex="216">{{ trans('staticPages.nav20') }}
<span class="caret"></span></a>
<ul class="metager-dropdown-menu">
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe/") }}" tabindex="217">{{ trans('staticPages.nav20') }}</a>
</li>
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/faq/") }}" tabindex="218">{{ trans('staticPages.nav21') }}</a>
</li>
</ul>
</li>
<li @if (isset($navbarFocus) && $navbarFocus === 'kontakt') class="metager-dropdown active" @else class="metager-dropdown" @endif >
<a class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" id="navigationKontakt" tabindex="219">{{ trans('staticPages.nav18') }}
<span class="caret"></span></a>
<ul class="metager-dropdown-menu">
<li>
<a href="http://forum.suma-ev.de/" tabindex="220">{{ trans('staticPages.nav4') }}</a>
</li>
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/kontakt/") }}" tabindex="221">{{ trans('staticPages.nav5') }}</a>
</li>
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/team/") }}" tabindex="222">{{ trans('staticPages.nav6') }}</a>
</li>
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/about/") }}" tabindex="223">{{ trans('staticPages.nav7') }}</a>
</li>
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/impressum/") }}" tabindex="224">{{ trans('staticPages.nav8') }}</a>
</li>
</ul>
</li>
<li @if (isset($navbarFocus) && $navbarFocus === 'dienste') class="metager-dropdown active" @else class="metager-dropdown" @endif >
<a class="metager-dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" tabindex="225">{{ trans('staticPages.nav15') }}
<span class="caret"></span></a>
<ul class="metager-dropdown-menu">
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/widget/") }}" tabindex="226">{{ trans('staticPages.nav10') }}</a>
</li>
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/zitat-suche/") }}" tabindex="227">{{ trans('staticPages.nav22') }}</a>
</li>
<li>
<a href="https://metager.de/klassik/asso/" tabindex="228">{{ trans('staticPages.nav11') }}</a>
</li>
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/app/") }}" tabindex="230">@lang('staticPages.nav25')</a>
</li>
<li>
<a href="https://metager.to/" tabindex="231">{{ trans('staticPages.nav13') }}</a>
</li>
<li>
<a href="https://maps.metager.de" target="_blank" tabindex="232">Maps.MetaGer.de</a>
</li>
<li>
<a href="https://gitlab.metager3.de/open-source/MetaGer" tabindex="233">{{ trans('staticPages.nav24') }}</a>
</li>
<li>
<a href="http://forum.suma-ev.de/viewtopic.php?f=3&amp;t=43" tabindex="234">{{ trans('staticPages.nav14') }}</a>
</li>
</ul>
</li>
<li class="metager-dropdown">
<a class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" id="navigationSprache" tabindex="235">{{ trans('staticPages.nav19') }} ({{ LaravelLocalization::getSupportedLocales()[LaravelLocalization::getCurrentLocale()]['native'] }})
<span class="caret"></span></a>
<ul class="metager-dropdown-menu">
@foreach(LaravelLocalization::getSupportedLocales() as $localeCode => $properties)
<li>
<a rel="alternate" hreflang="{{$localeCode}}" href="{{LaravelLocalization::getLocalizedURL($localeCode) }}" tabindex="{{235 + $loop->index}}">{{{ $properties['native'] }}}</a>
</li>
@endforeach
</ul>
</li>
</ul>
</div>
resources/views/layouts/staticPages.blade.php
+ 1
− 102
View file @ 8bc9937a
......@@ -32,109 +32,8 @@
<body>
<header>
@yield('homeIcon')
<input name="nav" id="nav0" style="display: none;" type="checkbox">
<div class="sideBar">
<label role="button" for="nav0"></label>
<ul id="metager-static-nav-list" class="list-inline pull-right">
<li @if ( !isset($navbarFocus) || $navbarFocus === 'suche') class="active" @endif >
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" tabindex="200" id="navigationSuche">{{ trans('staticPages.nav1') }}</a>
</li>
<li @if (isset($navbarFocus) && $navbarFocus === 'foerdern') class="metager-dropdown active" @else class="metager-dropdown" @endif >
<a class="metager-dropdown-toggle" role="button" aria-expanded="false" tabindex="201">{{ trans('staticPages.nav16') }}
<span class="caret"></span></a>
<ul class="metager-dropdown-menu">
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/spende/") }}" tabindex="202">{{ trans('staticPages.nav2') }}</a>
</li>
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/beitritt/") }}" tabindex="203">{{ trans('staticPages.nav23') }}</a>
</li>
<li>
<a href="https://www.boost-project.com/de/shops?charity_id=1129&amp;tag=bl" tabindex="204">{{ trans('staticPages.nav17') }}</a>
</li>
</ul>
</li>
<li @if (isset($navbarFocus) && $navbarFocus === 'datenschutz') class="active" @endif >
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/datenschutz/") }}" id="navigationPrivacy" tabindex="215">{{ trans('staticPages.nav3') }}</a>
</li>
<li @if (isset($navbarFocus) && $navbarFocus === 'hilfe') class="metager-dropdown active" @else class="metager-dropdown" @endif >
<a class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" id="navigationHilfe" tabindex="216">{{ trans('staticPages.nav20') }}
<span class="caret"></span></a>
<ul class="metager-dropdown-menu">
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/hilfe/") }}" tabindex="217">{{ trans('staticPages.nav20') }}</a>
</li>
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/faq/") }}" tabindex="218">{{ trans('staticPages.nav21') }}</a>
</li>
</ul>
</li>
<li @if (isset($navbarFocus) && $navbarFocus === 'kontakt') class="metager-dropdown active" @else class="metager-dropdown" @endif >
<a class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" id="navigationKontakt" tabindex="219">{{ trans('staticPages.nav18') }}
<span class="caret"></span></a>
<ul class="metager-dropdown-menu">
<li>
<a href="http://forum.suma-ev.de/" tabindex="220">{{ trans('staticPages.nav4') }}</a>
</li>
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/kontakt/") }}" tabindex="221">{{ trans('staticPages.nav5') }}</a>
</li>
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/team/") }}" tabindex="222">{{ trans('staticPages.nav6') }}</a>
</li>
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/about/") }}" tabindex="223">{{ trans('staticPages.nav7') }}</a>
</li>
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/impressum/") }}" tabindex="224">{{ trans('staticPages.nav8') }}</a>
</li>
</ul>
</li>
<li @if (isset($navbarFocus) && $navbarFocus === 'dienste') class="metager-dropdown active" @else class="metager-dropdown" @endif >
<a class="metager-dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" tabindex="225">{{ trans('staticPages.nav15') }}
<span class="caret"></span></a>
<ul class="metager-dropdown-menu">
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/widget/") }}" tabindex="226">{{ trans('staticPages.nav10') }}</a>
</li>
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/zitat-suche/") }}" tabindex="227">{{ trans('staticPages.nav22') }}</a>
</li>
<li>
<a href="https://metager.de/klassik/asso/" tabindex="228">{{ trans('staticPages.nav11') }}</a>
</li>
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/app/") }}" tabindex="230">@lang('staticPages.nav25')</a>
</li>
<li>
<a href="https://metager.to/" tabindex="231">{{ trans('staticPages.nav13') }}</a>
</li>
<li>
<a href="https://maps.metager.de" target="_blank" tabindex="232">Maps.MetaGer.de</a>
</li>
<li>
<a href="https://gitlab.metager3.de/open-source/MetaGer" tabindex="233">{{ trans('staticPages.nav24') }}</a>
</li>
<li>
<a href="http://forum.suma-ev.de/viewtopic.php?f=3&amp;t=43" tabindex="234">{{ trans('staticPages.nav14') }}</a>
</li>
</ul>
</li>
<li class="metager-dropdown">
<a class="metager-dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" id="navigationSprache" tabindex="235">{{ trans('staticPages.nav19') }} ({{ LaravelLocalization::getSupportedLocales()[LaravelLocalization::getCurrentLocale()]['native'] }})
<span class="caret"></span></a>
<ul class="metager-dropdown-menu">
@foreach(LaravelLocalization::getSupportedLocales() as $localeCode => $properties)
<li>
<a rel="alternate" hreflang="{{$localeCode}}" href="{{LaravelLocalization::getLocalizedURL($localeCode) }}" tabindex="{{235 + $loop->index}}">{{{ $properties['native'] }}}</a>
</li>
@endforeach
</ul>
</li>
</ul>
</div>
</header>
@include('layouts.sidebar')
<div class="wrapper">
<main class="mg-panel container">
@if (isset($success))
......
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