forked from Ponysearch/Ponysearch
theme: oscar - tidy up trailing whitespaces and tab usage
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
parent
9988cdcbc5
commit
2a5c39e33c
10 changed files with 50 additions and 53 deletions
|
@ -24,7 +24,7 @@ module.exports = function(grunt) {
|
||||||
jshint: {
|
jshint: {
|
||||||
files: ['gruntfile.js', 'js/searx_src/*.js'],
|
files: ['gruntfile.js', 'js/searx_src/*.js'],
|
||||||
options: {
|
options: {
|
||||||
reporterOutput: "",
|
reporterOutput: "",
|
||||||
// options here to override JSHint defaults
|
// options here to override JSHint defaults
|
||||||
globals: {
|
globals: {
|
||||||
jQuery: true,
|
jQuery: true,
|
||||||
|
@ -55,7 +55,7 @@ module.exports = function(grunt) {
|
||||||
"css/logicodev-dark.min.css": "less/logicodev-dark/oscar.less"}
|
"css/logicodev-dark.min.css": "less/logicodev-dark/oscar.less"}
|
||||||
},
|
},
|
||||||
/*
|
/*
|
||||||
// built with ./manage.sh styles
|
// built with ./manage.sh styles
|
||||||
bootstrap: {
|
bootstrap: {
|
||||||
options: {
|
options: {
|
||||||
paths: ["less/bootstrap"],
|
paths: ["less/bootstrap"],
|
||||||
|
@ -90,7 +90,7 @@ module.exports = function(grunt) {
|
||||||
grunt.registerTask('test', ['jshint']);
|
grunt.registerTask('test', ['jshint']);
|
||||||
|
|
||||||
grunt.registerTask('default', ['jshint', 'concat', 'uglify', 'less']);
|
grunt.registerTask('default', ['jshint', 'concat', 'uglify', 'less']);
|
||||||
|
|
||||||
grunt.registerTask('styles', ['less']);
|
grunt.registerTask('styles', ['less']);
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -109,7 +109,7 @@ ul.nav li a {
|
||||||
|
|
||||||
.btn:hover {
|
.btn:hover {
|
||||||
color:#444 !important;
|
color:#444 !important;
|
||||||
background-color: #BBB !important;
|
background-color: #BBB !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.btn-primary.active {
|
.btn-primary.active {
|
||||||
|
@ -221,7 +221,7 @@ p.btn.btn-default{
|
||||||
}
|
}
|
||||||
|
|
||||||
.table-hover > tbody > tr:hover > td, .table-hover > tbody > tr:hover > th {
|
.table-hover > tbody > tr:hover > td, .table-hover > tbody > tr:hover > th {
|
||||||
background: rgb(102, 105, 110) !important;
|
background: rgb(102, 105, 110) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.btn-success {
|
.btn-success {
|
||||||
|
|
|
@ -78,7 +78,7 @@ pre, code{
|
||||||
user-select: none;
|
user-select: none;
|
||||||
cursor: default;
|
cursor: default;
|
||||||
color: #556366;
|
color: #556366;
|
||||||
|
|
||||||
&::selection {
|
&::selection {
|
||||||
background: transparent; /* WebKit/Blink Browsers */
|
background: transparent; /* WebKit/Blink Browsers */
|
||||||
}
|
}
|
||||||
|
@ -99,5 +99,3 @@ pre, code{
|
||||||
.highlight {
|
.highlight {
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
table-layout: fixed;
|
table-layout: fixed;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.infobox_part:last-child {
|
.infobox_part:last-child {
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,4 +28,3 @@
|
||||||
width: 80%;
|
width: 80%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -69,7 +69,7 @@
|
||||||
-ms-user-select: none;
|
-ms-user-select: none;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
cursor: default;
|
cursor: default;
|
||||||
|
|
||||||
&::selection {
|
&::selection {
|
||||||
background: transparent; /* WebKit/Blink Browsers */
|
background: transparent; /* WebKit/Blink Browsers */
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
word-wrap: break-word;
|
word-wrap: break-word;
|
||||||
table-layout: fixed;
|
table-layout: fixed;
|
||||||
}
|
}
|
||||||
|
|
||||||
.infobox_part:last-child {
|
.infobox_part:last-child {
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,10 +3,10 @@
|
||||||
{%- else -%}
|
{%- else -%}
|
||||||
<select class="time_range custom-select form-control" id='language' name='language'>
|
<select class="time_range custom-select form-control" id='language' name='language'>
|
||||||
{%- endif -%}
|
{%- endif -%}
|
||||||
<option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Default language') }}</option>
|
<option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Default language') }}</option>
|
||||||
{%- for lang_id,lang_name,country_name,english_name in language_codes | sort(attribute=1) -%}
|
{%- for lang_id,lang_name,country_name,english_name in language_codes | sort(attribute=1) -%}
|
||||||
<option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>
|
<option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>
|
||||||
{{- lang_name }} {% if country_name %}({{ country_name }}) {% endif %}- {{ lang_id -}}
|
{{- lang_name }} {% if country_name %}({{ country_name }}) {% endif %}- {{ lang_id -}}
|
||||||
</option>
|
</option>
|
||||||
{%- endfor -%}
|
{%- endfor -%}
|
||||||
</select>
|
</select>
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
{% set language_label = _('Search language') %}
|
{% set language_label = _('Search language') %}
|
||||||
{% set language_info = _('What language do you prefer for search?') %}
|
{% set language_info = _('What language do you prefer for search?') %}
|
||||||
{{ preferences_item_header(language_info, language_label, rtl) }}
|
{{ preferences_item_header(language_info, language_label, rtl) }}
|
||||||
{% include 'oscar/languages.html' %}
|
{% include 'oscar/languages.html' %}
|
||||||
{{ preferences_item_footer(language_info, language_label, rtl) }}
|
{{ preferences_item_footer(language_info, language_label, rtl) }}
|
||||||
|
|
||||||
{% set locale_label = _('Interface language') %}
|
{% set locale_label = _('Interface language') %}
|
||||||
|
@ -156,26 +156,26 @@
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
<table class="table table-hover table-condensed table-striped">
|
<table class="table table-hover table-condensed table-striped">
|
||||||
<tr>
|
<tr>
|
||||||
{% if not rtl %}
|
{% if not rtl %}
|
||||||
<th>{{ _("Allow") }}</th>
|
<th>{{ _("Allow") }}</th>
|
||||||
<th>{{ _("Engine name") }}</th>
|
<th>{{ _("Engine name") }}</th>
|
||||||
<th>{{ _("Shortcut") }}</th>
|
<th>{{ _("Shortcut") }}</th>
|
||||||
<th>{{ _("Selected language") }}</th>
|
<th>{{ _("Selected language") }}</th>
|
||||||
<th>{{ _("SafeSearch") }}</th>
|
<th>{{ _("SafeSearch") }}</th>
|
||||||
<th>{{ _("Time range") }}</th>
|
<th>{{ _("Time range") }}</th>
|
||||||
<th>{{ _("Avg. time") }}</th>
|
<th>{{ _("Avg. time") }}</th>
|
||||||
<th>{{ _("Max time") }}</th>
|
<th>{{ _("Max time") }}</th>
|
||||||
{% else %}
|
{% else %}
|
||||||
<th>{{ _("Max time") }}</th>
|
<th>{{ _("Max time") }}</th>
|
||||||
<th>{{ _("Avg. time") }}</th>
|
<th>{{ _("Avg. time") }}</th>
|
||||||
<th>{{ _("Time range") }}</th>
|
<th>{{ _("Time range") }}</th>
|
||||||
<th>{{ _("SafeSearch") }}</th>
|
<th>{{ _("SafeSearch") }}</th>
|
||||||
<th>{{ _("Selected language") }}</th>
|
<th>{{ _("Selected language") }}</th>
|
||||||
<th>{{ _("Shortcut") }}</th>
|
<th>{{ _("Shortcut") }}</th>
|
||||||
<th>{{ _("Engine name") }}</th>
|
<th>{{ _("Engine name") }}</th>
|
||||||
<th>{{ _("Allow") }}</th>
|
<th>{{ _("Allow") }}</th>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</tr>
|
</tr>
|
||||||
{% for search_engine in engines_by_category[categ] %}
|
{% for search_engine in engines_by_category[categ] %}
|
||||||
|
@ -186,19 +186,19 @@
|
||||||
{{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }}
|
{{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }}
|
||||||
</td>
|
</td>
|
||||||
<th>{{ search_engine.name }}</th>
|
<th>{{ search_engine.name }}</th>
|
||||||
<td class="name">{{ shortcuts[search_engine.name] }}</td>
|
<td class="name">{{ shortcuts[search_engine.name] }}</td>
|
||||||
<td>{{ support_toggle(stats[search_engine.name].supports_selected_language) }}</td>
|
<td>{{ support_toggle(stats[search_engine.name].supports_selected_language) }}</td>
|
||||||
<td>{{ support_toggle(search_engine.safesearch==True) }}</td>
|
<td>{{ support_toggle(search_engine.safesearch==True) }}</td>
|
||||||
<td>{{ support_toggle(search_engine.time_range_support==True) }}</td>
|
<td>{{ support_toggle(search_engine.time_range_support==True) }}</td>
|
||||||
<td class="{{ 'danger' if stats[search_engine.name]['warn_time'] else '' }}">{{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }}</td>
|
<td class="{{ 'danger' if stats[search_engine.name]['warn_time'] else '' }}">{{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }}</td>
|
||||||
<td class="{{ 'danger' if stats[search_engine.name]['warn_timeout'] else '' }}">{{ search_engine.timeout }}</td>
|
<td class="{{ 'danger' if stats[search_engine.name]['warn_timeout'] else '' }}">{{ search_engine.timeout }}</td>
|
||||||
{% else %}
|
{% else %}
|
||||||
<td class="{{ 'danger' if stats[search_engine.name]['warn_timeout'] else '' }}">{{ search_engine.timeout }}</td>
|
<td class="{{ 'danger' if stats[search_engine.name]['warn_timeout'] else '' }}">{{ search_engine.timeout }}</td>
|
||||||
<td class="{{ 'danger' if stats[search_engine.name]['warn_time'] else '' }}">{{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }}</td>
|
<td class="{{ 'danger' if stats[search_engine.name]['warn_time'] else '' }}">{{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }}</td>
|
||||||
<td>{{ support_toggle(search_engine.time_range_support==True) }}</td>
|
<td>{{ support_toggle(search_engine.time_range_support==True) }}</td>
|
||||||
<td>{{ support_toggle(search_engine.safesearch==True) }}</td>
|
<td>{{ support_toggle(search_engine.safesearch==True) }}</td>
|
||||||
<td>{{ support_toggle(stats[search_engine.name].supports_selected_language) }}</td>
|
<td>{{ support_toggle(stats[search_engine.name].supports_selected_language) }}</td>
|
||||||
<td>{{ shortcuts[search_engine.name] }}</td>
|
<td>{{ shortcuts[search_engine.name] }}</td>
|
||||||
<th>{{ search_engine.name }}</th>
|
<th>{{ search_engine.name }}</th>
|
||||||
<td class="onoff-checkbox">
|
<td class="onoff-checkbox">
|
||||||
{{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }}
|
{{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }}
|
||||||
|
@ -207,7 +207,7 @@
|
||||||
</tr>
|
</tr>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
<span class="label label-default pull-right">{{ result.engine }}</span>{{- "" -}}
|
<span class="label label-default pull-right">{{ result.engine }}</span>{{- "" -}}
|
||||||
<p class="text-muted pull-left">{{ result.pretty_url }}</p>{{- "" -}}
|
<p class="text-muted pull-left">{{ result.pretty_url }}</p>{{- "" -}}
|
||||||
<div class="clearfix"></div>{{- "" -}}
|
<div class="clearfix"></div>{{- "" -}}
|
||||||
<div class="row">{{- "" -}}
|
<div class="row">{{- "" -}}
|
||||||
<div class="col-md-6">{{- "" -}}
|
<div class="col-md-6">{{- "" -}}
|
||||||
<a href="{{ result.img_src }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} class="btn btn-default">{{ _('Get image') }}</a>{{- "" -}}
|
<a href="{{ result.img_src }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} class="btn btn-default">{{ _('Get image') }}</a>{{- "" -}}
|
||||||
</div>{{- "" -}}
|
</div>{{- "" -}}
|
||||||
|
|
Loading…
Reference in a new issue