From f22563b3ec20c186eec6d7dc1daea7614af60940 Mon Sep 17 00:00:00 2001 From: Philippe Loctaux Date: Wed, 8 Mar 2023 23:13:27 +0100 Subject: [PATCH] templates: moved pages to `pages` --- crates/ezidam/src/page.rs | 6 +++--- crates/ezidam/templates/base.html.tera | 11 ++--------- crates/ezidam/templates/homepage.html.tera | 18 ------------------ .../templates/{ => pages}/error.html.tera | 4 ++-- .../ezidam/templates/pages/homepage.html.tera | 9 +++++++++ .../templates/{ => pages}/setup.html.tera | 11 +++++------ 6 files changed, 21 insertions(+), 38 deletions(-) delete mode 100644 crates/ezidam/templates/homepage.html.tera rename crates/ezidam/templates/{ => pages}/error.html.tera (96%) create mode 100644 crates/ezidam/templates/pages/homepage.html.tera rename crates/ezidam/templates/{ => pages}/setup.html.tera (92%) diff --git a/crates/ezidam/src/page.rs b/crates/ezidam/src/page.rs index c553fa4..b806c54 100644 --- a/crates/ezidam/src/page.rs +++ b/crates/ezidam/src/page.rs @@ -18,9 +18,9 @@ impl Page { /// Template to render, the names comes from the file in "/templates" fn template_name(&self) -> &'static str { match self { - Page::Error(_) => "error", - Page::Setup => "setup", - Page::Homepage(_) => "homepage", + Page::Error(_) => "pages/error", + Page::Setup => "pages/setup", + Page::Homepage(_) => "pages/homepage", } } diff --git a/crates/ezidam/templates/base.html.tera b/crates/ezidam/templates/base.html.tera index b6804ef..4a80d83 100644 --- a/crates/ezidam/templates/base.html.tera +++ b/crates/ezidam/templates/base.html.tera @@ -4,7 +4,7 @@ - {{ title }} + {{ title }} - ezidam @@ -18,12 +18,5 @@ } - -{% block content %}{% endblock content %} - -
-
ezidam version {{ version }}
-
- - +{% block page %}{% endblock page %} \ No newline at end of file diff --git a/crates/ezidam/templates/homepage.html.tera b/crates/ezidam/templates/homepage.html.tera deleted file mode 100644 index 612bd4f..0000000 --- a/crates/ezidam/templates/homepage.html.tera +++ /dev/null @@ -1,18 +0,0 @@ -{% extends "base" %} - -{% block content %} - -
- - logo - -
-
- homepage goes here {{ abc }} -
-
- - -
- -{% endblock content %} diff --git a/crates/ezidam/templates/error.html.tera b/crates/ezidam/templates/pages/error.html.tera similarity index 96% rename from crates/ezidam/templates/error.html.tera rename to crates/ezidam/templates/pages/error.html.tera index 7a35290..e43934c 100644 --- a/crates/ezidam/templates/error.html.tera +++ b/crates/ezidam/templates/pages/error.html.tera @@ -1,6 +1,6 @@ {% extends "base" %} -{% block content %} +{% block page %}
@@ -26,4 +26,4 @@ -{% endblock content %} \ No newline at end of file +{% endblock page %} \ No newline at end of file diff --git a/crates/ezidam/templates/pages/homepage.html.tera b/crates/ezidam/templates/pages/homepage.html.tera new file mode 100644 index 0000000..25c8790 --- /dev/null +++ b/crates/ezidam/templates/pages/homepage.html.tera @@ -0,0 +1,9 @@ +{% extends "shell" %} + +{% block content %} +
+
+ homepage goes here {{ abc }} +
+
+{% endblock content %} diff --git a/crates/ezidam/templates/setup.html.tera b/crates/ezidam/templates/pages/setup.html.tera similarity index 92% rename from crates/ezidam/templates/setup.html.tera rename to crates/ezidam/templates/pages/setup.html.tera index c80e9e2..1ce952d 100644 --- a/crates/ezidam/templates/setup.html.tera +++ b/crates/ezidam/templates/pages/setup.html.tera @@ -1,14 +1,12 @@ {% extends "base" %} -{% block content %} +{% block page %} -
+
- - logo - + {% include "utils/logo" %}
{% if flash %} @@ -57,6 +55,7 @@
+ {% include "shell/footer" %}
@@ -64,4 +63,4 @@ -{% endblock content %} +{% endblock page %}