From 9b3efa6d8ab46a3db62f42624d7e9f4b55fdd0ef Mon Sep 17 00:00:00 2001
From: Alexandre Flament <alex@al-f.net>
Date: Sat, 7 May 2022 15:11:05 +0200
Subject: theme: remove __common__

---
 searx/templates/__common__/new_issue.html          | 65 ----------------------
 searx/templates/__common__/opensearch.xml          | 22 --------
 .../__common__/opensearch_response_rss.xml         | 53 ------------------
 .../templates/__common__/searxng-wordmark.min.svg  |  1 -
 searx/templates/simple/new_issue.html              | 65 ++++++++++++++++++++++
 searx/templates/simple/opensearch.xml              | 22 ++++++++
 searx/templates/simple/opensearch_response_rss.xml | 53 ++++++++++++++++++
 searx/templates/simple/search.html                 |  2 +-
 searx/templates/simple/searxng-wordmark.min.svg    |  1 +
 searx/templates/simple/stats.html                  |  2 +-
 10 files changed, 143 insertions(+), 143 deletions(-)
 delete mode 100644 searx/templates/__common__/new_issue.html
 delete mode 100644 searx/templates/__common__/opensearch.xml
 delete mode 100644 searx/templates/__common__/opensearch_response_rss.xml
 delete mode 100644 searx/templates/__common__/searxng-wordmark.min.svg
 create mode 100644 searx/templates/simple/new_issue.html
 create mode 100644 searx/templates/simple/opensearch.xml
 create mode 100644 searx/templates/simple/opensearch_response_rss.xml
 create mode 100644 searx/templates/simple/searxng-wordmark.min.svg

(limited to 'searx/templates')

