Merge branch 'master' of https://github.com/asciimoo/searx into about-opensearch

3 files changed, 24 insertions, 16 deletions

diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index b03929df3..0d96ff5f2 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -155,6 +155,14 @@
 
                 <!-- Tab panes -->
                 <div class="tab-content">
+
+                    <div class="hide_if_nojs">
+                        <p class="text-{% if rtl %}left{% else %}right{% endif %}">
+                            <button type="button" class="btn btn-default btn-success" id="allow-all-engines">{{ _("Allow all") }}</button>
+                            <button type="button" class="btn btn-default btn-danger" id="disable-all-engines">{{ _("Disable all") }}</button>
+                        </p>
+                    </div>
+
                     {% for categ in all_categories %}
                     <noscript><label>{{ _(categ) }}</label>
                     </noscript>
@@ -174,14 +182,14 @@
                                     <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 class="text-right">{{ _("Max time") }}</th>
+                                    <th class="text-right">{{ _("Avg. time") }}</th>
+                                    <th class="text-right">{{ _("Time range") }}</th>
+                                    <th class="text-right">{{ _("SafeSearch") }}</th>
+                                    <th class="text-right">{{ _("Selected language") }}</th>
+                                    <th class="text-right">{{ _("Shortcut") }}</th>
+                                    <th class="text-right">{{ _("Engine name") }}</th>
+                                    <th class="text-right">{{ _("Allow") }}</th>
                                     {% endif %}
                                 </tr>
                         {% for search_engine in engines_by_category[categ] %}
@@ -256,10 +264,10 @@
                 </p>
                 <table class="table table-striped">
                     <tr>
-                        <th class="text-muted">{{ _('Name') }}</th>
-                        <th class="text-muted">{{ _('Keywords') }}</th>
-                        <th class="text-muted">{{ _('Description') }}</th>
-                        <th class="text-muted">{{ _('Examples') }}</th>
+                        <th class="text-muted{% if rtl %} text-right{% endif %}">{{ _('Name') }}</th>
+                        <th class="text-muted{% if rtl %} text-right{% endif %}">{{ _('Keywords') }}</th>
+                        <th class="text-muted{% if rtl %} text-right{% endif %}">{{ _('Description') }}</th>
+                        <th class="text-muted{% if rtl %} text-right{% endif %}">{{ _('Examples') }}</th>
                     </tr>
 
                     {% for answerer in answerers %}
@@ -285,8 +293,8 @@
                 {% if cookies %}
                 <table class="table table-striped">
                     <tr>
-                        <th class="text-muted" style="padding-right:40px;">{{ _('Cookie name') }}</th>
-                        <th class="text-muted">{{ _('Value') }}</th>
+                        <th class="text-muted{% if rtl %} text-right{% endif %}" style="padding-right:40px;">{{ _('Cookie name') }}</th>
+                        <th class="text-muted{% if rtl %} text-right{% endif %}">{{ _('Value') }}</th>
                     </tr>
 
                     {% for cookie in cookies %}
diff --git a/searx/templates/oscar/search.html b/searx/templates/oscar/search.html
index 9978801ca..666a4df38 100644
--- a/searx/templates/oscar/search.html
+++ b/searx/templates/oscar/search.html
@@ -3,7 +3,7 @@
   <div class="row">
     <div class="col-xs-12 col-md-8">
       <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 }}" accesskey="s">
+        <input type="search" autofocus 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">
             <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="reset" class="btn btn-default" aria-label="{{ _('Clear search') }}"><span class="hide_if_nojs">{{ icon('remove') }}</span><span class="hidden active_if_nojs">{{ _('Clear') }}</span></button>
diff --git a/searx/templates/oscar/search_full.html b/searx/templates/oscar/search_full.html
index ea821dc45..1f1c50e50 100644
--- a/searx/templates/oscar/search_full.html
+++ b/searx/templates/oscar/search_full.html
@@ -6,7 +6,7 @@
     {% else %}
     <div class="input-group col-md-8 col-md-offset-2">
     {% 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 }}" accesskey="s">
+        <input type="search" autofocus 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">
             <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="reset" class="btn btn-default input-lg" aria-label="{{ _('Clear search') }}"><span class="hide_if_nojs">{{ icon('remove') }}</span><span class="hidden active_if_nojs">{{ _('Clear') }}</span></button>