From 6b4c7e609834683e6ee1407fdb9b4bb4e5d27efe Mon Sep 17 00:00:00 2001 From: Taylor Helsper Date: Fri, 1 Dec 2023 16:32:07 -0600 Subject: [PATCH] Simplify Web UI Titles --- .../mynode_apps/astral/www/python/astral.py | 2 +- .../share/mynode_apps/jam/www/python/jam.py | 2 +- .../lilywallet/www/python/lilywallet.py | 2 +- .../mynode_apps/lndboss/www/python/lndboss.py | 2 +- .../share/mynode_apps/lndg/www/python/lndg.py | 2 +- .../mynode_apps/lntop/www/python/lntop.py | 2 +- .../mynode_apps/noscl/www/python/noscl.py | 2 +- .../nostrrsrelay/www/python/nostrrsrelay.py | 2 +- .../tailscale/www/python/tailscale.py | 2 +- .../mynode_apps/wetty/www/python/wetty.py | 2 +- rootfs/standard/var/www/mynode/bitcoin.py | 18 +++--- rootfs/standard/var/www/mynode/bos.py | 2 +- rootfs/standard/var/www/mynode/caravan.py | 2 +- rootfs/standard/var/www/mynode/dojo.py | 2 +- .../var/www/mynode/electrum_server.py | 2 +- rootfs/standard/var/www/mynode/generic_app.py | 2 +- rootfs/standard/var/www/mynode/joinmarket.py | 2 +- rootfs/standard/var/www/mynode/lnd.py | 28 ++++---- rootfs/standard/var/www/mynode/lndmanage.py | 2 +- rootfs/standard/var/www/mynode/manage_apps.py | 4 +- rootfs/standard/var/www/mynode/marketplace.py | 6 +- rootfs/standard/var/www/mynode/mynode.py | 64 +++++++++---------- .../standard/var/www/mynode/premium_plus.py | 2 +- rootfs/standard/var/www/mynode/pyblock.py | 2 +- rootfs/standard/var/www/mynode/settings.py | 18 +++--- rootfs/standard/var/www/mynode/sphinxrelay.py | 2 +- .../var/www/mynode/templates/about.html | 2 +- .../www/mynode/templates/app/generic_app.html | 2 +- .../var/www/mynode/templates/help.html | 2 +- .../var/www/mynode/templates/login.html | 2 +- .../mynode/templates/marketplace_add_app.html | 2 +- .../www/mynode/templates/marketplace_app.html | 2 +- rootfs/standard/var/www/mynode/tor.py | 2 +- rootfs/standard/var/www/mynode/vpn.py | 2 +- .../standard/var/www/mynode/wardenterminal.py | 2 +- rootfs/standard/var/www/mynode/whirlpool.py | 2 +- 36 files changed, 99 insertions(+), 99 deletions(-) diff --git a/rootfs/standard/usr/share/mynode_apps/astral/www/python/astral.py b/rootfs/standard/usr/share/mynode_apps/astral/www/python/astral.py index 3f33a35e..467eadc0 100644 --- a/rootfs/standard/usr/share/mynode_apps/astral/www/python/astral.py +++ b/rootfs/standard/usr/share/mynode_apps/astral/www/python/astral.py @@ -22,7 +22,7 @@ def astral_page(): # Load page templateData = { - "title": "MyNode - " + app["name"], + "title": app["name"], "ui_settings": read_ui_settings(), "app_status": app_status, "app_status_color": app_status_color, diff --git a/rootfs/standard/usr/share/mynode_apps/jam/www/python/jam.py b/rootfs/standard/usr/share/mynode_apps/jam/www/python/jam.py index 7545550f..9a761bc7 100644 --- a/rootfs/standard/usr/share/mynode_apps/jam/www/python/jam.py +++ b/rootfs/standard/usr/share/mynode_apps/jam/www/python/jam.py @@ -22,7 +22,7 @@ def jam_page(): # Load page templateData = { - "title": "MyNode - " + app["name"], + "title": app["name"], "ui_settings": read_ui_settings(), "app_status": app_status, "app_status_color": app_status_color, diff --git a/rootfs/standard/usr/share/mynode_apps/lilywallet/www/python/lilywallet.py b/rootfs/standard/usr/share/mynode_apps/lilywallet/www/python/lilywallet.py index baaa4888..5566fe5f 100644 --- a/rootfs/standard/usr/share/mynode_apps/lilywallet/www/python/lilywallet.py +++ b/rootfs/standard/usr/share/mynode_apps/lilywallet/www/python/lilywallet.py @@ -22,7 +22,7 @@ def lilywallet_page(): # Load page templateData = { - "title": "MyNode - " + app["name"], + "title": app["name"], "ui_settings": read_ui_settings(), "app_status": app_status, "app_status_color": app_status_color, diff --git a/rootfs/standard/usr/share/mynode_apps/lndboss/www/python/lndboss.py b/rootfs/standard/usr/share/mynode_apps/lndboss/www/python/lndboss.py index 74bbfba9..d4fe86e4 100644 --- a/rootfs/standard/usr/share/mynode_apps/lndboss/www/python/lndboss.py +++ b/rootfs/standard/usr/share/mynode_apps/lndboss/www/python/lndboss.py @@ -22,7 +22,7 @@ def lndboss_page(): # Load page templateData = { - "title": "MyNode - " + app["name"], + "title": app["name"], "ui_settings": read_ui_settings(), "app_status": app_status, "app_status_color": app_status_color, diff --git a/rootfs/standard/usr/share/mynode_apps/lndg/www/python/lndg.py b/rootfs/standard/usr/share/mynode_apps/lndg/www/python/lndg.py index 88f2173a..df9a09ed 100644 --- a/rootfs/standard/usr/share/mynode_apps/lndg/www/python/lndg.py +++ b/rootfs/standard/usr/share/mynode_apps/lndg/www/python/lndg.py @@ -22,7 +22,7 @@ def lndg_page(): # Load page templateData = { - "title": "MyNode - " + app["name"], + "title": app["name"], "ui_settings": read_ui_settings(), "app_status": app_status, "app_status_color": app_status_color, diff --git a/rootfs/standard/usr/share/mynode_apps/lntop/www/python/lntop.py b/rootfs/standard/usr/share/mynode_apps/lntop/www/python/lntop.py index b44f1aa5..2f702579 100644 --- a/rootfs/standard/usr/share/mynode_apps/lntop/www/python/lntop.py +++ b/rootfs/standard/usr/share/mynode_apps/lntop/www/python/lntop.py @@ -22,7 +22,7 @@ def lntop_page(): # Load page templateData = { - "title": "MyNode - " + app["name"], + "title": app["name"], "ui_settings": read_ui_settings(), "app_status": app_status, "app_status_color": app_status_color, diff --git a/rootfs/standard/usr/share/mynode_apps/noscl/www/python/noscl.py b/rootfs/standard/usr/share/mynode_apps/noscl/www/python/noscl.py index bed37fc9..94c4b011 100644 --- a/rootfs/standard/usr/share/mynode_apps/noscl/www/python/noscl.py +++ b/rootfs/standard/usr/share/mynode_apps/noscl/www/python/noscl.py @@ -22,7 +22,7 @@ def noscl_page(): # Load page templateData = { - "title": "MyNode - " + app["name"], + "title": app["name"], "ui_settings": read_ui_settings(), "app_status": app_status, "app_status_color": app_status_color, diff --git a/rootfs/standard/usr/share/mynode_apps/nostrrsrelay/www/python/nostrrsrelay.py b/rootfs/standard/usr/share/mynode_apps/nostrrsrelay/www/python/nostrrsrelay.py index 3e091df5..f7d19f7d 100644 --- a/rootfs/standard/usr/share/mynode_apps/nostrrsrelay/www/python/nostrrsrelay.py +++ b/rootfs/standard/usr/share/mynode_apps/nostrrsrelay/www/python/nostrrsrelay.py @@ -22,7 +22,7 @@ def nostrrsrelay_page(): # Load page templateData = { - "title": "MyNode - " + app["name"], + "title": app["name"], "ui_settings": read_ui_settings(), "app_status": app_status, "app_status_color": app_status_color, diff --git a/rootfs/standard/usr/share/mynode_apps/tailscale/www/python/tailscale.py b/rootfs/standard/usr/share/mynode_apps/tailscale/www/python/tailscale.py index 47baedac..5d5b4ff2 100644 --- a/rootfs/standard/usr/share/mynode_apps/tailscale/www/python/tailscale.py +++ b/rootfs/standard/usr/share/mynode_apps/tailscale/www/python/tailscale.py @@ -22,7 +22,7 @@ def tailscale_page(): # Load page templateData = { - "title": "MyNode - " + app["name"], + "title": app["name"], "ui_settings": read_ui_settings(), "app_status": app_status, "app_status_color": app_status_color, diff --git a/rootfs/standard/usr/share/mynode_apps/wetty/www/python/wetty.py b/rootfs/standard/usr/share/mynode_apps/wetty/www/python/wetty.py index f02627b7..e2b78bc1 100644 --- a/rootfs/standard/usr/share/mynode_apps/wetty/www/python/wetty.py +++ b/rootfs/standard/usr/share/mynode_apps/wetty/www/python/wetty.py @@ -22,7 +22,7 @@ def wetty_page(): # Load page templateData = { - "title": "MyNode - " + app["name"], + "title": app["name"], "ui_settings": read_ui_settings(), "app_status": app_status, "app_status_color": app_status_color, diff --git a/rootfs/standard/var/www/mynode/bitcoin.py b/rootfs/standard/var/www/mynode/bitcoin.py index 47f904b3..bd9bcd1b 100644 --- a/rootfs/standard/var/www/mynode/bitcoin.py +++ b/rootfs/standard/var/www/mynode/bitcoin.py @@ -67,7 +67,7 @@ def bitcoin_status_page(): except Exception as e: templateData = { - "title": "MyNode Bitcoin Error", + "title": "Bitcoin Error", "header": "Bitcoin Status", "message": Markup("Error communicating with bitcoin. Node may be busy syncing.

