[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-merchant-frontends] branch master updated: Showing (
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-merchant-frontends] branch master updated: Showing (empty) pop-up when tracking a order. |
Date: |
Tue, 28 Feb 2017 10:22:20 +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 b9f2324 Showing (empty) pop-up when tracking a order.
b9f2324 is described below
commit b9f2324934ac47f5495af6201ab65674bc4b353b
Author: Marcello Stanisci <address@hidden>
AuthorDate: Tue Feb 28 10:21:49 2017 +0100
Showing (empty) pop-up when tracking a order.
---
talerfrontends/blog/static/backoffice.js | 7 ++++
talerfrontends/blog/static/popup.css | 59 +++++++++++++++++++++++++++
talerfrontends/blog/templates/backoffice.html | 9 ++++
talerfrontends/blog/templates/base.html | 1 +
4 files changed, 76 insertions(+)
diff --git a/talerfrontends/blog/static/backoffice.js
b/talerfrontends/blog/static/backoffice.js
index a281e0b..f48f836 100644
--- a/talerfrontends/blog/static/backoffice.js
+++ b/talerfrontends/blog/static/backoffice.js
@@ -65,6 +65,13 @@ function track_order(order_id, instance){
for(var i=0; i<tracks.length; i++){
var entry = tracks[i];
+ var overlay = document.getElementsByClassName("overlay")[0];
+ var track_content =
document.getElementsByClassName("track-content")[0];
+ var p = document.createElement("p");
+ p.textContent = i;
+ track_content.appendChild(p);
+ overlay.style.visibility = "visible";
+ overlay.style.opacity = 1;
console.log("i", i);
console.log("Exchange", entry.exchange);
console.log("WTID", entry.wtid);
diff --git a/talerfrontends/blog/static/popup.css
b/talerfrontends/blog/static/popup.css
new file mode 100644
index 0000000..a922077
--- /dev/null
+++ b/talerfrontends/blog/static/popup.css
@@ -0,0 +1,59 @@
+.overlay {
+ position: fixed;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ background: rgba(0, 0, 0, 0.7);
+ transition: opacity 500ms;
+ visibility: hidden;
+ opacity: 0;
+}
+/*
+To be done via JS.
+.overlay:target {
+ visibility: visible;
+ opacity: 1;
+}*/
+
+.popup {
+ margin: 70px auto;
+ padding: 20px;
+ background: #fff;
+ border-radius: 5px;
+ width: 30%;
+ position: relative;
+ transition: all 5s ease-in-out;
+}
+
+.popup h2 {
+ margin-top: 0;
+ color: #333;
+ font-family: Tahoma, Arial, sans-serif;
+}
+.popup .close {
+ position: absolute;
+ top: 20px;
+ right: 30px;
+ transition: all 200ms;
+ font-size: 30px;
+ font-weight: bold;
+ text-decoration: none;
+ color: #333;
+}
+.popup .close:hover {
+ color: #06D85F;
+}
+.popup .track-content {
+ max-height: 30%;
+ overflow: auto;
+}
+
address@hidden screen and (max-width: 700px){
+ .box{
+ width: 70%;
+ }
+ .popup{
+ width: 70%;
+ }
+}
diff --git a/talerfrontends/blog/templates/backoffice.html
b/talerfrontends/blog/templates/backoffice.html
index a234550..fb138db 100644
--- a/talerfrontends/blog/templates/backoffice.html
+++ b/talerfrontends/blog/templates/backoffice.html
@@ -14,6 +14,15 @@
</tr>
</tbody>
</table>
+ <div id="popup1" class="overlay">
+ <div class="popup">
+ <h2>Tracks</h2>
+ <a class="close" href="/backoffice">×</a>
+ <div class="track-content">
+ <!-- Filled by JS. -->
+ </div>
+ </div>
+ </div>
{% endblock main %}
{% block scripts %}
diff --git a/talerfrontends/blog/templates/base.html
b/talerfrontends/blog/templates/base.html
index 533626c..140222a 100644
--- a/talerfrontends/blog/templates/base.html
+++ b/talerfrontends/blog/templates/base.html
@@ -20,6 +20,7 @@
<link rel="stylesheet" type="text/css" href="{{
url("/static/web-common/style.css") }}">
<link rel="stylesheet" type="text/css" href="{{
url("/static/web-common/lang.css") }}">
<link rel="stylesheet" type="text/css" href="{{
url("/static/web-common/taler-fallback.css") }}" id="taler-presence-stylesheet">
+ <link rel="stylesheet" type="text/css" href="{{ url("/static/popup.css") }}">
<script src="{{ url("/static/web-common/taler-wallet-lib.js") }}"
type="application/javascript"></script>
<script src="{{ url("/static/web-common/lang.js") }}"
type="application/javascript"></script>
<meta http-equiv="content-type" content="text/html;CHARSET=utf-8">
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-merchant-frontends] branch master updated: Showing (empty) pop-up when tracking a order.,
gnunet <=