From 2ba2ff57918bc7ee8dc3ec05932c0638f9eb55cc Mon Sep 17 00:00:00 2001 From: gerlofvanek Date: Mon, 14 Nov 2022 22:43:31 +0100 Subject: [PATCH] ui: GUI fixes + Added wallet lock/unlock icon --- basicswap/templates/bid.html | 29 ++++++-- basicswap/templates/bid_xmr.html | 24 +++++-- basicswap/templates/bids.html | 16 +++-- basicswap/templates/footer.html | 2 +- basicswap/templates/header.html | 33 ++++++++- basicswap/templates/offer.html | 94 +++++++++++++++++--------- basicswap/templates/offer_confirm.html | 14 ++-- basicswap/templates/offer_new_1.html | 8 +-- basicswap/templates/offer_new_2.html | 14 ++-- basicswap/templates/offers.html | 8 +-- 10 files changed, 166 insertions(+), 76 deletions(-) diff --git a/basicswap/templates/bid.html b/basicswap/templates/bid.html index 8b5c2bb..190630f 100644 --- a/basicswap/templates/bid.html +++ b/basicswap/templates/bid.html @@ -78,28 +78,45 @@ {% if data.was_sent == 'True' %} Swap - {{ data.amt_to }} {{ data.ticker_to }} for {{ data.amt_from }} {{ data.ticker_from }} - {% else %} + (To) {{ data.amt_to }} {{ data.ticker_to }} for (From) {{ data.amt_from }} {{ data.ticker_from }} + + {% else %} Swap - {{ data.amt_from }} {{ data.ticker_from }} for {{ data.amt_to }} {{ data.ticker_to }} - {% endif %} + (From) {{ data.amt_from }} {{ data.ticker_from }} for (To) {{ data.amt_to }} {{ data.ticker_to }} + + {% endif %} Bid Rate {{ data.bid_rate }} + {% if data.was_sent == 'True' %} + + You Send (To) + + {{ data.coin_to }} + {{ data.coin_to }} + - Coin From (You Send) + You Get (From) + + {{ data.coin_from }} + {{ data.coin_from }} + + {% else %} + + You Send (From) {{ data.coin_from }} {{ data.coin_from }} - Coin To (You Get) + You Get (To) {{ data.coin_to }} {{ data.coin_to }} + {% endif %} Bid State {{ data.bid_state }} diff --git a/basicswap/templates/bid_xmr.html b/basicswap/templates/bid_xmr.html index fc6c44b..192203a 100644 --- a/basicswap/templates/bid_xmr.html +++ b/basicswap/templates/bid_xmr.html @@ -77,31 +77,45 @@ {% if data.was_sent == 'True' %} Swap - {{ data.amt_to }} {{ data.ticker_to }} for {{ data.amt_from }} {{ data.ticker_from }} + (To) {{ data.amt_to }} {{ data.ticker_to }} for (From) {{ data.amt_from }} {{ data.ticker_from }} {% else %} Swap - {{ data.amt_from }} {{ data.ticker_from }} for {{ data.amt_to }} {{ data.ticker_to }} + (From) {{ data.amt_from }} {{ data.ticker_from }} for (To) {{ data.amt_to }} {{ data.ticker_to }} - {% endif %} Bid Rate {{ data.bid_rate }} + {% if data.was_sent == 'True' %} + + You Send (To) + + {{ data.coin_to }} + {{ data.coin_to }} + - Coin From (You Send) + You Get (From) + + {{ data.coin_from }} + {{ data.coin_from }} + + {% else %} + + You Send (From) {{ data.coin_from }} {{ data.coin_from }} - Coin To (You Get) + You Get (To) {{ data.coin_to }} {{ data.coin_to }} + {% endif %} Bid State {{ data.bid_state }} diff --git a/basicswap/templates/bids.html b/basicswap/templates/bids.html index 051cd63..9064336 100644 --- a/basicswap/templates/bids.html +++ b/basicswap/templates/bids.html @@ -32,14 +32,22 @@

{{ page_type_available }} {{ page_type_received }} {{ page_type_sent }}

{{ page_type_available_description }} {{ page_type_received_description }} {{ page_type_sent_description }}

+
+ {% if refresh %} + + + + + + + Refresh {{ refresh }} seconds + {% endif %} +
- {% if refresh %} -

Page Refresh: {{ refresh }} seconds

{% endif %} {% for m in messages %} -

{{ m }}

{% endfor %} - + {% include 'inc_messages.html' %}
diff --git a/basicswap/templates/footer.html b/basicswap/templates/footer.html index 3488074..2b818e8 100644 --- a/basicswap/templates/footer.html +++ b/basicswap/templates/footer.html @@ -23,7 +23,7 @@

GUI 0.1.2

Made with

- + by TV and CRZ
diff --git a/basicswap/templates/header.html b/basicswap/templates/header.html index b6aeef6..53cb2c3 100644 --- a/basicswap/templates/header.html +++ b/basicswap/templates/header.html @@ -260,11 +260,11 @@
{% if debug_mode == true %} - +
  • - + @@ -278,9 +278,38 @@

    Debug mode: Active

    {% if debug_ui_mode == true %}

    Debug UI mode: Active

    {% endif %}
    • +
{% endif %} + + {% if debug_mode == true %} + +
    +
  • +
    + +
    +
    + +
    • +
+ +
    +
  • +
    + +
    +
    + +
    • +
+ + {% endif %} {% if use_tor_proxy == true %}
    diff --git a/basicswap/templates/offer.html b/basicswap/templates/offer.html index 8af6767..dfad83e 100644 --- a/basicswap/templates/offer.html +++ b/basicswap/templates/offer.html @@ -33,16 +33,26 @@

    Offer (normal)

    Offer ID: {{ offer_id }}

-
{% if refresh %} - - - - {% else %} - - - - {% endif %}
- +
+ {% if refresh %} + + + + + + + Refresh {{ refresh }} seconds + {% else %} + + + + + + + Refresh + {% endif %} +
+
@@ -85,8 +95,8 @@ - - + + @@ -94,20 +104,24 @@ - - + + - - + + - - + + - - + + @@ -143,11 +157,11 @@ {% else %} - + {% endif %} - + @@ -190,7 +204,7 @@

Bids

-
+
ItemDataDetails
{{ data.state }}
Coin From{{ data.coin_from }}Coin From (From) + {{ data.coin_from }} + {{ data.coin_from }}
Coin To{{ data.coin_to }}Coin To (To) + {{ data.coin_to }} + {{ data.coin_to }}
Amount From{{ data.amt_from }} {{ data.tla_from }}Amount (From){{ data.amt_from }} {{ data.tla_from }}
Amount To{{ data.amt_to }} {{ data.tla_to }}Amount (To){{ data.amt_to }} {{ data.tla_to }}
Minimum Bid Amount
Address To{{ data.addr_to }} {{ data.addr_to_label }}{{ data.addr_to }} {{ data.addr_to_label }}
Address From{{ data.addr_from }} {{ data.addr_from_label }}{{ data.addr_from }} {{ data.addr_from_label }}
Created At
@@ -222,7 +236,7 @@

New Bid

-
+
@@ -307,17 +321,33 @@
-
- -
+
+ +
{% if data.sent == 'True' %} -
- +
+
{% if data.was_revoked != true %} -
- -
+
+ +
{% endif %} {% endif %} -
+ - + @@ -363,7 +363,7 @@ - +
You Get You Get (From) You Send You Send (To) Rate {{ o[7] }} {% if o[12]==2 %}Revoked{% elif o[11]==true %}Not Active{% else %}Active{% endif %}{{ o[7] }} {% if o[12]==2 %}(Revoked){% elif o[11]==true %}(Not Active){% else %}(Active){% endif %} {{ o[8] }} {{ o[2] }} {{ o[4] }}