diff --git a/searx/templates/__common__/new_issue.html b/searx/templates/__common__/new_issue.html
deleted file mode 100644
index 55dbefe60..000000000
--- a/searx/templates/__common__/new_issue.html
+++ /dev/null
@@ -1,65 +0,0 @@
-{% macro new_issue(engine_name, engine_reliability) %}
-<form action="{{ get_setting('brand.new_issue_url') }}" method="GET">
-    <input name="title" type="hidden" value="Bug: {{ engine_name }} engine">
-    <input name="labels" type="hidden" value="bug">
-    <input name="template" type="hidden" value="bug-report.md">
-    <textarea name="body" class="issue-hide">{{- '' -}}
-
-**Version of SearXNG, commit number if you are using on master branch and stipulate if you forked SearXNG**
-{% if searx_git_url and searx_git_url != 'unknow' %}
-Repository: {{ searx_git_url }}
-Branch: {{ searx_git_branch }}
-Version: {{ searx_version }}
-<!-- Check if these values are correct -->
-
-{% else %}
-<!-- If you are running on master branch using git execute this command
-in order to fetch the latest commit ID:
-```
-git log -1
-```
-If you are using searxng-docker then look at the bottom of the SearXNG page
-and check for the version after "Powered by SearXNG"
-
-Please also stipulate if you are using a forked version of SearxNG and
-include a link to the fork source code.
--->
-{% endif %}
-**How did you install SearXNG?**
-<!-- Did you install SearXNG using the official wiki or using searxng-docker
-or manually by executing the searx/webapp.py file? -->
-**What happened?**
-<!-- A clear and concise description of what the bug is. -->
-
-**How To Reproduce**
-<!-- How can we reproduce this issue? (as minimally and as precisely as possible) -->
-
-**Expected behavior**
-<!-- A clear and concise description of what you expected to happen. -->
-
-**Screenshots & Logs**
-<!-- If applicable, add screenshots, logs to help explain your problem. -->
-
-**Additional context**
-<!-- Add any other context about the problem here. -->
-
-**Technical report**
-
-{% for error in engine_reliability.errors %}
-{% if secondary %}Warning{% else %}Error{% endif %}
-{{'\n  '}}* Error: {{ error.exception_classname or error.log_message }}
-{{'  '}}* Percentage: {{ error.percentage }}
-{{'  '}}* Parameters: `{{ error.log_parameters }}`
-{{'  '}}* File name: `{{ error.filename }}:{{ error.line_no }}`
-{{'  '}}* Function: `{{ error.function }}`
-{{'  '}}* Code: `{{ error.code }}`
-{{'\n'-}}
-{%- endfor -%}
-{%- for test_name, results in engine_reliability.checker.items() -%}
-{%- if loop.first %}Checker{% endif -%}
-{{-'\n  '}}* {{ test_name }}: {% for result in results%}`{{ result }}`,{% endfor -%}
-{%- endfor -%}
-    </textarea>
-    <button type="submit" class="github-issue-button" title="{{ get_setting('brand.new_issue_url') }}">{{ _('Submit a new issue on Github including the above information') }}</button>
-</form>
-{% endmacro %}
diff --git a/searx/templates/__common__/opensearch.xml b/searx/templates/__common__/opensearch.xml
deleted file mode 100644
index 230f327a5..000000000
--- a/searx/templates/__common__/opensearch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-  <ShortName>{{ instance_name }}</ShortName>
-  <Description>a privacy-respecting, hackable metasearch engine</Description>
-  <InputEncoding>UTF-8</InputEncoding>
-  <Image>{{ url_for('static', filename='img/favicon.png', _external=True) }}</Image>
-  <LongName>searx metasearch</LongName>
-  {% if opensearch_method == 'get' %}
-    <Url rel="results" type="text/html" method="get" template="{{ url_for('search', _external=True) }}?q={searchTerms}"/>
-  {% else %}
-    <Url rel="results" type="text/html" method="post" template="{{ url_for('search', _external=True) }}">
-        <Param name="q" value="{searchTerms}" />
-    </Url>
-  {% endif %}
-  {% if autocomplete %}
-    <Url rel="suggestions" type="application/x-suggestions+json" template="{{ url_for('autocompleter', _external=True) }}?q={searchTerms}"/>
-  {% endif %}
-
-  <Url type="application/opensearchdescription+xml"
-      rel="self"
-      template="{{ opensearch_url }}" />
-</OpenSearchDescription>
diff --git a/searx/templates/__common__/opensearch_response_rss.xml b/searx/templates/__common__/opensearch_response_rss.xml
deleted file mode 100644
index 82d3f7c4e..000000000
--- a/searx/templates/__common__/opensearch_response_rss.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0"
-     xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"
-     xmlns:atom="http://www.w3.org/2005/Atom">
-  <channel>
-    <title>Searx search: {{ q|e }}</title>
-    <link>{{ url_for('search', _external=True) }}?q={{ q|e }}</link>
-    <description>Search results for "{{ q|e }}" - searx</description>
-    <opensearch:totalResults>{{ number_of_results }}</opensearch:totalResults>
-    <opensearch:startIndex>1</opensearch:startIndex>
-    <opensearch:itemsPerPage>{{ number_of_results }}</opensearch:itemsPerPage>
-    <atom:link rel="search" type="application/opensearchdescription+xml" href="{{ opensearch_url }}"/>
-    <opensearch:Query role="request" searchTerms="{{ q|e }}" startPage="1" />
-    {% if error_message %}
-    <item>
-      <title>Error</title>
-      <description>{{ error_message|e }}</description>
-    </item>
-    {% endif %}
-    {% for r in results %}
-    <item>
-      <title>{{ r.title }}</title>
-      <link>{{ r.url }}</link>
-      <description>{{ r.content }}</description>
-      {% if r.pubdate %}<pubDate>{{ r.pubdate }}</pubDate>{% endif %}
-    </item>
-    {% endfor %}
-    {% if answers %}
-      {% for a in answers %}
-      <item>
-        <title>{{ a }}</title>
-        <type>answer</type>
-      </item>
-      {% endfor %}
-    {% endif %}
-    {% if corrections %}
-      {% for a in corrections %}
-      <item>
-        <title>{{ a }}</title>
-        <type>correction</type>
-      </item>
-      {% endfor %}
-    {% endif %}
-    {% if suggestions %}
-      {% for a in suggestions %}
-      <item>
-        <title>{{ a }}</title>
-        <type>suggestion</type>
-      </item>
-      {% endfor %}
-    {% endif %}
-  </channel>
-</rss>
diff --git a/searx/templates/__common__/searxng-wordmark.min.svg b/searx/templates/__common__/searxng-wordmark.min.svg
deleted file mode 100644
index 45cc2c05b..000000000
--- a/searx/templates/__common__/searxng-wordmark.min.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="92mm" height="92mm" viewBox="0 0 92 92"><g transform="translate(-40.921 -17.417)"><circle cx="75.921" cy="53.903" r="30" fill="none" fill-opacity="1" stroke="#3050ff" stroke-width="10" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1"/><path d="M67.515 37.915a18 18 0 0 1 21.051 3.313 18 18 0 0 1 3.138 21.078" fill="none" fill-opacity="1" stroke="#3050ff" stroke-width="5" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1"/><rect width="18.846" height="39.963" x="3.706" y="122.09" ry="0" transform="rotate(-46.235)" opacity="1" fill="#3050ff" fill-opacity="1" stroke="none" stroke-width="8" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1"/></g></svg>
\ No newline at end of file
diff --git a/searx/templates/simple/new_issue.html b/searx/templates/simple/new_issue.html
new file mode 100644
index 000000000..55dbefe60
--- /dev/null
+++ b/searx/templates/simple/new_issue.html
@@ -0,0 +1,65 @@
+{% macro new_issue(engine_name, engine_reliability) %}
+<form action="{{ get_setting('brand.new_issue_url') }}" method="GET">
+    <input name="title" type="hidden" value="Bug: {{ engine_name }} engine">
+    <input name="labels" type="hidden" value="bug">
+    <input name="template" type="hidden" value="bug-report.md">
+    <textarea name="body" class="issue-hide">{{- '' -}}
+
+**Version of SearXNG, commit number if you are using on master branch and stipulate if you forked SearXNG**
+{% if searx_git_url and searx_git_url != 'unknow' %}
+Repository: {{ searx_git_url }}
+Branch: {{ searx_git_branch }}
+Version: {{ searx_version }}
+<!-- Check if these values are correct -->
+
+{% else %}
+<!-- If you are running on master branch using git execute this command
+in order to fetch the latest commit ID:
+```
+git log -1
+```
+If you are using searxng-docker then look at the bottom of the SearXNG page
+and check for the version after "Powered by SearXNG"
+
+Please also stipulate if you are using a forked version of SearxNG and
+include a link to the fork source code.
+-->
+{% endif %}
+**How did you install SearXNG?**
+<!-- Did you install SearXNG using the official wiki or using searxng-docker
+or manually by executing the searx/webapp.py file? -->
+**What happened?**
+<!-- A clear and concise description of what the bug is. -->
+
+**How To Reproduce**
+<!-- How can we reproduce this issue? (as minimally and as precisely as possible) -->
+
+**Expected behavior**
+<!-- A clear and concise description of what you expected to happen. -->
+
+**Screenshots & Logs**
+<!-- If applicable, add screenshots, logs to help explain your problem. -->
+
+**Additional context**
+<!-- Add any other context about the problem here. -->
+
+**Technical report**
+
+{% for error in engine_reliability.errors %}
+{% if secondary %}Warning{% else %}Error{% endif %}
+{{'\n  '}}* Error: {{ error.exception_classname or error.log_message }}
+{{'  '}}* Percentage: {{ error.percentage }}
+{{'  '}}* Parameters: `{{ error.log_parameters }}`
+{{'  '}}* File name: `{{ error.filename }}:{{ error.line_no }}`
+{{'  '}}* Function: `{{ error.function }}`
+{{'  '}}* Code: `{{ error.code }}`
+{{'\n'-}}
+{%- endfor -%}
+{%- for test_name, results in engine_reliability.checker.items() -%}
+{%- if loop.first %}Checker{% endif -%}
+{{-'\n  '}}* {{ test_name }}: {% for result in results%}`{{ result }}`,{% endfor -%}
+{%- endfor -%}
+    </textarea>
+    <button type="submit" class="github-issue-button" title="{{ get_setting('brand.new_issue_url') }}">{{ _('Submit a new issue on Github including the above information') }}</button>
+</form>
+{% endmacro %}
diff --git a/searx/templates/simple/opensearch.xml b/searx/templates/simple/opensearch.xml
new file mode 100644
index 000000000..230f327a5
--- /dev/null
+++ b/searx/templates/simple/opensearch.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
+  <ShortName>{{ instance_name }}</ShortName>
+  <Description>a privacy-respecting, hackable metasearch engine</Description>
+  <InputEncoding>UTF-8</InputEncoding>
+  <Image>{{ url_for('static', filename='img/favicon.png', _external=True) }}</Image>
+  <LongName>searx metasearch</LongName>
+  {% if opensearch_method == 'get' %}
+    <Url rel="results" type="text/html" method="get" template="{{ url_for('search', _external=True) }}?q={searchTerms}"/>
+  {% else %}
+    <Url rel="results" type="text/html" method="post" template="{{ url_for('search', _external=True) }}">
+        <Param name="q" value="{searchTerms}" />
+    </Url>
+  {% endif %}
+  {% if autocomplete %}
+    <Url rel="suggestions" type="application/x-suggestions+json" template="{{ url_for('autocompleter', _external=True) }}?q={searchTerms}"/>
+  {% endif %}
+
+  <Url type="application/opensearchdescription+xml"
+      rel="self"
+      template="{{ opensearch_url }}" />
+</OpenSearchDescription>
diff --git a/searx/templates/simple/opensearch_response_rss.xml b/searx/templates/simple/opensearch_response_rss.xml
new file mode 100644
index 000000000..82d3f7c4e
--- /dev/null
+++ b/searx/templates/simple/opensearch_response_rss.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0"
+     xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"
+     xmlns:atom="http://www.w3.org/2005/Atom">
+  <channel>
+    <title>Searx search: {{ q|e }}</title>
+    <link>{{ url_for('search', _external=True) }}?q={{ q|e }}</link>
+    <description>Search results for "{{ q|e }}" - searx</description>
+    <opensearch:totalResults>{{ number_of_results }}</opensearch:totalResults>
+    <opensearch:startIndex>1</opensearch:startIndex>
+    <opensearch:itemsPerPage>{{ number_of_results }}</opensearch:itemsPerPage>
+    <atom:link rel="search" type="application/opensearchdescription+xml" href="{{ opensearch_url }}"/>
+    <opensearch:Query role="request" searchTerms="{{ q|e }}" startPage="1" />
+    {% if error_message %}
+    <item>
+      <title>Error</title>
+      <description>{{ error_message|e }}</description>
+    </item>
+    {% endif %}
+    {% for r in results %}
+    <item>
+      <title>{{ r.title }}</title>
+      <link>{{ r.url }}</link>
+      <description>{{ r.content }}</description>
+      {% if r.pubdate %}<pubDate>{{ r.pubdate }}</pubDate>{% endif %}
+    </item>
+    {% endfor %}
+    {% if answers %}
+      {% for a in answers %}
+      <item>
+        <title>{{ a }}</title>
+        <type>answer</type>
+      </item>
+      {% endfor %}
+    {% endif %}
+    {% if corrections %}
+      {% for a in corrections %}
+      <item>
+        <title>{{ a }}</title>
+        <type>correction</type>
+      </item>
+      {% endfor %}
+    {% endif %}
+    {% if suggestions %}
+      {% for a in suggestions %}
+      <item>
+        <title>{{ a }}</title>
+        <type>suggestion</type>
+      </item>
+      {% endfor %}
+    {% endif %}
+  </channel>
+</rss>
diff --git a/searx/templates/simple/search.html b/searx/templates/simple/search.html
index 90a296aeb..c5f7de09c 100644
--- a/searx/templates/simple/search.html
+++ b/searx/templates/simple/search.html
@@ -2,7 +2,7 @@
   <div id="search_header">
     <a id="search_logo" href="{{ url_for('index') }}" tabindex="0" title="{{ _('Display the front page') }}">
       <span hidden>SearXNG</span>
