From 32a7e939a52d07bdb0912c4d4dfed19cec118a39 Mon Sep 17 00:00:00 2001
From: Edward Betts <edward@4angle.com>
Date: Sun, 26 Nov 2023 14:13:51 +0000
Subject: [PATCH] Rename article2.html to article.html

---
 templates/article.html     | 76 +++++++++++++++++---------------------
 templates/article2.html    | 48 ------------------------
 templates/article_old.html | 56 ++++++++++++++++++++++++++++
 web_view.py                |  2 +-
 4 files changed, 91 insertions(+), 91 deletions(-)
 delete mode 100644 templates/article2.html
 create mode 100644 templates/article_old.html

diff --git a/templates/article.html b/templates/article.html
index ec3d3e4..55d05b0 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -1,56 +1,48 @@
 {% extends "base.html" %}
 
-{% block title %}{{ title }}{% endblock %}
+{% block title %}Link '{{ title }}' in '{{ hit_title }}'{% endblock %}
 
 {% block style %}
-<style>
-
-span.exact { padding: 2px; background: green; color: white; font-weight: bold; }
-span.nomatch { padding: 2px; background: red; color: white; font-weight: bold; }
-span.case_mismatch { padding: 2px; background: orange; color: white; font-weight: bold; }
-span.searchmatch { font-weight: bold; }
-
-table.diff,td.diff-otitle,td.diff-ntitle{background-color:white}
-td.diff-otitle,td.diff-ntitle{text-align:center}
-td.diff-marker{text-align:right;font-weight:bold;font-size:1.25em}
-td.diff-lineno{font-weight:bold}
-td.diff-addedline,td.diff-deletedline,td.diff-context{font-size:88%;vertical-align:top;white-space:-moz-pre-wrap;white-space:pre-wrap}
-td.diff-addedline,td.diff-deletedline{border-style:solid;border-width:1px 1px 1px 4px;border-radius:0.33em}
-td.diff-addedline{border-color:#a3d3ff}
-td.diff-deletedline{border-color:#ffe49c}
-td.diff-context{background:#f3f3f3;color:#333333;border-style:solid;border-width:1px 1px 1px 4px;border-color:#e6e6e6;border-radius:0.33em}
-.diffchange{font-weight:bold;text-decoration:none}
-table.diff{border:none;width:98%;border-spacing:4px; table-layout:fixed}
-td.diff-addedline .diffchange,td.diff-deletedline .diffchange{border-radius:0.33em;padding:0.25em 0}
-td.diff-addedline .diffchange{background:#d8ecff}
-td.diff-deletedline .diffchange{background:#feeec8}
-table.diff td{padding:0.33em 0.66em}
-table.diff col.diff-marker{width:2%}
-table.diff col.diff-content{width:48%}
-table.diff td div{ word-wrap:break-word; overflow:auto}
-</style>
+<link href="{{ url_for("static", filename="css/diff.css") }}" rel="stylesheet"/>
 {% endblock %}
 
 {% block content %}
   <div class="container">
-    <h1>{{ self.title() }}</h1>
-    <form>
+    <h1>Link '{{ title }}' in '{{ hit_title }}'</h1>
+    <form action="{{ url_for("index") }}">
       <input name="q">
       <input type="submit" value="search">
     </form>
-    <div id="app"></div>
+
+    <div>Username: {{ g.user }}</div>
+
+    <div><a href="https://en.wikipedia.org/wiki/{{ title }}" target="_blank">view article</a></div>
+
+    <div><a href="{{ url_for('index') }}">back to index </a></div>
+
+    <div>total: {{ total }}</div>
+    <div>with link: {{ with_link }}</div>
+    <div>ratio: {{ "{:.1%}".format(with_link / total) }}</div>
+    {# <div>hit: {{ hit }}</div> #}
+    <div>replacement: {{ found.replacement }}</div>
+    <div>section: {{ found.section }}</div>
+    <table>
+      {{ diff | safe }}
+    </table>
+    <form method="POST">
+      <input type="hidden" name="hit" value="{{ hit_title }}">
+      <div class="my-3">
+        <input type="submit" class="btn btn-primary" value="save"/>
+        <a href="{{url_for("article_page", url_title=url_title, after=hit_title)}}" class="btn btn-primary">skip</a>
+      </div>
+    </form>
+
+    <ol>
+    {% for hit in hits %}
+      {% set url = url_for("article_page", url_title=url_title, title=hit.title) %}
+      <li><a href="{{ url }}">{{ hit.title }}</a> &ndash; {{ hit.snippet | safe }}</li>
+    {% endfor %}
+    </ol>
   </div>
-
-    <script type="module">
-      import main from {{ url_for('static', filename='add_links.es.js') | tojson }};
-      const props = {
-        title: {{ title | tojson }},
-        api_base_url: "/api/1"
-      }
-      main(props);
-    </script>
-
-
-
 {% endblock %}
 
diff --git a/templates/article2.html b/templates/article2.html
deleted file mode 100644
index 55d05b0..0000000
--- a/templates/article2.html
+++ /dev/null
@@ -1,48 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}Link '{{ title }}' in '{{ hit_title }}'{% endblock %}
-
-{% block style %}
-<link href="{{ url_for("static", filename="css/diff.css") }}" rel="stylesheet"/>
-{% endblock %}
-
-{% block content %}
-  <div class="container">
-    <h1>Link '{{ title }}' in '{{ hit_title }}'</h1>
-    <form action="{{ url_for("index") }}">
-      <input name="q">
-      <input type="submit" value="search">
-    </form>
-
-    <div>Username: {{ g.user }}</div>
-
-    <div><a href="https://en.wikipedia.org/wiki/{{ title }}" target="_blank">view article</a></div>
-
-    <div><a href="{{ url_for('index') }}">back to index </a></div>
-
-    <div>total: {{ total }}</div>
-    <div>with link: {{ with_link }}</div>
-    <div>ratio: {{ "{:.1%}".format(with_link / total) }}</div>
-    {# <div>hit: {{ hit }}</div> #}
-    <div>replacement: {{ found.replacement }}</div>
-    <div>section: {{ found.section }}</div>
-    <table>
-      {{ diff | safe }}
-    </table>
-    <form method="POST">
-      <input type="hidden" name="hit" value="{{ hit_title }}">
-      <div class="my-3">
-        <input type="submit" class="btn btn-primary" value="save"/>
-        <a href="{{url_for("article_page", url_title=url_title, after=hit_title)}}" class="btn btn-primary">skip</a>
-      </div>
-    </form>
-
-    <ol>
-    {% for hit in hits %}
-      {% set url = url_for("article_page", url_title=url_title, title=hit.title) %}
-      <li><a href="{{ url }}">{{ hit.title }}</a> &ndash; {{ hit.snippet | safe }}</li>
-    {% endfor %}
-    </ol>
-  </div>
-{% endblock %}
-
diff --git a/templates/article_old.html b/templates/article_old.html
new file mode 100644
index 0000000..ec3d3e4
--- /dev/null
+++ b/templates/article_old.html
@@ -0,0 +1,56 @@
+{% extends "base.html" %}
+
+{% block title %}{{ title }}{% endblock %}
+
+{% block style %}
+<style>
+
+span.exact { padding: 2px; background: green; color: white; font-weight: bold; }
+span.nomatch { padding: 2px; background: red; color: white; font-weight: bold; }
+span.case_mismatch { padding: 2px; background: orange; color: white; font-weight: bold; }
+span.searchmatch { font-weight: bold; }
+
+table.diff,td.diff-otitle,td.diff-ntitle{background-color:white}
+td.diff-otitle,td.diff-ntitle{text-align:center}
+td.diff-marker{text-align:right;font-weight:bold;font-size:1.25em}
+td.diff-lineno{font-weight:bold}
+td.diff-addedline,td.diff-deletedline,td.diff-context{font-size:88%;vertical-align:top;white-space:-moz-pre-wrap;white-space:pre-wrap}
+td.diff-addedline,td.diff-deletedline{border-style:solid;border-width:1px 1px 1px 4px;border-radius:0.33em}
+td.diff-addedline{border-color:#a3d3ff}
+td.diff-deletedline{border-color:#ffe49c}
+td.diff-context{background:#f3f3f3;color:#333333;border-style:solid;border-width:1px 1px 1px 4px;border-color:#e6e6e6;border-radius:0.33em}
+.diffchange{font-weight:bold;text-decoration:none}
+table.diff{border:none;width:98%;border-spacing:4px; table-layout:fixed}
+td.diff-addedline .diffchange,td.diff-deletedline .diffchange{border-radius:0.33em;padding:0.25em 0}
+td.diff-addedline .diffchange{background:#d8ecff}
+td.diff-deletedline .diffchange{background:#feeec8}
+table.diff td{padding:0.33em 0.66em}
+table.diff col.diff-marker{width:2%}
+table.diff col.diff-content{width:48%}
+table.diff td div{ word-wrap:break-word; overflow:auto}
+</style>
+{% endblock %}
+
+{% block content %}
+  <div class="container">
+    <h1>{{ self.title() }}</h1>
+    <form>
+      <input name="q">
+      <input type="submit" value="search">
+    </form>
+    <div id="app"></div>
+  </div>
+
+    <script type="module">
+      import main from {{ url_for('static', filename='add_links.es.js') | tojson }};
+      const props = {
+        title: {{ title | tojson }},
+        api_base_url: "/api/1"
+      }
+      main(props);
+    </script>
+
+
+
+{% endblock %}
+
diff --git a/web_view.py b/web_view.py
index a8804cc..75926cd 100755
--- a/web_view.py
+++ b/web_view.py
@@ -298,7 +298,7 @@ def article_page(url_title: str) -> str | Response:
             return flask.render_template("all_done.html")
 
     return flask.render_template(
-        "article2.html",
+        "article.html",
         title=from_title,
         total=total,
         with_link=with_link,