diff --git a/basicswap/templates/bids.html b/basicswap/templates/bids.html index cfd4968..03495e8 100644 --- a/basicswap/templates/bids.html +++ b/basicswap/templates/bids.html @@ -16,7 +16,7 @@ -
  • {{ page_type_available }} {{ page_type_received }} {{ page_type_sent }} Bids
    • +
  • {{ page_type_available }} {{ page_type_received }} {{ page_type_sent }}
  • @@ -35,7 +35,7 @@
    -

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

    +

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

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

    diff --git a/basicswap/templates/footer.html b/basicswap/templates/footer.html index 10d7c10..dc35cd0 100644 --- a/basicswap/templates/footer.html +++ b/basicswap/templates/footer.html @@ -5,9 +5,10 @@ -

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

    -
    Help
    +
    BasicSwap Explained
    +
    Tutorials and Guides
    +
    Get Support
    diff --git a/basicswap/templates/header.html b/basicswap/templates/header.html index adf1e62..be0d24b 100644 --- a/basicswap/templates/header.html +++ b/basicswap/templates/header.html @@ -46,7 +46,7 @@ New Offer
    • - + + @@ -357,7 +361,7 @@ - Network Offers {{ summary.num_network_offers }} + Show Order Book {{ summary.num_network_offers }}
  • @@ -370,7 +374,7 @@ - Sent Offers {{ summary.num_sent_offers }} + Your Offers {{ summary.num_sent_offers }}
  • @@ -390,7 +394,7 @@ - Received Bids {{ summary.num_recv_bids }} + Bids Received {{ summary.num_recv_bids }}
  • @@ -400,7 +404,7 @@ - Sent Bids {{ summary.num_sent_bids }} + Bids Sent {{ summary.num_sent_bids }}
    • @@ -470,7 +474,7 @@ - Network Offers {{ summary.num_network_offers }} + Show Order Book {{ summary.num_network_offers }}
  • @@ -484,7 +488,7 @@ - Sent Offers {{ summary.num_sent_offers }} + Your Offers {{ summary.num_sent_offers }}
  • @@ -505,7 +509,7 @@ - Received Bids {{ summary.num_recv_bids }} + Bids Received {{ summary.num_recv_bids }}
  • @@ -516,7 +520,7 @@ - Sent Bids {{ summary.num_sent_bids }} + Bids Sent {{ summary.num_sent_bids }}

    • Settings

    diff --git a/basicswap/templates/index.html b/basicswap/templates/index.html index 02018ba..805583a 100644 --- a/basicswap/templates/index.html +++ b/basicswap/templates/index.html @@ -20,13 +20,13 @@
    - +
    - +
    diff --git a/basicswap/templates/offer_confirm.html b/basicswap/templates/offer_confirm.html index 53cc69e..4d9f912 100644 --- a/basicswap/templates/offer_confirm.html +++ b/basicswap/templates/offer_confirm.html @@ -3,38 +3,36 @@
    - +
    @@ -44,8 +42,8 @@
    -

    Place an new Offer (Confirm)

    -

    Place an order on the network order book.

    +

    Confirm your offer information

    +

    Place a new offer on BasicSwap’s order book.

    diff --git a/basicswap/templates/offer_new_1.html b/basicswap/templates/offer_new_1.html index c9a64b6..f3ae21d 100644 --- a/basicswap/templates/offer_new_1.html +++ b/basicswap/templates/offer_new_1.html @@ -14,14 +14,12 @@ -
  • Place an new Offer
    • +
  • Place an new offer
    • -
  • Step 1
    • -
  • @@ -35,8 +33,8 @@
    -

    Place an new Offer (Step 1)

    -

    Place an order on the network order book.

    +

    Place an new offer

    +

    Place a new offer on BasicSwap’s order book.

    @@ -51,7 +49,7 @@ {% for m in messages %} -
    +
    • -
  • Place an new Offer
    • +
  • Place an new offer
    • -
  • Step 1
    • +
  • Setup offer parameters
    • -
  • Step 2
    • -
  • @@ -38,8 +36,8 @@
    -

    Place an new Offer (Step 2)

    -

    Place an order on the network order book.

    +

    Setup offer parameters

    +

    Place a new offer on BasicSwap’s order book.

    diff --git a/basicswap/templates/offers.html b/basicswap/templates/offers.html index be0e528..9595020 100644 --- a/basicswap/templates/offers.html +++ b/basicswap/templates/offers.html @@ -179,7 +179,7 @@ @@ -270,7 +270,6 @@ -
    @@ -281,10 +280,10 @@ - - - - + + + + @@ -312,13 +311,13 @@ - - - - + + + + - diff --git a/basicswap/ui/page_bids.py b/basicswap/ui/page_bids.py index 082e1e0..4b7d095 100644 --- a/basicswap/ui/page_bids.py +++ b/basicswap/ui/page_bids.py @@ -168,9 +168,9 @@ def page_bids(self, url_split, post_string, sent=False, available=False, receive template = server.env.get_template('bids.html') return self.render_template(template, { - 'page_type_sent': 'Sent' if sent else '', - 'page_type_available': 'Available' if available else '', - 'page_type_received': 'Received' if received else '', + 'page_type_sent': 'Bids Sent' if sent else '', + 'page_type_available': 'Bids Available' if available else '', + 'page_type_received': 'Received Bids' if received else '', 'page_type_sent_description': '' if sent else '', 'page_type_available_description': '' if available else '', 'page_type_received_description': '' if received else '', diff --git a/basicswap/ui/page_offers.py b/basicswap/ui/page_offers.py index 4739b8b..c3e0945 100644 --- a/basicswap/ui/page_offers.py +++ b/basicswap/ui/page_offers.py @@ -620,7 +620,7 @@ def page_offers(self, url_split, post_string, sent=False): template = server.env.get_template('offers.html') return self.render_template(template, { - 'page_type': 'Sent Offers' if sent else 'Network Offers', + 'page_type': 'Your Offers' if sent else 'Network Order Book', 'page_type_description': '' if sent else '', 'messages': messages, 'chart': 'hidden' if sent else '',
    From Recipient BUYING SELLING Amount From Amount To You Get You Send Rate {{ o[7] }} {{ o[8] }}{% if o[9]==true %} {% endif %} {{ o[3] }} {{ o[2] }}{{ o[4] }}{{ o[5] }} {{ o[3] }}:{{ o[4] }} {{ o[2] }}:{{ o[5] }} {{ o[6] }} {% if o[9]==true %}Edit {% else %} Trade {% endif %} + {% if o[9]==true %}Edit {% else %} Swap {% endif %}