diff --git a/app/Models/Result.php b/app/Models/Result.php index 7ffc3150945cd4944986eebe3bf62a92e64f75f7..b82962529a1de94c3347077734f47ef5755f534a 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 996884db282e88b7bd8694d014bcfd77698584ea..0dd3b76bfa7621203aa5e01f3ef3d34629642bfe 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 897c000b022d5d6489dd88eaddf19fb64937e123..bac93f380566dcabb067196600bbe8af9136b2d9 100644 --- a/resources/assets/less/metager/quicktips.less +++ b/resources/assets/less/metager/quicktips.less @@ -1,20 +1,5 @@ /* Quicktips */ - -/* - *
SUMMARY - *
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 53691c6ddb0b24a8b0abe51a897fea1cf581ba56..0f72dc7e531dde86611e095dbf2e1d9844e13b81 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 ddcf960348dcd18c7dab279f70cf68b32890cc6f..4a7cbe252fd29f0894c77f06c225166cb92f7c72 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 !!}
+
-
- {!! $result->titel !!}
-
-
+
@@ -20,14 +18,14 @@