From 46dd63af682246c162423e37e0361e2d644c93e1 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 12 Oct 2020 13:38:35 +0200
Subject: share menu and style sheets across demo pages (fixes #5704)

---
 talermerchantdemos/survey/templates/base.html.j2   | 72 +---------------------
 talermerchantdemos/survey/templates/footer.html.j2 |  1 +
 .../survey/templates/language-switcher.html.j2     |  1 +
 talermerchantdemos/survey/templates/menu.html.j2   |  1 +
 4 files changed, 6 insertions(+), 69 deletions(-)
 create mode 120000 talermerchantdemos/survey/templates/footer.html.j2
 create mode 120000 talermerchantdemos/survey/templates/language-switcher.html.j2
 create mode 120000 talermerchantdemos/survey/templates/menu.html.j2

(limited to 'talermerchantdemos/survey')

diff --git a/talermerchantdemos/survey/templates/base.html.j2 b/talermerchantdemos/survey/templates/base.html.j2
index 2b424f1..734da6f 100644
--- a/talermerchantdemos/survey/templates/base.html.j2
+++ b/talermerchantdemos/survey/templates/base.html.j2
@@ -21,45 +21,7 @@
   <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='pure.css') }}" />
   <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='demo.css') }}" />
   <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='navbar.css') }}" />
-  <style>
-    .warn {
-      background-color: #aa393977;
-      padding: 1em;
-    }
-    @keyframes hoveranim {
-      from {left:0;}
-      to {left:1vw;}
-    }
-    @keyframes hoveranimrevert {
-      from {left:1vw;}
-      to {left:0;}
-    }
-    .notice {
-      border-radius: 1em;
-      background: #0333;
-      border-left: 0.3em solid #033;
-      padding-left: 1em;
-      padding-top: 0.5em;
-      padding-bottom: 0.5em;
-      margin-top: 2em;
-      margin-bottom: 2em;
-    }
-    .notice {
-      position: relative;
-      left: 0;
-      animation-name: hoveranimrevert;
-      animation-duration: 1s;
-    }
-    .notice:hover {
-      left: 1vw;
-      animation-name: hoveranim;
-      animation-duration: 1s;
-    }
-    #main a:link, #main a:visited, #main a:hover, #main a:active {
-        color: black;
-    }
-  </style>
-
+  <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='torsten.css') }}" />
   {% block styles %}{% endblock %}
   {% block scripts %}{% endblock %}
 </head>
@@ -74,41 +36,13 @@
       }}
     </p>
   </header>
-  <div style="display:flex; flex-direction: column;" class="navcontainer">
-    <nav class="demolist">
-      <a href="{{ env('TALER_ENV_URL_INTRO', '#') }}">{{gettext("Introduction")}}</a>
-      <a href="{{ env('TALER_ENV_URL_BANK', '#') }}">{{gettext("Bank")}}</a>
-      <a href="{{ env('TALER_ENV_URL_MERCHANT_BLOG', '#') }}" class="active">{{gettext("Essay Shop")}}</a>
-      <a href="{{ env('TALER_ENV_URL_MERCHANT_DONATIONS', '#') }}">{{gettext("Donations")}}</a>
-      <a href="{{ env('TALER_ENV_URL_MERCHANT_SURVEY', '#') }}">{{gettext("Tipping/Survey")}}</a>
-      <!-- a href="{{ env('TALER_ENV_URL_BACKOFFICE', '#') }}">{{gettext("Back-office")}}</a -->
-      <span class="right">
-        {{ gettext("English [en]") }}
-        <!-- <input type="checkbox"> -->
-        <div class="nav">
-          <br>
-          <!--<hr style="width: 100%;">-->
-          {% if lang != 'en' %}
-          <a href="/en/" class="navbtn">English [en]</a><br>
-          {% endif %}
-          {% if lang != 'de' %}
-          <a href="/de/" class="navbtn">Deutsch [de]</a><br>
-          {% endif %}
-        </div>
-      </span>
-    </nav>
-  </div>
+  {% from 'templates/menu.html.j2' import menu with context %} {{ menu('survey') }}
 
   <section id="main" class="content">
     {% block main %}
       This is the main content of the page.
     {% endblock %}
-    <hr />
-    <div>
-      <p>{{ gettext('You can learn more about GNU Taler on our main <a href="{site}">website</a>.').format(site="https://taler.net/") }}</p>
-      <div style="flex-grow:1"></div>
-      <p>Copyright &copy; 2014&mdash;2020 Taler Systems SA</p>
-    </div>
+    {% include 'templates/footer.html.j2' %}
   </section>
 </body>
 </html>
diff --git a/talermerchantdemos/survey/templates/footer.html.j2 b/talermerchantdemos/survey/templates/footer.html.j2
new file mode 120000
index 0000000..028b093
--- /dev/null
+++ b/talermerchantdemos/survey/templates/footer.html.j2
@@ -0,0 +1 @@
+../../templates/footer.html.j2
\ No newline at end of file
diff --git a/talermerchantdemos/survey/templates/language-switcher.html.j2 b/talermerchantdemos/survey/templates/language-switcher.html.j2
new file mode 120000
index 0000000..6423c5c
--- /dev/null
+++ b/talermerchantdemos/survey/templates/language-switcher.html.j2
@@ -0,0 +1 @@
+../../templates/language-switcher.html.j2
\ No newline at end of file
diff --git a/talermerchantdemos/survey/templates/menu.html.j2 b/talermerchantdemos/survey/templates/menu.html.j2
new file mode 120000
index 0000000..b9575ea
--- /dev/null
+++ b/talermerchantdemos/survey/templates/menu.html.j2
@@ -0,0 +1 @@
+../../templates/menu.html.j2
\ No newline at end of file
-- 
cgit v1.2.3