{}".format(str(e))), "ui_settings": read_ui_settings() @@ -76,7 +76,7 @@ def bitcoin_status_page(): templateData = { - "title": "MyNode Bitcoin Status", + "title": "Bitcoin Status", "blocks": blocks, "peers": peers, "addresses": addresses, @@ -153,7 +153,7 @@ def bitcoin_reset_config_page(): # Wait until device is restarted templateData = { - "title": "MyNode Reboot", + "title": "Rebooting", "header_text": "Restarting", "subheader_text": "This will take several minutes...", "ui_settings": read_ui_settings() @@ -179,7 +179,7 @@ def bitcoin_config_page(): # Wait until device is restarted templateData = { - "title": "MyNode Reboot", + "title": "Rebooting", "header_text": "Restarting", "subheader_text": "This will take several minutes...", "ui_settings": read_ui_settings() @@ -191,7 +191,7 @@ def bitcoin_config_page(): bitcoin_config = get_bitcoin_config() templateData = { - "title": "MyNode Bitcoin Config", + "title": "Bitcoin Config", "using_bitcoin_custom_config": using_bitcoin_custom_config(), "extra_bitcoin_config": get_bitcoin_extra_config(), "bitcoin_config": bitcoin_config, @@ -205,7 +205,7 @@ def bitcoincli(): # Load page templateData = { - "title": "MyNode Bitcoin Terminal", + "title": "Bitcoin Terminal", "ui_settings": read_ui_settings() } return render_template('bitcoin_cli.html', **templateData) @@ -232,7 +232,7 @@ def bitcoin_toggle_bip37(): # Wait until device is restarted templateData = { - "title": "MyNode Reboot", + "title": "Rebooting", "header_text": "Restarting", "subheader_text": "This will take several minutes...", "ui_settings": read_ui_settings() @@ -252,7 +252,7 @@ def bitcoin_toggle_bip157(): # Wait until device is restarted templateData = { - "title": "MyNode Reboot", + "title": "Rebooting", "header_text": "Restarting", "subheader_text": "This will take several minutes...", "ui_settings": read_ui_settings() @@ -274,7 +274,7 @@ def bitcoin_toggle_bip158(): # Wait until device is restarted templateData = { - "title": "MyNode Reboot", + "title": "Rebooting", "header_text": "Restarting", "subheader_text": "This will take several minutes...", "ui_settings": read_ui_settings() diff --git a/rootfs/standard/var/www/mynode/bos.py b/rootfs/standard/var/www/mynode/bos.py index f714ab5b..c210277b 100644 --- a/rootfs/standard/var/www/mynode/bos.py +++ b/rootfs/standard/var/www/mynode/bos.py @@ -16,7 +16,7 @@ def bos_page(): # Load page templateData = { - "title": "MyNode Balance of Satoshis", + "title": "Balance of Satoshis", "ui_settings": read_ui_settings(), } return render_template('bos.html', **templateData) diff --git a/rootfs/standard/var/www/mynode/caravan.py b/rootfs/standard/var/www/mynode/caravan.py index 32edde01..95eea377 100644 --- a/rootfs/standard/var/www/mynode/caravan.py +++ b/rootfs/standard/var/www/mynode/caravan.py @@ -16,7 +16,7 @@ def caravan_page(): # Load page templateData = { - "title": "MyNode Caravan", + "title": "Caravan", "local_ip": get_local_ip(), "ui_settings": read_ui_settings() } diff --git a/rootfs/standard/var/www/mynode/dojo.py b/rootfs/standard/var/www/mynode/dojo.py index dd77ab95..9787ae96 100644 --- a/rootfs/standard/var/www/mynode/dojo.py +++ b/rootfs/standard/var/www/mynode/dojo.py @@ -27,7 +27,7 @@ def dojo_page(): # Load page templateData = { - "title": "MyNode Dojo", + "title": "Dojo", "ui_settings": read_ui_settings(), "dojo_status": dojo_status, "dojo_version": get_dojo_version(), diff --git a/rootfs/standard/var/www/mynode/electrum_server.py b/rootfs/standard/var/www/mynode/electrum_server.py index 2c82ccd0..aaafedf9 100644 --- a/rootfs/standard/var/www/mynode/electrum_server.py +++ b/rootfs/standard/var/www/mynode/electrum_server.py @@ -41,7 +41,7 @@ def electrum_server_page(): # Load page templateData = { - "title": "MyNode Electrum Server", + "title": "Electrum Server", "port": 50002, "status": status, "db_size": db_size, diff --git a/rootfs/standard/var/www/mynode/generic_app.py b/rootfs/standard/var/www/mynode/generic_app.py index 9793d961..c0d1bbcc 100644 --- a/rootfs/standard/var/www/mynode/generic_app.py +++ b/rootfs/standard/var/www/mynode/generic_app.py @@ -25,7 +25,7 @@ def app_generic_info_page(name): # Load page templateData = { - "title": "MyNode - " + app["name"], + "title": app["name"], "ui_settings": read_ui_settings(), "app_status": app_status, "app_status_color": app_status_color, diff --git a/rootfs/standard/var/www/mynode/joinmarket.py b/rootfs/standard/var/www/mynode/joinmarket.py index 9ed79c08..d555866b 100644 --- a/rootfs/standard/var/www/mynode/joinmarket.py +++ b/rootfs/standard/var/www/mynode/joinmarket.py @@ -60,7 +60,7 @@ def joininbox_page(): # Load page templateData = { - "title": "MyNode JoinMarket", + "title": "JoinMarket", "is_jam_installed": is_installed("jam"), "is_jam_enabled": is_service_enabled("jam"), "joinmarket_version": joinmarket_version, diff --git a/rootfs/standard/var/www/mynode/lnd.py b/rootfs/standard/var/www/mynode/lnd.py index f0693980..70d8397b 100644 --- a/rootfs/standard/var/www/mynode/lnd.py +++ b/rootfs/standard/var/www/mynode/lnd.py @@ -73,7 +73,7 @@ def page_lnd(): if not lnd_wallet_exists(): templateData = { - "title": "MyNode Lightning Wallet", + "title": "Lightning Wallet", "wallet_exists": wallet_exists, "wallet_logged_in": wallet_logged_in, "lnd_has_error": lnd_has_error, @@ -88,7 +88,7 @@ def page_lnd(): if not is_lnd_logged_in(): templateData = { - "title": "MyNode Lightning Wallet", + "title": "Lightning Wallet", "wallet_exists": wallet_exists, "wallet_logged_in": wallet_logged_in, "lnd_has_error": lnd_has_error, @@ -108,7 +108,7 @@ def page_lnd(): # If lightning data is still None, show message if data == None: templateData = { - "title": "MyNode Lightning Wallet", + "title": "Lightning Wallet", "wallet_exists": wallet_exists, "wallet_logged_in": False, "lnd_has_error": lnd_has_error, @@ -168,7 +168,7 @@ def page_lnd(): except Exception as e: templateData = { - "title": "MyNode Lightning Status", + "title": "Lightning Status", "header": "Lightning Status", #"message": str(e), "message": traceback.format_exc(), @@ -181,7 +181,7 @@ def page_lnd(): refresh_rate = 15 templateData = { - "title": "MyNode Lightning Status", + "title": "Lightning Status", "is_community_edition": is_community_edition(), "wallet_exists": wallet_exists, "wallet_logged_in": wallet_logged_in, @@ -266,7 +266,7 @@ def page_lnd_create_wallet(): session['seed'] = seed.strip() except: templateData = { - "title": "MyNode Lightning Wallet", + "title": "Lightning Wallet", "show_lightning_back_button": True, "header": "Lightning Status", "message": Markup("Waiting on Lightning...
Please try again in a minute."), @@ -275,7 +275,7 @@ def page_lnd_create_wallet(): return render_template('error.html', **templateData) templateData = { - "title": "MyNode Lightning Wallet", + "title": "Lightning Wallet", "seed": seed, "ui_settings": read_ui_settings() } @@ -288,7 +288,7 @@ def page_lnd_create_wallet_with_seed(): # Load page if request.method == 'GET': templateData = { - "title": "MyNode Lightning Wallet", + "title": "Lightning Wallet", "ui_settings": read_ui_settings() } return render_template('lnd_wallet_create_with_seed.html', **templateData) @@ -321,7 +321,7 @@ def page_lnd_create_wallet_confirm(): # Load page if request.method == 'GET': templateData = { - "title": "MyNode Lightning Wallet", + "title": "Lightning Wallet", "ui_settings": read_ui_settings() } return render_template('lnd_wallet_create_confirm.html', **templateData) @@ -423,7 +423,7 @@ def page_lnd_pair_wallet(): # Show lndconnect page templateData = { - "title": "MyNode Lightning Wallet", + "title": "Lightning Wallet", "dots_img": get_image_src_b64("/var/www/mynode/static/images/dots.png"), "pairs": pairs, "ui_settings": read_ui_settings() @@ -467,7 +467,7 @@ def lnd_reset_config_page(): # Wait until device is restarted templateData = { - "title": "MyNode Reboot", + "title": "Rebooting", "header_text": "Restarting", "subheader_text": "This will take several minutes...", "ui_settings": read_ui_settings() @@ -493,7 +493,7 @@ def lnd_config_page(): # Wait until device is restarted templateData = { - "title": "MyNode Reboot", + "title": "Rebooting", "header_text": "Restarting", "subheader_text": "This will take several minutes...", "ui_settings": read_ui_settings() @@ -505,7 +505,7 @@ def lnd_config_page(): lnd_config = get_lnd_config() templateData = { - "title": "MyNode LND Config", + "title": "LND Config", "using_lnd_custom_config": using_lnd_custom_config(), "lnd_config": lnd_config, "extra_lnd_config": get_lnd_extra_config(), @@ -551,7 +551,7 @@ def page_lnd_watchtower(): watchtower_client_policy = get_lightning_watchtower_client_policy() templateData = { - "title": "MyNode Lightning Watchtower", + "title": "Lightning Watchtower", "watchtower_server_enabled": is_watchtower_server_enabled(), "watchtower_server_uri": Markup(watchtower_server_info["watchtower_server_uri"]), "watchtower_client_enabled": is_watchtower_client_enabled(), diff --git a/rootfs/standard/var/www/mynode/lndmanage.py b/rootfs/standard/var/www/mynode/lndmanage.py index cc69cede..87c5d58d 100644 --- a/rootfs/standard/var/www/mynode/lndmanage.py +++ b/rootfs/standard/var/www/mynode/lndmanage.py @@ -16,7 +16,7 @@ def bos_page(): # Load page templateData = { - "title": "MyNode lndmanage", + "title": "lndmanage", "ui_settings": read_ui_settings(), } return render_template('lndmanage.html', **templateData) diff --git a/rootfs/standard/var/www/mynode/manage_apps.py b/rootfs/standard/var/www/mynode/manage_apps.py index 9e47136d..36420273 100644 --- a/rootfs/standard/var/www/mynode/manage_apps.py +++ b/rootfs/standard/var/www/mynode/manage_apps.py @@ -20,7 +20,7 @@ def manage_apps_page(): t2 = get_system_time_in_ms() # Load page templateData = { - "title": "MyNode Manage Apps", + "title": "Manage Apps", "ui_settings": read_ui_settings(), "load_time": t2-t1, "product_key_skipped": skipped_product_key(), @@ -74,7 +74,7 @@ def customize_app_versions_page(): # Load page templateData = { - "title": "MyNode Customize App Versions", + "title": "Customize App Versions", "ui_settings": read_ui_settings(), "product_key_skipped": skipped_product_key(), "apps": apps, diff --git a/rootfs/standard/var/www/mynode/marketplace.py b/rootfs/standard/var/www/mynode/marketplace.py index 9a65212f..33e9b2a5 100644 --- a/rootfs/standard/var/www/mynode/marketplace.py +++ b/rootfs/standard/var/www/mynode/marketplace.py @@ -30,7 +30,7 @@ def marketplace_page(): # Load page templateData = { - "title": "MyNode Marketplace", + "title": "Marketplace", "ui_settings": read_ui_settings(), "load_time": t2-t1, "product_key_skipped": skipped_product_key(), @@ -47,7 +47,7 @@ def marketplace_add_app_page(): # Load page (no form submission) if request.method == 'GET': templateData = { - "title": "MyNode - Add Community Application", + "title": "Add Community Application", "ui_settings": read_ui_settings(), "product_key_skipped": skipped_product_key() } @@ -114,7 +114,7 @@ def marketplace_app_page(app_name): # Load page templateData = { - "title": "MyNode - " + app["name"], + "title": app["name"], "ui_settings": read_ui_settings(), "product_key_skipped": skipped_product_key(), "app_status": app_status, diff --git a/rootfs/standard/var/www/mynode/mynode.py b/rootfs/standard/var/www/mynode/mynode.py index c4f0b06c..bc21100e 100644 --- a/rootfs/standard/var/www/mynode/mynode.py +++ b/rootfs/standard/var/www/mynode/mynode.py @@ -153,7 +153,7 @@ def index(): status = status.decode("utf8") status = Markup("
"+status+"
") templateData = { - "title": "MyNode Uploader", + "title": "Uploader", "header_text": "Uploader Device", "quicksync_status": status, "ui_settings": read_ui_settings() @@ -162,7 +162,7 @@ def index(): if status == STATE_UNKNOWN: templateData = { - "title": "MyNode Error", + "title": "Error", "header_text": "Status Unknown", "subheader_text": "An error has occurred. You may want to reboot the device.", "ui_settings": read_ui_settings() @@ -170,7 +170,7 @@ def index(): return render_template('state.html', **templateData) elif status == STATE_ROOTFS_READ_ONLY: templateData = { - "title": "MyNode Error", + "title": "Error", "header_text": "SD Card Error", "subheader_text": "The root filesystem is read only. Your SD card may be corrupt.", "ui_settings": read_ui_settings() @@ -178,7 +178,7 @@ def index(): return render_template('state.html', **templateData) elif status == STATE_HDD_READ_ONLY: templateData = { - "title": "MyNode Error", + "title": "Error", "header_text": "Drive Error", "subheader_text": "The external drive filesystem is read only. Try rebooting the device.", "ui_settings": read_ui_settings() @@ -187,7 +187,7 @@ def index(): elif is_warning_present(): warning = get_current_warning() templateData = { - "title": "MyNode Warning", + "title": "Warning", "header_text": "Warning", "subheader_text": get_warning_header(warning), "description_text": get_warning_description(warning), @@ -199,7 +199,7 @@ def index(): # Drive may be getting repaired if is_drive_being_repaired(): templateData = { - "title": "MyNode Repairing Drive", + "title": "Repairing Drive", "header_text": "Repairing Drive", "subheader_text": Markup("Drive is being checked and repaired...

This may take several hours."), "ui_settings": read_ui_settings() @@ -207,7 +207,7 @@ def index(): return render_template('state.html', **templateData) templateData = { - "title": "MyNode Looking for Drive", + "title": "Looking for Drive", "header_text": "Looking for Drive", "subheader_text": "Please attach a drive to your MyNode", "ui_settings": read_ui_settings() @@ -221,13 +221,13 @@ def index(): return redirect("/") templateData = { - "title": "MyNode Confirm Drive Format", + "title": "Confirm Drive Format", "ui_settings": read_ui_settings() } return render_template('confirm_drive_format.html', **templateData) elif status == STATE_DRIVE_FORMATTING: templateData = { - "title": "MyNode Drive Formatting", + "title": "Drive Formatting", "header_text": "Drive Formatting", "subheader_text": "MyNode is preparing the drive for use...", "ui_settings": read_ui_settings() @@ -235,7 +235,7 @@ def index(): return render_template('state.html', **templateData) elif status == STATE_DRIVE_MOUNTED: templateData = { - "title": "MyNode Drive Mounted", + "title": "Drive Mounted", "header_text": "Starting...", "subheader_text": "Drive Mounted", "ui_settings": read_ui_settings() @@ -243,7 +243,7 @@ def index(): return render_template('state.html', **templateData) elif status == STATE_CHOOSE_NETWORK: templateData = { - "title": "MyNode Choose Network", + "title": "Choose Network", "ui_settings": read_ui_settings() } return render_template('choose_network.html', **templateData) @@ -264,7 +264,7 @@ def index(): message += "To move to larger drive, try the Clone Tool." message += "

