diff --git a/peach-web/src/context/dns.rs b/peach-web/src/context/dns.rs index 9d74ced..7a86646 100644 --- a/peach-web/src/context/dns.rs +++ b/peach-web/src/context/dns.rs @@ -11,6 +11,7 @@ pub struct ConfigureDNSContext { pub title: Option, pub flash_name: Option, pub flash_msg: Option, + pub theme: Option, } impl ConfigureDNSContext { @@ -31,6 +32,7 @@ impl ConfigureDNSContext { title: None, flash_name: None, flash_msg: None, + theme: None, } } } diff --git a/peach-web/templates/help.html.tera b/peach-web/templates/help.html.tera index 4baa227..0109d1e 100644 --- a/peach-web/templates/help.html.tera +++ b/peach-web/templates/help.html.tera @@ -2,16 +2,9 @@ {%- block card %}
-
+
- - {%- if flash_msg and flash_name == "success" %} - -
{{ flash_msg }}.
- {%- elif flash_msg and flash_name == "error" %} - -
{{ flash_msg }}.
- {%- endif %} + {% include "snippets/flash_message" %}
{%- endblock card -%} diff --git a/peach-web/templates/home.html.tera b/peach-web/templates/home.html.tera index ecce8c2..9013c7c 100644 --- a/peach-web/templates/home.html.tera +++ b/peach-web/templates/home.html.tera @@ -5,27 +5,39 @@ -
+
-
+
-
+
-
+ {% if sbot_status.state == "active" %} +
+

^_^

+
+ {% elif sbot_status.state == "inactive" %} +
+

z_z

+
+ {% else %} +
+

x_x

+
+ {% endif %}
@@ -34,21 +46,21 @@ {% else -%} {%- endif -%} -
+
-
+
-
+
diff --git a/peach-web/templates/login.html.tera b/peach-web/templates/login.html.tera index 504b242..31d7ccf 100644 --- a/peach-web/templates/login.html.tera +++ b/peach-web/templates/login.html.tera @@ -3,7 +3,7 @@
-
+ @@ -12,12 +12,10 @@
- {% include "snippets/flash_message" %} - -
diff --git a/peach-web/templates/nav.html.tera b/peach-web/templates/nav.html.tera index e89e50a..7e31734 100644 --- a/peach-web/templates/nav.html.tera +++ b/peach-web/templates/nav.html.tera @@ -17,13 +17,25 @@ {%- endblock nav -%} diff --git a/peach-web/templates/scuttlebutt/messages.html.tera b/peach-web/templates/scuttlebutt/messages.html.tera index 979a68c..d3da0af 100644 --- a/peach-web/templates/scuttlebutt/messages.html.tera +++ b/peach-web/templates/scuttlebutt/messages.html.tera @@ -2,7 +2,7 @@ {%- block card %}
-
+
{% include "snippets/flash_message" %}
diff --git a/peach-web/templates/scuttlebutt/profile.html.tera b/peach-web/templates/scuttlebutt/profile.html.tera index a34a37a..74b1c31 100644 --- a/peach-web/templates/scuttlebutt/profile.html.tera +++ b/peach-web/templates/scuttlebutt/profile.html.tera @@ -5,7 +5,7 @@
- Profile picture + Profile picture Profile picture @@ -15,14 +15,14 @@

{ description }

-
+
-
+
Follow Block Private Message diff --git a/peach-web/templates/settings/admin/change_password.html.tera b/peach-web/templates/settings/admin/change_password.html.tera index 604fe46..b3b0749 100644 --- a/peach-web/templates/settings/admin/change_password.html.tera +++ b/peach-web/templates/settings/admin/change_password.html.tera @@ -2,7 +2,7 @@ {%- block card %}
-
+ diff --git a/peach-web/templates/settings/admin/configure_admin.html.tera b/peach-web/templates/settings/admin/configure_admin.html.tera index f19cead..0127e1b 100644 --- a/peach-web/templates/settings/admin/configure_admin.html.tera +++ b/peach-web/templates/settings/admin/configure_admin.html.tera @@ -3,9 +3,9 @@
-

Current Admins

+

Current Admins

{% if not ssb_admin_ids %} -
+
There are no currently configured admins.
{% else %} diff --git a/peach-web/templates/settings/scuttlebutt/configure_sbot.html.tera b/peach-web/templates/settings/scuttlebutt/configure_sbot.html.tera index a791519..3b74880 100644 --- a/peach-web/templates/settings/scuttlebutt/configure_sbot.html.tera +++ b/peach-web/templates/settings/scuttlebutt/configure_sbot.html.tera @@ -15,57 +15,59 @@
-
- +
+
- - - - - - - - - -
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
-
-
- +
+
-
- +
+
-
-
- +
+
-
-
- +
+
-
- -
-
- -
-
- -
-
+ +
+ +
+ +
-
+
-
@@ -75,7 +77,7 @@ - + Restore Defaults diff --git a/peach-web/templates/snippets/flash_message.html.tera b/peach-web/templates/snippets/flash_message.html.tera index 0c967ce..0b7fc3b 100644 --- a/peach-web/templates/snippets/flash_message.html.tera +++ b/peach-web/templates/snippets/flash_message.html.tera @@ -1,11 +1,11 @@ {% if flash_msg and flash_name == "success" %} -
{{ flash_msg }}.
+
{{ flash_msg }}.
{%- elif flash_msg and flash_name == "info" %} -
{{ flash_msg }}.
+
{{ flash_msg }}.
{%- elif flash_msg and flash_name == "error" %} -
{{ flash_msg }}.
-{%- endif -%} \ No newline at end of file +
{{ flash_msg }}.
+{%- endif -%} diff --git a/peach-web/templates/status/scuttlebutt.html.tera b/peach-web/templates/status/scuttlebutt.html.tera index d147bbf..32d04bc 100644 --- a/peach-web/templates/status/scuttlebutt.html.tera +++ b/peach-web/templates/status/scuttlebutt.html.tera @@ -6,21 +6,26 @@ {% set mem = sbot_status.memory / 1024 / 1024 | round -%} {%- else -%} {% set mem = "X" -%} + {%- endif -%} + {%- if sbot_status.blobstore -%} + {% set blobs = sbot_status.blobstore / 1024 / 1024 | round -%} + {%- else -%} + {% set blobs = "X" -%} {%- endif -%}
-
+
- Configure + Configure
- Hermies + Hermies
@@ -78,25 +83,25 @@
- +
- +
- - + +
- +
- +