From 174c605219cc279ca316ec07f94e695dd702b649 Mon Sep 17 00:00:00 2001 From: Karl Hasselbring Date: Tue, 16 Jan 2018 11:18:13 +0100 Subject: [PATCH] =?UTF-8?q?Verbessertes=20Kartendesign,=20jetzt=20auch=20f?= =?UTF-8?q?=C3=BCr=20Quicktips?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/Result.php | 7 +- app/Models/Searchengine.php | 2 +- resources/assets/less/metager/quicktips.less | 22 ++--- resources/assets/less/metager/result.less | 96 ++++++++++---------- resources/views/layouts/ad.blade.php | 27 +++--- resources/views/layouts/result.blade.php | 50 +++++----- 6 files changed, 90 insertions(+), 114 deletions(-) diff --git a/app/Models/Result.php b/app/Models/Result.php index 7ffc3150..b8296252 100644 --- a/app/Models/Result.php +++ b/app/Models/Result.php @@ -22,13 +22,12 @@ class Result public $engineBoost = 1; # Der Boost für den Provider des Suchergebnisses public $valid = true; # Ob das Ergebnis noch gültig ist (bool) public $host; # Der aus dem Link gelesene Host des Suchergebnisses - public $strippedHost; # Der Host in Form "foo.bar.de" - public $strippedDomain; # Die Domain in Form "bar.de" - public $strippedLink; # Der Link in Form "foo.bar.de/test" + public $strippedHost; # Der Host in Form "foo.bar.de" + public $strippedDomain; # Die Domain in Form "bar.de" + public $strippedLink; # Der Link in Form "foo.bar.de/test" public $rank; # Das Ranking für das Ergebnis # Erstellt ein neues Ergebnis - #public function __construct($provider, $titel, $link, $anzeigeLink, $descr, $gefVon, $sourceRank, $partnershop = false, $image = "", $price = 0, $additionalInformation = []) public function __construct($provider, $titel, $link, $anzeigeLink, $descr, $gefVon, $sourceRank, $additionalInformation = []) { $provider = simplexml_load_string($provider); diff --git a/app/Models/Searchengine.php b/app/Models/Searchengine.php index 996884db..0dd3b76b 100644 --- a/app/Models/Searchengine.php +++ b/app/Models/Searchengine.php @@ -71,7 +71,7 @@ abstract class Searchengine $this->useragent = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1"; $this->ip = $metager->getIp(); - $this->gefVon = "homepage . "\" target=\"_blank\" rel=\"noopener\">" . $this->displayName . ""; + $this->gefVon = $this->displayName; $this->startTime = microtime(); # Suchstring generieren diff --git a/resources/assets/less/metager/quicktips.less b/resources/assets/less/metager/quicktips.less index 897c000b..bac93f38 100644 --- a/resources/assets/less/metager/quicktips.less +++ b/resources/assets/less/metager/quicktips.less @@ -1,20 +1,5 @@ /* Quicktips */ - -/* - *
- *
- *
- * - *

TITLE - *

SUMMARY - *

- *

DETAILTITLE - *

