From 2a5c39e33c3306ca17e09211fbf5a0f785cb10c8 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Tue, 10 Dec 2019 18:10:33 +0100
Subject: [PATCH] theme: oscar - tidy up trailing whitespaces and tab usage

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 searx/static/themes/oscar/gruntfile.js        |  6 +-
 .../oscar/less/logicodev-dark/oscar.less      |  4 +-
 .../themes/oscar/less/logicodev/code.less     |  4 +-
 .../themes/oscar/less/logicodev/infobox.less  |  2 +-
 .../themes/oscar/less/logicodev/navbar.less   |  1 -
 .../themes/oscar/less/pointhi/code.less       |  2 +-
 .../themes/oscar/less/pointhi/infobox.less    |  2 +-
 searx/templates/oscar/languages.html          | 14 ++--
 searx/templates/oscar/preferences.html        | 66 +++++++++----------
 .../oscar/result_templates/images.html        |  2 +-
 10 files changed, 50 insertions(+), 53 deletions(-)

diff --git a/searx/static/themes/oscar/gruntfile.js b/searx/static/themes/oscar/gruntfile.js
index 591399449..def035dba 100644
--- a/searx/static/themes/oscar/gruntfile.js
+++ b/searx/static/themes/oscar/gruntfile.js
@@ -24,7 +24,7 @@ module.exports = function(grunt) {
     jshint: {
       files: ['gruntfile.js', 'js/searx_src/*.js'],
       options: {
-        reporterOutput: "",	    
+        reporterOutput: "",
         // options here to override JSHint defaults
         globals: {
           jQuery: true,
@@ -55,7 +55,7 @@ module.exports = function(grunt) {
                     "css/logicodev-dark.min.css": "less/logicodev-dark/oscar.less"}
         },
         /*
-	// built with ./manage.sh styles
+        // built with ./manage.sh styles
         bootstrap: {
             options: {
                 paths: ["less/bootstrap"],
@@ -90,7 +90,7 @@ module.exports = function(grunt) {
   grunt.registerTask('test', ['jshint']);
 
   grunt.registerTask('default', ['jshint', 'concat', 'uglify', 'less']);
-  
+
   grunt.registerTask('styles', ['less']);
 
 };
diff --git a/searx/static/themes/oscar/less/logicodev-dark/oscar.less b/searx/static/themes/oscar/less/logicodev-dark/oscar.less
index 9a4272331..e788b8cba 100644
--- a/searx/static/themes/oscar/less/logicodev-dark/oscar.less
+++ b/searx/static/themes/oscar/less/logicodev-dark/oscar.less
@@ -109,7 +109,7 @@ ul.nav li a {
 
 .btn:hover {
   color:#444 !important;
-  background-color: #BBB !important; 
+  background-color: #BBB !important;
 }
 
 .btn-primary.active {
@@ -221,7 +221,7 @@ p.btn.btn-default{
 }
 
 .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 {
diff --git a/searx/static/themes/oscar/less/logicodev/code.less b/searx/static/themes/oscar/less/logicodev/code.less
index 96486f5aa..491b30e5a 100644
--- a/searx/static/themes/oscar/less/logicodev/code.less
+++ b/searx/static/themes/oscar/less/logicodev/code.less
@@ -78,7 +78,7 @@ pre, code{
     user-select: none;
     cursor: default;
     color: #556366;
-    
+
     &::selection {
         background: transparent; /* WebKit/Blink Browsers */
     }
@@ -99,5 +99,3 @@ pre, code{
 .highlight {
     font-weight: 700;
 }
-
-
diff --git a/searx/static/themes/oscar/less/logicodev/infobox.less b/searx/static/themes/oscar/less/logicodev/infobox.less
index 0d488d744..954f4507a 100644
--- a/searx/static/themes/oscar/less/logicodev/infobox.less
+++ b/searx/static/themes/oscar/less/logicodev/infobox.less
@@ -30,7 +30,7 @@
         table-layout: fixed;
 
     }
-    
+
     .infobox_part:last-child {
         margin-bottom: 0;
     }
diff --git a/searx/static/themes/oscar/less/logicodev/navbar.less b/searx/static/themes/oscar/less/logicodev/navbar.less
index 5da7115d9..6e4f9ee10 100644
--- a/searx/static/themes/oscar/less/logicodev/navbar.less
+++ b/searx/static/themes/oscar/less/logicodev/navbar.less
@@ -28,4 +28,3 @@
         width: 80%;
     }
 }
-
diff --git a/searx/static/themes/oscar/less/pointhi/code.less b/searx/static/themes/oscar/less/pointhi/code.less
index 90a2cd60c..70a2a5d49 100644
--- a/searx/static/themes/oscar/less/pointhi/code.less
+++ b/searx/static/themes/oscar/less/pointhi/code.less
@@ -69,7 +69,7 @@
     -ms-user-select: none;
     user-select: none;
     cursor: default;
-    
+
     &::selection {
         background: transparent; /* WebKit/Blink Browsers */
     }
