Skip to content
Snippets Groups Projects
Commit cf8b85fb authored by Karl Hasselbring's avatar Karl Hasselbring
Browse files

Es wird nun Quicktip-Version 1.1.0 ohne Anführungszeichen um das Zitat geladen

parent 26dbaf18
No related branches found
No related tags found
1 merge request!1365Resolve "Filter Options for MetaGer"
...@@ -12,9 +12,9 @@ class Quicktips ...@@ -12,9 +12,9 @@ class Quicktips
{ {
use DispatchesJobs; use DispatchesJobs;
const QUICKTIP_URL = "https://quicktips.metager3.de/quicktips.xml"; //const QUICKTIP_URL = "https://quicktips.metager3.de/1.1.0/quicktips.xml";
//const QUICKTIP_URL = "http://localhost:63825/quicktips.xml"; const QUICKTIP_URL = "http://localhost:63825/1.1.0/quicktips.xml";
const QUICKTIP_NAME = "quicktips"; const QUICKTIP_NAME = "quicktips";
const CACHE_DURATION = 60; const CACHE_DURATION = 60;
private $hash; private $hash;
...@@ -69,7 +69,7 @@ class Quicktips ...@@ -69,7 +69,7 @@ class Quicktips
public function loadResults() public function loadResults()
{ {
$resultsRaw = $this->retrieveResults($this->hash); $resultsRaw = $this->retrieveResults($this->hash);
$results = $this->parseResults($resultsRaw); $results = $this->parseResults($resultsRaw);
return $results; return $results;
} }
...@@ -148,14 +148,14 @@ class Quicktips ...@@ -148,14 +148,14 @@ class Quicktips
$descr = $quicktip_xml->content->__toString(); $descr = $quicktip_xml->content->__toString();
// Details // Details
$details = []; $details = [];
$details_xpath = $quicktip_xml->xpath('mg:details'); $details_xpath = $quicktip_xml->xpath('mg:details');
if (sizeof($details_xpath) > 0) { if (sizeof($details_xpath) > 0) {
foreach ($details_xpath[0] as $detail_xml) { foreach ($details_xpath[0] as $detail_xml) {
$details_title = $detail_xml->title->__toString(); $details_title = $detail_xml->title->__toString();
$details_link = $detail_xml->url->__toString(); $details_link = $detail_xml->url->__toString();
$details_descr = $detail_xml->text->__toString(); $details_descr = $detail_xml->text->__toString();
$details[] = new \App\Models\Quicktips\Quicktip_detail( $details[] = new \App\Models\Quicktips\Quicktip_detail(
$details_title, $details_title,
$details_link, $details_link,
$details_descr $details_descr
......
...@@ -108,14 +108,12 @@ ...@@ -108,14 +108,12 @@
} }
&[type="spruch"] { &[type="spruch"] {
order: 1; order: 1;
p { .quicktip-summary {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
text-align: justify; p {
.author { text-align: justify;
color: #404040;
font-style: italic; font-style: italic;
align-self: flex-end;
quotes: '„' '”'; quotes: '„' '”';
&:before { &:before {
content: open-quote; content: open-quote;
...@@ -126,31 +124,31 @@ ...@@ -126,31 +124,31 @@
} }
.author { .author {
color: #404040; color: #404040;
font-style: italic; align-self: flex-end;
float: right;
}
}
&[type="duckDuckGo-bang"] {
order: 2;
.bang-btn {
width: 100%;
margin-top: 5px;
color: #fff;
background-color: #286992;
font-size: 16px;
} }
} }
&[type="wikipedia"] { }
order: 3; &[type="duckDuckGo-bang"] {
} order: 2;
&[type="dictCC"] { .bang-btn {
order: 4; width: 100%;
} margin-top: 5px;
&[type="tip"] { color: #fff;
order: 5; background-color: #286992;
} font-size: 16px;
&[type="ad"] {
order: 6;
} }
} }
} &[type="wikipedia"] {
\ No newline at end of file order: 3;
}
&[type="dictCC"] {
order: 4;
}
&[type="tip"] {
order: 5;
}
&[type="ad"] {
order: 6;
}
}
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment