fix #8326

6 files changed, 1 insertions, 97 deletions

diff --git a/talermerchantdemos/templates/common-base.html.j2 b/talermerchantdemos/templates/common-base.html.j2
index 7c6fdd0..f37a306 100644
--- a/talermerchantdemos/templates/common-base.html.j2
+++ b/talermerchantdemos/templates/common-base.html.j2
@@ -65,9 +65,6 @@
     <a href="{{ env('TALER_ENV_URL_MERCHANT_DONATIONS', '#') + getlang() + '/' }}"
              {% if getactive() == 'donations' %} class="active" {% endif %}
             >{{gettext("Donations")}}</a>
-    <a href="{{ env('TALER_ENV_URL_MERCHANT_SURVEY', '#') + getlang() + '/' }}"
-             {% if getactive() == 'survey' %} class="active" {% endif %}
-            >{{gettext("Survey")}}</a>
     <script>
       function handleLang(event){
         if (event.type === 'click') {
diff --git a/talermerchantdemos/templates/landing-index.html.j2 b/talermerchantdemos/templates/landing-index.html.j2
index 5c7b0e2..0cf4788 100644
--- a/talermerchantdemos/templates/landing-index.html.j2
+++ b/talermerchantdemos/templates/landing-index.html.j2
@@ -62,23 +62,7 @@
         </p>
       </article>
     <article>
-      <h2>{{ gettext("Step 5: Survey") }}</h2>
-      <p>
-         {{
-           gettext("Websites can give rewards to visitors for completing tasks.") + "<br>" +
-           gettext('You can earn some {currency} coins by filling in our <a href="{url}">survey</a>.').format(url=merchant_survey_url,currency=merchant_currency)
-         }}
-      </p>
-    </article>
-    <!-- article>
-      <h2>Step 6: Are you a merchant? Taler has a build-in back-office!</h2>
-      <p>
-         If you are a merchant, you can check the <a href="{{ backoffice_url }}">back-office</a>
-         website to see how your Taler transactions got payed back by bank wire transfers.
-      </p>
-    </article -->
-    <article>
-      <h2>{{ gettext("Step 6: Reach out to us") }}</h2>
+      <h2>{{ gettext("Step 5: Reach out to us") }}</h2>
       <p>
       {{
          gettext("We appreciate feedback about Taler and this demonstrator.") + "<br>" +
diff --git a/talermerchantdemos/templates/survey-base.html.j2 b/talermerchantdemos/templates/survey-base.html.j2
deleted file mode 100644
index b9c7fc5..0000000
--- a/talermerchantdemos/templates/survey-base.html.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "common-base.html.j2" %}
-
-{% block head %}
-  <link rel="stylesheet" type="text/css" href="{{ static('colors-survey.css') }}" />
-{% endblock head %}
-
-
-{% block header_content %}
-
-<h1>
-<span class="it"><a href="{{ env('TALER_ENV_URL_MERCHANT_SURVEY', '#') }}">{{ gettext("Survey") }}</a></span></h1>
-<p>{{
-gettext("This page demonstrates how to reward visitors for completing small tasks.") + "<br>" +
-gettext("Rewarding is a way of offering cash rewards that go straight into a user's wallet.")
-}}
-</p>
-
-{% endblock %}
diff --git a/talermerchantdemos/templates/survey-error-graceful.html.j2 b/talermerchantdemos/templates/survey-error-graceful.html.j2
deleted file mode 100644
index ece2252..0000000
--- a/talermerchantdemos/templates/survey-error-graceful.html.j2
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends "survey-base.html.j2" %}
-{% block main %}
-  <h1>{{ gettext("Unexpected result") }}</h1>
-
-  <p>{{ message }}</p>
-
-{% endblock main %}
diff --git a/talermerchantdemos/templates/survey-error.html.j2 b/talermerchantdemos/templates/survey-error.html.j2
deleted file mode 100644
index b2f84f9..0000000
--- a/talermerchantdemos/templates/survey-error.html.j2
+++ /dev/null
@@ -1,24 +0,0 @@
-{% extends "survey-base.html.j2" %}
-{% block main %}
-  <h1>{{ gettext("Error encountered") }}</h1>
-
-  <p>{{ message }}</p>
-
-  {% if status_code %}
-  <p>
-    {{ gettext ("The backend returned status code {code}.").format(code=status_code) }}
-  </p>
-  {% endif %}
-
-  {% if json %}
-  <p>{{gettext("Backend response:")}}</p>
-  <pre>{{ json }}</pre>
-  {% endif %}
-
-  {% if stack %}
-  <p>{{gettext("Stack trace:")}}</p>
-  <pre>
-    {{ stack }}
-  </pre>
-  {% endif %}
-{% endblock main %}
diff --git a/talermerchantdemos/templates/survey-index.html.j2 b/talermerchantdemos/templates/survey-index.html.j2
deleted file mode 100644
index 1296546..0000000
--- a/talermerchantdemos/templates/survey-index.html.j2
+++ /dev/null
@@ -1,28 +0,0 @@
-{% extends "survey-base.html.j2" %}
-{% block main %}
-  <div>
-    <p>
-    {{
-    gettext("Please participate in our survey about payment systems and receive a reward in return.")
-    }}
-    </p>
-  </div>
-  <div>
-    <form action="{{ (script_name or "") + "/" + getlang() + "/submit-survey" }}" method="post" class="pure-form pure-form-stacked">
-      <fieldset>
-      <legend>{{ gettext("Which payment system do you prefer?") }}</legend>
-      <label for="option-taler">
-        <input id="option-taler" type="radio" name="paypref" value="taler" checked="checked" />
-        Taler
-      </label>
-      <label for="option-visa">
-        <input id="option-visa" type="radio" name="paypref" value="visa" />
-        Visa
-      </label>
-      </fieldset>
-      <button name="submit" class="pure-button pure-button-primary" >
-        {{ gettext("Submit Survey")}}
-      </button>
-    </form>
-  </div>
-{% endblock %}