[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-bank] branch stable updated (860d826 -> eac24d5)
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [taler-bank] branch stable updated (860d826 -> eac24d5) |
|
Date: |
Tue, 06 Feb 2018 01:27:24 +0100 |
This is an automated email from the git hooks/post-receive script.
dold pushed a change to branch stable
in repository bank.
from 860d826 adapting to new amount format <curr>:x.y
add eb164b3 experiment with nicer transfer dialog design
add 216b80a formatting
add 805b1ac use new amount+currency input everywhere
add 7704bdb style
add eac24d5 fix css specifity
No new revisions were added by this update.
Summary of changes:
talerbank/app/static/bank.css | 57 ++++++++++++++++++++++---------
talerbank/app/templates/base.html | 2 +-
talerbank/app/templates/profile_page.html | 50 ++++++++++++++++-----------
3 files changed, 72 insertions(+), 37 deletions(-)
diff --git a/talerbank/app/static/bank.css b/talerbank/app/static/bank.css
index 4c16e94..0b195ba 100644
--- a/talerbank/app/static/bank.css
+++ b/talerbank/app/static/bank.css
@@ -25,22 +25,6 @@ a.pure-button {
text-decoration: line-through;
}
-/**
- * NOTE: could not set input width with "normal"
- * 'size' and 'maxlength' HTML attributes because
- * they are ignored for "number"-typed inputs. */
-input#id_amount {
- width: 230px;
- padding-right: 160px;
-}
-
-/* Styling the wrapper */
-span.currency-symbol {
- position: absolute;
- margin-top: 13px;
- margin-left: 90px;
-}
-
input[type="number"]::-webkit-outer-spin-button,
input[type="number"]::-webkit-inner-spin-button {
-webkit-appearance: none;
margin: 0;
@@ -49,3 +33,44 @@ input[type="number"]::-webkit-outer-spin-button,
input[type="number"]::-webkit-i
input[type="number"] {
-moz-appearance: textfield;
}
+
+#transfer-fields {
+ display: flex;
+ flex-wrap: wrap;
+}
+
+#id_amount {
+ width: 6em;
+ display: inline-block;
+ border-radius: 4px 0px 0px 4px;
+}
+
+/**
+ * Amount without the currency,
+ * placed left to a .currency-indicator.
+ */
+#main .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.
+ */
+#main .currency-indicator {
+ color: black;
+ display: inline-block;
+ border-radius: 0px 4px 4px 0px;
+}
+
+#main .fieldlabel {
+ display: block;
+ padding-bottom: 0.5em;
+}
+
+#main .fieldbox {
+ margin-right: 1em;
+ margin-bottom: 0.5em;
+}
diff --git a/talerbank/app/templates/base.html
b/talerbank/app/templates/base.html
index 56d736f..fc33ca3 100644
--- a/talerbank/app/templates/base.html
+++ b/talerbank/app/templates/base.html
@@ -21,10 +21,10 @@
<html data-taler-nojs="true">
<head>
<title>{{ settings_value("TALER_CURRENCY") }} Bank - Taler Demo</title>
- <link rel="stylesheet" type="text/css" href="{{ static('bank.css') }}" />
<link rel="stylesheet" type="text/css" href="{{ static('pure.css') }}" />
<link rel="stylesheet" type="text/css" href="{{
static('web-common/demo.css') }}" />
<link rel="stylesheet" type="text/css" href="{{
static('web-common/taler-fallback.css') }}" id="taler-presence-stylesheet" />
+ <link rel="stylesheet" type="text/css" href="{{ static('bank.css') }}" />
{% block head %} {% endblock %}
</head>
<body>
diff --git a/talerbank/app/templates/profile_page.html
b/talerbank/app/templates/profile_page.html
index 4a03e52..e5f9abc 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 }}" tabindex="-1" value="{{ currency }}">
+
<input id="select-exchange"
class="taler-installed-show pure-button pure-button-primary"
type="submit"
@@ -109,20 +111,28 @@
name="tform">
<input type="hidden" name="csrfmiddlewaretoken" value="{{ csrf_token
}}" />
- <span class="currency-widget">
- <span class="currency-symbol">{{ currency }}</span>
- {{ wt_form.amount }}
- </span>
- <label for="id_receiver">
- to
- {{ wt_form.receiver }}
- </label>
- <br />
- <br />
- <label for="id_subject">
- subject
- {{ wt_form.subject }}
- </label>
+
+ <div id="transfer-fields">
+
+ <div class="fieldbox">
+ <label class="fieldlabel" for="id_amount">Amount to
transfer:</label>
+ {{ wt_form.amount }}<!--
+ --><input type="text" readonly class="currency-indicator" size="{{
currency|length }}" tabindex="-1" value="{{ currency }}">
+ </div>
+
+ <div class="fieldbox">
+ <label class="fieldlabel" for="id_receiver">Receiver:</label>
+ {{ wt_form.receiver }}
+ </div>
+
+ <div class="fieldbox">
+ <label class="fieldlabel" for="id_receiver">Subject:</label>
+ {{ wt_form.subject }}
+ </div>
+
+ </div>
+
+
<input class="pure-button pure-button-primary"
type="submit"
value="Transfer!" />
--
To stop receiving notification emails like this one, please contact
address@hidden
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-bank] branch stable updated (860d826 -> eac24d5),
gnunet <=