From 9b88094d7c8a3c027fe4d6f232d71332068ea7e8 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Mon, 31 Jan 2022 21:50:40 +0530
Subject: [PATCH 1/2] fix autofocus

---
 searx/templates/etheme/macros.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/searx/templates/etheme/macros.html b/searx/templates/etheme/macros.html
index 8f4f3a85f..6a1f8eb15 100644
--- a/searx/templates/etheme/macros.html
+++ b/searx/templates/etheme/macros.html
@@ -6,13 +6,13 @@
 {%- endmacro %}
 
 <!-- Search bar base -->
-{% macro search_bar(value="", inline=false, rtl=false, autofocus=false) -%}
+{% macro search_bar(value="", inline=false, rtl=false, autofocus=True) -%}
     <form method="{{ method or 'POST' }}" action="{{ url_for('search') }}" id="search_form" {% if inline %}class="inline-search" {% endif %} role="search">
         <div id="search_input_container" {% if rtl -%} class="rtl" {%- endif %}>
             {% if inline %}
             <a href="{{ url_for('index') }}" id="logo_link"><img src="{{ url_for('static', filename='themes/etheme/img/logo.png') }}" alt="" id="logo"></a>
             {% endif %}
-            <input type="search" name="q" class="form-control" id="q" placeholder="{{ _('Search for...') }}" autocomplete="off" value="{{ value }}" {% if autofocus %}autofocus{% endif %}>
+            <input type="search" name="q" class="form-control autofocus" id="q" placeholder="{{ _('Search for...') }}" autocomplete="off" value="{{ value }}" {% if autofocus %}autofocus{% endif %}>
             <button type="submit">{{ icon('search') }}</button>
         </div>
         
@@ -35,8 +35,8 @@
 {%- endmacro -%}
 
 <!-- Draw result header -->
-{% macro result_header(result, favicons, put_icon=True) -%}
-<h4 class="result_header">{% if result.engine~".png" in favicons and put_icon %}{{ draw_favicon(result.engine) }} {% endif %}{{ result_link(result.url, result.title|safe) }}</h4>
+{% macro result_header(result, favicons) -%}
+<h4 class="result_header">{% if result.engine~".png" in favicons and result.show_source %}{{ draw_favicon(result.engine) }} {% endif %}{{ result_link(result.url, result.title|safe) }}</h4>
 {%- endmacro %}
 {% macro result_engine(result, favicons) -%}
 <span class="result_engine">{{ result.engine }}{% if result.engine~".png" in favicons %}{{ draw_favicon(result.engine)}}{% endif %}</span>
-- 
GitLab


From 753ef432f3c585d62b6aa5dd52710423a88507d1 Mon Sep 17 00:00:00 2001
From: nivesh <nivesh@e.email>
Date: Mon, 31 Jan 2022 21:51:18 +0530
Subject: [PATCH 2/2] show_source of engines

---
 searx/preferences.py                    | 11 +++++++++++
 searx/settings.yml                      |  1 +
 searx/static/themes/etheme/js/searx.js  |  2 +-
 searx/templates/etheme/preferences.html |  9 +++++++++
 searx/webapp.py                         |  4 +++-
 5 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/searx/preferences.py b/searx/preferences.py
index 9698240f9..a93d37e1d 100644
--- a/searx/preferences.py
+++ b/searx/preferences.py
@@ -347,6 +347,17 @@ class Preferences:
                 is_locked('autocomplete'),
                 choices=list(autocomplete.backends.keys()) + ['']
             ),
+            'show_source': MapSetting(
+                settings['ui'].get('show_source', True),
+                is_locked('show_source'),
+                map={
+                    '': settings['ui'].get('show_source', True),
+                    '0': False,
+                    '1': True,
+                    'True': True,
+                    'False': False
+                }
+            ),
             'image_proxy': MapSetting(
                 settings['server'].get('image_proxy', False),
                 is_locked('image_proxy'),
diff --git a/searx/settings.yml b/searx/settings.yml
index a869bba4f..2238d6e7b 100644
--- a/searx/settings.yml
+++ b/searx/settings.yml
@@ -38,6 +38,7 @@ server:
 
 ui:
     static_path : "" # Custom static path - leave it blank if you didn't change
+    show_source: True
     templates_path : "" # Custom templates path - leave it blank if you didn't change
     default_theme : oscar # ui theme
     default_locale : "" # Default interface locale - leave blank to detect from browser information or use codes from the 'locales' config section
diff --git a/searx/static/themes/etheme/js/searx.js b/searx/static/themes/etheme/js/searx.js
index 72519d140..23eede059 100644
--- a/searx/static/themes/etheme/js/searx.js
+++ b/searx/static/themes/etheme/js/searx.js
@@ -110,7 +110,7 @@ $(document).ready(function(){
     /**
      * focus element if class="autofocus" and id="q"
      */
-    $('#q.autofocus').focus();
+   $('.autofocus').focus();
 
     /**
      * Empty search bar when click on reset button
diff --git a/searx/templates/etheme/preferences.html b/searx/templates/etheme/preferences.html
index adbe997ca..27d93cd08 100644
--- a/searx/templates/etheme/preferences.html
+++ b/searx/templates/etheme/preferences.html
@@ -53,6 +53,15 @@
                     </select>
                 {% endcall %}
 
+                {% set showsource_label = _('Show source') %}
+                {% set showsource_info = _('Show source engine') %}
+                {% call preferences_item(showsource_info, showsource_label, rtl) %}
+                    <select class="form-control custom-select" name='show_source' data-hide-search>
+                        <option value="1" {% if show_source  %}selected="selected"{% endif %}>{{ _('Enabled') }}</option>
+                        <option value="0" {% if not show_source %}selected="selected"{% endif %}>{{ _('Disabled')}}</option>
+                    </select>
+                {% endcall %}
+
                 {% set image_proxy_label = _('Image proxy') %}
                 {% set image_proxy_info = _('Proxying image results through searx') %}
                 {% call preferences_item(image_proxy_info, image_proxy_label, rtl) %}
diff --git a/searx/webapp.py b/searx/webapp.py
index d4da85328..cbce580f1 100755
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -761,7 +761,8 @@ def search():
         base_url=get_base_url(),
         theme=get_current_theme_folder_name(),
         favicons=global_favicons[themes_folder_name.index(get_current_theme_folder_name())],
-        timeout_limit=request.form.get('timeout_limit', None)
+        timeout_limit=request.form.get('timeout_limit', None),
+        show_source=request.preferences.get_value('show_source')
     )
     resp = make_response(rendered_page)
     if request.form.get('preferences'):
@@ -912,6 +913,7 @@ def preferences():
                   locales=settings['locales'],
                   current_locale=request.preferences.get_value("locale"),
                   image_proxy=image_proxy,
+                  show_source=request.preferences.get_value("show_source"),
                   engines_by_category=engines_by_category,
                   stats=stats,
                   answerers=[{'info': a.self_info(), 'keywords': a.keywords} for a in answerers],
-- 
GitLab