mirror of
https://github.com/searxng/searxng.git
synced 2024-08-25 23:40:15 +02:00
Merge branch 'master' into filtron
This commit is contained in:
commit
2b2a882df0
@ -172,7 +172,7 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
|
||||
.result-videos,
|
||||
.result-map {
|
||||
clear: both;
|
||||
padding: 2px 4px;
|
||||
padding: 0.5em 4px;
|
||||
}
|
||||
.result-default:hover,
|
||||
.result-code:hover,
|
||||
|
File diff suppressed because one or more lines are too long
@ -145,7 +145,7 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
|
||||
.result-videos,
|
||||
.result-map {
|
||||
clear: both;
|
||||
padding: 2px 4px;
|
||||
padding: 0.5em 4px;
|
||||
}
|
||||
.result-default:hover,
|
||||
.result-code:hover,
|
||||
|
File diff suppressed because one or more lines are too long
@ -78,7 +78,13 @@ if(searx.autocompleter) {
|
||||
}
|
||||
|
||||
$(document).ready(function(){
|
||||
var original_search_value = '';
|
||||
if(searx.autocompleter) {
|
||||
$("#q").on('keydown', function(e) {
|
||||
if(e.which == 13) {
|
||||
original_search_value = $('#q').val();
|
||||
}
|
||||
});
|
||||
$('#q').typeahead(null, {
|
||||
name: 'search-results',
|
||||
displayKey: function(result) {
|
||||
@ -87,6 +93,9 @@ $(document).ready(function(){
|
||||
source: searx.searchResults.ttAdapter()
|
||||
});
|
||||
$('#q').bind('typeahead:selected', function(ev, suggestion) {
|
||||
if(original_search_value) {
|
||||
$('#q').val(original_search_value);
|
||||
}
|
||||
$("#search_form").submit();
|
||||
});
|
||||
}
|
||||
|
4
searx/static/themes/oscar/js/searx.min.js
vendored
4
searx/static/themes/oscar/js/searx.min.js
vendored
File diff suppressed because one or more lines are too long
@ -25,7 +25,13 @@ if(searx.autocompleter) {
|
||||
}
|
||||
|
||||
$(document).ready(function(){
|
||||
var original_search_value = '';
|
||||
if(searx.autocompleter) {
|
||||
$("#q").on('keydown', function(e) {
|
||||
if(e.which == 13) {
|
||||
original_search_value = $('#q').val();
|
||||
}
|
||||
});
|
||||
$('#q').typeahead(null, {
|
||||
name: 'search-results',
|
||||
displayKey: function(result) {
|
||||
@ -34,6 +40,9 @@ $(document).ready(function(){
|
||||
source: searx.searchResults.ttAdapter()
|
||||
});
|
||||
$('#q').bind('typeahead:selected', function(ev, suggestion) {
|
||||
if(original_search_value) {
|
||||
$('#q').val(original_search_value);
|
||||
}
|
||||
$("#search_form").submit();
|
||||
});
|
||||
}
|
||||
|
@ -64,7 +64,7 @@
|
||||
// default formating of results
|
||||
.result-default, .result-code, .result-torrent, .result-videos, .result-map {
|
||||
clear: both;
|
||||
padding: 2px 4px;
|
||||
padding: 0.5em 4px;
|
||||
&:hover{
|
||||
background-color: @dim-gray;
|
||||
}
|
||||
|
@ -1,15 +1,18 @@
|
||||
{
|
||||
"devDependencies": {
|
||||
"grunt": "~0.4.5",
|
||||
"grunt-contrib-uglify": "~0.6.0",
|
||||
"grunt-contrib-watch": "~0.6.1",
|
||||
"grunt": "^0.4.5",
|
||||
"grunt-contrib-concat": "~0.5.0",
|
||||
"grunt-contrib-jshint": "~0.10.0",
|
||||
"grunt-contrib-less": "~0.11.0"
|
||||
"grunt-contrib-less": "~0.11.0",
|
||||
"grunt-contrib-uglify": "~0.6.0",
|
||||
"grunt-contrib-watch": "~0.6.1"
|
||||
},
|
||||
"scripts": {
|
||||
"build": "npm install && grunt",
|
||||
"start": "grunt watch",
|
||||
"test": "grunt"
|
||||
},
|
||||
"dependencies": {
|
||||
"grunt-cli": "^1.3.2"
|
||||
}
|
||||
}
|
||||
|
@ -98,6 +98,7 @@
|
||||
<table class="engine-table">
|
||||
<tr>
|
||||
<th>{{ _('Engine name') }}</th>
|
||||
<th>{{ _('Shortcut') }}</th>
|
||||
<th>{{ _('Category') }}</th>
|
||||
<th>{{ _('Allow') }} / {{ _('Block') }}</th>
|
||||
</tr>
|
||||
@ -106,7 +107,8 @@
|
||||
|
||||
{% if not search_engine.private %}
|
||||
<tr>
|
||||
<td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})‎</td>
|
||||
<td>{{ search_engine.name }}</td>
|
||||
<td>{{ shortcuts[search_engine.name] }}</td>
|
||||
<td>{{ _(categ) }}</td>
|
||||
<td class="engine_checkbox">
|
||||
<input type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}__{{ categ }}"{% if (search_engine.name, categ) in disabled_engines %} checked="checked"{% endif %} />
|
||||
|
@ -95,6 +95,7 @@
|
||||
<table>
|
||||
<tr>
|
||||
<th>{{ _('Engine name') }}</th>
|
||||
<th>{{ _('Shortcut') }}</th>
|
||||
<th>{{ _('Category') }}</th>
|
||||
<th>{{ _('Allow') }} / {{ _('Block') }}</th>
|
||||
</tr>
|
||||
@ -103,7 +104,8 @@
|
||||
|
||||
{% if not search_engine.private %}
|
||||
<tr>
|
||||
<td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})‎</td>
|
||||
<td>{{ search_engine.name }}</td>
|
||||
<td>{{ shortcuts[search_engine.name] }}</td>
|
||||
<td>{{ _(categ) }}</td>
|
||||
<td class="engine_checkbox">
|
||||
<input type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}__{{ categ }}"{% if (search_engine.name, categ) in disabled_engines %} checked="checked"{% endif %} />
|
||||
|
Loading…
Reference in New Issue
Block a user