" templateData = { - "title": "MyNode Drive Full", + "title": "Drive Full", "header_text": "Drive Full", "subheader_text": Markup(message), "ui_settings": read_ui_settings() @@ -276,7 +276,7 @@ def index(): log_message(clone_state) if clone_state == CLONE_STATE_DETECTING: templateData = { - "title": "MyNode Clone Tool", + "title": "Clone Tool", "header_text": "Cloning Tool", "subheader_text": Markup("Detecting Drives..."), "ui_settings": read_ui_settings(), @@ -300,7 +300,7 @@ def index(): msg += "

" msg += "Exit Clone Tool" templateData = { - "title": "MyNode Clone Tool", + "title": "Clone Tool", "header_text": "Cloning Tool", "subheader_text": Markup(msg), "ui_settings": read_ui_settings(), @@ -324,7 +324,7 @@ def index(): source_drive_info = get_drive_info(source_drive) target_drive_info = get_drive_info(target_drive) templateData = { - "title": "MyNode Clone Tool", + "title": "Clone Tool", "header_text": "Cloning Tool", "target_drive_has_mynode": target_drive_has_mynode, "source_drive_info": source_drive_info, @@ -335,7 +335,7 @@ def index(): elif clone_state == CLONE_STATE_IN_PROGRESS: progress = get_clone_progress() templateData = { - "title": "MyNode Clone Tool", + "title": "Clone Tool", "header_text": "Cloning Tool", "subheader_text": Markup("Cloning...

