Commit f63baf43 authored by Karl Hasselbring's avatar Karl Hasselbring
Browse files

Löschen-Knopf hinzugefügt

parent aaf37c32
......@@ -16,7 +16,7 @@ $(document).ready(function () {
var search = getMetaTag('q') || '';
var locale = getMetaTag('l') || 'de';
//loadQuicktips(search, locale, sprueche); // load the quicktips
// loadQuicktips(search, locale, sprueche) // load the quicktips
});
/*
......@@ -65,6 +65,7 @@ function tabs () {
getDocumentReadyForUse(fokus);
}
});
$('#search-delete-btn').removeClass('hidden');
}
function getDocumentReadyForUse (fokus, custom) {
......@@ -85,11 +86,11 @@ function getDocumentReadyForUse (fokus, custom) {
}
function addListeners () {
$('#reset').attr('type', 'button').click(resetSearchbar);
$('#search-delete-btn').click(resetSearchbar);
}
function resetSearchbar () {
$('#eingabeTop').val('');
$('.search-input input').val('').focus();
}
function pluginInfo () {
......@@ -133,23 +134,23 @@ function clickLog () {
}
function botProtection () {
$(".result").find("a").click(function(){
var link = $(this).attr("href");
$('.result').find('a').click(function () {
var link = $(this).attr('href');
var newtab = false;
if($(this).attr("target") == "_blank"){
if ($(this).attr('target') == '_blank') {
newtab = true;
}
$.ajax({
url: '/img/cat.jpg',
type: "post",
data: { mm: $("meta[name=mm]").attr("content")},
url: '/img/cat.jpg',
type: 'post',
data: { mm: $('meta[name=mm]').attr('content')},
timeout: 2000
})
.always(function(){
if(!newtab)
document.location.href = link;
});
if(!newtab)
.always(function () {
if (!newtab)
document.location.href = link;
});
if (!newtab)
return false;
else
return true;
......@@ -287,7 +288,6 @@ function fokiChanger () {
});
})(jQuery);
/**
* Loads the content for a given fokus
*/
......
......@@ -250,7 +250,6 @@ header:nth-child(1) {
}
}
/* Scrollbar Style */
@scrollfade-color: white;
......@@ -288,4 +287,17 @@ header:nth-child(1) {
width: 100%;
max-width: 760px;
height: 61px;
}
.search-input {
position: relative;
}
#search-delete-btn {
position: absolute;
right: 0;
bottom: 5px;
border: none;
background-color: transparent;
font-size: 14px;
}
\ No newline at end of file
......@@ -5,7 +5,14 @@
<div class="searchbar {{$class or ''}}">
<div class="search-input-submit">
<div class="search-input">
<<<<<<< Updated upstream
<input type="text" name="eingabe" value="@if(isset($eingabe)){{$eingabe}}@endif" required="" @if($class=='startpage-searchbar') autofocus="" @endif autocomplete="{{$autocomplete or 'off'}}" class="form-control" placeholder="{{ trans('index.placeholder') }}">
=======
<input type="text" name="eingabe" value="@if(isset($eingabe)){{$eingabe}}@endif" required="" @if($class=='startpage-searchbar') autofocus="" @endif autocomplete="{{$autocomplete or 'off'}}" class="form-control" placeholder="{{ trans('index.placeholder') }}" tabindex="1" autofocus>
<button class="hidden" id="search-delete-btn" type="button">
<i class="fa fa-eraser" aria-hidden="true"></i>
</button>
>>>>>>> Stashed changes
</div>
<div class="search-submit" id="submit-inputgroup">
<button type="submit">
......
Supports Markdown
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