From 606af5568e839f8bc6651ac1d43f711f00b1b3aa Mon Sep 17 00:00:00 2001 From: sowgro Date: Thu, 14 Dec 2023 01:22:21 -0500 Subject: theme v4 --- templates/directory.html.twig | 26 ++++++++++++++ templates/home.html.twig | 31 +++++----------- templates/page.html.twig | 16 +++------ templates/partials/base.html.twig | 0 templates/partials/header.html.twig | 11 ++++++ templates/partials/list.html.twig | 9 +++++ templates/partials/navigation.html.twig | 61 ++++++++------------------------ templates/partials/navigation2.html.twig | 53 --------------------------- 8 files changed, 75 insertions(+), 132 deletions(-) create mode 100644 templates/directory.html.twig delete mode 100644 templates/partials/base.html.twig create mode 100644 templates/partials/header.html.twig create mode 100644 templates/partials/list.html.twig delete mode 100644 templates/partials/navigation2.html.twig (limited to 'templates') diff --git a/templates/directory.html.twig b/templates/directory.html.twig new file mode 100644 index 0000000..bdb3a5c --- /dev/null +++ b/templates/directory.html.twig @@ -0,0 +1,26 @@ + +{% do assets.addCss('theme://css/website.css', 100) %} + + + + + + + {{ assets.css()|raw }} + {{ header.title|e }} - {{site.title|e}} + + + {% include 'partials/header.html.twig' %} +
+
+

Blog pages

+ {{ page.content|raw }} + {% include 'partials/list.html.twig' %} + {% include 'partials/navigation.html.twig' %} +
+
+
+ {{ header.date|e }} +
+ + \ No newline at end of file diff --git a/templates/home.html.twig b/templates/home.html.twig index ff817d1..afb2b70 100644 --- a/templates/home.html.twig +++ b/templates/home.html.twig @@ -1,5 +1,5 @@ - {% do assets.addCss('theme://css/website.css', 100) %} + @@ -10,35 +10,22 @@ {{site.title|e}} -
-
-
- home -
-
-
+ {% include 'partials/header.html.twig' %}
- {% set foo = page.content|raw %} - {% set sp = foo|split(page.header.page_list_placeholder) %} - {{sp[0]|raw}} - {% include 'partials/navigation2.html.twig' %} - {{sp[1]|raw}} + {{ page.content|raw }}
-
- {{ header.date|e }} -
- {#
-
- +
+
+ arrow_back - Queso Webring - + Queso Webring + arrow_forward
-
#} +
\ No newline at end of file diff --git a/templates/page.html.twig b/templates/page.html.twig index 6671f5b..1291aaf 100644 --- a/templates/page.html.twig +++ b/templates/page.html.twig @@ -7,24 +7,18 @@ {{ assets.css()|raw }} - {{ header.title|e }} + {{ header.title|e }} - {{site.title|e}} -
-
- - home - - Tyler Ferrari's Site -
-
+ {% include 'partials/header.html.twig' %}
{{ page.content|raw }} + {% include 'partials/navigation.html.twig' %}
-
- {{ header.date|e }} +
+ {{ header.date|e }}
\ No newline at end of file diff --git a/templates/partials/base.html.twig b/templates/partials/base.html.twig deleted file mode 100644 index e69de29..0000000 diff --git a/templates/partials/header.html.twig b/templates/partials/header.html.twig new file mode 100644 index 0000000..4229a92 --- /dev/null +++ b/templates/partials/header.html.twig @@ -0,0 +1,11 @@ +
+ {% if page.header.icon %} + {{page.header.icon}} + {% else %} + web + {% endif %} + {% if page.url != "/" %} + {{site.title|e}} + {% endif %} + web +
\ No newline at end of file diff --git a/templates/partials/list.html.twig b/templates/partials/list.html.twig new file mode 100644 index 0000000..eb2f485 --- /dev/null +++ b/templates/partials/list.html.twig @@ -0,0 +1,9 @@ + diff --git a/templates/partials/navigation.html.twig b/templates/partials/navigation.html.twig index 28df6aa..4426c8c 100644 --- a/templates/partials/navigation.html.twig +++ b/templates/partials/navigation.html.twig @@ -1,47 +1,16 @@ -{% macro loop(page) %} - {% for p in page.children.visible %} - {% set current_page = (p.active or p.activeChild) ? 'selected' : '' %} - {% if p.children.visible.count > 0 %} -
  • - - {% if p.header.icon %}{% endif %} - {{ p.menu|e }} - -
      - {{ _self.loop(p) }} -
    -
    • - {% else %} -
  • - - {% if p.header.icon %}{% endif %} - {{ p.menu|e }} - -
    • - {% endif %} - {% endfor %} -{% endmacro %} - - + +
    + home + Home +
    +     +
    diff --git a/templates/partials/navigation2.html.twig b/templates/partials/navigation2.html.twig deleted file mode 100644 index 2e865bd..0000000 --- a/templates/partials/navigation2.html.twig +++ /dev/null @@ -1,53 +0,0 @@ -{% macro loop(page) %} - {% for p in page.children.visible %} - {% set current_page = (p.active or p.activeChild) ? 'selected' : '' %} - {% if p.children.visible.count > 0 %} - -
  • - - {% if p.header.icon %}{% endif %} - {{ p.menu|e }} - -
      - {{ _self.loop(p) }} -
    -
    • - {% else %} - -
  • - - {% if p.header.icon %}{% endif %} - {{ p.menu|e }} - -
    • - {% endif %} - {% endfor %} -{% endmacro %} - - -- cgit v1.2.3