" + progress), "ui_settings": read_ui_settings(), @@ -344,7 +344,7 @@ def index(): return render_template('state.html', **templateData) elif clone_state == CLONE_STATE_COMPLETE: templateData = { - "title": "MyNode Clone Tool", + "title": "Clone Tool", "header_text": "Cloning Tool", "subheader_text": Markup("Clone Complete!"), "ui_settings": read_ui_settings(), @@ -352,7 +352,7 @@ def index(): return render_template('clone_complete.html', **templateData) else: templateData = { - "title": "MyNode Clone Tool", + "title": "Clone Tool", "header_text": "Cloning Tool", "subheader_text": "Unknown Clone State: " + clone_state, "ui_settings": read_ui_settings() @@ -360,7 +360,7 @@ def index(): return render_template('state.html', **templateData) elif status == STATE_GEN_DHPARAM: templateData = { - "title": "MyNode Generating Data", + "title": "Generating Data", "header_text": "Generating Data", "subheader_text": "This may take 15-20 minutes...", "ui_settings": read_ui_settings() @@ -387,7 +387,7 @@ def index(): subheader_msg = Markup("Copying files... This will take several hours.
{:.2f}%{}".format(percent, message)) templateData = { - "title": "MyNode QuickSync", + "title": "QuickSync", "header_text": "QuickSync", "subheader_text": subheader_msg, "ui_settings": read_ui_settings() @@ -395,7 +395,7 @@ def index(): return render_template('state.html', **templateData) elif status == STATE_QUICKSYNC_RESET: templateData = { - "title": "MyNode QuickSync", + "title": "QuickSync", "header_text": "QuickSync", "subheader_text": "Restarting QuickSync...", "ui_settings": read_ui_settings() @@ -420,7 +420,7 @@ def index(): subheader = Markup("Starting
Waiting on download client to start...") templateData = { - "title": "MyNode QuickSync", + "title": "QuickSync", "header_text": "QuickSync", "subheader_text": subheader, "ui_settings": read_ui_settings() @@ -428,7 +428,7 @@ def index(): return render_template('state.html', **templateData) elif status == STATE_UPGRADING: templateData = { - "title": "MyNode Upgrading", + "title": "Upgrading", "header_text": "Upgrading...", "subheader_text": "This may take a while...", "refresh_rate": 120, @@ -453,7 +453,7 @@ def index(): error_message = "Bitcoin has experienced an error. Please check the Bitcoin log on the status page." message = "
{}".format( get_message(include_funny=True) ) templateData = { - "title": "MyNode Status", + "title": "Status", "header_text": "Starting...", "subheader_text": Markup("Launching MyNode Services{}".format(message)), "error_message": Markup(error_message + "

