From c73287cc2772b7fccad9401de5c73fa1f1e4e7f3 Mon Sep 17 00:00:00 2001 From: glyph Date: Mon, 15 Nov 2021 17:31:15 +0200 Subject: [PATCH] modify templates --- .../{ => catchers}/internal_error.html.tera | 0 .../{ => catchers}/not_found.html.tera | 0 peach-web/templates/configure_dns.html.tera | 75 -------- peach-web/templates/device.html.tera | 12 +- .../{index.html.tera => home.html.tera} | 16 +- peach-web/templates/messages.html.tera | 12 -- peach-web/templates/nav.html.tera | 4 +- peach-web/templates/network_add.html.tera | 23 --- peach-web/templates/network_card.html.tera | 164 ------------------ peach-web/templates/network_detail.html.tera | 76 -------- peach-web/templates/network_list.html.tera | 38 ---- peach-web/templates/network_modify.html.tera | 21 --- peach-web/templates/network_usage.html.tera | 47 ----- .../password/change_password.html.tera | 50 ------ .../password/forgot_password.html.tera | 25 --- .../password/reset_password.html.tera | 48 ----- peach-web/templates/peers.html.tera | 15 -- peach-web/templates/peers_list.html.tera | 16 -- .../{shutdown.html.tera => power.html.tera} | 6 +- peach-web/templates/profile.html.tera | 33 ---- peach-web/templates/settings.html.tera | 14 -- peach-web/templates/ssb_settings.html.tera | 20 --- 22 files changed, 19 insertions(+), 696 deletions(-) rename peach-web/templates/{ => catchers}/internal_error.html.tera (100%) rename peach-web/templates/{ => catchers}/not_found.html.tera (100%) delete mode 100644 peach-web/templates/configure_dns.html.tera rename peach-web/templates/{index.html.tera => home.html.tera} (73%) delete mode 100644 peach-web/templates/messages.html.tera delete mode 100644 peach-web/templates/network_add.html.tera delete mode 100644 peach-web/templates/network_card.html.tera delete mode 100644 peach-web/templates/network_detail.html.tera delete mode 100644 peach-web/templates/network_list.html.tera delete mode 100644 peach-web/templates/network_modify.html.tera delete mode 100644 peach-web/templates/network_usage.html.tera delete mode 100644 peach-web/templates/password/change_password.html.tera delete mode 100644 peach-web/templates/password/forgot_password.html.tera delete mode 100644 peach-web/templates/password/reset_password.html.tera delete mode 100644 peach-web/templates/peers.html.tera delete mode 100644 peach-web/templates/peers_list.html.tera rename peach-web/templates/{shutdown.html.tera => power.html.tera} (77%) delete mode 100644 peach-web/templates/profile.html.tera delete mode 100644 peach-web/templates/settings.html.tera delete mode 100644 peach-web/templates/ssb_settings.html.tera diff --git a/peach-web/templates/internal_error.html.tera b/peach-web/templates/catchers/internal_error.html.tera similarity index 100% rename from peach-web/templates/internal_error.html.tera rename to peach-web/templates/catchers/internal_error.html.tera diff --git a/peach-web/templates/not_found.html.tera b/peach-web/templates/catchers/not_found.html.tera similarity index 100% rename from peach-web/templates/not_found.html.tera rename to peach-web/templates/catchers/not_found.html.tera diff --git a/peach-web/templates/configure_dns.html.tera b/peach-web/templates/configure_dns.html.tera deleted file mode 100644 index 019bc5b..0000000 --- a/peach-web/templates/configure_dns.html.tera +++ /dev/null @@ -1,75 +0,0 @@ -{%- extends "nav" -%} -{%- block card %} - -
- -
- - {% if enable_dyndns %} - -
-
- {% if is_dyndns_online %} - - {% else %} - - {% endif %} -
-
- {% endif %} - -
-
- - - -
-
-
- - - -
-
-
- - - -
-
- -
- -
- - - - - {% if flash_msg and flash_name == "success" %} - -
{{ flash_msg }}.
- {%- elif flash_msg and flash_name == "info" %} - -
{{ flash_msg }}.
- {%- elif flash_msg and flash_name == "error" %} - -
{{ flash_msg }}.
- {%- endif -%} - - - -
- - -{%- endblock card -%} diff --git a/peach-web/templates/device.html.tera b/peach-web/templates/device.html.tera index 9b31333..96d1cc7 100644 --- a/peach-web/templates/device.html.tera +++ b/peach-web/templates/device.html.tera @@ -25,7 +25,7 @@
- Network + Network
@@ -33,7 +33,7 @@
- Display + Display
@@ -41,7 +41,7 @@
- Stats + Stats
@@ -51,7 +51,7 @@
- Dyndns + Dyndns
@@ -59,7 +59,7 @@
- Config + Config
@@ -67,7 +67,7 @@
- Sbot + Sbot
diff --git a/peach-web/templates/index.html.tera b/peach-web/templates/home.html.tera similarity index 73% rename from peach-web/templates/index.html.tera rename to peach-web/templates/home.html.tera index b7142ae..14edce6 100644 --- a/peach-web/templates/index.html.tera +++ b/peach-web/templates/home.html.tera @@ -6,21 +6,21 @@
- +
- +
- +
@@ -30,23 +30,23 @@ - +
- +
- +
- +
- +
diff --git a/peach-web/templates/messages.html.tera b/peach-web/templates/messages.html.tera deleted file mode 100644 index 394f0b0..0000000 --- a/peach-web/templates/messages.html.tera +++ /dev/null @@ -1,12 +0,0 @@ -{%- extends "nav" -%} -{%- block card %} - -
-
- - {% include "snippets/flash_message" %} - - {% include "snippets/noscript" %} -
-
-{%- endblock card -%} diff --git a/peach-web/templates/nav.html.tera b/peach-web/templates/nav.html.tera index 33c50e7..e89e50a 100644 --- a/peach-web/templates/nav.html.tera +++ b/peach-web/templates/nav.html.tera @@ -22,8 +22,8 @@ PeachCloud - - Question mark + + Power switch {%- endblock nav -%} diff --git a/peach-web/templates/network_add.html.tera b/peach-web/templates/network_add.html.tera deleted file mode 100644 index aaa47ad..0000000 --- a/peach-web/templates/network_add.html.tera +++ /dev/null @@ -1,23 +0,0 @@ -{%- extends "nav" -%} -{%- block card %} - -
-
-
- - - - -
- - Cancel -
-
- - {% include "snippets/flash_message" %} - - {% include "snippets/noscript" %} -
-
- -{%- endblock card -%} diff --git a/peach-web/templates/network_card.html.tera b/peach-web/templates/network_card.html.tera deleted file mode 100644 index aac40c4..0000000 --- a/peach-web/templates/network_card.html.tera +++ /dev/null @@ -1,164 +0,0 @@ -{%- extends "nav" -%} - -{%- block card %} - - {%- if ap_state == "up" %} - -
- -
- - - -
- WiFi router - -
- - -
- -

