From 59adf3368bf611426eb3e65b9532e4624a13302a Mon Sep 17 00:00:00 2001 From: gerlofvanek Date: Tue, 15 Nov 2022 17:03:30 +0100 Subject: [PATCH] ui: Updated notifications popup/dropdown. --- basicswap/static/css/style.css | 34 +++++++++++-- basicswap/templates/bids.html | 4 +- basicswap/templates/header.html | 84 ++++++++++++++++++++------------- basicswap/templates/tor.html | 34 +++++++++---- 4 files changed, 107 insertions(+), 49 deletions(-) diff --git a/basicswap/static/css/style.css b/basicswap/static/css/style.css index 0ac5384..528c400 100644 --- a/basicswap/static/css/style.css +++ b/basicswap/static/css/style.css @@ -16,11 +16,9 @@ .floatright { - position:fixed; - top:10px; - right:18px; - margin: 0; - width:calc(33.33% - 25px); + position: absolute; + top:1.25rem; + right:1.25rem; z-index: 9999; } @@ -32,3 +30,29 @@ { color:red; } + +#hide { + -moz-animation: cssAnimation 0s ease-in 15s forwards; + /* Firefox */ + -webkit-animation: cssAnimation 0s ease-in 15s forwards; + /* Safari and Chrome */ + -o-animation: cssAnimation 0s ease-in 15s forwards; + /* Opera */ + animation: cssAnimation 0s ease-in 15s forwards; + -webkit-animation-fill-mode: forwards; + animation-fill-mode: forwards; +} +@keyframes cssAnimation { + to { + width:0; + height:0; + overflow:hidden; + } +} +@-webkit-keyframes cssAnimation { + to { + width:0; + height:0; + visibility:hidden; + } +} \ No newline at end of file diff --git a/basicswap/templates/bids.html b/basicswap/templates/bids.html index 9064336..40d14f5 100644 --- a/basicswap/templates/bids.html +++ b/basicswap/templates/bids.html @@ -171,9 +171,9 @@ - + - +
diff --git a/basicswap/templates/header.html b/basicswap/templates/header.html index 53cb2c3..09b4822 100644 --- a/basicswap/templates/header.html +++ b/basicswap/templates/header.html @@ -113,7 +113,7 @@ Debug - {% endif %} + {% endif %} {% if debug_mode == true %}
  • Explorers @@ -125,6 +125,19 @@ Explorers
    • {% endif %} + {% if use_tor_proxy == true %} +
  • + Debug + + + + + + + + Tor +
    • + {% endif %}
  • Settings @@ -135,7 +148,7 @@ SMSG Addresses -
    • +
  • Automation Strategies @@ -163,7 +176,7 @@ Automation Strategies
    • - {% endif %} + {% endif %}
    Shutdown @@ -194,49 +207,49 @@
    {% for entry in notifications %} {% if entry[1] == 1 %}
    -
    New Offer
    +
    - NEW NETWORK OFFER -
    -     {{ entry[2].offer_id|truncate(37, True) }} + NEW NETWORK OFFER +
    + {{ entry[2].offer_id|truncate(42, True) }}
    -
    {{ entry[0] }}
    +
    {{ entry[0] }}
    {% elif entry[1] == 2 %}
    -
    New Accepted
    +
    - NEW BID ON OFFER -
    - {{ entry[2].offer_id|truncate(37, True) }} + NEW BID ON OFFER +
    + {{ entry[2].offer_id|truncate(42, True) }}
    -
    {{ entry[0] }}
    +
    {{ entry[0] }}
    {% elif entry[1] == 3 %}
    -
    New Offer
    +
    - BID ACCEPTED -
    - {{ entry[2].bid_id|truncate(37, True) }} + BID ACCEPTED +
    + {{ entry[2].bid_id|truncate(42, True) }}
    -
    {{ entry[0] }}
    +
    {{ entry[0] }}
    {% else %}
    -
    New Offer
    +
    UNKNOWN EVENT -
    +
    {{ entry[1] }} -
    {{ entry[0] }}
    +
    {{ entry[0] }}
    {% endif %} @@ -265,7 +278,7 @@
  • - + @@ -296,18 +309,18 @@

    • - + {% endif %} {% if use_tor_proxy == true %} @@ -550,7 +563,7 @@
  • - + @@ -559,7 +572,7 @@ Debug
    • - {% endif %} + {% endif %} {% if debug_mode == true %}
  • @@ -624,7 +637,7 @@ - TOR + Tor
    • {% endif %} @@ -648,7 +661,7 @@ {% if ws_url %} {% endif %} \ No newline at end of file diff --git a/basicswap/templates/tor.html b/basicswap/templates/tor.html index a7d5a29..d9ce6ac 100644 --- a/basicswap/templates/tor.html +++ b/basicswap/templates/tor.html @@ -14,7 +14,7 @@ -
  • TOR
    • +
  • Tor
  • @@ -29,13 +29,27 @@
    -

    TOR

    -

    TOR connection information

    +

    Tor

    +

    Tor connection information

    -
    - - - +
    + {% if refresh %} + + + + + + + Refresh {{ refresh }} seconds + {% else %} + + + + + + + Refresh + {% endif %}
    @@ -52,12 +66,12 @@ - - + + - +
    Name:Output:Tor
    TOR ModeTor Mode {% if use_tor_proxy == true %} Active {% if tor_established == true %} & Connected{% endif %} {% endif %}