Commit 70dddd6b authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '466-ergebnisseite-ohne-javascript-stark-eingeschrankt' into 'development'

Resolve "Ergebnisseite ohne Javascript stark eingeschränkt"

Closes #466

See merge request !879
parents 63161166 d8426cdc
This diff is collapsed.
$(document).ready(function () {
activateJSOnlyContent()
createCustomFocuses();
var focus = $('#foki > li.active > a').attr('aria-controls');
var custom = $('#foki > li.active').hasClass('custom-focus-tab-selector');
......@@ -6,6 +7,11 @@ $(document).ready(function () {
botProtection();
})
function activateJSOnlyContent() {
$('#searchplugin').removeClass('hide')
$('.options').removeClass('hide')
}
function tabs () {
$('#foki > li.tab-selector > a').each(function () {
if ($(this).attr('target') != '_blank') {
......
......@@ -79,7 +79,7 @@ function setSettings () {
$('fieldset.mobile input#bilder').attr('id', 'angepasst')
$('fieldset.mobile label#bilder-label').attr('id', 'anpassen-label')
$('fieldset.mobile label#anpassen-label').attr('for', 'angepasst')
$('fieldset.mobile label#anpassen-label a.fa').attr('class', 'fa fa-cog')
$('fieldset.mobile label#anpassen-label i.fa').attr('class', 'fa fa-cog')
$('fieldset.mobile label#anpassen-label span.content').html('angepasst')
}
}
......
{
"js/editLanguage.js": "js/editLanguage-7a1cbfb2ba.js",
"js/kontakt.js": "js/kontakt-de49d68db3.js",
"js/scriptResultPage.js": "js/scriptResultPage-14a8249fe7.js",
"js/scriptStartPage.js": "js/scriptStartPage-032f11cdbb.js",
"js/scriptResultPage.js": "js/scriptResultPage-e3ad18a4a0.js",
"js/scriptStartPage.js": "js/scriptStartPage-f63fab5e8d.js",
"js/settings.js": "js/settings-6ff0eab621.js",
"js/widgets.js": "js/widgets-866379dd63.js"
}
\ No newline at end of file
......@@ -7725,6 +7725,7 @@ a:hover {
}
#quicktips iframe {
width: 100%;
height: 800px;
background-color: transparent;
border: 0px none transparent;
padding: 0px;
......@@ -7853,6 +7854,17 @@ footer a {
padding-right: 0;
}
}
.image-container {
display: -webkit-box;
display: flex;
flex-wrap: wrap;
}
.image-item {
margin: 5px;
}
.image-item .img {
box-shadow: 0px 0px 10px 2px rgba(0, 0, 0, 0.3);
}
.qtheader {
font-size: 16px;
margin: 0px;
......
This diff is collapsed.
$(document).ready(function () {
activateJSOnlyContent()
createCustomFocuses();
var focus = $('#foki > li.active > a').attr('aria-controls');
var custom = $('#foki > li.active').hasClass('custom-focus-tab-selector');
......@@ -6,6 +7,11 @@ $(document).ready(function () {
botProtection();
})
function activateJSOnlyContent() {
$('#searchplugin').removeClass('hide')
$('.options').removeClass('hide')
}
function tabs () {
$('#foki > li.tab-selector > a').each(function () {
if ($(this).attr('target') != '_blank') {
......
......@@ -410,6 +410,7 @@ a:hover {
#quicktips iframe {
width: 100%;
height: 800px;
background-color: transparent;
border: 0px none transparent;
padding: 0px;
......@@ -569,4 +570,16 @@ footer a {
padding-left: 0;
padding-right: 0;
}
}
.image-container {
display: flex;
flex-wrap: wrap;
}
.image-item {
margin: 5px;
.img {
box-shadow: 0px 0px 10px 2px rgba(0, 0, 0, 0.3);
}
}
\ No newline at end of file
@if( strpos(rtrim(Request::header('REFERER'), '/'), LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") ) === 0 && ( $browser === 'Firefox' || $browser === 'Mozilla' || $browser === 'Chrome' || $browser === 'IE' || $browser === 'Edge') )
<div id="searchplugin" class="alert alert-warning alert-dismissible" role="alert" style="">
<div id="searchplugin" class="alert alert-warning alert-dismissible hide" role="alert" style="">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
{!! trans('researchandtabs.plugin.1', ['browser' => $browser]) !!}
<br />
......@@ -10,7 +10,7 @@
@endif
<div class="content-wrapper container">
<header id="research" class="row">
<nav class="navbar navbar-default navbar-fixed-top navbar-resultpage">
<nav class="navbar navbar-default navbar-fixed-top navbar-resultpage">
<div class="container">
<div class="row">
<div class="col-xs-3 logo dense-col">
......
......@@ -16,7 +16,7 @@
{{ $result->anzeigeLink }}
</a>
</div>
<div class="options">
<div class="options hide">
<a tabindex="0" data-toggle="popover" data-trigger="focus" data-placement="auto bottom" data-container="body" data-html="true" data-title="<i class='fa fa-cog' aria-hidden='true'></i> Optionen">
@if(strlen($metager->getSite()) === 0)
<i class="fa fa-caret-down" aria-hidden="true"></i>
......
......@@ -19,9 +19,9 @@
</ul>
</div>
@endif
<div id="container">
<div id="container" class="image-container">
@foreach($metager->getResults() as $result)
<div class="item">
<div class="item image-item">
<div class="img">
<a href="{{ $result->link }}" target="{{ $metager->getNewtab() }}"><img src="{{ $metager->getImageProxyLink($result->image) }}" width="150px" alt="" rel="noopener"/></a>
<span class="label label-default hostlabel">{!! $result->gefVon !!}</span>
......
......@@ -16,9 +16,9 @@
</ul>
</div>
@endif
<div id="container">
<div id="container" class="image-container">
@foreach($metager->getResults() as $result)
<div class="item">
<div class="item image-item">
<div class="img">
<a href="{{ $result->link }}" target="{{ $metager->getNewtab() }}"><img src="{{ $metager->getImageProxyLink($result->image) }}" width="150px" alt="" rel="noopener"/></a>
<span class="label label-default hostlabel">{{ strip_tags($result->gefVon) }}</span>
......
Markdown is supported
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