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

Improved: Gespeicherte Ergebnisse werden jetzt korrekt undter den Quicktips angezeigt

parent 3e72b0e5
No related branches found
No related tags found
1 merge request!1365Resolve "Filter Options for MetaGer"
Hide whitespace changes
Inline Side-by-side
resources/assets/js/results.js
+ 22
− 23
View file @ f264f08b
...@@ -250,34 +250,33 @@ Result.prototype.remove = function () { ...@@ -250,34 +250,33 @@ Result.prototype.remove = function () {
Result.prototype.toHtml = function () { Result.prototype.toHtml = function () {
var result = $('\ var result = $('\
<div class="result row">\ <div class="saved-result result">\
<div class="col-sm-1 glyphicon glyphicon-trash remover" title="Ergebnis aus dem Speicher löschen">\ <div class="saved-result-remover remover" title="Ergebnis aus dem Speicher löschen">\
<i class="fa fa-trash"></i>\
</div>\ </div>\
<div class="result-information col-xs-12 col-sm-11">\ <div class="saved-result-content">\
<div class="col-xs-10 col-sm-11" style="padding:0; ">\ <h2 class="result-title">\
<p class="title">\ <a class="title" href="' + this.link + '" target="_blank" data-hoster="' + this.hoster + '" data-count="1" rel="noopener">\
<a class="title" href="' + this.link + '" target="_blank" data-hoster="' + this.hoster + '" data-count="1" rel="noopener">\ ' + this.title + '\
' + this.title + '\ </a>\
</h2>\
<div class="result-header">\
<div class="result-link">\
<a href="' + this.link + '" target="_blank" data-hoster="' + this.hoster + '" data-count="' + this.index + '" rel="noopener">\
' + this.anzeigeLink + '\
</a>\ </a>\
</p>\
<div class="link">\
<div>\
<div class="link-link">\
<a href="' + this.link + '" target="_blank" data-hoster="' + this.hoster + '" data-count="' + this.index + '" rel="noopener">\
' + this.anzeigeLink + '\
</a>\
</div>\
</div>\ </div>\
<span class="hoster">\ <span class="result-hoster">' + this.gefVon + '</span>\
' + this.gefVon + '\ <span class="result-proxy">\
<a class="result-proxy" onmouseover="$(this).popover(\'show\');" onmouseout="$(this).popover(\'hide\');" data-toggle="popover" data-placement="auto right" data-container="body" data-content="Der Link wird anonymisiert geöffnet. Ihre Daten werden nicht zum Zielserver übertragen. Möglicherweise funktionieren manche Webseiten nicht wie gewohnt." href="' + this.proxy + '" target="_blank" rel="noopener" data-original-title="" title="">\
<img src="/img/proxyicon.png" alt="">\
anonym öffnen\
</a>\
</span>\ </span>\
<a class="proxy" onmouseover="$(this).popover(\'show\');" onmouseout="$(this).popover(\'hide\');" data-toggle="popover" data-placement="auto right" data-container="body" data-content="Der Link wird anonymisiert geöffnet. Ihre Daten werden nicht zum Zielserver übertragen. Möglicherweise funktionieren manche Webseiten nicht wie gewohnt." href="' + this.proxy + '" target="_blank" rel="noopener" data-original-title="" title="">\
<img src="/img/proxyicon.png" alt="">\
anonym öffnen\
</a>\
</div>\ </div>\
</div>\ <div class="result-body">\
<div class="description">' + this.description + '</div>\ <div class="description">' + this.description + '</div>\
</div>\
</div>\ </div>\
</div>'); </div>');
$(result).find('.remover').click({caller: this}, function (event) { $(result).find('.remover').click({caller: this}, function (event) {
......
resources/assets/less/metager/result-saver.less
+ 21
− 0
View file @ f264f08b
@saved-result-distance-first: 10px;
@saved-result-distance-between: 10px;
#savedFoki { #savedFoki {
padding-top: 50px; padding-top: 50px;
display: flex;
flex-direction: column;
#saver-options { #saver-options {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
...@@ -22,4 +27,20 @@ ...@@ -22,4 +27,20 @@
width: 100%; width: 100%;
} }
} }
.saved-result {
display: flex;
align-items: baseline;
margin-top: @saved-result-distance-first;
margin-bottom: @saved-result-distance-between;
padding-bottom: @saved-result-distance-between;
.saved-result-remover {
padding: 0px 10px;
.fa {
font-size: 20px;
}
}
.saved-result-content {
overflow: hidden;
}
}
} }
\ No newline at end of file
resources/assets/less/metager/result.less
+ 1
− 1
View file @ f264f08b
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
margin-top: 0; margin-top: 0;
margin-left: 10px; margin-left: 10px;
} }
.result-proxy { .result-proxy, .result-proxy a {
font-size: 13px; font-size: 13px;
margin-top: 0; margin-top: 0;
white-space: nowrap; white-space: nowrap;
......
resources/views/layouts/result.blade.php
+ 6
− 4
View file @ f264f08b
...@@ -56,10 +56,12 @@ ...@@ -56,10 +56,12 @@
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/partnershops") }}" target="_blank" rel="noopener">{!! trans('result.options.4') !!}</a> <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/partnershops") }}" target="_blank" rel="noopener">{!! trans('result.options.4') !!}</a>
</span> </span>
@endif @endif
<a class="result-proxy" onmouseover="$(this).popover('show');" onmouseout="$(this).popover('hide');" data-toggle="popover" data-placement="auto right" data-container="body" data-content="@lang('result.proxytext')" href="{{ $result->proxyLink }}" target="{{ $metager->getNewtab() }}" rel="noopener"> <span class="result-proxy">
<img src="/img/proxyicon.png" alt="" /> <a onmouseover="$(this).popover('show');" onmouseout="$(this).popover('hide');" data-toggle="popover" data-placement="auto right" data-container="body" data-content="@lang('result.proxytext')" href="{{ $result->proxyLink }}" target="{{ $metager->getNewtab() }}" rel="noopener">
<span>{!! trans('result.options.5') !!}</span> <img src="/img/proxyicon.png" alt="" />
</a> <span>{!! trans('result.options.5') !!}</span>
</a>
</span>
</div> </div>
<div class="result-body"> <div class="result-body">
@if( isset($result->logo) ) @if( isset($result->logo) )
......
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