devol
/
searx
mirror of https://github.com/searx/searx
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1763 from return42/dos2unix 

themes: remove CR from newlines
This commit is contained in:
Adam Tauber 2019-12-11 15:43:38 +00:00 committed by GitHub
parent 50e1fcaa5e a3b5f3230c
commit b0177847f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 1538 additions and 1545 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
searx/static/themes/oscar/gruntfile.js
View File

@ -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"],

20
searx/static/themes/oscar/js/searx.js
View File

@ -154,7 +154,7 @@ $(document).ready(function(){
$(this).toggleClass('btn-default'); $(this).toggleClass('btn-default');
}); });
/** /**
* change text during btn-toggle click if possible * change text during btn-toggle click if possible
*/ */
$('.media-loader').click(function() { $('.media-loader').click(function() {
@ -305,19 +305,19 @@ $(document).ready(function(){
// TODO hack // TODO hack
// change default imagePath // change default imagePath
L.Icon.Default.imagePath = "./static/themes/oscar/img/map"; L.Icon.Default.imagePath = "./static/themes/oscar/img/map";
// init map // init map
var map = L.map(leaflet_target); var map = L.map(leaflet_target);
// create the tile layer with correct attribution // create the tile layer with correct attribution
var osmMapnikUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'; var osmMapnikUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
var osmMapnikAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors'; var osmMapnikAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
var osmMapnik = new L.TileLayer(osmMapnikUrl, {minZoom: 1, maxZoom: 19, attribution: osmMapnikAttrib}); var osmMapnik = new L.TileLayer(osmMapnikUrl, {minZoom: 1, maxZoom: 19, attribution: osmMapnikAttrib});
var osmWikimediaUrl='https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png'; var osmWikimediaUrl='https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png';
var osmWikimediaAttrib = 'Wikimedia maps beta | Maps data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors'; var osmWikimediaAttrib = 'Wikimedia maps beta | Maps data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
var osmWikimedia = new L.TileLayer(osmWikimediaUrl, {minZoom: 1, maxZoom: 19, attribution: osmWikimediaAttrib}); var osmWikimedia = new L.TileLayer(osmWikimediaUrl, {minZoom: 1, maxZoom: 19, attribution: osmWikimediaAttrib});
// init map view // init map view
if(map_bounds) { if(map_bounds) {
@ -334,9 +334,9 @@ $(document).ready(function(){
map.setView(new L.LatLng(map_lat, map_lon),8); map.setView(new L.LatLng(map_lat, map_lon),8);
} }
map.addLayer(osmMapnik); map.addLayer(osmMapnik);
var baseLayers = { var baseLayers = {
"OSM Mapnik": osmMapnik/*, "OSM Mapnik": osmMapnik/*,
"OSM Wikimedia": osmWikimedia*/ "OSM Wikimedia": osmWikimedia*/
}; };

2
searx/static/themes/oscar/js/searx_src/element_modifiers.js
View File

@ -64,7 +64,7 @@ $(document).ready(function(){
$(this).toggleClass('btn-default'); $(this).toggleClass('btn-default');
}); });
/** /**
* change text during btn-toggle click if possible * change text during btn-toggle click if possible
*/ */
$('.media-loader').click(function() { $('.media-loader').click(function() {

18
searx/static/themes/oscar/js/searx_src/leaflet_map.js
View File

@ -116,19 +116,19 @@ $(document).ready(function(){
// TODO hack // TODO hack
// change default imagePath // change default imagePath
L.Icon.Default.imagePath = "./static/themes/oscar/img/map"; L.Icon.Default.imagePath = "./static/themes/oscar/img/map";
// init map // init map
var map = L.map(leaflet_target); var map = L.map(leaflet_target);
// create the tile layer with correct attribution // create the tile layer with correct attribution
var osmMapnikUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'; var osmMapnikUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
var osmMapnikAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors'; var osmMapnikAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
var osmMapnik = new L.TileLayer(osmMapnikUrl, {minZoom: 1, maxZoom: 19, attribution: osmMapnikAttrib}); var osmMapnik = new L.TileLayer(osmMapnikUrl, {minZoom: 1, maxZoom: 19, attribution: osmMapnikAttrib});
var osmWikimediaUrl='https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png'; var osmWikimediaUrl='https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png';
var osmWikimediaAttrib = 'Wikimedia maps beta | Maps data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors'; var osmWikimediaAttrib = 'Wikimedia maps beta | Maps data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
var osmWikimedia = new L.TileLayer(osmWikimediaUrl, {minZoom: 1, maxZoom: 19, attribution: osmWikimediaAttrib}); var osmWikimedia = new L.TileLayer(osmWikimediaUrl, {minZoom: 1, maxZoom: 19, attribution: osmWikimediaAttrib});
// init map view // init map view
if(map_bounds) { if(map_bounds) {
@ -145,9 +145,9 @@ $(document).ready(function(){
map.setView(new L.LatLng(map_lat, map_lon),8); map.setView(new L.LatLng(map_lat, map_lon),8);
} }
map.addLayer(osmMapnik); map.addLayer(osmMapnik);
var baseLayers = { var baseLayers = {
"OSM Mapnik": osmMapnik/*, "OSM Mapnik": osmMapnik/*,
"OSM Wikimedia": osmWikimedia*/ "OSM Wikimedia": osmWikimedia*/
}; };

2
searx/static/themes/oscar/less/logicodev/code.less
View File

@ -99,5 +99,3 @@ pre, code{
.highlight { .highlight {
font-weight: 700; font-weight: 700;
} }

1
searx/static/themes/oscar/less/logicodev/navbar.less
View File

@ -28,4 +28,3 @@
width: 80%; width: 80%;
} }
} }

18
searx/templates/oscar/languages.html
View File

@ -1,12 +1,8 @@
{% if preferences -%} <select class="language custom-select form-control" id="language" name="language" accesskey="l">
<select class="custom-select form-control" name='language'> <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Default language') }}</option>
{%- else -%} {%- for lang_id,lang_name,country_name,english_name in language_codes | sort(attribute=1) -%}
<select class="time_range custom-select form-control" id='language' name='language'> <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>
{%- endif -%} {{- lang_name }} {% if country_name %}({{ country_name }}) {% endif %}- {{ lang_id -}}
<option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Default language') }}</option> </option>
{%- for lang_id,lang_name,country_name,english_name in language_codes | sort(attribute=1) -%} {%- endfor -%}
<option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>
{{- lang_name }} {% if country_name %}({{ country_name }}) {% endif %}- {{ lang_id -}}
</option>
{%- endfor -%}
</select> </select>

66
searx/templates/oscar/preferences.html
View File

@ -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>

2
searx/templates/oscar/result_templates/images.html
View File

@ -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>{{- "" -}}

2
searx/templates/oscar/results.html
View File

@ -100,7 +100,7 @@
{% if unresponsive_engines and results|length >= 1 -%} {% if unresponsive_engines and results|length >= 1 -%}
<div class="alert alert-danger fade in" role="alert"> <div class="alert alert-danger fade in" role="alert">
<p>{{ _('Engines cannot retrieve results') }}:</p> <p>{{ _('Engines cannot retrieve results') }}:</p>
{%- for engine_name, error_type in unresponsive_engines -%}AAAA {%- for engine_name, error_type in unresponsive_engines -%}
{{- engine_name }} ({{ error_type }}){% if not loop.last %}, {% endif %}{{- "" -}} {{- engine_name }} ({{ error_type }}){% if not loop.last %}, {% endif %}{{- "" -}}
{%- endfor -%} {%- endfor -%}
</div> </div>

2
searx/templates/oscar/search.html
View File

@ -3,7 +3,7 @@
<div class="row"> <div class="row">
<div class="col-xs-12 col-md-8"> <div class="col-xs-12 col-md-8">
<div class="input-group search-margin"> <div class="input-group search-margin">
<input type="search" name="q" class="form-control" id="q" placeholder="{{ _('Search for...') }}" aria-label="{{ _('Search for...') }}" autocomplete="off" value="{{ q }}"> <input type="search" name="q" class="form-control" id="q" placeholder="{{ _('Search for...') }}" aria-label="{{ _('Search for...') }}" autocomplete="off" value="{{ q }}" accesskey="s">
<span class="input-group-btn"> <span class="input-group-btn">
<button type="submit" class="btn btn-default" aria-label="{{ _('Start search') }}"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="hidden active_if_nojs">{{ _('Start search') }}</span></button> <button type="submit" class="btn btn-default" aria-label="{{ _('Start search') }}"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="hidden active_if_nojs">{{ _('Start search') }}</span></button>
</span> </span>

2
searx/templates/oscar/search_full.html
View File

@ -6,7 +6,7 @@
{% else %} {% else %}
<div class="input-group col-md-8 col-md-offset-2"> <div class="input-group col-md-8 col-md-offset-2">
{% endif %} {% endif %}
<input type="search" name="q" class="form-control input-lg autofocus" id="q" placeholder="{{ _('Search for...') }}" aria-label="{{ _('Search for...') }}" autocomplete="off" value="{{ q }}"> <input type="search" name="q" class="form-control input-lg autofocus" id="q" placeholder="{{ _('Search for...') }}" aria-label="{{ _('Search for...') }}" autocomplete="off" value="{{ q }}" accesskey="s">
<span class="input-group-btn"> <span class="input-group-btn">
<button type="submit" class="btn btn-default input-lg" aria-label="{{ _('Start search') }}"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="hidden active_if_nojs">{{ _('Start search') }}</span></button> <button type="submit" class="btn btn-default input-lg" aria-label="{{ _('Start search') }}"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="hidden active_if_nojs">{{ _('Start search') }}</span></button>
</span> </span>

2
searx/templates/oscar/time-range.html
View File

@ -1,4 +1,4 @@
<select name="time_range" id="time-range" class="custom-select form-control">{{- "" -}} <select name="time_range" id="time-range" class="custom-select form-control" accesskey="t">{{- "" -}}
<option id="time-range-anytime" value="" {{ "selected" if time_range=="" or not time_range else ""}}> <option id="time-range-anytime" value="" {{ "selected" if time_range=="" or not time_range else ""}}>
{{- _('Anytime') -}} {{- _('Anytime') -}}
</option>{{- "" -}} </option>{{- "" -}}