"), @@ -464,7 +464,7 @@ def index(): # if is_installing_docker_images(): # message = "
{}".format( get_message(include_funny=True) ) # templateData = { - # "title": "MyNode Status", + # "title": "Status", # "header_text": "Starting...", # "subheader_text": Markup("Building Docker Images...{}".format(message)), # "ui_settings": read_ui_settings() @@ -479,7 +479,7 @@ def index(): if mynode_block_height == None: mynode_block_height = 0 templateData = { - "title": "MyNode Sync", + "title": "Sync", "header_text": "Bitcoin Blockchain", "bitcoin_block_height": bitcoin_block_height, "mynode_block_height": mynode_block_height, @@ -526,7 +526,7 @@ def index(): refresh_rate = 120 templateData = { - "title": "MyNode Home", + "title": "Home", "refresh_rate": refresh_rate, "config": CONFIG, "apps": get_all_applications(order_by="homepage"), @@ -586,7 +586,7 @@ def index(): return render_template('main.html', **templateData) else: templateData = { - "title": "MyNode Error", + "title": "Error", "header_text": "Error", "subheader_text": "Unknown State ("+status+"). Please restart your MyNode.", "ui_settings": read_ui_settings() @@ -606,7 +606,7 @@ def page_product_key(): return redirect("/") else: templateData = { - "title": "MyNode Product Key", + "title": "Product Key", "header_text": "Product Key", "ui_settings": read_ui_settings() } @@ -728,7 +728,7 @@ def page_rebooting(): # Show that device is rebooting and use JS to refresh once back online templateData = { - "title": "MyNode Reboot", + "title": "Rebooting", "header_text": "Restarting", "subheader_text": "This will take several minutes...", "ui_settings": read_ui_settings() @@ -739,7 +739,7 @@ def page_rebooting(): @app.errorhandler(404) def not_found_error(error): templateData = { - "title": "MyNode 404", + "title": "404 Error", "header_text": "Page not found", "subheader_text": "Click on the MyNode logo to reach the home page", "ui_settings": read_ui_settings() @@ -749,7 +749,7 @@ def not_found_error(error): @app.errorhandler(500) def internal_error(error): templateData = { - "title": "MyNode 500", + "title": "500 Error", "header_text": "Internal server error", "subheader_text": "If you were manually upgrading MyNode, please try again.", "ui_settings": read_ui_settings() diff --git a/rootfs/standard/var/www/mynode/premium_plus.py b/rootfs/standard/var/www/mynode/premium_plus.py index 529188a1..a8cdc58d 100644 --- a/rootfs/standard/var/www/mynode/premium_plus.py +++ b/rootfs/standard/var/www/mynode/premium_plus.py @@ -29,7 +29,7 @@ def premium_plus_page(): # Load page templateData = { - "title": "MyNode Premium+", + "title": "Premium+", "product_key_skipped": skipped_product_key(), "has_access_token": has_premium_plus_token(), "access_token": get_premium_plus_token(), diff --git a/rootfs/standard/var/www/mynode/pyblock.py b/rootfs/standard/var/www/mynode/pyblock.py index 11ef055c..7360bc99 100644 --- a/rootfs/standard/var/www/mynode/pyblock.py +++ b/rootfs/standard/var/www/mynode/pyblock.py @@ -16,7 +16,7 @@ def pyblock_page(): # Load page templateData = { - "title": "MyNode PyBlock", + "title": "PyBlock", "ui_settings": read_ui_settings(), } return render_template('pyblock.html', **templateData) diff --git a/rootfs/standard/var/www/mynode/settings.py b/rootfs/standard/var/www/mynode/settings.py index f090373a..50d2895b 100644 --- a/rootfs/standard/var/www/mynode/settings.py +++ b/rootfs/standard/var/www/mynode/settings.py @@ -53,7 +53,7 @@ def page_settings(): logout_time_days, logout_time_hours = get_flask_session_timeout() templateData = { - "title": "MyNode Settings", + "title": "Settings", "apps": get_all_applications(order_by="alphabetic"), "password_message": "", "current_version": current_version, @@ -181,7 +181,7 @@ def page_status(): running_containers = get_docker_running_containers() templateData = { - "title": "MyNode Status", + "title": "Status", "password_message": "", "current_version": current_version, "latest_version": latest_version, @@ -347,7 +347,7 @@ def upgrade_page(): # Display wait page templateData = { - "title": "MyNode Upgrade", + "title": "Upgrading", "header_text": "Upgrading", "subheader_text": "This may take a while...", "show_upgrade_log": True, @@ -367,7 +367,7 @@ def upgrade_beta_page(): # Display wait page templateData = { - "title": "MyNode Upgrade", + "title": "Upgrading", "header_text": "Upgrading", "subheader_text": "This may take a while...", "show_upgrade_log": True, @@ -401,7 +401,7 @@ def upgrade_page_test(): # Display wait page templateData = { - "title": "MyNode Upgrade", + "title": "Upgrading", "header_text": "Upgrading", "subheader_text": "This may take a while...", "show_upgrade_log": True, @@ -487,7 +487,7 @@ def shutdown_device_page(): # Wait until device is restarted templateData = { - "title": "MyNode Shutdown", + "title": "Shutting Down", "header_text": "Shutting down...", "ui_settings": read_ui_settings() } @@ -527,7 +527,7 @@ def open_clone_tool_page(): # Display wait page templateData = { - "title": "MyNode Reboot", + "title": "Rebooting", "header_text": "Restarting", "subheader_text": "Restarting to Open Clone Tool....", "ui_settings": read_ui_settings() @@ -924,7 +924,7 @@ def reinstall_app_page(): # Display wait page templateData = { - "title": "MyNode Install", + "title": "Installing", "header_text": "Installing", "subheader_text": "This may take a while...", "show_upgrade_log": True, @@ -999,7 +999,7 @@ def install_custom_bitcoin_page(): # Display wait page templateData = { - "title": "MyNode Install", + "title": "Installing", "header_text": "Installing", "subheader_text": "This may take a while...", "show_upgrade_log": True, diff --git a/rootfs/standard/var/www/mynode/sphinxrelay.py b/rootfs/standard/var/www/mynode/sphinxrelay.py index d1957d62..b9a847f5 100644 --- a/rootfs/standard/var/www/mynode/sphinxrelay.py +++ b/rootfs/standard/var/www/mynode/sphinxrelay.py @@ -26,7 +26,7 @@ def sphinxrelay_page(): # Load page templateData = { - "title": "MyNode Sphinx Relay", + "title": "Sphinx Relay", "ui_settings": read_ui_settings(), "sphinxrelay_status": sphinxrelay_status, "sphinxrelay_connection_string": get_connection_string(), diff --git a/rootfs/standard/var/www/mynode/templates/about.html b/rootfs/standard/var/www/mynode/templates/about.html index e9a3ca5f..e4ae19d7 100644 --- a/rootfs/standard/var/www/mynode/templates/about.html +++ b/rootfs/standard/var/www/mynode/templates/about.html @@ -1,6 +1,6 @@ - MyNode About + About {% include 'includes/head.html' %} diff --git a/rootfs/standard/var/www/mynode/templates/app/generic_app.html b/rootfs/standard/var/www/mynode/templates/app/generic_app.html index cb58bada..f1aad2b6 100644 --- a/rootfs/standard/var/www/mynode/templates/app/generic_app.html +++ b/rootfs/standard/var/www/mynode/templates/app/generic_app.html @@ -1,6 +1,6 @@ - MyNode - {{app.name}} + {{app.name}} {% include 'includes/head.html' %} diff --git a/rootfs/standard/var/www/mynode/templates/help.html b/rootfs/standard/var/www/mynode/templates/help.html index 66ea57c9..b8d0077a 100644 --- a/rootfs/standard/var/www/mynode/templates/help.html +++ b/rootfs/standard/var/www/mynode/templates/help.html @@ -1,6 +1,6 @@ - MyNode Help + Help {% include 'includes/head.html' %} diff --git a/rootfs/standard/var/www/mynode/templates/login.html b/rootfs/standard/var/www/mynode/templates/login.html index 443f812a..90c3f448 100644 --- a/rootfs/standard/var/www/mynode/templates/login.html +++ b/rootfs/standard/var/www/mynode/templates/login.html @@ -1,6 +1,6 @@ - MyNode Login + Login {% include 'includes/head.html' %} diff --git a/rootfs/standard/var/www/mynode/templates/marketplace_add_app.html b/rootfs/standard/var/www/mynode/templates/marketplace_add_app.html index c7984c8f..158b4585 100644 --- a/rootfs/standard/var/www/mynode/templates/marketplace_add_app.html +++ b/rootfs/standard/var/www/mynode/templates/marketplace_add_app.html @@ -1,6 +1,6 @@ - MyNode - Add Community Application + Add Community Application {% include 'includes/head.html' %} diff --git a/rootfs/standard/var/www/mynode/templates/marketplace_app.html b/rootfs/standard/var/www/mynode/templates/marketplace_app.html index 4f0d5b9d..d95f2c0f 100644 --- a/rootfs/standard/var/www/mynode/templates/marketplace_app.html +++ b/rootfs/standard/var/www/mynode/templates/marketplace_app.html @@ -1,6 +1,6 @@ - MyNode - {{app.name}} + {{app.name}} {% include 'includes/head.html' %} diff --git a/rootfs/standard/var/www/mynode/tor.py b/rootfs/standard/var/www/mynode/tor.py index fce91ab2..17b4f660 100644 --- a/rootfs/standard/var/www/mynode/tor.py +++ b/rootfs/standard/var/www/mynode/tor.py @@ -101,7 +101,7 @@ def page_tor(): # Load page templateData = { - "title": "MyNode Tor Services", + "title": "Tor Services", "version": get_tor_version(), "is_btc_tor_enabled": settings_file_exists("btc_tor_enabled"), "is_lnd_tor_enabled": settings_file_exists("lnd_tor_enabled"), diff --git a/rootfs/standard/var/www/mynode/vpn.py b/rootfs/standard/var/www/mynode/vpn.py index 59902cb9..1248c03d 100644 --- a/rootfs/standard/var/www/mynode/vpn.py +++ b/rootfs/standard/var/www/mynode/vpn.py @@ -37,7 +37,7 @@ def page_vpn_info(): status = "Running" templateData = { - "title": "MyNode VPN Info", + "title": "VPN Info", "status": status, "vpn_file_exists": vpn_file_exists, "port_forwarded": port_forwarded, diff --git a/rootfs/standard/var/www/mynode/wardenterminal.py b/rootfs/standard/var/www/mynode/wardenterminal.py index 4e199083..87e2416a 100644 --- a/rootfs/standard/var/www/mynode/wardenterminal.py +++ b/rootfs/standard/var/www/mynode/wardenterminal.py @@ -16,7 +16,7 @@ def pyblock_page(): # Load page templateData = { - "title": "MyNode Warden Terminal", + "title": "Warden Terminal", "ui_settings": read_ui_settings(), } return render_template('wardenterminal.html', **templateData) diff --git a/rootfs/standard/var/www/mynode/whirlpool.py b/rootfs/standard/var/www/mynode/whirlpool.py index 2020c534..074a8a27 100644 --- a/rootfs/standard/var/www/mynode/whirlpool.py +++ b/rootfs/standard/var/www/mynode/whirlpool.py @@ -34,7 +34,7 @@ def whirlpool_page(): # Load page templateData = { - "title": "MyNode Whirlpool", + "title": "Whirlpool", "ui_settings": read_ui_settings(), "local_ip": get_local_ip(), "whirlpool_onion_url": get_onion_url_for_service("whirlpool"),