use new amount+currency input everywhere

2 files changed, 27 insertions, 14 deletions

diff --git a/talerbank/app/static/bank.css b/talerbank/app/static/bank.css
index 2f54298..cd2658c 100644
--- a/talerbank/app/static/bank.css
+++ b/talerbank/app/static/bank.css
@@ -40,13 +40,29 @@ input[type="number"] {
 }
 
 #id_amount {
-  width: 7em;
+  width: 6em;
   display: inline-block;
   border-radius: 4px 0px 0px 4px;
 }
 
-#id_currency {
+/**
+ * Amount without the currency,
+ * placed left to a .currency-indicator.
+ */
+.amount {
+  width: 6em;
+  display: inline-block;
+  border-radius: 4px 0px 0px 4px;
+}
+
+/*
+ * Currency indicator to the right of input fields,
+ * with non-rounded corners to the left.
+ */
+.currency-indicator {
   color: black;
+  display: inline-block;
+  border-radius: 0px 4px 4px 0px;
 }
 
 .fieldlabel {
@@ -58,8 +74,3 @@ input[type="number"] {
   margin-right: 1em;
   margin-bottom: 0.5em;
 }
-
-#id_currency {
-  display: inline-block;
-  border-radius: 0px 4px 4px 0px;
-}
diff --git a/talerbank/app/templates/profile_page.html b/talerbank/app/templates/profile_page.html
index 6215aeb..e528243 100644
--- a/talerbank/app/templates/profile_page.html
+++ b/talerbank/app/templates/profile_page.html
@@ -84,12 +84,14 @@
               name="tform">
           <input type="hidden" name="csrfmiddlewaretoken" value="{{ csrf_token }}" />
           Amount to withdraw:
-          <select id="reserve-amount" name="kudos_amount" autofocus>
-              <option value="{{ currency }}:5.00">5.00 {{ currency }}</option>
-              <option value="{{ currency }}:10.00">10.00 {{ currency }}</option>
-              <option value="{{ currency }}:15.00">15.00 {{ currency }}</option>
-              <option value="{{ currency }}:20.00">20.00 {{ currency }}</option>
-          </select>
+          <select id="reserve-amount" name="kudos_amount" class="amount" autofocus>
+              <option value="{{ currency }}:5.00">5.00</option>
+              <option value="{{ currency }}:10.00">10.00</option>
+              <option value="{{ currency }}:15.00">15.00</option>
+              <option value="{{ currency }}:20.00">20.00</option>
+          </select><!--
+            --><input type="text" readonly class="currency-indicator" size="{{ currency|length }}" value="{{ currency }}">
+
           <input id="select-exchange"
                  class="taler-installed-show pure-button pure-button-primary"
                  type="submit"
@@ -115,7 +117,7 @@
           <div class="fieldbox">
             <label class="fieldlabel" for="id_amount">Amount to transfer:</label>
             {{ wt_form.amount }}<!--
-            --><input type="text" readonly id="id_currency" size="{{ currency|length }}" value="{{ currency }}">
+            --><input type="text" readonly name="currency-indicator" size="{{ currency|length }}" value="{{ currency }}">
           </div>
             
           <div class="fieldbox">