Combine first and second pages.

templates/combined.html

@@ -0,0 +1,37 @@
+{% extends "base.html" %}
+
+{% block title %}Flickr mail{% endblock %}
+
+{% block content %}
+  <div class="container">
+    <div class="row">
+    <h1>Enter URLs</h1>
+    <form action="{{ url_for(request.endpoint) }}">
+      <div class="mb-3">
+        <label for="wikipedia" class="form-label">Wikipedia URL:</label>
+        <input type="text" class="form-control" id="wikipedia" name="wikipedia" value="{{ wikipedia_url }}" required>
+      </div>
+
+      <input type="submit" value="Submit">
+    </form>
+
+    {% if name %}
+
+    <p>Wikipedia article: {{ name }}</p>
+    <p><a href="https://flickr.com/search/?view_all=1&safe_search=3&text={{ '"' + name + '"' | urlencode }}">Search flickr</a></p>
+
+    <form action="{{ url_for("show_message") }}">
+      <input type="hidden" name="wikipedia" value="{{ wikipedia_url }}"></input>
+  <div class="mb-3">
+        <label for="flickr" class="form-label">Flickr URL:</label>
+        <input type="text" class="form-control" id="flickr" name="flickr" required>
+        </div>
+
+        <input type="submit" value="Submit">
+    </form>
+
+    {% endif %}
+
+  </div>
+  </div>
+{% endblock %}