diff --git a/searx/static/themes/oscar/less/pointhi/infobox.less b/searx/static/themes/oscar/less/pointhi/infobox.less
index 41375f277..df51b002e 100644
--- a/searx/static/themes/oscar/less/pointhi/infobox.less
+++ b/searx/static/themes/oscar/less/pointhi/infobox.less
@@ -4,7 +4,7 @@
         word-wrap: break-word;
         table-layout: fixed;
     }
-    
+
     .infobox_part:last-child {
         margin-bottom: 0;
     }
diff --git a/searx/templates/oscar/languages.html b/searx/templates/oscar/languages.html
index c52cbd14a..e38202864 100644
--- a/searx/templates/oscar/languages.html
+++ b/searx/templates/oscar/languages.html
@@ -3,10 +3,10 @@
 {%- else -%}
 <select class="time_range custom-select form-control" id='language' name='language'>
 {%- endif -%}
-	<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) -%}
-		<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>
\ No newline at end of file
+        <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) -%}
+                <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>
diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index b64d72ddf..1a484dd4b 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -41,7 +41,7 @@
                     {% set language_label = _('Search language') %}
                     {% set language_info = _('What language do you prefer for search?') %}
                     {{ preferences_item_header(language_info, language_label, rtl) }}
-						{% include 'oscar/languages.html' %}
+                                                {% include 'oscar/languages.html' %}
                     {{ preferences_item_footer(language_info, language_label, rtl) }}
 
                     {% set locale_label = _('Interface language') %}
@@ -156,26 +156,26 @@
                         <div class="container-fluid">
                         <fieldset>
                           <div class="table-responsive">
-			  <table class="table table-hover table-condensed table-striped">
-			        <tr>
+                          <table class="table table-hover table-condensed table-striped">
+                                <tr>
                                     {% if not rtl %}
-				    <th>{{ _("Allow") }}</th>
-				    <th>{{ _("Engine name") }}</th>
-				    <th>{{ _("Shortcut") }}</th>
-				    <th>{{ _("Selected language") }}</th>
-				    <th>{{ _("SafeSearch") }}</th>
-				    <th>{{ _("Time range") }}</th>
-				    <th>{{ _("Avg. time") }}</th>
-				    <th>{{ _("Max time") }}</th>
+                                    <th>{{ _("Allow") }}</th>
+                                    <th>{{ _("Engine name") }}</th>
+                                    <th>{{ _("Shortcut") }}</th>
+                                    <th>{{ _("Selected language") }}</th>
+                                    <th>{{ _("SafeSearch") }}</th>
+                                    <th>{{ _("Time range") }}</th>
+                                    <th>{{ _("Avg. time") }}</th>
+                                    <th>{{ _("Max time") }}</th>
                                     {% else %}
-				    <th>{{ _("Max time") }}</th>
-				    <th>{{ _("Avg. time") }}</th>
-				    <th>{{ _("Time range") }}</th>
-				    <th>{{ _("SafeSearch") }}</th>
-				    <th>{{ _("Selected language") }}</th>
-				    <th>{{ _("Shortcut") }}</th>
-				    <th>{{ _("Engine name") }}</th>
-				    <th>{{ _("Allow") }}</th>
+                                    <th>{{ _("Max time") }}</th>
+                                    <th>{{ _("Avg. time") }}</th>
+                                    <th>{{ _("Time range") }}</th>
+                                    <th>{{ _("SafeSearch") }}</th>
+                                    <th>{{ _("Selected language") }}</th>
+                                    <th>{{ _("Shortcut") }}</th>
+                                    <th>{{ _("Engine name") }}</th>
+                                    <th>{{ _("Allow") }}</th>
                                     {% endif %}
                                 </tr>
                         {% 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) }}
                                     </td>
                                     <th>{{ search_engine.name }}</th>
-				    <td class="name">{{ shortcuts[search_engine.name] }}</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.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_timeout'] else '' }}">{{ search_engine.timeout }}</td>
-									{% 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_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.safesearch==True) }}</td>
-					<td>{{ support_toggle(stats[search_engine.name].supports_selected_language) }}</td>
-					<td>{{ 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(search_engine.safesearch==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_timeout'] else '' }}">{{ search_engine.timeout }}</td>
+                                                                        {% 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_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.safesearch==True) }}</td>
+                                        <td>{{ support_toggle(stats[search_engine.name].supports_selected_language) }}</td>
+                                        <td>{{ shortcuts[search_engine.name] }}</td>
                                     <th>{{ search_engine.name }}</th>
                                     <td class="onoff-checkbox">
                                         {{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }}
@@ -207,7 +207,7 @@
                                 </tr>
                             {% endif %}
                         {% endfor %}
-		          </table>
+                          </table>
                           </div>
                         </fieldset>
                         </div>
diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html
index 8985a9f4e..d0a3b7b83 100644
--- a/searx/templates/oscar/result_templates/images.html
+++ b/searx/templates/oscar/result_templates/images.html
@@ -22,7 +22,7 @@
                 <span class="label label-default pull-right">{{ result.engine }}</span>{{- "" -}}
                 <p class="text-muted pull-left">{{ result.pretty_url }}</p>{{- "" -}}
                 <div class="clearfix"></div>{{- "" -}}
-				<div class="row">{{- "" -}}
+                                <div class="row">{{- "" -}}
                     <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>{{- "" -}}
                     </div>{{- "" -}}