diff --git a/resources/assets/less/metager/result-page.less b/resources/assets/less/metager/result-page.less
index 893389de298551d3f64ff25e93ee70f91cb3a2a1..ec5adf0e4baba53cbb1b3ac365b057d7c7802fd3 100644
--- a/resources/assets/less/metager/result-page.less
+++ b/resources/assets/less/metager/result-page.less
@@ -35,7 +35,7 @@
@lsprev-or-lsnext-i-background-color: @result-page-color-black;
body {
background-image: inherit;
- background-color: @body-background-color;
+ background-color: white;
}
footer {
@@ -48,7 +48,6 @@ footer {
#map,
#map div {
display: flex;
- margin: 0;
}
.nav-tabs>li>a {
@@ -208,10 +207,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 {
@@ -316,13 +312,9 @@ a {
.result {
margin-bottom: 40px;
width: 100%;
- &>.number {
- font-size: 15px;
- line-height: 1;
- text-align: right;
- }
&>.resultInformation {
border-radius: 5px;
+ padding-left: 0px;
&>.save {
position: absolute;
top: 0;
@@ -391,7 +383,7 @@ a {
}
img {
margin: 5px;
- margin-left: 0;
+ margin-left: 0px;
margin-right: 15px;
height: auto;
width: auto;
@@ -400,11 +392,19 @@ a {
border: solid 1px @result-description-img-border-color;
}
}
- &.ad .description {
- max-width: 115ch;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ &.ad {
+ .ad-label {
+ border: green solid 1px;
+ padding: 1px;
+ color: green;
+ border-radius: 4px;
+ }
+ .description {
+ max-width: 115ch;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
}
.hoster {
font-size: 13px;
@@ -493,15 +493,6 @@ a {
}
}
-#quicktips iframe {
- width: 100%;
- height: 800px;
- background-color: transparent;
- border: 0px none transparent;
- padding: 0px;
- overflow: hidden;
-}
-
.js-only {
display: none;
}
@@ -632,14 +623,14 @@ a {
}
}
-@media(max-width: @screen-xs-max) {
- .resultContainer {
- padding-left: 0;
- padding-right: 0;
+.resultContainer {
+ margin: 0px;
+ padding: 0px;
+ @media(max-width: @screen-xs-max) {
+ padding-right: 0px;
}
}
-
/*
* <div id="quicktips">
* <div class="quicktip" type="TYPE">
@@ -656,8 +647,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;
@@ -675,18 +665,21 @@ a {
font-size: 15px;
font-weight: bold;
}
+ p {
+ font-size: 16px;
+ }
}
.quicktip-detail {
border-top: 1px solid #ddd;
border-bottom: 1px solid #ddd;
h2 {
margin: 10px 0px;
- font-size: 14px;
+ font-size: 16px;
font-weight: bold;
}
p {
display: none;
- font-size: 12px;
+ font-size: 14px;
}
}
.gefVon {
diff --git a/resources/lang/de/ad.php b/resources/lang/de/ad.php
index 000f5b3c255210f32461d3ce10510c87285ed520..45514ae2502449a84d518587086920fe53d175df 100644
--- a/resources/lang/de/ad.php
+++ b/resources/lang/de/ad.php
@@ -1,5 +1,6 @@
<?php
return [
+ 'werbung' => 'Werbung',
'von' => 'Werbung von',
];
diff --git a/resources/lang/en/ad.php b/resources/lang/en/ad.php
index ad94ee89eb0cf67e992a5733e5e5b7e0fb4ce5d9..b62512838d61fcfb139998b7643eec0db85d6ede 100644
--- a/resources/lang/en/ad.php
+++ b/resources/lang/en/ad.php
@@ -1,5 +1,4 @@
<?php
return [
- 'von' => 'Advertisement by',
];
diff --git a/resources/lang/es/ad.php b/resources/lang/es/ad.php
index 9332c62b6c87868281853a5a6a91c884efe4f93e..6dd3552331f7b742ca73b82d99f0a1ae5b549f31 100644
--- a/resources/lang/es/ad.php
+++ b/resources/lang/es/ad.php
@@ -1,5 +1,4 @@
<?php
return [
- "von" => "Reclamo de:"
];
\ No newline at end of file
diff --git a/resources/views/layouts/ad.blade.php b/resources/views/layouts/ad.blade.php
index 334f76d2fea5fbaf163f9590aa383da0de716d3a..79a11634e7402fc1f4951b4da6cda79fa6bd0675 100644
--- a/resources/views/layouts/ad.blade.php
+++ b/resources/views/layouts/ad.blade.php
@@ -1,6 +1,5 @@
@if(isset($ad) && !$apiAuthorized)
<div class="result ad row">
- <div class="number col-sm-1"></div>
<div class="resultInformation col-sm-10">
<p class="title">
<a class="title" href="{{ $ad->link }}" target="{{ $metager->getNewtab() }}" data-hoster="{{ $ad->gefVon }}" data-count="0">
@@ -12,7 +11,7 @@
{{ $ad->anzeigeLink }}
</a>
<span class="hoster">
- {!! trans('ad.von') !!} {!! $ad->gefVon !!}
+ <span class="ad-label">{!! trans('ad.werbung') !!}</span> {!! trans('ad.von') !!} {!! $ad->gefVon !!}
</span>
</p>
<p class="description">
diff --git a/resources/views/layouts/researchandtabs.blade.php b/resources/views/layouts/researchandtabs.blade.php
index 118384eac06da7b41ca7983045f0fc640351b6c8..3d26cac5c787e9429a35bbbe4a84c4241b36019a 100644
--- a/resources/views/layouts/researchandtabs.blade.php
+++ b/resources/views/layouts/researchandtabs.blade.php
@@ -17,7 +17,7 @@
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><h1>M<span class="hidden-xs">eta</span>G<span class="hidden-xs">er</span></h1></a>
</div>
<div class="col-xs-9 dense-col">
- <form method="{{ Request::method() }}" accept-charset="UTF-8" class="form" id="submitForm">
+ <form method="{{ Request::method() }}" accept-charset="UTF-8" class="form search-bar-input" id="submitForm">
<div class="searchbar">
<input autocomplete="off" class="form-control" form="submitForm" id="eingabeTop" name="eingabe" placeholder="Suchbegriffe erweitern/verändern, oder völlig neue Suche:" tabindex="1" type="text" value="{{ $eingabe }}" required />
<button type='submit' form="submitForm" id='search'><i class="fa fa-search" aria-hidden="true"></i></button>
@@ -32,168 +32,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>
diff --git a/resources/views/layouts/result.blade.php b/resources/views/layouts/result.blade.php
index 0f80c819729e844e18793b2d52cb4f519c775f12..60ebca5dfd809cec58c656b86ad89b0112f04405 100644
--- a/resources/views/layouts/result.blade.php
+++ b/resources/views/layouts/result.blade.php
@@ -1,7 +1,4 @@
<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">
diff --git a/resources/views/metager3.blade.php b/resources/views/metager3.blade.php
index 73fb507906348029ece063e333298913e9c953c8..8c4522ffd231e637ddb1e7a8bff7c6ab7ee6583a 100644
--- a/resources/views/metager3.blade.php
+++ b/resources/views/metager3.blade.php
@@ -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>
diff --git a/resources/views/metager3results.blade.php b/resources/views/metager3results.blade.php
index f0e66ecd683a7033299a204b9cf1f74778455513..8dee0601cd6bfa4872299a0b7715c326d11ab797 100644
--- a/resources/views/metager3results.blade.php
+++ b/resources/views/metager3results.blade.php
@@ -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>