Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
MetaGer
Commits
ad7c5b58
Commit
ad7c5b58
authored
Sep 28, 2018
by
Karl Hasselbring
Browse files
Es wird nun Quicktip-Version 1.1.0 ohne Anführungszeichen um das Zitat geladen
parent
b2039082
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/Models/Quicktips/Quicktips.php
View file @
ad7c5b58
...
...
@@ -12,9 +12,9 @@ class Quicktips
{
use
DispatchesJobs
;
const
QUICKTIP_URL
=
"https://quicktips.metager3.de/quicktips.xml"
;
//
const QUICKTIP_URL = "http://localhost:63825/quicktips.xml";
const
QUICKTIP_NAME
=
"quicktips"
;
//
const QUICKTIP_URL = "https://quicktips.metager3.de/
1.1.0/
quicktips.xml";
const
QUICKTIP_URL
=
"http://localhost:63825/
1.1.0/
quicktips.xml"
;
const
QUICKTIP_NAME
=
"quicktips"
;
const
CACHE_DURATION
=
60
;
private
$hash
;
...
...
@@ -69,7 +69,7 @@ class Quicktips
public
function
loadResults
()
{
$resultsRaw
=
$this
->
retrieveResults
(
$this
->
hash
);
$results
=
$this
->
parseResults
(
$resultsRaw
);
$results
=
$this
->
parseResults
(
$resultsRaw
);
return
$results
;
}
...
...
@@ -148,14 +148,14 @@ class Quicktips
$descr
=
$quicktip_xml
->
content
->
__toString
();
// Details
$details
=
[];
$details
=
[];
$details_xpath
=
$quicktip_xml
->
xpath
(
'mg:details'
);
if
(
sizeof
(
$details_xpath
)
>
0
)
{
foreach
(
$details_xpath
[
0
]
as
$detail_xml
)
{
$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
[]
=
new
\
App\Models\Quicktips\Quicktip_detail
(
$details
[]
=
new
\
App\Models\Quicktips\Quicktip_detail
(
$details_title
,
$details_link
,
$details_descr
...
...
resources/assets/less/metager/quicktips.less
View file @
ad7c5b58
...
...
@@ -108,14 +108,12 @@
}
&[type="spruch"] {
order: 1;
p
{
.quicktip-summary
{
display: flex;
flex-direction: column;
text-align: justify;
.author {
color: #404040;
p {
text-align: justify;
font-style: italic;
align-self: flex-end;
quotes: '„' '”';
&:before {
content: open-quote;
...
...
@@ -126,31 +124,31 @@
}
.author {
color: #404040;
font-style: italic;
float: right;
}
}
&[type="duckDuckGo-bang"] {
order: 2;
.bang-btn {
width: 100%;
margin-top: 5px;
color: #fff;
background-color: #286992;
font-size: 16px;
align-self: flex-end;
}
}
&[type="wikipedia"] {
order: 3;
}
&[type="dictCC"] {
order: 4;
}
&[type="tip"] {
order: 5;
}
&[type="ad"] {
order: 6;
}
&[type="duckDuckGo-bang"] {
order: 2;
.bang-btn {
width: 100%;
margin-top: 5px;
color: #fff;
background-color: #286992;
font-size: 16px;
}
}
}
\ No newline at end of file
&[type="wikipedia"] {
order: 3;
}
&[type="dictCC"] {
order: 4;
}
&[type="tip"] {
order: 5;
}
&[type="ad"] {
order: 6;
}
}
}
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment