From 575159b194440052d7b48aa073d7e03c80799c90 Mon Sep 17 00:00:00 2001
From: jibe-b <user701@orange.fr>
Date: Fri, 22 Sep 2017 23:43:05 +0200
Subject: [enh] oa_doi_rewrite plugin broadens doai_rewrite

---
 searx/templates/oscar/preferences.html | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index f4b2c63ea..dcca3cba7 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -223,6 +223,23 @@
                             </div>
                         </div>
                         {% endfor %}
+                        <div class="panel panel-default">
+                            <div class="panel-heading">
+                                <h3 class="panel-title">{{ _('OA DOI rewrite') }}</h3>
+                            </div>
+                            <div class="panel-body">
+                                <div class="col-xs-6 col-sm-4 col-md-6">{{ _('Avoid paywalls by redirecting to open-access versions of publications when available') }}</div>
+                                <div class="col-xs-6 col-sm-4 col-md-6">
+                                    <select class="form-control" id='doi_resolver' name='doi_resolver'>
+                                        {% for doi_resolver_name,doi_resolver_url in doi_resolvers.items() %}
+                                        <option value="{{ doi_resolver_name }}" {% if doi_resolver_name == current_doi_resolver %}selected="selected"{% endif %}>
+                                                {{ doi_resolver_name }} - {{ doi_resolver_url }}
+                                        </option>
+                                         {% endfor %}
+                                     </select>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </fieldset>
             </div>
-- 
cgit v1.2.3


From 1b10abfc92afed36627c7052b89d2de5e7f537ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= <sitbackandwait@gmail.com>
Date: Wed, 1 Nov 2017 13:58:48 +0100
Subject: minor fixes of doi resolver

Closes #1047
---
 searx/templates/oscar/preferences.html | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index dcca3cba7..5f85a9af6 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -118,6 +118,18 @@
                             <option value="0" {% if not results_on_new_tab %}selected="selected"{% endif %}>{{ _('Off')}}</option>
                         </select>
                     {{ preferences_item_footer(info, label, rtl) }}
+
+                    {% set label = _('Open Access DOI resolver') %}
+                    {% set info = _('Redirect to open-access versions of publications when available (plugin required)') %}
+                    {{ preferences_item_header(info, label, rtl) }}
+                        <select class="form-control" id='doi_resolver' name='doi_resolver'>
+                            {% for doi_resolver_name,doi_resolver_url in doi_resolvers.items() %}
+                            <option value="{{ doi_resolver_name }}" {% if doi_resolver_name == current_doi_resolver %}selected="selected"{% endif %}>
+                                    {{ doi_resolver_name }} - {{ doi_resolver_url }}
+                            </option>
+                             {% endfor %}
+                         </select>
+                    {{ preferences_item_footer(info, label, rtl) }}
                 </div>
                 </fieldset>
             </div>
@@ -223,23 +235,6 @@
                             </div>
                         </div>
                         {% endfor %}
-                        <div class="panel panel-default">
-                            <div class="panel-heading">
-                                <h3 class="panel-title">{{ _('OA DOI rewrite') }}</h3>
-                            </div>
-                            <div class="panel-body">
-                                <div class="col-xs-6 col-sm-4 col-md-6">{{ _('Avoid paywalls by redirecting to open-access versions of publications when available') }}</div>
-                                <div class="col-xs-6 col-sm-4 col-md-6">
-                                    <select class="form-control" id='doi_resolver' name='doi_resolver'>
-                                        {% for doi_resolver_name,doi_resolver_url in doi_resolvers.items() %}
-                                        <option value="{{ doi_resolver_name }}" {% if doi_resolver_name == current_doi_resolver %}selected="selected"{% endif %}>
-                                                {{ doi_resolver_name }} - {{ doi_resolver_url }}
-                                        </option>
-                                         {% endfor %}
-                                     </select>
-                                </div>
-                            </div>
-                        </div>
                     </div>
                 </fieldset>
             </div>
-- 
cgit v1.2.3