From a520ebf23f2c4bba4a798af4a647ef2c01ba145e Mon Sep 17 00:00:00 2001 From: gerlofvanek Date: Wed, 16 Nov 2022 10:31:39 +0100 Subject: [PATCH] ui: GUI update/fixes. --- basicswap/templates/active.html | 26 ++++++++--- basicswap/templates/bid.html | 65 +++++++++++++++----------- basicswap/templates/bid_xmr.html | 51 +++++++++++--------- basicswap/templates/header.html | 8 ++-- basicswap/templates/offer.html | 48 +++++++++++++------ basicswap/templates/offer_confirm.html | 4 +- basicswap/templates/offer_new_1.html | 10 ++-- basicswap/templates/offer_new_2.html | 4 +- basicswap/templates/offers.html | 8 ++-- 9 files changed, 138 insertions(+), 86 deletions(-) diff --git a/basicswap/templates/active.html b/basicswap/templates/active.html index bcb3f7d..338d30a 100644 --- a/basicswap/templates/active.html +++ b/basicswap/templates/active.html @@ -29,13 +29,27 @@
-

Swaps in Progress / Active Swaps

-

{% if refresh %} Page Refresh {{ refresh }} seconds {% endif %}

+

Swaps in Progress

+

-
- - - +
+ {% if refresh %} + + + + + + + Refresh {{ refresh }} seconds + {% else %} + + + + + + + Refresh + {% endif %}
diff --git a/basicswap/templates/bid.html b/basicswap/templates/bid.html index d076783..35a50be 100644 --- a/basicswap/templates/bid.html +++ b/basicswap/templates/bid.html @@ -20,7 +20,7 @@ -
  • BID ID:{{ bid_id }}
    • +
  • BID ID: {{ bid_id }}
    • @@ -37,7 +37,7 @@

    Bid ID: {{ bid_id }}

    -
    +
    {% if refresh %} @@ -53,13 +53,13 @@ - Refresh - {% endif %} + Refresh + {% endif %}
    - + {% include 'inc_messages.html' %}
    @@ -74,16 +74,30 @@ Details - + {% if data.was_sent == 'True' %} Swap - (To) {{ data.amt_to }} {{ data.ticker_to }} for (From) {{ data.amt_from }} {{ data.ticker_from }} + +
    + {{ data.amt_to }} {{ data.ticker_to }} + + {{ data.amt_from }} {{ data.ticker_from }} +
    + {% else %} Swap - (From) {{ data.amt_from }} {{ data.ticker_from }} for (To) {{ data.amt_to }} {{ data.ticker_to }} + +
    + {{ data.amt_from }} {{ data.ticker_from }} + + {{ data.amt_to }} {{ data.ticker_to }} +
    + {% endif %} @@ -92,26 +106,26 @@ {% if data.was_sent == 'True' %} - You Send (To) + You Send {{ data.coin_to }} {{ data.coin_to }} - You Get (From) + You Get {{ data.coin_from }} {{ data.coin_from }} {% else %} - You Send (From) + You Send {{ data.coin_from }} {{ data.coin_from }} - You Get (To) + You Get {{ data.coin_to }} {{ data.coin_to }} @@ -196,7 +210,7 @@ Participate Conf {{ data.participate_conf }} - + {% if data.show_txns %} Initiate Tx Refund @@ -213,7 +227,7 @@ Participate Tx Spend Tx {{ data.participate_tx_spend }} - + {% endif %}
    @@ -247,7 +261,7 @@
    {{ s[0] | formatts }}
    - + {% endfor %} @@ -289,7 +303,7 @@
    -
    +
    {% if edit_bid %} @@ -302,22 +316,19 @@ - + {% if data.debug_ui == true %} - + {% else %} - + {% endif %} @@ -91,26 +105,26 @@ {% if data.was_sent == 'True' %} - + - + {% else %} - + - + @@ -353,7 +367,7 @@ - View Tx + View Tx
    + View Lock Wallet Transfers
    @@ -377,14 +391,11 @@ {% endif %} {% endif %} - - - {% if data.show_bidder_seq_diagram %}
    -

    Bidder Sequence Diagram

    +

    Bidder Sequence Diagram

    @@ -412,9 +423,6 @@
    {% endif %} - - - {% if data.chain_a_lock_tx_inputs %}
    @@ -464,9 +472,9 @@ {% if data.debug_ui == true %}
    - - + - + - + - + @@ -163,12 +163,32 @@ - - - + + + - - + + @@ -194,7 +214,7 @@ - + {% endif %}
    Debug Option: - - -
    +
    - - +
    Swap(To) {{ data.amt_to }} {{ data.ticker_to }} for (From) {{ data.amt_from }} {{ data.ticker_from }} +
    + {{ data.amt_to }} {{ data.ticker_to }} + + {{ data.amt_from }} {{ data.ticker_from }} +
    +
    Swap(From) {{ data.amt_from }} {{ data.ticker_from }} for (To) {{ data.amt_to }} {{ data.ticker_to }} +
    + {{ data.amt_from }} {{ data.ticker_from }} + + {{ data.amt_to }} {{ data.ticker_to }} +
    +
    You Send (To) You Send {{ data.coin_to }} {{ data.coin_to }}
    You Get (From)You Get {{ data.coin_from }} {{ data.coin_from }}
    You Send (From)You Send {{ data.coin_from }} {{ data.coin_from }}
    You Get (To)You Get {{ data.coin_to }} {{ data.coin_to }}
    Debug Option +
    - +
    + Submit Edit Bid
    {% else %} {% if data.show_bidder_seq_diagram %} @@ -537,14 +544,14 @@ {% endif %}
    + Edit bit
    {% endif %} {% if data.was_received == 'True' %}
    -
    + {% endif %} @@ -562,4 +569,4 @@ {% include 'footer.html' %} - + \ No newline at end of file diff --git a/basicswap/templates/header.html b/basicswap/templates/header.html index 09b4822..adb54f7 100644 --- a/basicswap/templates/header.html +++ b/basicswap/templates/header.html @@ -214,7 +214,7 @@
    {{ entry[2].offer_id|truncate(42, True) }} -
    {{ entry[0] }}
    +
    {{ entry[0] }}
    {% elif entry[1] == 2 %} @@ -226,7 +226,7 @@
    {{ entry[2].offer_id|truncate(42, True) }} -
    {{ entry[0] }}
    +
    {{ entry[0] }}
    {% elif entry[1] == 3 %} @@ -238,7 +238,7 @@
    {{ entry[2].bid_id|truncate(42, True) }} -
    {{ entry[0] }}
    +
    {{ entry[0] }}
    {% else %} @@ -249,7 +249,7 @@ UNKNOWN EVENT
    {{ entry[1] }} -
    {{ entry[0] }}
    +
    {{ entry[0] }}
    {% endif %} diff --git a/basicswap/templates/offer.html b/basicswap/templates/offer.html index ead531b..dc6244c 100644 --- a/basicswap/templates/offer.html +++ b/basicswap/templates/offer.html @@ -104,23 +104,23 @@     		{{ data.state }}
    Coin From (From)You Get {{ data.coin_from }} {{ data.coin_from }}
    Coin To (To)You Send {{ data.coin_to }} {{ data.coin_to }}
    Amount (From)Amount You Get {{ data.amt_from }} {{ data.tla_from }}
    Amount (To)Amount You Send {{ data.amt_to }} {{ data.tla_to }}
    Address From {{ data.addr_from }} {{ data.addr_from_label }}
    Created At{{ data.created_at | formatts }}
    + + + + + + +
    +
    Created At
    +
    +     		{{ data.created_at }} | formatts
    Expired At
    + + + + + + +
    +
    Expired At
    +
    +     		{{ data.expired_at | formatts }}
    Chain A local fee rate{{ data.a_fee_rate_verify }}, fee source: {{ data.a_fee_rate_verify_src }} {% if data.a_fee_warn == true %} WARNING {% endif %}{{ data.a_fee_rate_verify }} (Fee source: {{ data.a_fee_rate_verify_src }}{% if data.a_fee_warn == true %} WARNING{% endif %})
    @@ -241,13 +261,13 @@ - - + + - - + + diff --git a/basicswap/templates/offer_confirm.html b/basicswap/templates/offer_confirm.html index ebdad34..9bb0238 100644 --- a/basicswap/templates/offer_confirm.html +++ b/basicswap/templates/offer_confirm.html @@ -162,7 +162,7 @@
    -

    You Send (From)

    +

    You Send

    @@ -260,7 +260,7 @@
    -

    You Get (To)

    +

    You Get

    diff --git a/basicswap/templates/offer_new_1.html b/basicswap/templates/offer_new_1.html index 147ca1b..80f462f 100644 --- a/basicswap/templates/offer_new_1.html +++ b/basicswap/templates/offer_new_1.html @@ -150,7 +150,7 @@
    -

    You Send (From

    +

    You Send

    @@ -160,7 +160,7 @@
    +
    @@ -191,7 +191,7 @@
    -

    You Get (To)

    +

    You Get

    @@ -201,7 +201,7 @@
    - + - + @@ -363,7 +363,7 @@ - +
    DetailsDetails
    Receive (From) {{ data.amt_from }} {{ data.tla_from }} {% if data.xmr_type == true %} (excluding {{ data.amt_from_lock_spend_tx_fee }} {{ data.tla_from }} in tx fees). {% else %} (excluding a tx fee). {% endif %}You will send (To) {{ data.amt_to }} {{ data.tla_to }}Amount you will get {{ data.amt_from }} {{ data.tla_from }} {% if data.xmr_type == true %} (excluding {{ data.amt_from_lock_spend_tx_fee }} {{ data.tla_from }} in tx fees). {% else %} (excluding a tx fee). {% endif %}Anount you will send {{ data.amt_to }} {{ data.tla_to }}
    Send From Address Network Recipient You Get (From) You Get You Send (To) You Send 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] }}