[taler-taler-merchant-demos] branch master updated (d46e839 -> cddb599)

[gnunet]

This is an automated email from the git hooks/post-receive script.

sebasjm pushed a change to branch master
in repository taler-merchant-demos.

    from d46e839  fix #7391
     new 193e1e0  higher contrast
     new bacb49b  adding labels to form inputs
     new aae59e2  using button instead of type submit
     new cddb599  adding label to inputs

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 talermerchantdemos/static/colors-survey.css        |  6 +--
 talermerchantdemos/static/demo.css                 | 15 ++++----
 .../templates/blog-confirm-refund.html.j2          |  2 +-
 talermerchantdemos/templates/common-base.html.j2   | 37 +++++++++---------
 .../templates/donations-index.html.j2              | 44 +++++++++++++++-------
 talermerchantdemos/templates/survey-index.html.j2  |  2 +-
 6 files changed, 63 insertions(+), 43 deletions(-)

diff --git a/talermerchantdemos/static/colors-survey.css 
b/talermerchantdemos/static/colors-survey.css
index 9377331..bb14ab8 100644
--- a/talermerchantdemos/static/colors-survey.css
+++ b/talermerchantdemos/static/colors-survey.css
@@ -5,13 +5,13 @@ nav span,
 .demobar,
 .navbtn {
   color: white;
-  background: #ffaf00;
+  background: #3b000f;
 }
 
 nav a.active,
 nav span.active,
 .navbtn.active {
-  background-color: #6e5e3c;
+  background-color: #4f0014;
 }
 
 nav a.active:hover,
@@ -20,5 +20,5 @@ nav span.active:hover,
 nav a:hover,
 nav span:hover,
 .navbtn:hover {
-  background: #b88d31;
+  background: #6e001c;
 }
diff --git a/talermerchantdemos/static/demo.css 
b/talermerchantdemos/static/demo.css
index b55e2ec..3c74bfa 100644
--- a/talermerchantdemos/static/demo.css
+++ b/talermerchantdemos/static/demo.css
@@ -7,14 +7,15 @@
   left: -10000px;
   top: auto;
   width: 1px;