-      {% include '__common__/searxng-wordmark.min.svg' without context %}
+      {% include 'simple/searxng-wordmark.min.svg' without context %}
     </a>
     <div id="search_view">
       <div class="search_box">
diff --git a/searx/templates/simple/searxng-wordmark.min.svg b/searx/templates/simple/searxng-wordmark.min.svg
new file mode 100644
index 000000000..45cc2c05b
--- /dev/null
+++ b/searx/templates/simple/searxng-wordmark.min.svg
@@ -0,0 +1 @@
+<svg width="92mm" height="92mm" viewBox="0 0 92 92"><g transform="translate(-40.921 -17.417)"><circle cx="75.921" cy="53.903" r="30" fill="none" fill-opacity="1" stroke="#3050ff" stroke-width="10" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1"/><path d="M67.515 37.915a18 18 0 0 1 21.051 3.313 18 18 0 0 1 3.138 21.078" fill="none" fill-opacity="1" stroke="#3050ff" stroke-width="5" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1"/><rect width="18.846" height="39.963" x="3.706" y="122.09" ry="0" transform="rotate(-46.235)" opacity="1" fill="#3050ff" fill-opacity="1" stroke="none" stroke-width="8" stroke-miterlimit="4" stroke-dasharray="none" stroke-opacity="1"/></g></svg>
\ No newline at end of file
diff --git a/searx/templates/simple/stats.html b/searx/templates/simple/stats.html
index f45f5b260..9cc035cfd 100644
--- a/searx/templates/simple/stats.html
+++ b/searx/templates/simple/stats.html
@@ -1,5 +1,5 @@
 {% from 'simple/icons.html' import icon_big %}
-{% from '__common__/new_issue.html' import new_issue with context %}
+{% from 'simple/new_issue.html' import new_issue with context %}
 
 {% extends "simple/page_with_header.html" %}
 
-- 
cgit v1.2.3