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

Die Quicktips haben jetzt einen Verweis auf ihre Herkunft, sofern diese nicht MetaGer ist

parent 7b7433a7
No related branches found
No related tags found
3 merge requests!1262WIP: Resolve "Spendenseite Texte anpassen",!1207WIP: Resolve "Rechtschreibfehler",!1198Meta ger redesign
Hide whitespace changes
Inline Side-by-side
Showing
with 99 additions and 632 deletions
app/Models/Quicktips/Quicktip.php
+ 5
− 1
View file @ c521d6b8
......@@ -7,15 +7,19 @@ class Quicktip
public $type;
public $title;
public $link;
public $gefVonTitle;
public $gefVonLink;
public $descr;
public $details;
# Erstellt ein neues Ergebnis
public function __construct($type, $title, $link, $descr, $details)
public function __construct($type, $title, $link, $gefVonTitle, $gefVonLink, $descr, $details)
{
$this->type = $type;
$this->title = $title;
$this->link = $link;
$this->gefVonTitle = $gefVonTitle;
$this->gefVonLink = $gefVonLink;
$this->descr = $descr;
$this->details = $details;
}
......
app/Models/Quicktips/Quicktips.php
+ 22
− 5
View file @ c521d6b8
......@@ -104,19 +104,34 @@ class Quicktips
$quicktips_xpath = $content->xpath('main:entry');
foreach ($quicktips_xpath as $quicktip_xml) {
// Type
$quicktip_xml->registerXPathNamespace('mg', 'http://metager.de/opensearch/quicktips/');
$types = $quicktip_xml->xpath('mg:type');
if (sizeof($types) > 0) {
$type = $types[0]->__toString();
} else {
$type = "";
}
// Title
$title = $quicktip_xml->title->__toString();
// Link
$link = $quicktip_xml->link['href']->__toString();
// Type
// gefVon
$quicktip_xml->registerXPathNamespace('mg', 'http://metager.de/opensearch/quicktips/');
$types = $quicktip_xml->xpath('mg:type');
if (sizeof($types) > 0) {
$type = $types[0]->__toString();
$gefVonTitles = $quicktip_xml->xpath('mg:gefVonTitle');
if (sizeof($gefVonTitles) > 0) {
$gefVonTitle = $gefVonTitles[0]->__toString();
} else {
$type = "";
$gefVonTitle = "";
}
$gefVonLinks = $quicktip_xml->xpath('mg:gefVonLink');
if (sizeof($gefVonLinks) > 0) {
$gefVonLink = $gefVonLinks[0]->__toString();
} else {
$gefVonLink = "";
}
// Description
......@@ -141,6 +156,8 @@ class Quicktips
$type,
$title,
$link,
$gefVonTitle,
$gefVonLink,
$descr,
$details
);
......
public/css/styleResultPage.css deleted 100644 → 0
+ 0
− 594
View file @ 7b7433a7
* {
font-family: Liberation Sans, sans-serif;
}
.hostlabel a:link, .hostlabel a:visited {
color: #FFFFFF;
}
.hostlabel {
display: none;
position: relative;
margin-top: -14px;
background-color: #333;
}
.img:hover .hostlabel {
display: block;
}
.row {
margin: 10px 15px;
margin-top: 0;
}
.nav-tabs > li.active {}
nav-tabs > li.active {
border-bottom: 0;
}
.tab-pane.active {
-moz-box-shadow: 5px 5px 10px 0px rgba(0, 0, 0, 0.55);
padding: 10px 0;
padding-top: 0;
}
/* Hier der Style für unsere Suchleiste */
.tab-pane .alert {
margin: 10px 0;
padding: 5px 15px;
}
.alert ul {
list-style-type: none;
padding-left: 49px;
}
/* Logo */
.logo {
height: 35px;
padding: 5px 0;
}
.logo > a {
line-height: 100%;
height: 100%;
display: block;
}
#research ul.list-inline {
margin-left: 0;
width: 100%;
}
@media (max-width: 767px) {
#research .visible-xs {
display: inline-block!important;
}
}
.input-group-addon {
padding: 0;
}
input#eingabeTop {
height: 35px;
}
nav .input-group {
height: 35px;
padding: 5px 0;
}
header nav {
height: 100%;
display: table;
}
header ul {
height: 100%;
vertical-align: middle;
display: table-row;
}
header li.pull-left.visible-xs {
float: left !important;
width: auto;
}
header li.pull-right {
width: 100% !important;
float: none !important;
display: table-cell;
}
#research nav ul > li {
width: 20%;
height: 45px;
vertical-align: middle;
padding-left: 15px;
padding-right: 15px;
}
#research nav ul > li.visible-xs {
width: 10%;
padding-left: 15px;
padding-right: 15px;
}
#research nav ul li + li + li {
width: 80%;
}
#research {
background-color: white;
position: fixed;
top: 0;
width: 100%;
height: 55px;
z-index: 500;
width: 80%;
left: 50%;
margin-left: -40%;
}
.logo h1 {
font-family: Liberation Sans, sans-serif;
font-style: italic;
margin: 0;
font-weight: bold;
line-height: 1;
white-space: nowrap;
}
#search {
background-color: inherit;
border: 0;
width: 50px;
height: 100%;
}
#reSearch a {
color: black;
}
.content-wrapper {
width: 80%;
margin: 0 auto;
padding-top: 60px;
/* padding: 10px; */
background-color: white;
-webkit-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
-moz-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
}
#helpButton {
color: black;
}
body {
height: 100%;
background-image: inherit;
background-color: rgba(2, 93, 140, .03);
}
a:link {
color: #0000FF;
font-size: 12px;
}
a#donation:hover {}
a#donation, a#donation:visited {
color: inherit;
}
a#donation:hover {
color: red;
}
a:visited {
color: #792ea1;
}
a:hover {
text-decoration: none;
color: red;
}
/* Hier der Style für unsere Tabliste */
#foki {
background-color: white;
}
#foki a {
color: grey;
}
#foki li.active a {
color: black;
background-color: white;
}
#foki li.active a i + span {
display: inline!important;
margin-left: 5px;
}
#foki li a i + span {
margin-left: 5px;
}
/* Hier der Style für unseren Spruch */
#spruch {
padding: 10px;
margin-bottom: 0;
padding-bottom: 10px;
padding-left: 65px;
color: green;
font-weight: bold;
}
#spenden {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
#spruch .author {
font-size: 80%;
font-weight: normal;
font-style: italic;
color: #333333;
}
#spruch > p {
margin-bottom: 0;
}
#spruch > p + p {
margin-top: 4px;
}
/* Hier der Style für die einzelnen Ergebnisboxen */
p.link > a {
white-space: nowrap;
max-width: 50%;
overflow: hidden;
text-overflow: ellipsis;
float: left;
padding-right: 5px;
}
.result {
margin-bottom: 10px;
width: 100%
}
.result > .number {
font-size: 15px;
line-height: 1;
text-align: right;
}
.result > .resultInformation {
border-radius: 5px;
}
.result .title {
color: black;
text-decoration: none;
font-size: 14px;
font-weight: bold;
margin-bottom: 0;
white-space: nowrap;
line-height: 1.1;
max-width: 115ch;
overflow: hidden;
text-overflow: ellipsis;
}
.result.ad .title {
color: green;
}
.result .link {
font-size: 13px;
margin: 0;
line-height: 1.5;
}
.result .link-link {
white-space: nowrap;
max-width: 60%;
overflow: hidden;
text-overflow: ellipsis;
float: left;
}
.result:not(.ad) .link > div {
white-space: nowrap;
}
.result:not(.ad) .link > span {
white-space: nowrap;
margin: 0 5px;
}
.result:not(.ad) .link .options {
color: #333;
float: left;
}
.result:not(.ad) .link:hover {
cursor: pointer;
}
.result:not(.ad) .link .options > a {
color: #333;
display: block;
padding-left: 5px;
padding-right: 5px;
}
.result:not(.ad) .link .options > a > span {
font-size: 10px;
}
.result .description {
margin-bottom: 3px;
color: black;
font-size: 14px;
line-height: 1.3;
clear: both;
}
.result .description p {
margin: 0;
margin-bottom: 4px;
}
.result .description img {
margin: 5px;
margin-left: 0;
margin-right: 15px;
height: auto;
width: auto;
max-width: 120px;
max-height: 200px
}
.result.ad .description {
color: green;
max-width: 115ch;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.result:not(.ad) .hoster {
font-size: 13px;
margin: 0;
color: #777;
margin-right: 10px;
white-space: nowrap;
}
.result:not(.ad) .hoster a {
color: #333;
}
.result .result-image > img {
height: 100px;
padding: 10px;
}
.result .proxy {
font-size: 13px;
margin-top: 0;
white-space: nowrap;
}
.result .partnershop-info {
font-size: 13px;
margin-top: 0;
margin-left: 10px;
}
.result .proxy img {
margin-bottom: 0px;
margin-right: 2px
}
.description-container {
margin: 0!important;
}
.result .image > img {
max-width: 100%;
}
.options-list > li:hover {
background-color: lightgrey;
}
.options-list > li > a {
color: #333;
white-space: nowrap;
display: block;
padding: 5px 14px;
}
.options-list > li input[type=submit] {
width: 100%;
background-color: transparent;
border: 0;
margin: 5px 0;
}
.container-fluid {
padding-top: 15px;
padding-bottom: 15px;
background-color: white;
}
#quicktips iframe {
width: 100%;
height: 1000px;
background-color: transparent;
border: 0px none transparent;
padding: 0px;
overflow: hidden;
}
/* Hier der Style für die Bilder */
#fit-width .masonry {
margin: 0 auto;
}
.item {
width: 150px;
text-align: center;
margin-bottom: 10px;
}
#container {
margin: 10px auto;
}
/* Hier der Style für die Werbeboxen */
.result.ad .hoster {
color: green;
}
/* Style für den Footer */
footer {
text-align: center;
}
footer a {
color: black!important;
}
/* Ein resetter für Floats */
.clearfix {
clear: both;
}
/* Placeholder für ladende Tabs */
.loader {
text-align: center;
margin-top: 20px;
}
.loader > img {
width: 30px;
}
#searchplugin {
display: none;
position: fixed;
top: 50px;
right: 10px;
z-index: 501;
width: 25%;
}
#searchplugin > div {
text-align: center;
padding-top: 5px;
}
#searchplugin > div > a {
color: white;
}
@media(min-width: 768px) {
#searchplugin {
display: initial;
}
}
.product {
text-align: center;
border: 1px dotted lightgrey;
padding: 5px;
max-width: 150px;
}
.product a {
color: #333;
}
.product .price {
position: relative;
top: 20px;
background-color: rgba(255, 255, 255, 0.9);
color: #333;
text-align: left;
width: 80px;
font-weight: bold;
}
.product .title {
font-size: 12px;
font-weight: bold;
text-align: left;
max-height: 31px;
overflow: hidden;
margin-bottom: 4px;
}
.product .shop {
font-size: 10px;
text-align: left;
color: green;
margin-bottom: 6px;
}
.product .shipping {
font-size: 10px;
text-align: left;
}
.lightslider {
overflow: visible!important;
}
.lSPrev > span, .lSNext > span {
background-color: black;
padding: 5px;
}
#mark {
font-size: 13px;
}
#mark a {
margin-left: 3px;
}
.product img {
max-width: 100px;
}
\ No newline at end of file
resources/assets/less/metager/cards.less
+ 4
− 1
View file @ c521d6b8
.card, .card-medium {
.card,
.card-medium {
border: 1px solid #ccc;
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);
margin: 8px;
padding: 15px;
}
.card-heavy {
.card;
box-shadow: 0px 4px 5px 0px rgba(0, 0, 0, 0.12), 4px 0px 5px 0px rgba(0, 0, 0, 0.24);
}
.card-light {
.card;
box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.12), 0px 0px 1px 0px rgba(0, 0, 0, 0.24);
......
resources/assets/less/metager/quicktips.less
+ 44
− 19
View file @ c521d6b8
/* Quicktips */
@quicktip-font-large: @result-font-large;
@quicktip-font-medium: @result-font-medium;
@quicktip-font-small: @result-font-small;
#quicktips {
display: flex;
flex-direction: column;
.quicktip {
.card-light;
position: relative;
.quicktip-extender {
position: absolute;
top: 5px;
right: 5px;
color: #777;
font-size: 20px;
}
details[open=""] .quicktip-extender {
animation-name: quicktip-extender-turn;
animation-fill-mode: forwards;
......@@ -22,9 +18,6 @@
width: 100%;
border: 1px solid #ccc;
background-color: white;
@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;
......@@ -33,11 +26,49 @@
}
}
.quicktip-summary {
h1 {
margin: 0px 0px 5px 0px;
font-size: 18px;
.quicktip-headline {
width: 100%;
display: flex;
justify-content: space-between;
.quicktip-title,
.quicktip-title a {
flex-grow: 0;
margin: 0px 0px 5px 0px;
font-size: 18px;
display: flex;
justify-content: space-between;
font-size: @quicktip-font-large;
}
.space-taker {
flex-grow: 1;
}
.quicktip-hoster {
flex-grow: 0;
font-size: @quicktip-font-small;
color: #808080;
white-space: nowrap;
}
.quicktip-extender {
flex-grow: 0;
color: #777;
font-size: 20px;
font-size: @quicktip-font-large;
}
>* {
margin: 0px 5px;
&:first-child {
margin-left: 0px;
}
&:last-child {
margin-right: 0px;
}
}
}
.result-hoster {
font-size: @result-font-small;
margin-left: 20px;
color: #808080;
white-space: nowrap;
}
p {
font-size: 16px;
......@@ -49,7 +80,6 @@
h2 {
margin: 10px 0px;
font-size: 16px;
font-weight: bold;
}
p {
display: none;
......@@ -89,11 +119,6 @@
}
&[type=dictCC] {
order: 3;
.quicktip-summary {
p {
font-weight: bold;
}
}
}
&[type=tip] {
order: 4;
......
resources/assets/less/metager/result.less
+ 1
− 1
View file @ c521d6b8
......@@ -17,7 +17,6 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-size: @result-font-large;
a {
&,
&:active,
......@@ -26,6 +25,7 @@
&:visited {
color: black;
text-decoration: none;
font-size: @result-font-large;
}
}
}
......
resources/views/parts/quicktip.blade.php
+ 23
− 11
View file @ c521d6b8
@if (sizeof($quicktip->details) > 0)
<details>
<summary class="quicktip-summary">
<i class="quicktip-extender fa fa-chevron-down"></i>
@if ($quicktip->title != "")
<h1>
@if ($quicktip->link != "")
<a href="{{ $quicktip->link }}">{{ $quicktip->title }}</a>
@else
{{ $quicktip->title }}
@endif
</h1>
@endif
<p>{!! $quicktip->descr !!}</p>
<div class="quicktip-headline">
@if ($quicktip->title != "")
<h1 class="quicktip-title">
@if ($quicktip->link != "")
<a href="{{ $quicktip->link }}">{{ $quicktip->title }}</a>
@else
{{ $quicktip->title }}
@endif
</h1>
@endif
<div class="space-taker"></div>
@if ($quicktip->gefVonLink != "")
<a class="quicktip-hoster" href="{{ $quicktip->gefVonLink }}" target="_blank" rel="noopener">
@if ($quicktip->gefVonTitle != "")
{{ $quicktip->gefVonTitle }}
@else
{{ $quicktip->gefVonTitle }}
@endif
</a>
@endif
<i class="quicktip-extender fa fa-chevron-down"></i>
</div>
<p class="quicktip-description">{!! $quicktip->descr !!}</p>
</summary>
@foreach ($quicktip->details as $detail)
<div class="quicktip-detail">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment