diff --git a/basicswap/templates/404.html b/basicswap/templates/404.html index 49ddd9a..8ff92b3 100644 --- a/basicswap/templates/404.html +++ b/basicswap/templates/404.html @@ -23,7 +23,7 @@ - + {% include 'inc_messages.html' %}
@@ -39,12 +39,12 @@
-
+
- -{% include 'footer.html' %} + +{% include 'footer.html' %} \ No newline at end of file diff --git a/basicswap/templates/active.html b/basicswap/templates/active.html index dbbda96..2cefab1 100644 --- a/basicswap/templates/active.html +++ b/basicswap/templates/active.html @@ -26,7 +26,10 @@
-
+
+ + +

Swaps in Progress

@@ -40,7 +43,7 @@ - Refresh {{ refresh }} seconds + Refresh {{ refresh }} seconds {% else %} @@ -48,7 +51,7 @@ - Refresh + Refresh {% endif %}
@@ -72,7 +75,7 @@ PTX Status - + {% for s in active_swaps %} {{ s[0] }} @@ -80,8 +83,8 @@ {{ s[2] }} {{ s[3] }} {{ s[4] }} - - {% endfor %} + + {% endfor %}
diff --git a/basicswap/templates/automation_strategies.html b/basicswap/templates/automation_strategies.html index e83d344..4427b6f 100644 --- a/basicswap/templates/automation_strategies.html +++ b/basicswap/templates/automation_strategies.html @@ -26,7 +26,10 @@
-
+
+ + +

Automation Strategies

@@ -121,13 +124,13 @@ Name Type - + {% for s in strategies %} {{ s[1] }} {{ s[2] }} - - {% endfor %} + + {% endfor %}
diff --git a/basicswap/templates/automation_strategy.html b/basicswap/templates/automation_strategy.html index 5bffdd7..404c126 100644 --- a/basicswap/templates/automation_strategy.html +++ b/basicswap/templates/automation_strategy.html @@ -27,10 +27,13 @@
-
+
+ + +
-

Automation Strategy {{ strategy_id }}

+

Automation Strategy {{ strategy_id }}

diff --git a/basicswap/templates/automation_strategy_new.html b/basicswap/templates/automation_strategy_new.html index fb0049a..d70781d 100644 --- a/basicswap/templates/automation_strategy_new.html +++ b/basicswap/templates/automation_strategy_new.html @@ -27,10 +27,13 @@
-
+
+ + +
-

New Automation Strategy (todo)

+

New Automation Strategy (todo)

@@ -45,7 +48,7 @@
- + {% include 'footer.html' %} diff --git a/basicswap/templates/bid.html b/basicswap/templates/bid.html index 35a50be..eda9f67 100644 --- a/basicswap/templates/bid.html +++ b/basicswap/templates/bid.html @@ -27,7 +27,10 @@
-
+
+ + +

Bid @@ -37,7 +40,7 @@

Bid ID: {{ bid_id }}

-
+
{% if refresh %} @@ -45,7 +48,7 @@ - Refresh {{ refresh }} seconds + Refresh {{ refresh }} seconds {% else %} @@ -53,13 +56,13 @@ - Refresh - {% endif %} + Refresh + {% endif %}
-
+ {% include 'inc_messages.html' %}
@@ -74,7 +77,7 @@ Details - + {% if data.was_sent == 'True' %} Swap @@ -210,7 +213,7 @@ Participate Conf {{ data.participate_conf }} - + {% if data.show_txns %} Initiate Tx Refund @@ -227,7 +230,7 @@ Participate Tx Spend Tx {{ data.participate_tx_spend }} - + {% endif %}
@@ -407,7 +410,7 @@
-

Bidder Sequence Diagram

+

Bidder Sequence Diagram

@@ -423,7 +426,7 @@
-

Offerer Sequence Diagram

+

Offerer Sequence Diagram

diff --git a/basicswap/templates/bid_xmr.html b/basicswap/templates/bid_xmr.html index e2df293..c4c16c9 100644 --- a/basicswap/templates/bid_xmr.html +++ b/basicswap/templates/bid_xmr.html @@ -27,7 +27,10 @@
-
+
+ + +

Bid @@ -44,7 +47,7 @@ - Refresh {{ refresh }} seconds + Refresh {{ refresh }} seconds {% else %} @@ -52,7 +55,7 @@ - Refresh + Refresh {% endif %}

@@ -91,7 +94,7 @@ Swap
- {{ data.amt_from }} {{ data.ticker_from }} + {{ data.amt_from }} {{ data.ticker_from }} {{ data.amt_to }} {{ data.ticker_to }} @@ -204,7 +207,7 @@
-

Old states

+

Old states

@@ -496,61 +499,61 @@
+ Cancel
+ Submit Edit Bid
{% else %} {% if data.show_bidder_seq_diagram %}
+ Hide Bidder Sequence Diagram
{% else %}
+ Show Bidder Sequence Diagram
{% endif %} {% if data.show_offerer_seq_diagram %}
+ Hide Offerer Sequence Diagram
{% else %}
+ Show Offerer Sequence Diagram
{% endif %} {% if data.can_abandon == true %}
+ Abandon Bid
{% endif %} {% if data.show_txns %}
+ Hide info
{% else %}
+ Show More Info
{% endif %}
+ Edit bit
{% endif %} {% if data.was_received == 'True' %}
+ Accept Bid
{% endif %}
diff --git a/basicswap/templates/bids.html b/basicswap/templates/bids.html index 40d14f5..192e11b 100644 --- a/basicswap/templates/bids.html +++ b/basicswap/templates/bids.html @@ -26,7 +26,10 @@
-
+
+ + +

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

@@ -40,7 +43,7 @@ - Refresh {{ refresh }} seconds + Refresh {{ refresh }} seconds {% endif %}
@@ -191,7 +194,7 @@ {% endfor %} -
+
diff --git a/basicswap/templates/debug.html b/basicswap/templates/debug.html index 1c19aff..e0be7e8 100644 --- a/basicswap/templates/debug.html +++ b/basicswap/templates/debug.html @@ -26,7 +26,10 @@
-
+
+ + +

Debug

@@ -62,7 +65,8 @@
-
+
+
diff --git a/basicswap/templates/error.html b/basicswap/templates/error.html index cec7c3e..620e2e1 100644 --- a/basicswap/templates/error.html +++ b/basicswap/templates/error.html @@ -1,16 +1,13 @@ - {{ title }} -

{{ title_str }}

Info: {{ message_str }}

home

- \ No newline at end of file diff --git a/basicswap/templates/explorers.html b/basicswap/templates/explorers.html index d1969a0..f955435 100644 --- a/basicswap/templates/explorers.html +++ b/basicswap/templates/explorers.html @@ -26,7 +26,10 @@
-
+
+ + +

Explorers

diff --git a/basicswap/templates/footer.html b/basicswap/templates/footer.html index 2b818e8..ba64713 100644 --- a/basicswap/templates/footer.html +++ b/basicswap/templates/footer.html @@ -26,7 +26,7 @@ - by TV and CRZ
+ by TV and CRZ
@@ -40,7 +40,7 @@
- +
diff --git a/basicswap/templates/header.html b/basicswap/templates/header.html index adb54f7..488c291 100644 --- a/basicswap/templates/header.html +++ b/basicswap/templates/header.html @@ -1,6 +1,5 @@ - {% if refresh %} @@ -14,7 +13,6 @@ {{ title }} -
diff --git a/basicswap/templates/identity.html b/basicswap/templates/identity.html index 3777e83..8f46aa6 100644 --- a/basicswap/templates/identity.html +++ b/basicswap/templates/identity.html @@ -27,7 +27,10 @@
-
+
+ + +

Identity

@@ -108,7 +111,7 @@
- {% endif %}
+ {% endif %}
diff --git a/basicswap/templates/inc_messages.html b/basicswap/templates/inc_messages.html index 8454fd2..b39a4da 100644 --- a/basicswap/templates/inc_messages.html +++ b/basicswap/templates/inc_messages.html @@ -11,11 +11,11 @@
-

{{ m[1] }}

+

{{ m[1] }}

-
-
-{% endfor %} +
+{% endfor %} {% for m in err_messages %} +
{% endfor %} \ No newline at end of file diff --git a/basicswap/templates/index.html b/basicswap/templates/index.html index ed55cb3..bd3ffba 100644 --- a/basicswap/templates/index.html +++ b/basicswap/templates/index.html @@ -9,7 +9,11 @@

Welcome to BasicSwap DEX

-
+
+ + + +

Swap cryptocurrencies in a distributed trading environment with no restrictions and no fees.

@@ -18,10 +22,10 @@
- +
- +
diff --git a/basicswap/templates/info.html b/basicswap/templates/info.html index cec7c3e..620e2e1 100644 --- a/basicswap/templates/info.html +++ b/basicswap/templates/info.html @@ -1,16 +1,13 @@ - {{ title }} -

{{ title_str }}

Info: {{ message_str }}

home

- \ No newline at end of file diff --git a/basicswap/templates/offer.html b/basicswap/templates/offer.html index dc6244c..d2a6d09 100644 --- a/basicswap/templates/offer.html +++ b/basicswap/templates/offer.html @@ -27,7 +27,10 @@
-
+
+ + +

Offer (normal)

@@ -41,7 +44,7 @@ - Refresh {{ refresh }} seconds + Refresh {{ refresh }} seconds {% else %} @@ -49,14 +52,14 @@ - Refresh - {% endif %} + Refresh + {% endif %}
-
+
- {% include 'inc_messages.html' %} + {% include 'inc_messages.html' %} {% if sent_bid_id %}
@@ -86,7 +89,7 @@
{% endif %}
-
+
@@ -203,7 +206,7 @@ Auto Accept Strategy - {% if data.automation_strat_id == -1 %} None {% else %}{{ data.automation_strat_label }} {% endif %} + {% if data.automation_strat_id == -1 %} None {% else %}{{ data.automation_strat_label }}{% endif %} {% endif %} @@ -221,7 +224,7 @@
-

Bids

+

Bids

@@ -235,7 +238,7 @@ Bid Status Identity From - + {% for b in bids %} {{ b[0] }} @@ -386,7 +389,7 @@ - Repeat Offer + Repeat Offer
{% if data.was_revoked != true %}
diff --git a/basicswap/templates/offer_confirm.html b/basicswap/templates/offer_confirm.html index 123e78b..259745d 100644 --- a/basicswap/templates/offer_confirm.html +++ b/basicswap/templates/offer_confirm.html @@ -38,7 +38,10 @@
-
+
+ + +

Confirm your offer information

@@ -225,7 +228,7 @@
-
Fee Rate Source: {{ data.from_fee_src }}
+
Fee Rate Source: {{ data.from_fee_src }}

Fee From Increase By

@@ -249,7 +252,7 @@ -
Lock Tx Spend Fee: {{ data.amt_from_lock_spend_tx_fee }} {{ data.tla_from }}
+
Lock Tx Spend Fee: {{ data.amt_from_lock_spend_tx_fee }} {{ data.tla_from }} {% endif %} @@ -436,7 +439,7 @@ - + @@ -587,7 +590,7 @@ - Confirm Offer + Confirm Offer @@ -601,7 +604,7 @@ {% if data.automation_strat_id != -1 %} - {% endif %} + {% endif %} {% if data.amt_var==true %} {% endif %} diff --git a/basicswap/templates/offer_new_1.html b/basicswap/templates/offer_new_1.html index 9fcccf3..5799bdf 100644 --- a/basicswap/templates/offer_new_1.html +++ b/basicswap/templates/offer_new_1.html @@ -303,7 +303,7 @@

Rates

-

+

@@ -327,7 +327,7 @@ - Check Current Rates + Check Current Rates
+ Continue
diff --git a/basicswap/templates/offer_new_2.html b/basicswap/templates/offer_new_2.html index 0725a4d..574210d 100644 --- a/basicswap/templates/offer_new_2.html +++ b/basicswap/templates/offer_new_2.html @@ -32,7 +32,10 @@
-
+
+ + +

Setup offer parameters

