Skip to content

GitLab

MetaGer
MetaGer
Commit 4438af63 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files
Options

Merge branch '683' into 'MetaGer-Redesign' 

Ergebnis Hoster wird jetzt zu jedem Ergebnis oben rechts angezeigt und ist verlinkt

See merge request !1172
parents 00387dd8 9b80e6be
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 79 deletions
app/Models/Result.php
View file @ 4438af63
......@@ -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) {
......
app/Models/Searchengine.php
View file @ 4438af63
......@@ -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
......
app/Models/parserSkripte/Allesklar.php
View file @ 4438af63
......@@ -43,7 +43,7 @@ class Allesklar extends Searchengine
$link,
$link,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
} catch (\Exception $e) {
......
app/Models/parserSkripte/BASE.php
View file @ 4438af63
......@@ -49,7 +49,7 @@ class BASE extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
}
......
app/Models/parserSkripte/Beammachine.php
View file @ 4438af63
......@@ -34,7 +34,7 @@ class Beammachine extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
}
......
app/Models/parserSkripte/Bing.php
View file @ 4438af63
......@@ -32,7 +32,7 @@ class Bing extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
});
......
app/Models/parserSkripte/Bing_bilder.php
View file @ 4438af63
......@@ -31,7 +31,7 @@ class Bing_bilder extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter,
['image' => $image]
);
......
app/Models/parserSkripte/Blogsearch.php
View file @ 4438af63
......@@ -36,7 +36,7 @@ class Blogsearch extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
}
......
app/Models/parserSkripte/Dailymotion.php
View file @ 4438af63
......@@ -37,7 +37,7 @@ class Dailymotion extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter,
['partnershop' => false]
);
......
app/Models/parserSkripte/Dart.php
View file @ 4438af63
......@@ -57,7 +57,7 @@ class Dart extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
}
......
app/Models/parserSkripte/Dmoznebel.php
View file @ 4438af63
......@@ -36,7 +36,7 @@ class Dmoznebel extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
}
......
app/Models/parserSkripte/Dmoznebel_int.php
View file @ 4438af63
......@@ -28,7 +28,7 @@ class Dmoznebel_int extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
}
......
app/Models/parserSkripte/Ebay.php
View file @ 4438af63
......@@ -51,7 +51,7 @@ class Ebay extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter,
['partnershop' => false,
'price' => $price,
......
app/Models/parserSkripte/Ecoshopper.php
View file @ 4438af63
......@@ -49,7 +49,7 @@ class Ecoshopper extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter,
['partnershop' => false,
'image' => $image]
......
app/Models/parserSkripte/Europeana.php
View file @ 4438af63
......@@ -42,7 +42,7 @@ class Europeana extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter,
['image' => $image]
);
......
app/Models/parserSkripte/Exalead.php
View file @ 4438af63
......@@ -61,7 +61,7 @@ class Exalead extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
} catch (\ErrorException $e) {
......
app/Models/parserSkripte/Fairmondo.php
View file @ 4438af63
......@@ -42,7 +42,7 @@ class Fairmondo extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter,
[
'price' => $price,
......
app/Models/parserSkripte/Fastbot.php
View file @ 4438af63
......@@ -38,7 +38,7 @@ class Fastbot extends Searchengine
$link,
$result[3],
$result[2],
$this->gefVon,
$this->displayName,$this->homepage,
$counter
);
}
......
app/Models/parserSkripte/Fernsehsuche.php
View file @ 4438af63
......@@ -38,7 +38,7 @@ class Fernsehsuche extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter,
['image' => $image]
);
......
app/Models/parserSkripte/Fess.php
View file @ 4438af63
......@@ -37,7 +37,7 @@ class Fess extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
} catch (\ErrorException $e) {
......
app/Models/parserSkripte/Flickr.php
View file @ 4438af63
......@@ -37,7 +37,7 @@ class Flickr extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter,
['image' => $image]
);
......
app/Models/parserSkripte/Goyax.php
View file @ 4438af63
......@@ -31,7 +31,7 @@ class Goyax extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
});
......
app/Models/parserSkripte/Loklak.php
View file @ 4438af63
......@@ -35,7 +35,7 @@ class Loklak extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
}
......
app/Models/parserSkripte/Mg_hochsch_de.php
View file @ 4438af63
......@@ -34,7 +34,7 @@ class Mg_hochsch_de extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
}
......
app/Models/parserSkripte/Mg_produkt2.php
View file @ 4438af63
......@@ -42,7 +42,7 @@ class Mg_produkt2 extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter,
['image' => $image]
);
......
app/Models/parserSkripte/Mnogosearch.php
View file @ 4438af63
......@@ -39,7 +39,7 @@ class Mnogosearch extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
});
......
app/Models/parserSkripte/Nebel.php
View file @ 4438af63
......@@ -34,7 +34,7 @@ class Nebel extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
}
......
app/Models/parserSkripte/Onenewspage.php
View file @ 4438af63
......@@ -37,7 +37,7 @@ class Onenewspage extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter,
$additionalInformation
);
......
app/Models/parserSkripte/Onenewspagegermany.php
View file @ 4438af63
......@@ -40,7 +40,7 @@ class Onenewspagegermany extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter,
$additionalInformation
);
......
app/Models/parserSkripte/Onenewspagevideo.php
View file @ 4438af63
......@@ -36,7 +36,7 @@ class Onenewspagevideo extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter,
$additionalInformation
);
......
app/Models/parserSkripte/Openclipart.php
View file @ 4438af63
......@@ -37,7 +37,7 @@ class Openclipart extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter,
['image' => $image]
);
......
app/Models/parserSkripte/Opencrawlastronomie.php
View file @ 4438af63
......@@ -41,7 +41,7 @@ class Opencrawlastronomie extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
$count++;
......
app/Models/parserSkripte/Opencrawlpolitik.php
View file @ 4438af63
......@@ -49,7 +49,7 @@ class Opencrawlpolitik extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter,
$additionalInformation
);
......
app/Models/parserSkripte/Opencrawlregengergie.php
View file @ 4438af63
......@@ -41,7 +41,7 @@ class Opencrawlregengergie extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
$count++;
......
app/Models/parserSkripte/Overture.php
View file @ 4438af63
......@@ -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
);
}
......
app/Models/parserSkripte/OvertureAds.php
View file @ 4438af63
......@@ -35,7 +35,7 @@ class OvertureAds extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
}
......
app/Models/parserSkripte/Pixabay.php
View file @ 4438af63
......@@ -37,7 +37,7 @@ class Pixabay extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter,
['image' => $image]
);
......
app/Models/parserSkripte/Qip.php
View file @ 4438af63
......@@ -36,7 +36,7 @@ class Qip extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
}
......
app/Models/parserSkripte/Qualigo.php
View file @ 4438af63
......@@ -36,7 +36,7 @@ class Qualigo extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
}
......
app/Models/parserSkripte/Radiobrowser.php
View file @ 4438af63
......@@ -50,7 +50,7 @@ class Radiobrowser extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
}
......
app/Models/parserSkripte/Similar_product.php
View file @ 4438af63
......@@ -30,7 +30,7 @@ class Similar_product extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
}
......
app/Models/parserSkripte/Similar_product_ads.php
View file @ 4438af63
......@@ -34,7 +34,7 @@ class Similar_product_ads extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
}
......
app/Models/parserSkripte/Suchticker.php
View file @ 4438af63
......@@ -34,7 +34,7 @@ class Suchticker extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
}
......
app/Models/parserSkripte/Tuhh.php
View file @ 4438af63
......@@ -40,7 +40,7 @@ class Tuhh extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
$count++;
......
app/Models/parserSkripte/Wikipedia.php
View file @ 4438af63
......@@ -24,7 +24,7 @@ class Wikipedia extends Searchengine
$link,
$result[3],
$result[2],
$this->gefVon,
$this->displayName,$this->homepage,
$counter
);
}
......
app/Models/parserSkripte/Witch.php
View file @ 4438af63
......@@ -37,7 +37,7 @@ class Witch extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
}
......
app/Models/parserSkripte/Yacy.php
View file @ 4438af63
......@@ -36,7 +36,7 @@ class Yacy extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
}
......
app/Models/parserSkripte/Yacyunih.php
View file @ 4438af63
......@@ -43,7 +43,7 @@ class Yacyunih extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
$count++;
......
app/Models/parserSkripte/Yandex.php
View file @ 4438af63
......@@ -48,7 +48,7 @@ class Yandex extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
}
......
app/Models/parserSkripte/Zeitde.php
View file @ 4438af63
......@@ -38,7 +38,7 @@ class Zeitde extends Searchengine
$link,
$anzeigeLink,
$descr,
$this->gefVon,
$this->displayName,$this->homepage,
$this->counter
);
}
......
resources/assets/less/metager/result.less
View file @ 4438af63
......@@ -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 {
......
resources/views/layouts/ad.blade.php
View file @ 4438af63
@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>
......
resources/views/layouts/result.blade.php
View file @ 4438af63
<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>
......