Merge pull request #930 from return42/merge-user-doc2

Integrate the user documentation into the application

3 files changed, 13 insertions, 13 deletions

diff --git a/searx/templates/oscar/help.html b/searx/templates/oscar/help.html
deleted file mode 100644
index bf311fb4a..000000000
--- a/searx/templates/oscar/help.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends "oscar/base.html" %}
-{% block title %}{{ page.title }} - {% endblock %}
-{% block content %}
-<ul class="nav nav-tabs">
-{% for name, page in all_pages %}
-  <li {% if name == page_filename %}class="active"{% endif %}>
-    <a href="{{name}}">{{page.title}}</a>
-  </li>
-{% endfor %}
-</ul>
-{{ page.content | safe }}
-{% endblock %}
diff --git a/searx/templates/oscar/info.html b/searx/templates/oscar/info.html
new file mode 100644
index 000000000..0c2044adb
--- /dev/null
+++ b/searx/templates/oscar/info.html
@@ -0,0 +1,12 @@
+{% extends "oscar/base.html" %}
+{% block title %}{{ active_page.title }} - {% endblock %}
+{% block content %}
+<ul class="nav nav-tabs">
+  {% for pagename, page, locale in all_pages %}
+  <li>
+    <a href="{{ url_for('info', pagename=pagename, locale=locale) }}" {% if pagename == active_pagename %}class="active"{% endif %}>{{page.title}}</a>
+  </li>
+{% endfor %}
+</ul>
+{{ active_page.html | safe }}
+{% endblock %}
diff --git a/searx/templates/oscar/navbar.html b/searx/templates/oscar/navbar.html
index b1d344c11..f5401c382 100644
--- a/searx/templates/oscar/navbar.html
+++ b/searx/templates/oscar/navbar.html
@@ -3,7 +3,7 @@
         <a href="{{ url_for('index') }}">{{ instance_name }}</a>{{- "" -}}
     </span>{{- "" -}}
     <span class="{% if rtl %}pull-left{% else %}pull-right{% endif %}">{{- "" -}}
-        <a href="{{ url_for('help_page', pagename='about') }}">{{ _('about') }}</a>{{- "" -}}
+        <a href="{{ url_for('info', pagename='about') }}">{{ _('about') }}</a>{{- "" -}}
         <a href="{{ url_for('preferences') }}">{{ _('preferences') }}</a>{{- "" -}}
     </span>{{- "" -}}
 </div>