@@ -284,13 +287,13 @@
-
+

Fee From Increase By

- +
@@ -355,7 +358,7 @@
-
+
@@ -384,7 +387,7 @@ - + {% if data.debug_ui == true %}
@@ -420,7 +423,7 @@
- + {% if data.swap_style != 'xmr' %}
(Participate txn will be locked for half the time.)
{% endif %} @@ -459,7 +462,7 @@ - + {% for c in coins %} {% endfor %} @@ -77,12 +80,12 @@
- +
- {% if result %} + {% if result %}
diff --git a/basicswap/templates/settings.html b/basicswap/templates/settings.html index e8cc904..074d483 100644 --- a/basicswap/templates/settings.html +++ b/basicswap/templates/settings.html @@ -14,7 +14,7 @@ -
  • Settings
    • +
  • Settings
    • @@ -24,7 +24,10 @@
    -
    +
    + + +

    Settings

    @@ -106,7 +109,7 @@
    @@ -177,14 +180,14 @@ + {% endif %} {% if c.name == 'particl' %} + {% endif %}
    - +
    Blocks Confirmed Target -
    Anon Tx Ring Size -
    @@ -198,7 +201,7 @@
    {% if c.can_disable == true %}
    - +
    {% endif %} {% if c.can_reenable == true %} @@ -225,7 +228,7 @@ General -
    +
    @@ -276,7 +279,7 @@
    - +
    @@ -317,7 +320,7 @@ - Chart API Key + Chart API Key @@ -330,7 +333,7 @@
    - +
    @@ -390,22 +393,22 @@ Tor Proxy Host - + Tor Proxy Port - + Tor Control Port - + Tor Control Password - +
    @@ -414,7 +417,7 @@
    - +
    @@ -439,4 +442,4 @@ {% include 'footer.html' %} - + \ No newline at end of file diff --git a/basicswap/templates/smsgaddresses.html b/basicswap/templates/smsgaddresses.html index eb620d0..4680989 100644 --- a/basicswap/templates/smsgaddresses.html +++ b/basicswap/templates/smsgaddresses.html @@ -26,7 +26,10 @@
    -
    +
    + + +

    Active SMSG Addresses

    @@ -49,7 +52,7 @@
    -

    Edit Address: {{ data.addr_data.addr }}

    +

    Edit Address: {{ data.addr_data.addr }}

    @@ -106,7 +109,7 @@
    -

    New Receiving Address

    +

    New Receiving Address

    @@ -143,7 +146,7 @@
    -

    Add Sending Address

    +

    Add Sending Address

    @@ -231,7 +234,7 @@
    {% endif %} - + @@ -241,9 +244,4 @@ {% include 'footer.html' %} - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/basicswap/templates/tor.html b/basicswap/templates/tor.html index 92e3637..96fdcfa 100644 --- a/basicswap/templates/tor.html +++ b/basicswap/templates/tor.html @@ -26,7 +26,10 @@
    -
    +
    + + +

    Tor

    @@ -40,7 +43,7 @@ - Refresh {{ refresh }} seconds + Refresh {{ refresh }} seconds {% else %} @@ -48,8 +51,8 @@ - Refresh - {% endif %} + Refresh + {% endif %}
    @@ -88,7 +91,8 @@
    -
    + + diff --git a/basicswap/templates/wallet.html b/basicswap/templates/wallet.html index aca28fa..9c6086d 100644 --- a/basicswap/templates/wallet.html +++ b/basicswap/templates/wallet.html @@ -27,12 +27,15 @@
    -
    +
    + + +

    {{ w.name }} - {{ w.name }} Wallet + {{ w.name }} Wallet

    Manage your {{ w.ticker }} wallet. {% if refresh %} (Page Refresh: {{ refresh }} seconds) {% endif %}

    @@ -43,13 +46,13 @@ - Refresh + Refresh
    - {% include 'inc_messages.html' %} + {% include 'inc_messages.html' %} {% if w.updating %}
    @@ -343,7 +346,7 @@ Create UTXO - +
    @@ -387,7 +390,7 @@ {% endif %} {% endif %} - +