From eec0760e44435e8f4a8055de25886a098e9a5db7 Mon Sep 17 00:00:00 2001 From: gerlofvanek Date: Wed, 19 Jun 2024 13:35:43 +0200 Subject: [PATCH] ui: Various Fixes - Fix warning/alert messages on unlock / offer templates. - Add change/set your password in header nav. - Various small tweaks / updates. - Console debug for sweep_all --- basicswap/templates/changepassword.html | 13 +++------- basicswap/templates/footer.html | 2 +- basicswap/templates/header.html | 11 ++++++++- basicswap/templates/inc_messages.html | 3 --- basicswap/templates/index.html | 5 ++-- basicswap/templates/offer.html | 16 ++++++------ basicswap/templates/offers.html | 24 +++++++++--------- basicswap/templates/style.html | 8 ++++++ basicswap/templates/unlock.html | 33 +++++++++++-------------- basicswap/templates/wallet.html | 18 +++++++++----- basicswap/templates/wallets.html | 2 +- 11 files changed, 74 insertions(+), 61 deletions(-) diff --git a/basicswap/templates/changepassword.html b/basicswap/templates/changepassword.html index e5be07e..1e75742 100644 --- a/basicswap/templates/changepassword.html +++ b/basicswap/templates/changepassword.html @@ -5,14 +5,9 @@
    -
  • - -

    Home

    -     -
  • {{ breadcrumb_line_svg | safe }}
  • - +

    Home
    • @@ -37,8 +32,8 @@
    -

    Change Password

    -

    Update your BasicSwap / Wallets password.

    +

    Change/Set your Password

    +

    Change or Set your BasicSwap / Wallets password.

@@ -187,4 +182,4 @@ toggles.forEach(function (toggle_id, index) { }); - \ No newline at end of file + diff --git a/basicswap/templates/footer.html b/basicswap/templates/footer.html index eef424d..484d05c 100644 --- a/basicswap/templates/footer.html +++ b/basicswap/templates/footer.html @@ -27,7 +27,7 @@

GUI: v3.0.0

Made with

{{ love_svg | safe }} - by TV and CRZ
+
diff --git a/basicswap/templates/header.html b/basicswap/templates/header.html index bcd2bb3..180a47a 100644 --- a/basicswap/templates/header.html +++ b/basicswap/templates/header.html @@ -1,5 +1,5 @@ -{% from 'style.html' import notifications_network_offer_svg, notifications_bid_accepted_svg, notifications_unknow_event_svg, notifications_new_bid_on_offer_svg, notifications_close_svg, swap_in_progress_mobile_svg, wallet_svg, page_back_svg, order_book_svg, new_offer_svg, settings_svg, asettings_svg, cog_svg, rpc_svg, debug_svg, explorer_svg, tor_svg, smsg_svg, outputs_svg, automation_svg, shutdown_svg, notifications_svg, debug_nerd_svg, wallet_locked_svg, mobile_menu_svg, wallet_unlocked_svg, tor_purple_svg, sun_svg, moon_svg, swap_in_progress_svg, swap_in_progress_green_svg, available_bids_svg, your_offers_svg, bids_received_svg, bids_sent_svg, header_arrow_down_svg, love_svg %} +{% from 'style.html' import change_password_svg, notifications_network_offer_svg, notifications_bid_accepted_svg, notifications_unknow_event_svg, notifications_new_bid_on_offer_svg, notifications_close_svg, swap_in_progress_mobile_svg, wallet_svg, page_back_svg, order_book_svg, new_offer_svg, settings_svg, asettings_svg, cog_svg, rpc_svg, debug_svg, explorer_svg, tor_svg, smsg_svg, outputs_svg, automation_svg, shutdown_svg, notifications_svg, debug_nerd_svg, wallet_locked_svg, mobile_menu_svg, wallet_unlocked_svg, tor_purple_svg, sun_svg, moon_svg, swap_in_progress_svg, swap_in_progress_green_svg, available_bids_svg, your_offers_svg, bids_received_svg, bids_sent_svg, header_arrow_down_svg, love_svg %} @@ -130,6 +130,10 @@ Settings {{ cog_svg | safe }} Settings +
  • + Change/Set Password + {{ change_password_svg | safe }} Change/Set Password +
    • {% if debug_mode == true %}
  • RPC @@ -451,6 +455,11 @@ {{ settings_svg | safe }} Settings
    • +
  • + + {{ change_password_svg | safe }} + Change/Set Password +
    • {% if debug_mode == true %}
  • diff --git a/basicswap/templates/inc_messages.html b/basicswap/templates/inc_messages.html index dda87db..cb0db65 100644 --- a/basicswap/templates/inc_messages.html +++ b/basicswap/templates/inc_messages.html @@ -10,14 +10,11 @@
    {{ circular_info_messages_svg | safe }}
    - -
    • INFO:
    • {{ m[1] }}
    • -
    diff --git a/basicswap/templates/offers.html b/basicswap/templates/offers.html index 52bc487..ca6e4b6 100644 --- a/basicswap/templates/offers.html +++ b/basicswap/templates/offers.html @@ -80,7 +80,7 @@

    -

    +

    @@ -108,7 +108,7 @@

    -

    +

    @@ -141,7 +141,7 @@

    -

    +

    $ @@ -175,7 +175,7 @@

    -

    +

    @@ -209,7 +209,7 @@

    -

    +

    @@ -243,7 +243,7 @@

    -

    +

    @@ -277,7 +277,7 @@

    -

    +

    @@ -311,7 +311,7 @@

    -

    +

    @@ -345,7 +345,7 @@

    -

    +

    @@ -379,7 +379,7 @@

    -

    +

    @@ -413,7 +413,7 @@

    -

    +

    @@ -447,7 +447,7 @@

    -

    +

    diff --git a/basicswap/templates/style.html b/basicswap/templates/style.html index c03d453..4bf0cbc 100644 --- a/basicswap/templates/style.html +++ b/basicswap/templates/style.html @@ -694,4 +694,12 @@ ' %} +{% set change_password_svg = ' + + + + + + +' %} {% set select_box_class = 'hover:border-blue-500 bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-white text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0' %} diff --git a/basicswap/templates/unlock.html b/basicswap/templates/unlock.html index 0468ab5..8862be9 100644 --- a/basicswap/templates/unlock.html +++ b/basicswap/templates/unlock.html @@ -1,3 +1,4 @@ +{% from 'style.html' import circular_info_messages_svg, green_cross_close_svg, red_cross_close_svg, circular_error_messages_svg %} @@ -38,18 +39,15 @@ {% for m in messages %}