Access Point

- -

peach

- -

{{ ap_ip }}

-
-
- - - - {% include "snippets/flash_message" %} - -
-
-
- Digital devices -
- -
- -
-
- Download -
- {%- if ap_traffic -%} - - - {%- else -%} - - - {%- endif -%} -
- -
-
- Upload -
- {%- if ap_traffic -%} - - - {%- else -%} - - - {%- endif -%} -
- -
-
-
-
- {%- else %} - -
- - {%- if wlan_state == "up" %} -
- - - -
- WiFi online - - {%- else %} -
-
- WiFi offline - - {%- endif %} -
-
- - - -

WiFi Client

- -

{{ wlan_ssid }}

- -

{{ wlan_ip }}

-
-
- - - - {% include "snippets/flash_message" %} -
- - -
-
- Signal -
- -
- -
-
- Download -
- {%- if wlan_traffic %} - - - - {%- else %} - - - - {%- endif %} -
- -
-
- Upload -
- {%- if wlan_traffic %} - - - - {%- else %} - - - - {%- endif %} -
- -
-
-
-
- - {%- endif -%} -{%- endblock card -%} diff --git a/peach-web/templates/network_detail.html.tera b/peach-web/templates/network_detail.html.tera deleted file mode 100644 index c58b5de..0000000 --- a/peach-web/templates/network_detail.html.tera +++ /dev/null @@ -1,76 +0,0 @@ -{%- extends "nav" -%} -{%- block card -%} - {%- if wlan_networks -%} - {%- for ssid, ap in wlan_networks -%} - {# select only the access point we are interested in #} - {%- if ssid == selected %} - -
- -
- - -
- WiFi icon - -
- - -
- -

{{ ssid }}

- -

{% if ap.detail %}{% if ap.detail.protocol != "" %}{{ ap.detail.protocol }}{% else %}None{% endif %}{% else %}Unknown{% endif %}

- -

{% if ap.signal %}{{ ap.signal }}%{% else %}Unknown{% endif %}

-
-
- -
-
- {%- if wlan_ssid == selected -%} -
- - - -
- {%- endif -%} - {%- if saved_aps -%} - {# Loop through the list of AP's with saved credentials #} - {%- for ap in saved_aps -%} - {# If the selected access point appears in the list, #} - {# display the Modify and Forget buttons. #} - {%- if ap.ssid == selected -%} - {# Set 'in_list' to true to allow correct Add button display #} - {% set_global in_list = true %} - {%- if wlan_ssid != selected and ap.state == "Available" -%} -
- - - -
- {%- endif -%} - Modify -
- - - -
- {%- endif -%} - {%- endfor -%} - {%- endif -%} - {%- if in_list == false -%} - {# Display the Add button if AP creds not already in saved networks list #} - Add - {%- endif -%} - Cancel -
- - {% include "snippets/flash_message" %} -
-
- - {%- endif -%} - {%- endfor -%} - {%- endif -%} -{%- endblock card -%} diff --git a/peach-web/templates/network_list.html.tera b/peach-web/templates/network_list.html.tera deleted file mode 100644 index 45d8227..0000000 --- a/peach-web/templates/network_list.html.tera +++ /dev/null @@ -1,38 +0,0 @@ -{%- extends "nav" -%} -{%- block card %} -
-
- -
-
-{%- endblock card -%} diff --git a/peach-web/templates/network_modify.html.tera b/peach-web/templates/network_modify.html.tera deleted file mode 100644 index 3c9b18c..0000000 --- a/peach-web/templates/network_modify.html.tera +++ /dev/null @@ -1,21 +0,0 @@ -{%- extends "nav" -%} -{%- block card %} - -
-
-
- - - - -
- - Cancel -
-
- - {% include "snippets/flash_message" %} -
-
- -{%- endblock card -%} diff --git a/peach-web/templates/network_usage.html.tera b/peach-web/templates/network_usage.html.tera deleted file mode 100644 index 2c0ac65..0000000 --- a/peach-web/templates/network_usage.html.tera +++ /dev/null @@ -1,47 +0,0 @@ -{%- extends "nav" -%} -{%- block card -%} - -
-
-
- - -
- -
-
-
- Warning -
-
- - - -
-
- - -
-
- Cutoff -
-
- - - -
-
- - -
-
-
- - Reset - Cancel -
- - {% include "snippets/flash_message" %} -
- -{%- endblock card %} diff --git a/peach-web/templates/password/change_password.html.tera b/peach-web/templates/password/change_password.html.tera deleted file mode 100644 index f4414a6..0000000 --- a/peach-web/templates/password/change_password.html.tera +++ /dev/null @@ -1,50 +0,0 @@ -{%- extends "nav" -%} -{%- block card %} - -
-
-
-
- - -
- -
- - -
- -
- - -
- -
- -
- Cancel -
- - - {% include "snippets/flash_message" %} - - - {% include "snippets/noscript" %} - -
-
- - -{%- endblock card -%} diff --git a/peach-web/templates/password/forgot_password.html.tera b/peach-web/templates/password/forgot_password.html.tera deleted file mode 100644 index 4cec989..0000000 --- a/peach-web/templates/password/forgot_password.html.tera +++ /dev/null @@ -1,25 +0,0 @@ -{%- extends "nav" -%} -{%- block card %} - -
-

- Click the button below to send a new temporary password which can be used to change your device password. -

- The temporary password will be sent in an SSB private message to the admin of this device. -

- -
-
- -
-
- - - {% include "snippets/flash_message" %} - - - {% include "snippets/noscript" %} - -
-
-{%- endblock card -%} diff --git a/peach-web/templates/password/reset_password.html.tera b/peach-web/templates/password/reset_password.html.tera deleted file mode 100644 index 1e71905..0000000 --- a/peach-web/templates/password/reset_password.html.tera +++ /dev/null @@ -1,48 +0,0 @@ -{%- extends "nav" -%} -{%- block card %} - -
-
-
-
- - -
- -
- - -
- -
- - -
- -
- -
-
- - - {% include "snippets/flash_message" %} - - - {% include "snippets/noscript" %} - -
-
- -{%- endblock card -%} diff --git a/peach-web/templates/peers.html.tera b/peach-web/templates/peers.html.tera deleted file mode 100644 index b78906f..0000000 --- a/peach-web/templates/peers.html.tera +++ /dev/null @@ -1,15 +0,0 @@ -{%- extends "nav" -%} -{%- block card %} - -
-
- - -
-
-{%- endblock card -%} diff --git a/peach-web/templates/peers_list.html.tera b/peach-web/templates/peers_list.html.tera deleted file mode 100644 index 2b61d78..0000000 --- a/peach-web/templates/peers_list.html.tera +++ /dev/null @@ -1,16 +0,0 @@ -{%- extends "nav" -%} -{%- block card %} -
- -
-{%- endblock card -%} diff --git a/peach-web/templates/shutdown.html.tera b/peach-web/templates/power.html.tera similarity index 77% rename from peach-web/templates/shutdown.html.tera rename to peach-web/templates/power.html.tera index 12b450c..ffd0a1e 100644 --- a/peach-web/templates/shutdown.html.tera +++ b/peach-web/templates/power.html.tera @@ -5,8 +5,8 @@
@@ -15,5 +15,5 @@ {% include "snippets/noscript" %}
- + {%- endblock card -%} diff --git a/peach-web/templates/profile.html.tera b/peach-web/templates/profile.html.tera deleted file mode 100644 index a34a37a..0000000 --- a/peach-web/templates/profile.html.tera +++ /dev/null @@ -1,33 +0,0 @@ -{%- extends "nav" -%} -{%- block card %} - -
- -
- - Profile picture - - - Profile picture - -

{ name }

- -

{ description }

-
- -
- - - -
- - - - - {% include "snippets/flash_message" %} -
-{%- endblock card -%} diff --git a/peach-web/templates/settings.html.tera b/peach-web/templates/settings.html.tera deleted file mode 100644 index 43253c8..0000000 --- a/peach-web/templates/settings.html.tera +++ /dev/null @@ -1,14 +0,0 @@ -{%- extends "nav" -%} -{%- block card %} - -
-
- - -
-
-{%- endblock card -%} diff --git a/peach-web/templates/ssb_settings.html.tera b/peach-web/templates/ssb_settings.html.tera deleted file mode 100644 index 24587ae..0000000 --- a/peach-web/templates/ssb_settings.html.tera +++ /dev/null @@ -1,20 +0,0 @@ -{%- extends "nav" -%} -{%- block card %} - -
-
- - -
-
-{%- endblock card -%}