Merge pull request #500 from return42/various

Various marginal fixes and improvements

manage

@@ -77,6 +77,7 @@ pyenv.:
 pypi.upload:
   Upload python packages to PyPi (to test use pypi.upload.test)
 test.:
+  yamllint  : lint YAML files: $YAMLLINT_FILES
   pylint    : lint PYLINT_FILES, searx/engines, searx & tests
   pep8      : pycodestyle (pep8) for all files except PYLINT_FILES
   unit      : run unit tests

searx/settings.yml

@@ -152,22 +152,32 @@ outgoing:
 #   - plugin2
 #   - ...
 
-# uncomment below section if you want to configure which plugin is enabled by
-# default
+# Comment or un-comment plugin to activate / deactivate by default.
 #
 # enabled_plugins:
-#   - "HTTPS rewrite"
-#   - "Hostname replace"  # see configuration below
-
-# "Hostname replace" plugin configuration example:
+#   # these plugins are enabled if nothing is configured ..
+#   - 'Hash plugin'
+#   - 'Search on category select'
+#   - 'Self Informations'
+#   - 'Tracker URL remover'
+#   - 'Ahmia blacklist'  # activation depends on outgoing.using_tor_proxy
+#   # these plugins are disabled if nothing is configured ..
+#   - 'Hostname replace'  # see hostname_replace configuration below
+#   - 'Infinite scroll'
+#   - 'Open Access DOI rewrite'
+#   - 'Vim-like hotkeys'
+
+# Configuration of the "Hostname replace" plugin:
+#
 # hostname_replace:
-#   '(.*\.)?youtube\.com$':           'invidious.example.com'
-#   '(.*\.)?youtu\.be$':              'invidious.example.com'
+#   '(.*\.)?youtube\.com$': 'invidious.example.com'
+#   '(.*\.)?youtu\.be$': 'invidious.example.com'
 #   '(.*\.)?youtube-noocookie\.com$': 'yotter.example.com'
-#   '(.*\.)?reddit\.com$':            'teddit.example.com'
-#   '(.*\.)?redd\.it$':               'teddit.example.com'
-#   '(www\.)?twitter\.com$':          'nitter.example.com'
-#   'spam\.example\.com':             false  # remove results from spam.example.com
+#   '(.*\.)?reddit\.com$': 'teddit.example.com'
+#   '(.*\.)?redd\.it$': 'teddit.example.com'
+#   '(www\.)?twitter\.com$': 'nitter.example.com'
+#   # to remove matching host names from result list, set value to false
+#   'spam\.example\.com': false
 
 checker:
   # disable checker when in debug mode

searx/templates/simple/categories.html

@@ -10,7 +10,7 @@
     'science': 'school-outline',
     'files': 'file-tray-full-outline',
     'social media': 'people-outline',
-}  -%}  
+}  -%}
 <div id="categories" class="search_categories">{{- '' -}}
     <div id="categories_container">
         {%- for category in categories -%}

searx/templates/simple/icons.html

@@ -20,13 +20,13 @@
   'file-tray-full-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path d="M384 80H128c-26 0-43 14-48 40L48 272v112a48.14 48.14 0 0048 48h320a48.14 48.14 0 0048-48V272l-32-152c-5-27-23-40-48-40z" fill="none" stroke="currentColor" stroke-linejoin="round" stroke-width="32"/><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32" d="M48 272h144M320 272h144M192 272a64 64 0 00128 0M144 144h224M128 208h256"/></svg>',
   'people-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path d="M402 168c-2.93 40.67-33.1 72-66 72s-63.12-31.32-66-72c-3-42.31 26.37-72 66-72s69 30.46 66 72z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/><path d="M336 304c-65.17 0-127.84 32.37-143.54 95.41-2.08 8.34 3.15 16.59 11.72 16.59h263.65c8.57 0 13.77-8.25 11.72-16.59C463.85 335.36 401.18 304 336 304z" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32"/><path d="M200 185.94c-2.34 32.48-26.72 58.06-53 58.06s-50.7-25.57-53-58.06C91.61 152.15 115.34 128 147 128s55.39 24.77 53 57.94z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/><path d="M206 306c-18.05-8.27-37.93-11.45-59-11.45-52 0-102.1 25.85-114.65 76.2-1.65 6.66 2.53 13.25 9.37 13.25H154" fill="none" stroke="currentColor" stroke-linecap="round" stroke-miterlimit="10" stroke-width="32"/></svg>',
 
-} 
+}
 -%}
-      
+
 {% macro icon(action, alt) -%}
   {{ icons[action] | replace("ionicon", "ion-icon") | safe }}
 {%- endmacro %}
-      
+
 {% macro icon_small(action) -%}
   {{ icons[action] | replace("ionicon", "ion-icon-small") | safe }}
 {%- endmacro %}