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

WIP: Started making page look like screenshot

parent a547954d
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/result-page.less
+ 7
− 10
View file @ 6fbe3b9b
......@@ -208,10 +208,7 @@ nav .input-group {
.content-wrapper {
padding: 0px;
padding-top: 52px;
background-color: @content-wrapper-background-color;
-webkit-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
-moz-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
background-color: white;
}
#helpButton {
......@@ -309,6 +306,7 @@ a {
}
&>.resultInformation {
border-radius: 5px;
padding-left: 0px;
&>.save {
position: absolute;
top: 0;
......@@ -618,10 +616,10 @@ a {
}
}
@media(max-width: @screen-xs-max) {
.resultContainer {
padding-left: 0;
padding-right: 0;
.resultContainer {
margin-left: 0px;
@media(max-width: @screen-xs-max) {
padding-right: 0px;
}
}
......@@ -642,8 +640,7 @@ a {
#quicktips {
display: flex;
flex-direction: column;
// border: 2px solid #ccc;
flex-direction: column; // border: 2px solid #ccc;
.quicktip {
margin: 10px 0px;
padding-left: 10px;
......
resources/views/layouts/researchandtabs.blade.php
+ 5
− 161
View file @ 6fbe3b9b
......@@ -35,168 +35,12 @@
</div>
</div>
</nav>
<ul id="foki" class=" resultpage-foki nav nav-tabs" role="tablist">
@if( $metager->getFokus() === "web" )
<li id="webTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
<a aria-controls="web" data-href="#web" href="#web">
<i class="fa fa-globe" aria-hidden="true"></i>
<span class="hidden-xs">{{ trans('index.foki.web') }}</span>
</a>
</li>
@else
<li data-loaded="0" id="webTabSelector" class="tab-selector" role="presentation">
<a aria-controls="web" data-href="{!! $metager->generateSearchLink('web') !!}" href="{!! $metager->generateSearchLink('web', false) !!}">
<i class="fa fa-globe" aria-hidden="true"></i>
<span class="hidden-xs">{{ trans('index.foki.web') }}</span>
</a>
</li>
@endif
@if( $metager->getFokus() === "nachrichten" )
<li id="nachrichtenTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
<a aria-controls="nachrichten" data-href="#nachrichten" href="#nachrichten">
<i class="fa fa-bullhorn" aria-hidden="true"></i>
<span class="hidden-xs">{{ trans('index.foki.nachrichten') }}</span>
</a>
</li>
@else
<li data-loaded="0" id="nachrichtenTabSelector" class="tab-selector" role="presentation" >
<a aria-controls="nachrichten" data-href="{!! $metager->generateSearchLink('nachrichten') !!}" href="{!! $metager->generateSearchLink('nachrichten', false) !!}">
<i class="fa fa-bullhorn" aria-hidden="true"></i>
<span class="hidden-xs">{{ trans('index.foki.nachrichten') }}</span>
</a>
</li>
@endif
@if( $metager->getFokus() === "wissenschaft" )
<li id="wissenschaftTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
<a aria-controls="wissenschaft" data-href="#wissenschaft" href="#wissenschaft">
<i class="fa fa-file-text" aria-hidden="true"></i>
<span class="hidden-xs">{{ trans('index.foki.wissenschaft') }}</span>
</a>
</li>
@else
<li data-loaded="0" id="wissenschaftTabSelector" class="tab-selector" role="presentation">
<a aria-controls="wissenschaft" data-href="{!! $metager->generateSearchLink('wissenschaft') !!}" href="{!! $metager->generateSearchLink('wissenschaft', false) !!}">
<i class="fa fa-file-text" aria-hidden="true"></i>
<span class="hidden-xs">{{ trans('index.foki.wissenschaft') }}</span>
</a>
</li>
@endif
@if( $metager->getFokus() === "produktsuche" )
<li id="produktsucheTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
<a aria-controls="produktsuche" data-href="#produktsuche" href="#produktsuche">
<i class="fa fa-shopping-cart" aria-hidden="true"></i>
<span class="hidden-xs">{{ trans('index.foki.produkte') }}</span>
</a>
</li>
@else
<li data-loaded="0" id="produktsucheTabSelector" class="tab-selector" role="presentation" >
<a aria-controls="produktsuche" data-href="{!! $metager->generateSearchLink('produktsuche') !!}" href="{!! $metager->generateSearchLink('produktsuche', false) !!}">
<i class="fa fa-shopping-cart" aria-hidden="true"></i>
<span class="hidden-xs">{{ trans('index.foki.produkte') }}</span>
</a>
</li>
@endif
{{-- Fix for older Versions --}}
@if( $metager->getFokus() === "angepasst" )
<li id="angepasstTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
<a aria-controls="angepasst" data-href="#angepasst" href="#angepasst">
<i class="fa fa-cog" aria-hidden="true"></i>
<span class="hidden-xs">{{ trans('index.foki.angepasst') }}</span>
</a>
</li>
@endif
<li id="mapsTabSelector" role="presentation" class="tab-selector">
<a href="https://maps.metager.de/map/{{ $metager->getQ() }}/-6.781309835595698/44.85855550132342/33.9779675081543/58.25372144666716" target="_blank">
<i class="fa fa-map-marker" aria-hidden="true"></i>
<span class="hidden-xs">{!! trans('index.foki.maps') !!}</span>
</a>
</li>
</ul>
</header>
<main id="main-content-tabs" class="tab-content row">
@if( $metager->getFokus() === "web" )
<div role="tabpanel" class="tab-pane active" id="web">
<div class="row">
@yield('results')
</div>
</div>
@else
<div role="tabpanel" class="tab-pane" id="web">
<div class="loader">
<img src="/img/ajax-loader.gif" alt="" />
</div>
</div>
@endif
@if( $metager->getFokus() === "bilder" )
<div role="tabpanel" class="tab-pane active" id="bilder">
<div class="row">
@yield('results')
</div>
</div>
@else
<div role="tabpanel" class="tab-pane" id="bilder">
<div class="loader">
<img src="/img/ajax-loader.gif" alt="" />
</div>
</div>
@endif
@if( $metager->getFokus() === "nachrichten" )
<div role="tabpanel" class="tab-pane active" id="nachrichten">
<div class="row">
@yield('results')
</div>
</div>
@else
<div role="tabpanel" class="tab-pane" id="nachrichten">
<div class="loader">
<img src="/img/ajax-loader.gif" alt="" />
</div>
<main id="main-content-tabs" class="row">
<div>
<div class="row">
@yield('results')
</div>
@endif
@if( $metager->getFokus() === "wissenschaft" )
<div role="tabpanel" class="tab-pane active" id="wissenschaft">
<div class="row">
@yield('results')
</div>
</div>
@else
<div role="tabpanel" class="tab-pane" id="wissenschaft">
<div class="loader">
<img src="/img/ajax-loader.gif" alt="" />
</div>
</div>
@endif
@if( $metager->getFokus() === "produktsuche" )
<div role="tabpanel" class="tab-pane active" id="produktsuche">
<div class="row">
@yield('results')
</div>
</div>
@else
<div role="tabpanel" class="tab-pane" id="produktsuche">
<div class="loader">
<img src="/img/ajax-loader.gif" alt="" />
</div>
</div>
@endif
@if( $metager->getFokus() === "angepasst" )
<div role="tabpanel" class="tab-pane active" id="angepasst">
<div class="row">
@yield('results')
</div>
</div>
@endif
</div>
</main>
</div>
resources/views/layouts/result.blade.php
+ 0
− 3
View file @ 6fbe3b9b
<div class="result row" data-count="{{ $result->number }}">
<div class="number col-sm-1 hidden-xs" style="color:{{ $result->color }}">
{{ $result->number }})
</div>
<div class="resultInformation col-xs-12 col-sm-11">
<div class="col-xs-10 col-sm-11" style="padding:0; ">
<p class="title">
......
resources/views/metager3.blade.php
+ 0
− 1
View file @ 6fbe3b9b
......@@ -36,7 +36,6 @@
@endif
@if($metager->getMaps())
<div class="result row" id="map">
<div class="number col-sm-1 hidden-xs"></div>
<div class="resultInformation col-xs-12 col-sm-11">
<iframe class="" src="https://maps.metager.de/metager/{{ $metager->getQ() }}" scrolling="no" tabindex="-1" style="width: 100%; height:0; border:0;"></iframe>
</div>
......
resources/views/metager3results.blade.php
+ 0
− 1
View file @ 6fbe3b9b
......@@ -28,7 +28,6 @@
@endif
@if($metager->getMaps())
<div class="result row" id="map">
<div class="number col-sm-1 hidden-xs"></div>
<div class="resultInformation col-xs-12 col-sm-11">
<iframe class="" src="https://maps.metager.de/metager/{{ $metager->getQ() }}" style="width: 100%; height:0; border:0;"></iframe>
</div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment