gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [taler-merchant-frontends] branch master updated: Styling /


From: gnunet
Subject: [GNUnet-SVN] [taler-merchant-frontends] branch master updated: Styling /backoffice.
Date: Sat, 04 Mar 2017 15:57:35 +0100

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

marcello pushed a commit to branch master
in repository merchant-frontends.

The following commit(s) were added to refs/heads/master by this push:
     new 636501d  Styling /backoffice.
636501d is described below

commit 636501d5ec4e0fe2945baf02d0087760db9dd0b3
Author: Marcello Stanisci <address@hidden>
AuthorDate: Sat Mar 4 15:56:41 2017 +0100

    Styling /backoffice.
---
 .../blog/static/{popup.css => backoffice.css}       | 21 +++++++++++++++++++++
 talerfrontends/blog/static/backoffice.js            | 18 ++++++++++++++----
 talerfrontends/blog/templates/backoffice.html       |  2 +-
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/talerfrontends/blog/static/popup.css 
b/talerfrontends/blog/static/backoffice.css
similarity index 85%
rename from talerfrontends/blog/static/popup.css
rename to talerfrontends/blog/static/backoffice.css
index 4e3afcd..50139da 100644
--- a/talerfrontends/blog/static/popup.css
+++ b/talerfrontends/blog/static/backoffice.css
@@ -11,6 +11,22 @@
   z-index: 2;
 }
 
+.date, .amount {
+  text-align: right;
+}
+
+.summary {
+  text-indent: 4%;
+}
+
+.even {
+  background-color: #ECFCEC
+}
+
+.odd {
+  background-color: #FFF7E6
+}
+
 .popup {
   margin: 70px auto;
   padding: 20px;
@@ -75,3 +91,8 @@ th {
   0% { transform: rotate(0deg); }
   100% { transform: rotate(360deg); }
 }
+
+.order-id {
+  font-family: monospace;
+  font-size: 200%;
+}
diff --git a/talerfrontends/blog/static/backoffice.js 
b/talerfrontends/blog/static/backoffice.js
index 795ea42..9d1b323 100644
--- a/talerfrontends/blog/static/backoffice.js
+++ b/talerfrontends/blog/static/backoffice.js
@@ -34,7 +34,7 @@ var INSTANCE = "FSF";
 
 function amount_to_string(amount){
   var number = Number(amount.value) + (Number(amount.fraction)/FRACTION);
-  return `${number} ${amount.currency}`;
+  return `${number.toFixed(2)} ${amount.currency}`;
 }
 
 function parse_date(date){
@@ -160,19 +160,29 @@ function fill_table(history){
   for (var i=0; i<history.length; i++){
     var entry = history[i];
     var row = document.createElement("tr");
+    row.className = "even";
+    var row_summary = document.createElement("tr");
+    row_summary.className = "odd";
     var td_order_id = document.createElement("td");
+    td_order_id.className = "order-id";
     var td_summary = document.createElement("td");
+    td_summary.setAttribute("colspan", 3);
+    td_summary.className += "summary";
     var td_amount = document.createElement("td");
-    var td_timestamp = document.createElement("td");
+    td_amount.className = "amount";
+    var td_date = document.createElement("td");
+    td_date.className = "date";
     td_order_id.innerHTML = `<a href="#" 
onclick='track_order("${entry.order_id}", "FSF");'>${entry.order_id}</a>`;
     td_summary.innerHTML = "TBD";
     td_amount.innerHTML = amount_to_string(entry.amount);
-    td_timestamp.innerHTML = parse_date(entry.timestamp);
+    td_date.innerHTML = parse_date(entry.timestamp);
     row.appendChild(td_order_id);
     row.appendChild(td_summary);
     row.appendChild(td_amount);
-    row.appendChild(td_timestamp);
+    row.appendChild(td_date);
+    row_summary.appendChild(td_summary);
     tbody.appendChild(row);
+    tbody.appendChild(row_summary);
     }
 
   function remove_loader(){
diff --git a/talerfrontends/blog/templates/backoffice.html 
b/talerfrontends/blog/templates/backoffice.html
index 719d4b6..78a67bd 100644
--- a/talerfrontends/blog/templates/backoffice.html
+++ b/talerfrontends/blog/templates/backoffice.html
@@ -38,7 +38,7 @@
 {% endblock main %}
 
 {% block styles %}
-  <link rel="stylesheet" type="text/css" href="{{ url("/static/popup.css") }}">
+  <link rel="stylesheet" type="text/css" href="{{ 
url("/static/backoffice.css") }}">
 {% endblock styles %}
 
 {% block scripts %}

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

[Prev in Thread] Current Thread [Next in Thread]