diff --git a/resources/assets/less/metager/base.less b/resources/assets/less/metager/base.less
index 44f99006411d59962114bfa0922b2a4ee366e6c7..998c2b5906cf75c4122d9a6506cc515b53023ee0 100644
--- a/resources/assets/less/metager/base.less
+++ b/resources/assets/less/metager/base.less
@@ -27,9 +27,6 @@ body {
display: flex;
flex-direction: column;
margin: 0;
- &>div {
- padding-top: 50px;
- }
}
.wrapper {
diff --git a/resources/assets/less/metager/result-page.less b/resources/assets/less/metager/result-page.less
index 1ac010e417770354fcc36e0a5cdcbb7777e536be..1071952d332429749b286d74d5eeb8a13408ec76 100644
--- a/resources/assets/less/metager/result-page.less
+++ b/resources/assets/less/metager/result-page.less
@@ -216,12 +216,6 @@ nav .input-group {
height: 100%;
}
-.content-wrapper {
- padding: 0px;
- padding-top: 52px;
- background-color: white;
-}
-
#helpButton {
color: black;
}
@@ -317,7 +311,6 @@ a {
.mg-logo {
color: #ff8000;
font-family: Liberation Sans, sans-serif;
- padding: 5px 30px 0px 0px;
}
#header-searchbar {
@@ -727,12 +720,12 @@ a {
border-bottom: 1px solid #ddd;
h2 {
margin: 10px 0px;
- font-size: 17px;
+ font-size: 16px;
font-weight: bold;
}
p {
display: none;
- font-size: 15px;
+ font-size: 14px;
}
}
.gefVon {
@@ -777,4 +770,92 @@ a {
}
}
}
+}
+
+
+/* New result style */
+
+@result-width: 700px;
+@quicktip-width: 500px;
+
+html,
+body,
+.content-wrapper {
+ width: 100%;
+}
+
+.content-wrapper {
+ display: flex;
+ flex-direction: column;
+}
+
+#header-logo a h1 {
+ margin: 0px;
+}
+
+#research-bar {
+ padding: 10px;
+ border-bottom: 2px solid rgb(255, 128, 0);
+ display: flex;
+ justify-content: center;
+ #header-searchbar {
+ margin-left: 10px;
+ }
+ @media (max-width: @screen-xs-max) {
+ flex-direction: column;
+ }
+}
+
+.resultpage-container {
+ width: @result-width + @quicktip-width;
+ align-self: center;
+ @media (max-width: (@result-width + @quicktip-width - 1px)) {
+ width: @result-width;
+ #quicktips {
+ display: none;
+ }
+ }
+ @media (max-width: @result-width) {
+ width: 100%;
+ }
+ display: flex;
+ justify-content: center;
+ #results {
+ max-width: @result-width;
+ width: 100%;
+ }
+ #quicktips {
+ padding-left: 50px;
+ width: @quicktip-width;
+ }
+}
+
+.result {
+ .result-title a {
+ color: black;
+ font-size: 18px;
+ font-weight: bold;
+ }
+ .result-header {
+ display: flex;
+ >* {
+ white-space: nowrap;
+ }
+ >*:not(:first-child) {
+ margin-left: 5px;
+ }
+ .result-link {
+ overflow: auto;
+ a {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: block;
+ }
+ }
+ }
+}
+
+@media (max-width: @screen-xs-max) {
+ // mobile
}
\ No newline at end of file
diff --git a/resources/assets/less/metager/searchbar.less b/resources/assets/less/metager/searchbar.less
index eff7b3a7a63e6a6e9aeee799066a8efd0d58679f..831e1a3ad21b19571c39e577e64d069d739cdff8 100644
--- a/resources/assets/less/metager/searchbar.less
+++ b/resources/assets/less/metager/searchbar.less
@@ -1,6 +1,7 @@
.searchbar {
display: flex;
align-items: stretch;
+ justify-content: center;
font-size: 16px;
background-color: white;
.search-focus-selector {
@@ -16,7 +17,7 @@
-moz-appearance: none;
appearance: none;
background-color: transparent;
- padding-right: 35px;
+ padding: 0px 35px 0px 5px;
font-family: FontAwesome, sans-serif;
border: none;
&>option {
@@ -73,6 +74,10 @@
.search-input-submit {
flex-grow: 1;
display: flex;
+ max-width: 600px;
+ @media (max-width: @screen-xs-max) {
+ max-width: initial;
+ }
}
.search-input {
flex-grow: 1;
@@ -178,7 +183,7 @@
}
.resultpage-searchbar {
- padding: 5px;
+ padding: 5px 45px 5px 5px;
:first-child {
border-left: none;
}
diff --git a/resources/views/layouts/researchandtabs.blade.php b/resources/views/layouts/researchandtabs.blade.php
index 40217345ec7d5ffe4ac65fdcc2f6ba91b696bfce..b99de7f613c51067da3851c1b963f4532e73c969 100644
--- a/resources/views/layouts/researchandtabs.blade.php
+++ b/resources/views/layouts/researchandtabs.blade.php
@@ -8,26 +8,16 @@
</div>
</div>
@endif
-<div class="content-wrapper container">
- <header id="research" class="row">
- <nav class="navbar navbar-default navbar-fixed-top navbar-resultpage">
- <div class="container">
- <div class="row" id="logo-searchbar-container">
- <div id="header-logo">
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><h1 class="mg-logo">MetaGer</h1></a>
- </div>
- <div id="header-searchbar">
- @include('parts.searchbar', ['class' => 'resultpage-searchbar', 'request' => Request::method()])
- </div>
- </div>
- </div>
- </nav>
- </header>
- <main id="main-content-tabs" class="row">
- <div>
- <div class="row">
- @yield('results')
- </div>
+<div class="content-wrapper">
+ <header id="research-bar">
+ <div id="header-logo">
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><h1 class="mg-logo">MetaGer</h1></a>
+ </div>
+ <div id="header-searchbar">
+ @include('parts.searchbar', ['class' => 'resultpage-searchbar', 'request' => Request::method()])
</div>
+ </header>
+ <main class="resultpage-container">
+ @yield('results')
</main>
-</div>
+</div>
\ No newline at end of file
diff --git a/resources/views/layouts/result.blade.php b/resources/views/layouts/result.blade.php
index 60ebca5dfd809cec58c656b86ad89b0112f04405..df1111fb9bb9beba732d81ec7fe3e02d50b9b0ef 100644
--- a/resources/views/layouts/result.blade.php
+++ b/resources/views/layouts/result.blade.php
@@ -1,73 +1,69 @@
-<div class="result row" data-count="{{ $result->number }}">
- <div class="resultInformation col-xs-12 col-sm-11">
- <div class="col-xs-10 col-sm-11" style="padding:0; ">
- <p class="title">
- <a class="title" href="{{ $result->link }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}" rel="noopener">
- {!! $result->titel !!}
- </a>
- </p>
- <div class="link">
- <div>
- <div class="link-link">
- <a href="{{ $result->link }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}" rel="noopener">
- {{ $result->anzeigeLink }}
+<div class="result" data-count="{{ $result->number }}">
+ <h2 class="result-title">
+ <a href="{{ $result->link }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}" rel="noopener">
+ {!! $result->titel !!}
+ </a>
+ </h2>
+ <div class="result-header">
+ <div class="result-link">
+ <a href="{{ $result->link }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}" rel="noopener">
+ {{ $result->anzeigeLink }}
+ </a>
+ </div>
+ <div class="result-options">
+ <a class="dropdown-opener" href="javascript:void(0);">
+ <i class="fa fa-caret-down option-opener-icon" aria-hidden="true"></i>
+ </a>
+ <div class="dropdown-content option-content">
+ <ul class="option-list list-unstyled small">
+ <li class="option-title">
+ <i class="fa fa-cog"></i> {!! trans('result.options.headline') !!}
+ </li>
+ <hr>
+ <li class="js-only">
+ <a href="javascript:resultSaver({{ $result->number }});" class="saver" data-counter="{{ $result->number }}">
+ <i class="fa fa-floppy-disk"></i> {!! trans('result.options.savetab') !!}
</a>
- </div>
- <div class="options">
- <a class="dropdown-opener" href="javascript:void(0);">
- <i class="fa fa-caret-down option-opener-icon" aria-hidden="true"></i>
+ </li>
+ @if(strlen($metager->getSite()) === 0)
+ <li>
+ <a href="{{ $metager->generateSiteSearchLink($result->strippedHost) }}">
+ {!! trans('result.options.1') !!}
</a>
- <div class="dropdown-content option-content">
- <ul class="option-list list-unstyled small">
- <li class="option-title">
- <i class="fa fa-cog"></i> {!! trans('result.options.headline') !!}
- </li>
- <hr>
- <li class="js-only">
- <a href="javascript:resultSaver({{ $result->number }});" class="saver" data-counter="{{ $result->number }}">
- <i class="fa fa-floppy-disk"></i> {!! trans('result.options.savetab') !!}
- </a>
- </li>
- @if(strlen($metager->getSite()) === 0)
- <li>
- <a href="{{ $metager->generateSiteSearchLink($result->strippedHost) }}">
- {!! trans('result.options.1') !!}
- </a>
- </li>
- @endif
- <li>
- <a href="{{ $metager->generateRemovedHostLink($result->strippedHost) }}">
- {!! trans('result.options.2', ['host' => $result->strippedHost]) !!}
- </a>
- </li>
- @if( $result->strippedHost !== $result->strippedDomain )
- <li>
- <a href="{{ $metager->generateRemovedDomainLink($result->strippedDomain) }}">
- {!! trans('result.options.3', ['domain' => $result->strippedDomain]) !!}
- </a>
- </li>
- @endif
- </ul>
- </div>
- </div>
- </div>
- <span class="hoster">
- von {!! $result->gefVon !!}
- </span>
- @if( isset($result->partnershop) && $result->partnershop === TRUE )
- <span class="partnershop-info">
- <img src="/img/boosticon.png" height="13" alt="">
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/partnershops") }}" target="_blank" rel="noopener">{!! trans('result.options.4') !!}</a>
- </span>
- @endif
- <a class="proxy" onmouseover="$(this).popover('show');" onmouseout="$(this).popover('hide');" data-toggle="popover" data-placement="auto right" data-container="body" data-content="@lang('result.proxytext')" href="{{ $result->proxyLink }}" target="{{ $metager->getNewtab() }}" rel="noopener">
- <img src="/img/proxyicon.png" alt="" />
- {!! trans('result.options.5') !!}
- </a>
+ </li>
+ @endif
+ <li>
+ <a href="{{ $metager->generateRemovedHostLink($result->strippedHost) }}">
+ {!! trans('result.options.2', ['host' => $result->strippedHost]) !!}
+ </a>
+ </li>
+ @if( $result->strippedHost !== $result->strippedDomain )
+ <li>
+ <a href="{{ $metager->generateRemovedDomainLink($result->strippedDomain) }}">
+ {!! trans('result.options.3', ['domain' => $result->strippedDomain]) !!}
+ </a>
+ </li>
+ @endif
+ </ul>
</div>
</div>
+ <span class="result-hoster">
+ <span>von {!! $result->gefVon !!}</span>
+ </span>
+ @if( isset($result->partnershop) && $result->partnershop === TRUE )
+ <span class="partnershop-info">
+ <img src="/img/boosticon.png" height="13" alt="">
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/partnershops") }}" target="_blank" rel="noopener">{!! trans('result.options.4') !!}</a>
+ </span>
+ @endif
+ <a class="result-proxy" onmouseover="$(this).popover('show');" onmouseout="$(this).popover('hide');" data-toggle="popover" data-placement="auto right" data-container="body" data-content="@lang('result.proxytext')" href="{{ $result->proxyLink }}" target="{{ $metager->getNewtab() }}" rel="noopener">
+ <img src="/img/proxyicon.png" alt="" />
+ <span>{!! trans('result.options.5') !!}</span>
+ </a>
+ </div>
+ <div>
@if( isset($result->logo) )
- <div class="col-xs-2 col-sm-1" style="padding: 0;">
+ <div>
<a href="{{ $result->link }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ strip_tags($result->gefVon) }}" data-count="{{ $result->number }}">
<img src="{{ $metager->getImageProxyLink($result->logo) }}" alt="" />
</a>
@@ -82,11 +78,10 @@
</div>
@else
@if( $metager->getFokus() == "nachrichten" )
- <div class="description"><span class="date">{{ isset($result->additionalInformation["date"])?date("Y-m-d H:i:s", $result->additionalInformation["date"]):"" }}</span> {{ $result->descr }}</div>
+ <div class="description"><span class="date">{{ isset($result->additionalInformation["date"])?date("Y-m-d H:i:s", $result->additionalInformation["date"]):"" }}</span> {{ $result->descr }}</div>
@else
- <div class="description">{{ $result->descr }}</div>
+ <div class="description">{{ $result->descr }}</div>
@endif
@endif
</div>
-
</div>
diff --git a/resources/views/layouts/resultPage.blade.php b/resources/views/layouts/resultPage.blade.php
index 2ec5f8b38f554211b4ffb484d25617d061a1f840..095e907e36e468231fdfe1819c45c451edb21826 100644
--- a/resources/views/layouts/resultPage.blade.php
+++ b/resources/views/layouts/resultPage.blade.php
@@ -25,15 +25,15 @@
@include('modals.create-focus-modal')
@include('layouts.researchandtabs')
@else
- <div class="tab-content container-fluid">
+ <div class="resultpage-container">
@yield('results')
</div>
@endif
<div id="feedback" style="width:50%;margin-left:25%;position: relative; top:10px;" class="alert alert-danger alert-dismissable">
<a href="#" class="close" data-dismiss="alert" aria-label="close">×</a>
- <strong> {!! trans('metaGer.feedback') !!}<a href="{{URL::to('')}}/kontakt/{{base64_encode(Request::fullUrl())}}/" target="_blank">
- {!! trans('kontakt.form.1') !!}</a>
- </strong>
+ <strong> {!! trans('metaGer.feedback') !!}<a href="{{URL::to('')}}/kontakt/{{base64_encode(Request::fullUrl())}}/" target="_blank">
+ {!! trans('kontakt.form.1') !!}</a>
+ </strong>
</div>
@include('parts.footer', ['type' => 'resultpage', 'id' => 'resultPageFooter'])
<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
diff --git a/resources/views/metager3.blade.php b/resources/views/metager3.blade.php
index e718409255db2013fbd25d53d81dcf14a6c0a700..3bbad8cb1f36d53480c51d41dc1239c5d55d86bc 100644
--- a/resources/views/metager3.blade.php
+++ b/resources/views/metager3.blade.php
@@ -1,6 +1,7 @@
@extends('layouts.resultPage')
@section('results')
+ {{-- Show all errors --}}
@if(sizeof($errors) > 0)
<div class="alert alert-danger">
<ul>
@@ -10,6 +11,7 @@
</ul>
</div>
@endif
+ {{-- Show all warnings --}}
@if(sizeof($warnings) > 0)
<div class="alert alert-warning">
<ul>
@@ -19,40 +21,41 @@
</ul>
</div>
@endif
- @if($metager->showQuicktips())
- <div class="col-xs-12 col-md-8 resultContainer">
- @else
- <div class="col-xs-12 col-md-12 resultContainer">
- @endif
+ <div id="results">
+ {{-- Show initial products or ads --}}
@if($metager->hasProducts())
- @if( $metager->getFokus() !== "produktsuche" && !$apiAuthorized)
- @include('layouts.products', ['products' => $metager->getProducts()])
- @endif
-
+ @if( $metager->getFokus() !== "produktsuche" && !$apiAuthorized)
+ @include('layouts.products', ['products' => $metager->getProducts()])
+ @endif
@else
@for($i = 0; $i <= 2; $i++)
@include('layouts.ad', ['ad' => $metager->popAd()])
@endfor
@endif
+ {{-- Show map --}}
@if($metager->getMaps())
- <div class="result row" id="map">
- <div class="resultInformation col-xs-12 col-sm-11">
+ <div class="result" id="map">
<iframe class="" src="https://maps.metager.de/metager/{{ $metager->getQ() }}" scrolling="no" tabindex="-1" style="width: 100%; height:0; border:0;"></iframe>
</div>
- </div>
@endif
+ {{-- Create results and ongoing ads --}}
@foreach($metager->getResults() as $result)
@if($result->number % 7 === 0)
@include('layouts.ad', ['ad' => $metager->popAd()])
@endif
@include('layouts.result', ['result' => $result])
@endforeach
+ {{-- Show pagination --}}
<nav class="mg-pager" aria-label="...">
- <div @if($metager->getPage() === 1) class="disabled" @endif><a href="@if($metager->getPage() === 1) # @else javascript:history.back() @endif">{{ trans('results.zurueck') }}</a></div>
- <div @if($metager->nextSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->nextSearchLink() }}">{{ trans('results.weiter') }}</a></div>
+ <div @if($metager->getPage() === 1) class="disabled" @endif>
+ <a @if($metager->getPage() !== 1) href="javascript:history.back()" @endif>{{ trans('results.zurueck') }}</a>
+ </div>
+ <div @if($metager->nextSearchLink() === "#") class="disabled" @endif>
+ <a @if($metager->nextSearchLink() !== "#") href="{{ $metager->nextSearchLink() }}" @endif>{{ trans('results.weiter') }}</a>
+ </div>
</nav>
</div>
@if( $metager->showQuicktips() )
- <div class="col-md-4 hidden-xs hidden-sm" id="quicktips"></div>
+ <div id="quicktips"></div>
@endif
@endsection
diff --git a/resources/views/metager3results.blade.php b/resources/views/metager3results.blade.php
index 8dee0601cd6bfa4872299a0b7715c326d11ab797..68480ab987ffd3fc1587635278020dabb78f49ac 100644
--- a/resources/views/metager3results.blade.php
+++ b/resources/views/metager3results.blade.php
@@ -1,4 +1,5 @@
-@if( sizeof($errors) > 0 )
+{{-- Show all errors --}}
+@if(sizeof($errors) > 0)
<div class="alert alert-danger">
<ul>
@foreach($errors as $error)
@@ -7,7 +8,8 @@
</ul>
</div>
@endif
-@if( sizeof($warnings) > 0)
+{{-- Show all warnings --}}
+@if(sizeof($warnings) > 0)
<div class="alert alert-warning">
<ul>
@foreach($warnings as $warning)
@@ -16,37 +18,40 @@
</ul>
</div>
@endif
-<div class="col-xs-12 col-md-8">
+<div id="results">
+ {{-- Show initial products or ads --}}
@if($metager->hasProducts())
- @if( $metager->getFokus() !== "produktsuche" && !$apiAuthorized)
- @include('layouts.products', ['products' => $metager->getProducts()])
+ @if( $metager->getFokus() !== "produktsuche" && !$apiAuthorized)
+ @include('layouts.products', ['products' => $metager->getProducts()])
@endif
@else
@for($i = 0; $i <= 2; $i++)
@include('layouts.ad', ['ad' => $metager->popAd()])
@endfor
@endif
+ {{-- Show map --}}
@if($metager->getMaps())
- <div class="result row" id="map">
- <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>
+ <div class="result" id="map">
+ <iframe class="" src="https://maps.metager.de/metager/{{ $metager->getQ() }}" scrolling="no" tabindex="-1" style="width: 100%; height:0; border:0;"></iframe>
</div>
@endif
+ {{-- Create results and ongoing ads --}}
@foreach($metager->getResults() as $result)
@if($result->number % 7 === 0)
@include('layouts.ad', ['ad' => $metager->popAd()])
@endif
@include('layouts.result', ['result' => $result])
@endforeach
- <nav aria-label="...">
- <ul class="pager">
- <li @if($metager->getPage() === 1) class="disabled" @endif><a href="@if($metager->getPage() === 1) # @else javascript:history.back() @endif">{{ trans('results.zurueck') }}</a></li>
- <li @if($metager->nextSearchLink() === "#") class="disabled" @endif><a href="{{ $metager->nextSearchLink() }}">{{ trans('results.weiter') }}</a></li>
- </ul>
+ {{-- Show pagination --}}
+ <nav class="mg-pager" aria-label="...">
+ <div @if($metager->getPage() === 1) class="disabled" @endif>
+ <a @if($metager->getPage() !== 1) href="javascript:history.back()" @endif>{{ trans('results.zurueck') }}</a>
+ </div>
+ <div @if($metager->nextSearchLink() === "#") class="disabled" @endif>
+ <a @if($metager->nextSearchLink() !== "#") href="{{ $metager->nextSearchLink() }}" @endif>{{ trans('results.weiter') }}</a>
+ </div>
</nav>
</div>
@if( $metager->showQuicktips() )
- <div class="col-md-4 hidden-xs hidden-sm" id="quicktips"></div>
-@endif
-</div>
+ <div id="quicktips"></div>
+@endif
\ No newline at end of file