From b799e3f593df7552176511fb73b74cf216db016d Mon Sep 17 00:00:00 2001
From: Karl Hasselbring <Karl Hasselbring>
Date: Tue, 20 Feb 2018 11:57:37 +0100
Subject: [PATCH] Ergebnis Hoster wird jetzt zu jedem Ergebnis oben rechts
angezeigt und ist verlinkt
---
app/Models/Result.php | 6 ++-
app/Models/Searchengine.php | 2 -
app/Models/parserSkripte/Allesklar.php | 2 +-
app/Models/parserSkripte/BASE.php | 2 +-
app/Models/parserSkripte/Beammachine.php | 2 +-
app/Models/parserSkripte/Bing.php | 2 +-
app/Models/parserSkripte/Bing_bilder.php | 2 +-
app/Models/parserSkripte/Blogsearch.php | 2 +-
app/Models/parserSkripte/Dailymotion.php | 2 +-
app/Models/parserSkripte/Dart.php | 2 +-
app/Models/parserSkripte/Dmoznebel.php | 2 +-
app/Models/parserSkripte/Dmoznebel_int.php | 2 +-
app/Models/parserSkripte/Ebay.php | 2 +-
app/Models/parserSkripte/Ecoshopper.php | 2 +-
app/Models/parserSkripte/Europeana.php | 2 +-
app/Models/parserSkripte/Exalead.php | 2 +-
app/Models/parserSkripte/Fairmondo.php | 2 +-
app/Models/parserSkripte/Fastbot.php | 2 +-
app/Models/parserSkripte/Fernsehsuche.php | 2 +-
app/Models/parserSkripte/Fess.php | 2 +-
app/Models/parserSkripte/Flickr.php | 2 +-
app/Models/parserSkripte/Goyax.php | 2 +-
app/Models/parserSkripte/Loklak.php | 2 +-
app/Models/parserSkripte/Mg_hochsch_de.php | 2 +-
app/Models/parserSkripte/Mg_produkt2.php | 2 +-
app/Models/parserSkripte/Mnogosearch.php | 2 +-
app/Models/parserSkripte/Nebel.php | 2 +-
app/Models/parserSkripte/Onenewspage.php | 2 +-
.../parserSkripte/Onenewspagegermany.php | 2 +-
app/Models/parserSkripte/Onenewspagevideo.php | 2 +-
app/Models/parserSkripte/Openclipart.php | 2 +-
.../parserSkripte/Opencrawlastronomie.php | 2 +-
app/Models/parserSkripte/Opencrawlpolitik.php | 2 +-
.../parserSkripte/Opencrawlregengergie.php | 2 +-
app/Models/parserSkripte/Overture.php | 4 +-
app/Models/parserSkripte/OvertureAds.php | 2 +-
app/Models/parserSkripte/Pixabay.php | 2 +-
app/Models/parserSkripte/Qip.php | 2 +-
app/Models/parserSkripte/Qualigo.php | 2 +-
app/Models/parserSkripte/Radiobrowser.php | 2 +-
app/Models/parserSkripte/Similar_product.php | 2 +-
.../parserSkripte/Similar_product_ads.php | 2 +-
app/Models/parserSkripte/Suchticker.php | 2 +-
app/Models/parserSkripte/Tuhh.php | 2 +-
app/Models/parserSkripte/Wikipedia.php | 2 +-
app/Models/parserSkripte/Witch.php | 2 +-
app/Models/parserSkripte/Yacy.php | 2 +-
app/Models/parserSkripte/Yacyunih.php | 2 +-
app/Models/parserSkripte/Yandex.php | 2 +-
app/Models/parserSkripte/Zeitde.php | 2 +-
resources/assets/less/metager/result.less | 39 ++++++++++++-------
resources/views/layouts/ad.blade.php | 14 ++++---
resources/views/layouts/result.blade.php | 13 ++++---
53 files changed, 93 insertions(+), 79 deletions(-)
diff --git a/app/Models/Result.php b/app/Models/Result.php
index b82962529..445c5180c 100644
--- a/app/Models/Result.php
+++ b/app/Models/Result.php
@@ -13,7 +13,8 @@ class Result
public $anzeigeLink; # Der tatsächlich angezeigte Link (rein optisch)
public $descr; # Die eventuell gekürzte Beschreibung des Suchergebnisses
public $longDescr; # Die ungekürzte Beschreibung des Suchergebnisses
- public $gefVon; # Das bei Suchergebnissen angezeigte von ... mitsamt Verlinkung
+ public $gefVon; # Die Suchmaschine von der dieses Ergebnis stammt
+ public $gefVonLink;
public $sourceRank; # Das Ranking für dieses Suchergebnis von der Seite, die es geliefert hat (implizit durch Ergebnisreihenfolge: 20 - Position in Ergebnisliste)
public $partnershop; # Ist das Ergebnis von einem Partnershop? (bool)
public $image; # Ein Vorschaubild für das Suchergebnis (als URL)
@@ -28,7 +29,7 @@ class Result
public $rank; # Das Ranking für das Ergebnis
# Erstellt ein neues Ergebnis
- public function __construct($provider, $titel, $link, $anzeigeLink, $descr, $gefVon, $sourceRank, $additionalInformation = [])
+ public function __construct($provider, $titel, $link, $anzeigeLink, $descr, $gefVon, $gefVonLink, $sourceRank, $additionalInformation = [])
{
$provider = simplexml_load_string($provider);
$this->titel = strip_tags(trim($titel));
@@ -46,6 +47,7 @@ class Result
}
$this->gefVon = trim($gefVon);
+ $this->gefVonLink = trim($gefVonLink);
$this->proxyLink = $this->generateProxyLink($this->link);
$this->sourceRank = $sourceRank;
if ($this->sourceRank <= 0 || $this->sourceRank > 20) {
diff --git a/app/Models/Searchengine.php b/app/Models/Searchengine.php
index c54d53eaa..d7611ff9e 100644
--- a/app/Models/Searchengine.php
+++ b/app/Models/Searchengine.php
@@ -23,7 +23,6 @@ abstract class Searchengine
public $cached = false;
public $ip; # Die IP aus der metager
- public $gefVon; # Der HTML-Code für die Verlinkung des Suchanbieters
public $uses; # Die Anzahl der Nutzungen dieser Suchmaschine
public $homepage; # Die Homepage dieser Suchmaschine
public $name; # Der Name dieser Suchmaschine
@@ -71,7 +70,6 @@ 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 = $this->displayName;
$this->startTime = microtime();
# Suchstring generieren
diff --git a/app/Models/parserSkripte/Allesklar.php b/app/Models/parserSkripte/Allesklar.php
index 2f5bb9e2c..7c7ca825a 100644
--- a/app/Models/parserSkripte/Allesklar.php
+++ b/app/Models/parserSkripte/Allesklar.php
@@ -43,7 +43,7 @@ class Allesklar extends Searchengine
$link,
$link,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
} catch (\Exception $e) {
diff --git a/app/Models/parserSkripte/BASE.php b/app/Models/parserSkripte/BASE.php
index 1ab7fe8cc..5ebbbf913 100644
--- a/app/Models/parserSkripte/BASE.php
+++ b/app/Models/parserSkripte/BASE.php
@@ -49,7 +49,7 @@ class BASE extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
}
diff --git a/app/Models/parserSkripte/Beammachine.php b/app/Models/parserSkripte/Beammachine.php
index 2dd2355b7..a37c2258c 100644
--- a/app/Models/parserSkripte/Beammachine.php
+++ b/app/Models/parserSkripte/Beammachine.php
@@ -34,7 +34,7 @@ class Beammachine extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
}
diff --git a/app/Models/parserSkripte/Bing.php b/app/Models/parserSkripte/Bing.php
index 5d94c4dc0..af6ebc9fe 100644
--- a/app/Models/parserSkripte/Bing.php
+++ b/app/Models/parserSkripte/Bing.php
@@ -32,7 +32,7 @@ class Bing extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
});
diff --git a/app/Models/parserSkripte/Bing_bilder.php b/app/Models/parserSkripte/Bing_bilder.php
index 24b854814..56dc4fd21 100644
--- a/app/Models/parserSkripte/Bing_bilder.php
+++ b/app/Models/parserSkripte/Bing_bilder.php
@@ -31,7 +31,7 @@ class Bing_bilder extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter,
['image' => $image]
);
diff --git a/app/Models/parserSkripte/Blogsearch.php b/app/Models/parserSkripte/Blogsearch.php
index b35df8321..ebe8bb006 100644
--- a/app/Models/parserSkripte/Blogsearch.php
+++ b/app/Models/parserSkripte/Blogsearch.php
@@ -36,7 +36,7 @@ class Blogsearch extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
}
diff --git a/app/Models/parserSkripte/Dailymotion.php b/app/Models/parserSkripte/Dailymotion.php
index 2cc36d8d6..d2a25e7f1 100644
--- a/app/Models/parserSkripte/Dailymotion.php
+++ b/app/Models/parserSkripte/Dailymotion.php
@@ -37,7 +37,7 @@ class Dailymotion extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter,
['partnershop' => false]
);
diff --git a/app/Models/parserSkripte/Dart.php b/app/Models/parserSkripte/Dart.php
index 86f601e71..b854d65cf 100644
--- a/app/Models/parserSkripte/Dart.php
+++ b/app/Models/parserSkripte/Dart.php
@@ -57,7 +57,7 @@ class Dart extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
}
diff --git a/app/Models/parserSkripte/Dmoznebel.php b/app/Models/parserSkripte/Dmoznebel.php
index 09354fe7a..6fb2878d2 100644
--- a/app/Models/parserSkripte/Dmoznebel.php
+++ b/app/Models/parserSkripte/Dmoznebel.php
@@ -36,7 +36,7 @@ class Dmoznebel extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
}
diff --git a/app/Models/parserSkripte/Dmoznebel_int.php b/app/Models/parserSkripte/Dmoznebel_int.php
index cf2702461..b23e45ad9 100644
--- a/app/Models/parserSkripte/Dmoznebel_int.php
+++ b/app/Models/parserSkripte/Dmoznebel_int.php
@@ -28,7 +28,7 @@ class Dmoznebel_int extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
}
diff --git a/app/Models/parserSkripte/Ebay.php b/app/Models/parserSkripte/Ebay.php
index 1312083bc..34ce81907 100644
--- a/app/Models/parserSkripte/Ebay.php
+++ b/app/Models/parserSkripte/Ebay.php
@@ -51,7 +51,7 @@ class Ebay extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter,
['partnershop' => false,
'price' => $price,
diff --git a/app/Models/parserSkripte/Ecoshopper.php b/app/Models/parserSkripte/Ecoshopper.php
index 4bee36fac..e5c752a16 100644
--- a/app/Models/parserSkripte/Ecoshopper.php
+++ b/app/Models/parserSkripte/Ecoshopper.php
@@ -49,7 +49,7 @@ class Ecoshopper extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter,
['partnershop' => false,
'image' => $image]
diff --git a/app/Models/parserSkripte/Europeana.php b/app/Models/parserSkripte/Europeana.php
index e61a6e70f..5fe68369e 100644
--- a/app/Models/parserSkripte/Europeana.php
+++ b/app/Models/parserSkripte/Europeana.php
@@ -42,7 +42,7 @@ class Europeana extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter,
['image' => $image]
);
diff --git a/app/Models/parserSkripte/Exalead.php b/app/Models/parserSkripte/Exalead.php
index 1d6694d4b..7592ca1bc 100644
--- a/app/Models/parserSkripte/Exalead.php
+++ b/app/Models/parserSkripte/Exalead.php
@@ -61,7 +61,7 @@ class Exalead extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
} catch (\ErrorException $e) {
diff --git a/app/Models/parserSkripte/Fairmondo.php b/app/Models/parserSkripte/Fairmondo.php
index 4a5f6068a..cbe480aa4 100644
--- a/app/Models/parserSkripte/Fairmondo.php
+++ b/app/Models/parserSkripte/Fairmondo.php
@@ -42,7 +42,7 @@ class Fairmondo extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter,
[
'price' => $price,
diff --git a/app/Models/parserSkripte/Fastbot.php b/app/Models/parserSkripte/Fastbot.php
index 448b9cf07..63a3a12c6 100644
--- a/app/Models/parserSkripte/Fastbot.php
+++ b/app/Models/parserSkripte/Fastbot.php
@@ -38,7 +38,7 @@ class Fastbot extends Searchengine
$link,
$result[3],
$result[2],
- $this->gefVon,
+ $this->displayName,$this->homepage,
$counter
);
}
diff --git a/app/Models/parserSkripte/Fernsehsuche.php b/app/Models/parserSkripte/Fernsehsuche.php
index 1c9d70457..8773c3c4c 100644
--- a/app/Models/parserSkripte/Fernsehsuche.php
+++ b/app/Models/parserSkripte/Fernsehsuche.php
@@ -38,7 +38,7 @@ class Fernsehsuche extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter,
['image' => $image]
);
diff --git a/app/Models/parserSkripte/Fess.php b/app/Models/parserSkripte/Fess.php
index a69142243..c25a006be 100644
--- a/app/Models/parserSkripte/Fess.php
+++ b/app/Models/parserSkripte/Fess.php
@@ -37,7 +37,7 @@ class Fess extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
} catch (\ErrorException $e) {
diff --git a/app/Models/parserSkripte/Flickr.php b/app/Models/parserSkripte/Flickr.php
index 4c6f53d4f..37be977e0 100644
--- a/app/Models/parserSkripte/Flickr.php
+++ b/app/Models/parserSkripte/Flickr.php
@@ -37,7 +37,7 @@ class Flickr extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter,
['image' => $image]
);
diff --git a/app/Models/parserSkripte/Goyax.php b/app/Models/parserSkripte/Goyax.php
index 9c21a4952..3ffe53aa9 100644
--- a/app/Models/parserSkripte/Goyax.php
+++ b/app/Models/parserSkripte/Goyax.php
@@ -31,7 +31,7 @@ class Goyax extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
});
diff --git a/app/Models/parserSkripte/Loklak.php b/app/Models/parserSkripte/Loklak.php
index 04d005eaf..deae65cda 100644
--- a/app/Models/parserSkripte/Loklak.php
+++ b/app/Models/parserSkripte/Loklak.php
@@ -35,7 +35,7 @@ class Loklak extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
}
diff --git a/app/Models/parserSkripte/Mg_hochsch_de.php b/app/Models/parserSkripte/Mg_hochsch_de.php
index 6914c8100..2f86369ba 100644
--- a/app/Models/parserSkripte/Mg_hochsch_de.php
+++ b/app/Models/parserSkripte/Mg_hochsch_de.php
@@ -34,7 +34,7 @@ class Mg_hochsch_de extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
}
diff --git a/app/Models/parserSkripte/Mg_produkt2.php b/app/Models/parserSkripte/Mg_produkt2.php
index 8d22633d3..9ac2a37c9 100644
--- a/app/Models/parserSkripte/Mg_produkt2.php
+++ b/app/Models/parserSkripte/Mg_produkt2.php
@@ -42,7 +42,7 @@ class Mg_produkt2 extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter,
['image' => $image]
);
diff --git a/app/Models/parserSkripte/Mnogosearch.php b/app/Models/parserSkripte/Mnogosearch.php
index 43f2ed81a..9998be59c 100644
--- a/app/Models/parserSkripte/Mnogosearch.php
+++ b/app/Models/parserSkripte/Mnogosearch.php
@@ -39,7 +39,7 @@ class Mnogosearch extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
});
diff --git a/app/Models/parserSkripte/Nebel.php b/app/Models/parserSkripte/Nebel.php
index d78e604de..34b0e085b 100644
--- a/app/Models/parserSkripte/Nebel.php
+++ b/app/Models/parserSkripte/Nebel.php
@@ -34,7 +34,7 @@ class Nebel extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
}
diff --git a/app/Models/parserSkripte/Onenewspage.php b/app/Models/parserSkripte/Onenewspage.php
index 009a20066..a6dbc68b7 100644
--- a/app/Models/parserSkripte/Onenewspage.php
+++ b/app/Models/parserSkripte/Onenewspage.php
@@ -37,7 +37,7 @@ class Onenewspage extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter,
$additionalInformation
);
diff --git a/app/Models/parserSkripte/Onenewspagegermany.php b/app/Models/parserSkripte/Onenewspagegermany.php
index 624bd77e4..1aaa97a75 100644
--- a/app/Models/parserSkripte/Onenewspagegermany.php
+++ b/app/Models/parserSkripte/Onenewspagegermany.php
@@ -40,7 +40,7 @@ class Onenewspagegermany extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter,
$additionalInformation
);
diff --git a/app/Models/parserSkripte/Onenewspagevideo.php b/app/Models/parserSkripte/Onenewspagevideo.php
index ee260caad..f70170f20 100644
--- a/app/Models/parserSkripte/Onenewspagevideo.php
+++ b/app/Models/parserSkripte/Onenewspagevideo.php
@@ -36,7 +36,7 @@ class Onenewspagevideo extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter,
$additionalInformation
);
diff --git a/app/Models/parserSkripte/Openclipart.php b/app/Models/parserSkripte/Openclipart.php
index 74d10fdb4..cb9a335ca 100644
--- a/app/Models/parserSkripte/Openclipart.php
+++ b/app/Models/parserSkripte/Openclipart.php
@@ -37,7 +37,7 @@ class Openclipart extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter,
['image' => $image]
);
diff --git a/app/Models/parserSkripte/Opencrawlastronomie.php b/app/Models/parserSkripte/Opencrawlastronomie.php
index 0ffc5439c..82c3124ae 100644
--- a/app/Models/parserSkripte/Opencrawlastronomie.php
+++ b/app/Models/parserSkripte/Opencrawlastronomie.php
@@ -41,7 +41,7 @@ class Opencrawlastronomie extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
$count++;
diff --git a/app/Models/parserSkripte/Opencrawlpolitik.php b/app/Models/parserSkripte/Opencrawlpolitik.php
index bc6ab7ca6..1ac681d72 100644
--- a/app/Models/parserSkripte/Opencrawlpolitik.php
+++ b/app/Models/parserSkripte/Opencrawlpolitik.php
@@ -49,7 +49,7 @@ class Opencrawlpolitik extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter,
$additionalInformation
);
diff --git a/app/Models/parserSkripte/Opencrawlregengergie.php b/app/Models/parserSkripte/Opencrawlregengergie.php
index 726d0fe38..94963e698 100644
--- a/app/Models/parserSkripte/Opencrawlregengergie.php
+++ b/app/Models/parserSkripte/Opencrawlregengergie.php
@@ -41,7 +41,7 @@ class Opencrawlregengergie extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
$count++;
diff --git a/app/Models/parserSkripte/Overture.php b/app/Models/parserSkripte/Overture.php
index 60a82a512..1cd0b69a9 100644
--- a/app/Models/parserSkripte/Overture.php
+++ b/app/Models/parserSkripte/Overture.php
@@ -36,7 +36,7 @@ class Overture extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
}
@@ -55,7 +55,7 @@ class Overture extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
}
diff --git a/app/Models/parserSkripte/OvertureAds.php b/app/Models/parserSkripte/OvertureAds.php
index 386330eee..35bdcde11 100644
--- a/app/Models/parserSkripte/OvertureAds.php
+++ b/app/Models/parserSkripte/OvertureAds.php
@@ -35,7 +35,7 @@ class OvertureAds extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
}
diff --git a/app/Models/parserSkripte/Pixabay.php b/app/Models/parserSkripte/Pixabay.php
index 6f620ca5c..a6e9716e2 100644
--- a/app/Models/parserSkripte/Pixabay.php
+++ b/app/Models/parserSkripte/Pixabay.php
@@ -37,7 +37,7 @@ class Pixabay extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter,
['image' => $image]
);
diff --git a/app/Models/parserSkripte/Qip.php b/app/Models/parserSkripte/Qip.php
index 0fd5f0873..f06db08d5 100644
--- a/app/Models/parserSkripte/Qip.php
+++ b/app/Models/parserSkripte/Qip.php
@@ -36,7 +36,7 @@ class Qip extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
}
diff --git a/app/Models/parserSkripte/Qualigo.php b/app/Models/parserSkripte/Qualigo.php
index ff240f802..6cec3158c 100644
--- a/app/Models/parserSkripte/Qualigo.php
+++ b/app/Models/parserSkripte/Qualigo.php
@@ -36,7 +36,7 @@ class Qualigo extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
}
diff --git a/app/Models/parserSkripte/Radiobrowser.php b/app/Models/parserSkripte/Radiobrowser.php
index 075cd447b..8c1391b6d 100644
--- a/app/Models/parserSkripte/Radiobrowser.php
+++ b/app/Models/parserSkripte/Radiobrowser.php
@@ -50,7 +50,7 @@ class Radiobrowser extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
}
diff --git a/app/Models/parserSkripte/Similar_product.php b/app/Models/parserSkripte/Similar_product.php
index 4a5834029..7e8d17558 100644
--- a/app/Models/parserSkripte/Similar_product.php
+++ b/app/Models/parserSkripte/Similar_product.php
@@ -30,7 +30,7 @@ class Similar_product extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
}
diff --git a/app/Models/parserSkripte/Similar_product_ads.php b/app/Models/parserSkripte/Similar_product_ads.php
index a8d1f42c2..c3b2e50aa 100644
--- a/app/Models/parserSkripte/Similar_product_ads.php
+++ b/app/Models/parserSkripte/Similar_product_ads.php
@@ -34,7 +34,7 @@ class Similar_product_ads extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
}
diff --git a/app/Models/parserSkripte/Suchticker.php b/app/Models/parserSkripte/Suchticker.php
index 14b004dee..04be4238b 100644
--- a/app/Models/parserSkripte/Suchticker.php
+++ b/app/Models/parserSkripte/Suchticker.php
@@ -34,7 +34,7 @@ class Suchticker extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
}
diff --git a/app/Models/parserSkripte/Tuhh.php b/app/Models/parserSkripte/Tuhh.php
index 568a71aa9..57be5d54a 100644
--- a/app/Models/parserSkripte/Tuhh.php
+++ b/app/Models/parserSkripte/Tuhh.php
@@ -40,7 +40,7 @@ class Tuhh extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
$count++;
diff --git a/app/Models/parserSkripte/Wikipedia.php b/app/Models/parserSkripte/Wikipedia.php
index f1fdd6ecf..c975bc487 100644
--- a/app/Models/parserSkripte/Wikipedia.php
+++ b/app/Models/parserSkripte/Wikipedia.php
@@ -24,7 +24,7 @@ class Wikipedia extends Searchengine
$link,
$result[3],
$result[2],
- $this->gefVon,
+ $this->displayName,$this->homepage,
$counter
);
}
diff --git a/app/Models/parserSkripte/Witch.php b/app/Models/parserSkripte/Witch.php
index 70e49ba41..1d058f460 100644
--- a/app/Models/parserSkripte/Witch.php
+++ b/app/Models/parserSkripte/Witch.php
@@ -37,7 +37,7 @@ class Witch extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
}
diff --git a/app/Models/parserSkripte/Yacy.php b/app/Models/parserSkripte/Yacy.php
index 37b0ce821..833fe5e03 100644
--- a/app/Models/parserSkripte/Yacy.php
+++ b/app/Models/parserSkripte/Yacy.php
@@ -36,7 +36,7 @@ class Yacy extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
}
diff --git a/app/Models/parserSkripte/Yacyunih.php b/app/Models/parserSkripte/Yacyunih.php
index ed8fe9595..d6ef93b0a 100644
--- a/app/Models/parserSkripte/Yacyunih.php
+++ b/app/Models/parserSkripte/Yacyunih.php
@@ -43,7 +43,7 @@ class Yacyunih extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
$count++;
diff --git a/app/Models/parserSkripte/Yandex.php b/app/Models/parserSkripte/Yandex.php
index 3169de7e6..b15b5bfcf 100644
--- a/app/Models/parserSkripte/Yandex.php
+++ b/app/Models/parserSkripte/Yandex.php
@@ -48,7 +48,7 @@ class Yandex extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
}
diff --git a/app/Models/parserSkripte/Zeitde.php b/app/Models/parserSkripte/Zeitde.php
index 2a2f51619..467ba7d7f 100644
--- a/app/Models/parserSkripte/Zeitde.php
+++ b/app/Models/parserSkripte/Zeitde.php
@@ -38,7 +38,7 @@ class Zeitde extends Searchengine
$link,
$anzeigeLink,
$descr,
- $this->gefVon,
+ $this->displayName,$this->homepage,
$this->counter
);
}
diff --git a/resources/assets/less/metager/result.less b/resources/assets/less/metager/result.less
index 3792c5f1b..9234952b1 100644
--- a/resources/assets/less/metager/result.less
+++ b/resources/assets/less/metager/result.less
@@ -11,22 +11,30 @@
background-color: white;
box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24);
.result-header {
- .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-headline {
+ display: flex;
+ justify-content: space-between;
+ .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-hoster {
+ margin-left: 20px;
+ color: #808080;
+ }
}
.result-link {
display: block;
@@ -34,6 +42,7 @@
text-overflow: ellipsis;
white-space: nowrap;
font-size: @result-font-small;
+ width: fit-content;
&,
&:active,
&:hover,
@@ -142,7 +151,7 @@
& a:focus,
& a:visited {
font-size: @result-font-small;
- color: #555;
+ color: #808080;
}
}
&>.remover {
diff --git a/resources/views/layouts/ad.blade.php b/resources/views/layouts/ad.blade.php
index b5f906dbb..09476d1ad 100644
--- a/resources/views/layouts/ad.blade.php
+++ b/resources/views/layouts/ad.blade.php
@@ -1,13 +1,15 @@
@if(isset($ad) && !$apiAuthorized)
<div class="result ad">
- <a class="ad-label" href="{!! $ad->link !!}" target="_blank" rel="noopener">Werbung von {!! $ad->gefVon !!}</a>
</span>
<div class="result-header">
- <h2 class="result-title">
- <a href="{{ $ad->link }}" target="{{ $metager->getNewtab() }}">
- {{ $ad->titel }}
- </a>
- </h2>
+ <div class="result-headline">
+ <h2 class="result-title">
+ <a href="{{ $ad->link }}" target="{{ $metager->getNewtab() }}">
+ {{ $ad->titel }}
+ </a>
+ </h2>
+ <a class="ad-label" href="{!! $ad->link !!}" target="_blank" rel="noopener">Werbung von {!! $ad->gefVon !!}</a>
+ </div>
<a class="result-link" href="{{ $ad->link }}" target="{{ $metager->getNewtab() }}">
{{ $ad->anzeigeLink }}
</a>
diff --git a/resources/views/layouts/result.blade.php b/resources/views/layouts/result.blade.php
index 44bc2e2f1..d2a80cc6b 100644
--- a/resources/views/layouts/result.blade.php
+++ b/resources/views/layouts/result.blade.php
@@ -1,10 +1,13 @@
<div class="result" data-count="{{ $result->number }}">
<div class="result-header">
- <h2 class="result-title">
- <a href="{{ $result->link }}" target="{{ $metager->getNewtab() }}" rel="noopener">
- {!! $result->titel !!}
- </a>
- </h2>
+ <div class="result-headline">
+ <h2 class="result-title">
+ <a href="{{ $result->link }}" target="{{ $metager->getNewtab() }}" rel="noopener">
+ {!! $result->titel !!}
+ </a>
+ </h2>
+ <a class="result-hoster" href="{{ $result->gefVonLink }}" target="{{ $metager->getNewtab() }}" rel="noopener">{{ $result->gefVon }}</a>
+ </div>
<a class="result-link" href="{{ $result->link }}" target="{{ $metager->getNewtab() }}" rel="noopener">
{{ $result->anzeigeLink }}
</a>
--
GitLab