DETAILSUMMARY - * GEFVON - * - */ - #quicktips { display: flex; flex-direction: column; @@ -25,7 +10,12 @@ .quicktip { margin: 10px 0px; padding: 10px 0px 10px 10px; + width: 100%; + border: 1px solid #ccc; border-left: 3px solid #fb0; + @media(max-width: @screen-xs-max) { + box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24); + } details:not([open=""]) { .quicktip-summary p { white-space: nowrap; @@ -81,7 +71,7 @@ } } &[type=spendenaufruf] { - border-left: #ddd; + border: none; color: #ff8000; .quicktip-summary { display: flex; diff --git a/resources/assets/less/metager/result.less b/resources/assets/less/metager/result.less index 53691c6d..0f72dc7e 100644 --- a/resources/assets/less/metager/result.less +++ b/resources/assets/less/metager/result.less @@ -11,40 +11,35 @@ @media(max-width: @screen-xs-max) { box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24); } - .result-title { - margin: 0px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - a, - a:active, - a:hover, - a:focus, - a:visited { - color: black; - font-size: @result-font-large; - font-weight: bold; - text-decoration: none; - } - } .result-header { - display: flex; - >*:not(:first-child) { - margin-left: 15px; + .result-title { + margin: 0px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + font-size: @result-font-large; + a { + &, + &:active, + &:hover, + &:focus, + &:visited { + color: black; + text-decoration: none; + } + } } .result-link { - overflow: auto; - a, - a:active, - a:hover, - a:focus, - a:visited { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - display: block; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + font-size: @result-font-small; + &, + &:active, + &:hover, + &:focus, + &:visited { color: #333; - font-size: @result-font-small; text-decoration: none; } } @@ -85,13 +80,19 @@ margin-top: 25px; display: flex; flex-wrap: wrap; - &>* { - margin: 10px; + &>*:not(:first-child) { + margin-left: 20px; } - .result-open a { - color: #ff8000; + .result-open { + &, + &:active, + &:hover, + &:focus, + &:visited { + color: #ff8000; + } } - .result-open-newtab a { + .result-open-newtab { &, &:active, &:hover, @@ -102,8 +103,7 @@ text-decoration: none; } } - .result-open-proxy, - .result-open-proxy a { + .result-open-proxy { &, &:active, &:hover, @@ -144,6 +144,7 @@ background-color: #e0e0e0; } a, + a:active, a:hover, a:focus, a:visited { @@ -154,19 +155,14 @@ } } &.ad .ad-label { - border: green solid 1px; - padding: 1px; - color: green; - border-radius: 4px; - } - .result-information { - border-radius: 5px; - padding-left: 0px; - &>.save { - position: absolute; - top: 0; - right: 10px; - cursor: pointer; + &, + & a, + & a:active, + & a:hover, + & a:focus, + & a:visited { + font-size: @result-font-small; + color: #555; } } &>.remover { diff --git a/resources/views/layouts/ad.blade.php b/resources/views/layouts/ad.blade.php index ddcf9603..4a7cbe25 100644 --- a/resources/views/layouts/ad.blade.php +++ b/resources/views/layouts/ad.blade.php @@ -1,22 +1,21 @@ @if(isset($ad) && !$apiAuthorized)

-

- - {{ $ad->titel }} - -

+ Werbung von {!! $ad->gefVon !!} +
-
- - {{ $ad->anzeigeLink }} +

+ + {{ $ad->titel }} -

- - {!! trans('ad.werbung') !!} {!! trans('ad.von') !!} {!! $ad->gefVon !!} - +

+ + {{ $ad->anzeigeLink }} +
-
- {{ $ad->descr }} +
+
+ {{ $ad->descr }} +
@endif diff --git a/resources/views/layouts/result.blade.php b/resources/views/layouts/result.blade.php index b89f5faa..149a8202 100644 --- a/resources/views/layouts/result.blade.php +++ b/resources/views/layouts/result.blade.php @@ -1,15 +1,13 @@ -
-

- - {!! $result->titel !!} - -

+
-
- - {{ $result->anzeigeLink }} +

+ + {!! $result->titel !!} -

+

+ + {{ $result->anzeigeLink }} + @if( isset($result->partnershop) && $result->partnershop === TRUE ) @@ -20,14 +18,14 @@
@if( isset($result->logo) ) @endif @if( $result->image !== "" )
- + {!! $result->descr !!} @@ -45,22 +43,16 @@ @endif
-
- - ÖFFNEN - -
-
- - IN NEUEM TAB - -
-
- - - ANONYM ÖFFNEN - -
+ + ÖFFNEN + + + IN NEUEM TAB + + + + ANONYM ÖFFNEN +
@@ -72,7 +64,7 @@
  • - + {!! trans('result.options.savetab') !!}
    • -- GitLab