-  height: 1px;
+  height: fit-content;
   overflow: hidden;
 }
 
 .skip:focus {
   position: static;
   width: auto;
-  height: auto;
+  background: black;
+  padding: 5px;
 }
 
 .demobar h1 {
@@ -27,7 +28,7 @@
 
 .demobar a,
 .demobar a:visited {
-  color: inherit;
+  color: white;
 }
 
 .tt {
@@ -90,6 +91,7 @@ nav {
 }
 
 nav a,
+nav button,
 nav span,
 .navbtn {
   border: none;
@@ -102,6 +104,7 @@ nav span,
 }
 
 nav a,
+nav button,
 nav span,
 .navbtn {
   padding: 15px 32px;
@@ -136,10 +139,6 @@ nav .right {
   margin-right: 5vw;
 }
 
-nav .right.hide div.nav {
+nav .hide div.nav {
   display: none;
 }
-button#id {
-       padding: 0px;
-       border: 0px;
-}
diff --git a/talermerchantdemos/templates/blog-confirm-refund.html.j2 
b/talermerchantdemos/templates/blog-confirm-refund.html.j2
index ab5dfcd..ff8624e 100644
--- a/talermerchantdemos/templates/blog-confirm-refund.html.j2
+++ b/talermerchantdemos/templates/blog-confirm-refund.html.j2
@@ -18,6 +18,6 @@
 
   <form action="{{ url_for('refund', order_id=order_id) }}" method="POST">
     <input type="text" name="article_name" value={{ article_name}} hidden>
-    <input type="submit" value="{{ gettext('Request refund') }}">
+    <button value="{{ gettext('Request refund') }}" name="submit"/>
   </form>
 {% endblock main %}
diff --git a/talermerchantdemos/templates/common-base.html.j2 
b/talermerchantdemos/templates/common-base.html.j2
index a28eeae..9129064 100644
--- a/talermerchantdemos/templates/common-base.html.j2
+++ b/talermerchantdemos/templates/common-base.html.j2
@@ -64,24 +64,27 @@
     </script>
 
     {# Language Selector #}
-    <button id="lang" class="right hide" onkeydown="handleLang(event)" 
onclick="handleLang(event)" name="language" value="{{ all_languages[getlang()] 
| default("en") }}">
-      <span>{{ all_languages[getlang()] | default("en") }}</span>
-      <div style="position: relative; overflow: visible;">
-      <div class="nav" style="position: absolute; background: #0042b2; 
max-height: 60vh; overflow-y: scroll">
-        <br>
-        {% for lang_code, lang_display in all_languages.items() %}
-        {% if lang_code != getlang() %}
-        {% if script_name != None %}
-       <a href="{{ script_name }}/{{ lang_code }}/" class="navbtn langbtn">{{ 
lang_display }}</a>
-        {% else %}
-       <a href="/{{ lang_code }}/" class="navbtn langbtn">{{ lang_display 
}}</a>
-        {% endif %}
-          <br>
-          {% endif %}
-        {% endfor %}
-      </div>
+    <div class="right>
+      <button onkeydown="handleLang(event)" onclick="handleLang(event)" 
name="language" value="{{ all_languages[getlang()] | default("en") }}">
+        {{ all_languages[getlang()] | default("en") }}
       </button>
-    </div>
+      <div id="lang" class="hide">
+        <div style="position: relative; overflow: visible;">
+          <div class="nav" style="position: absolute; background: #0042b2; 
max-height: 60vh; overflow-y: scroll">
+            <br>
+            {% for lang_code, lang_display in all_languages.items() %}
+            {% if lang_code != getlang() %}
+            {% if script_name != None %}
+      <a href="{{ script_name }}/{{ lang_code }}/" class="navbtn langbtn">{{ 
lang_display }}</a>
+            {% else %}
+      <a href="/{{ lang_code }}/" class="navbtn langbtn">{{ lang_display }}</a>
+            {% endif %}
+            <br>
+            {% endif %}
+          {% endfor %}
+          </div>
+        </div>
+      </div>
 
   </nav>
   </div>
diff --git a/talermerchantdemos/templates/donations-index.html.j2 
b/talermerchantdemos/templates/donations-index.html.j2
index 694efa9..17a530e 100644
--- a/talermerchantdemos/templates/donations-index.html.j2
+++ b/talermerchantdemos/templates/donations-index.html.j2
@@ -19,19 +19,37 @@
 
   <form name="tform" action="{{ url_for('checkout',lang=getlang()) }}" 
method="GET" class="pure-form">
     <div class="participation" id="fake-shop">
-      <select name="donation_receiver">
-        <option value="GNUnet">GNUnet</option>
-        <option value="Taler">GNU Taler</option>
-        <option value="Tor">Tor</option>
-      </select>
-      <select id="taler-donation" name="donation_amount">
-        <option value="{{ merchant_currency }}:0.1">0.1 {{ merchant_currency 
}}</option>
-        <option value="{{ merchant_currency }}:1">1 {{ merchant_currency 
}}</option>
-        <option value="{{ merchant_currency }}:6">5 {{ merchant_currency 
}}</option>
-        <option value="{{ merchant_currency }}:10">10 {{ merchant_currency 
}}</option>
-      </select>
-      <input type="text" name="donation_donor" value="{{gettext("Anonymous 
Donor")}}" />
-      <input type="submit" class="pure-button pure-button-primary" 
value="{{gettext("Donate!")}}" />
+      <div>
+        <label>
+          Receiver:
+          <select name="donation_receiver">
+            <option value="GNUnet">GNUnet</option>
+            <option value="Taler">GNU Taler</option>
+            <option value="Tor">Tor</option>
+          </select>
+        </label>
+      </div>
+      
+      <div>
+        <label>
+          Amount:
+          <select id="taler-donation" name="donation_amount">
+            <option value="{{ merchant_currency }}:0.1">0.1 {{ 
merchant_currency }}</option>
+            <option value="{{ merchant_currency }}:1">1 {{ merchant_currency 
}}</option>
+            <option value="{{ merchant_currency }}:6">5 {{ merchant_currency 
}}</option>
+            <option value="{{ merchant_currency }}:10">10 {{ merchant_currency 
}}</option>
+          </select>
+        </label>
+      </div>
+
+      <div>
+        <label>
+          Donor:
+          <input type="text" name="donation_donor" value="{{gettext("Anonymous 
Donor")}}" />
+        </label>
+      </div>
+      
+      <button class="pure-button pure-button-primary" name="submit" 
value="{{gettext("Donate!")}}" />
     </div>
   </form>
   <p class="graybox">
diff --git a/talermerchantdemos/templates/survey-index.html.j2 
b/talermerchantdemos/templates/survey-index.html.j2
index 0d0f87a..334cbc6 100644
--- a/talermerchantdemos/templates/survey-index.html.j2
+++ b/talermerchantdemos/templates/survey-index.html.j2
@@ -20,7 +20,7 @@
         Visa
       </label>
       </fieldset>
-      <input type="submit" value="{{ gettext("Submit Survey")}}" 
class="pure-button pure-button-primary" />
+      <button name="submit" value="{{ gettext("Submit Survey")}}" 
class="pure-button pure-button-primary" />
     </form>
   </div>
 {% endblock %}

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.