diff --git a/.gitmodules b/.gitmodules index 410b0db..068fd29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,6 +2,3 @@ path = source/style/hippie-style url = https://quelltext.interaktionsweise.de/interaktionsweise/hippie-style.git branch = development -[submodule "source/view/_includes/hippie-view"] - path = source/view/_includes/hippie-view - url = https://quelltext.interaktionsweise.de/interaktionsweise/hippie-view.git diff --git a/README.md b/README.md index 3f4beda..e40ece3 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Hippie interweaves preeminent personal interface elements This is a [Node.js](https://nodejs.org/) based generator for static HTML documents. It uses the [Eleventy](https://www.11ty.dev/) project to fiddle everything together. -Styling is powered by the CSS extension language [Sass](https://sass-lang.com/). The HTML pages are written with +Styling is powered by the CSS extension language [SASS](https://sass-lang.com/). The HTML pages are written with templating engines or directly as HTML files. Mainly [Liquid](https://liquidjs.com/) is used, but [Markdown](https://daringfireball.net/projects/markdown/) and [Nunjucks](https://mozilla.github.io/nunjucks/) are also options. diff --git a/source/style/hippie-style b/source/style/hippie-style index 08b2054..a66010a 160000 --- a/source/style/hippie-style +++ b/source/style/hippie-style @@ -1 +1 @@ -Subproject commit 08b2054d437e3ff45ed790f3da0742f8fa8fa30f +Subproject commit a66010a9ed535ad8ca5bbb7faed222861fc40ad4 diff --git a/source/view/_includes/hippie-view b/source/view/_includes/hippie-view deleted file mode 160000 index 49fa858..0000000 --- a/source/view/_includes/hippie-view +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 49fa85800392bc217653e6a90573feda4a1dc0ed diff --git a/source/view/_includes/hippie/app.liquid b/source/view/_includes/hippie/app.liquid new file mode 100644 index 0000000..87db0cb --- /dev/null +++ b/source/view/_includes/hippie/app.liquid @@ -0,0 +1,41 @@ +{% assign pageId = page.fileSlug -%} +{% assign pageClass = 'html_ui' -%} +{% layout 'hippie/default.liquid' %} + +{% block title %}{{ title }}{% endblock %} + +{% block links %} +{{ block.super -}} + + +{% endblock %} + +{% block assets %} + + + + +{% endblock %} + +{% block script %} + +{% endblock %} diff --git a/source/view/_includes/hippie/default.liquid b/source/view/_includes/hippie/default.liquid new file mode 100644 index 0000000..4ff5f5a --- /dev/null +++ b/source/view/_includes/hippie/default.liquid @@ -0,0 +1,39 @@ + +{% if pageId %} +{%- capture idAttr %} id="{{ pageId }}"{% endcapture -%} +{% endif -%} +{% if pageClass %} + {%- capture classAttr %} class="{{ pageClass }}"{% endcapture -%} +{% endif -%} +{% if bodyClass %} + {%- capture bodyClassAttr %} class="{{ bodyClass }}"{% endcapture -%} +{% endif -%} + + + + {% block head %} + + {{- hippie.titlePrefix -}} + {% block title %}{% endblock -%} + {{ hippie.titlePostfix -}} + + + {% block meta -%} + {% render 'hippie/partials/meta.liquid' %} + {% endblock -%} + {% block links -%} + {% render 'hippie/partials/links.liquid' %} + {% endblock -%} + {% block style -%}{% endblock -%} + {% endblock -%} + + + +{%- block body %}{% endblock -%} +{%- block assets %}{% endblock -%} + +{%- block script %}{% endblock -%} + + \ No newline at end of file diff --git a/source/view/_includes/hippie/full.liquid b/source/view/_includes/hippie/full.liquid new file mode 100644 index 0000000..dbbe4ae --- /dev/null +++ b/source/view/_includes/hippie/full.liquid @@ -0,0 +1,49 @@ + +{% if pageId %} +{%- capture idAttr %} id="{{ pageId }}"{% endcapture -%} +{% endif -%} +{% if pageClass %} + {%- capture classAttr %} class="{{ pageClass }}"{% endcapture -%} +{% endif -%} +{% if bodyClass %} + {%- capture bodyClassAttr %} class="{{ bodyClass }}"{% endcapture -%} +{% endif -%} + + + + {% block head %} + + {{- hippie.titlePrefix -}} + {% block title %}{{ title }}{% endblock -%} + {{ hippie.titlePostfix -}} + + {% block meta -%} + {% render 'hippie/partials/meta.liquid', author: 'Interaktionsweise', desc: 'Hippie interweaves preeminent personal interface elements' %} + {% comment %}{% endcomment %} + {% endblock -%} + {% render 'hippie/partials/script-log.liquid' %} + {% render 'hippie/partials/log-setup', hippie: hippie, state: true -%} + {% render 'hippie/partials/log-start' -%} + {% block links -%} + {% render 'hippie/partials/links.liquid' %} + + {% endblock -%} + {% render 'hippie/partials/log-log' with 'HEAD end :: Links parsed, starting to load.' as msg -%} + {% endblock -%} + + + +{% render 'hippie/partials/log-log' with 'BODY start' as msg -%} +{%- block body %}{% endblock -%} +{% render 'hippie/partials/log-log' with 'BODY :: Loading script assets...' as msg -%} +{%- block assets %}{% endblock -%} +{% render 'hippie/partials/log-assets', state: true -%} +{% render 'hippie/partials/log-log', msg: 'BODY :: Assets loaded, running page specific script...', arg: true -%} + +{%- block script %}{% endblock -%} +{% render 'hippie/partials/log-log' with 'BODY end :: Page script might still be loading.' as msg -%} +{% render 'hippie/partials/log-log' with 'Application ready... or is it?' as msg -%} + + \ No newline at end of file diff --git a/source/view/_includes/hippie/game.liquid b/source/view/_includes/hippie/game.liquid new file mode 100644 index 0000000..37c890b --- /dev/null +++ b/source/view/_includes/hippie/game.liquid @@ -0,0 +1,15 @@ +{% assign pageId = page.fileSlug -%} +{% layout 'hippie/default.liquid' %} + +{% block title %}{{ title }}{% endblock %} + +{% block links %} +{{ block.super -}} + +{% endblock %} + +{% block assets %} + + + +{% endblock %} diff --git a/source/view/_includes/hippie/page.liquid b/source/view/_includes/hippie/page.liquid new file mode 100644 index 0000000..5cf93c9 --- /dev/null +++ b/source/view/_includes/hippie/page.liquid @@ -0,0 +1,64 @@ +{% assign pageId = page.fileSlug -%} +{% layout 'hippie/full.liquid' %} + +{% block meta %} +{{ block.super -}} +{% comment %}{% endcomment %} +{% comment %}{% endcomment %} +{% endblock %} + +{% block links %} +{{ block.super -}} +{% if hippie.legacyMode %} + + + {% comment %}{% endcomment %} + {% comment %}{% endcomment %} +{% endif %} + +{% comment %}{% endcomment %} +{% comment %}{% endcomment %} +{% endblock %} + +{% block body %} +{{ block.super -}} +{% render 'hippie/partials/nav-page.liquid' %} +
+ {% render 'hippie/partials/header-page.liquid' %} + +
+ {% block main %}{% endblock %} +
+ + {% render 'hippie/partials/footer-page.liquid' %} +
+{% endblock %} + +{% block assets %} + + + + +{% endblock %} +{% block script %} + +{% endblock %} diff --git a/source/view/_includes/hippie/partials/footer-page.liquid b/source/view/_includes/hippie/partials/footer-page.liquid new file mode 100644 index 0000000..7aa500a --- /dev/null +++ b/source/view/_includes/hippie/partials/footer-page.liquid @@ -0,0 +1,3 @@ +
+
+
\ No newline at end of file diff --git a/source/view/_includes/hippie/partials/footer-pinned.liquid b/source/view/_includes/hippie/partials/footer-pinned.liquid new file mode 100644 index 0000000..5f4160a --- /dev/null +++ b/source/view/_includes/hippie/partials/footer-pinned.liquid @@ -0,0 +1,3 @@ +
+

Unten fixiert

+
diff --git a/source/view/_includes/hippie/partials/footer-status.liquid b/source/view/_includes/hippie/partials/footer-status.liquid new file mode 100644 index 0000000..b46ecf2 --- /dev/null +++ b/source/view/_includes/hippie/partials/footer-status.liquid @@ -0,0 +1,9 @@ +
+
Kontakt: + {{ email | default: 'admin@domain.tld' }} + · Server: + {{ app | default: 'Application' }}/{{ version | default: 'ver.s.ion' }} + ({{ system | default: 'System name' }}) · Domain: + {{ domain | default: 'domain.tld:port' }} +
+
\ No newline at end of file diff --git a/source/view/_includes/hippie/partials/frame-header.liquid b/source/view/_includes/hippie/partials/frame-header.liquid new file mode 100644 index 0000000..14d04bc --- /dev/null +++ b/source/view/_includes/hippie/partials/frame-header.liquid @@ -0,0 +1,20 @@ +
+ + +
\ No newline at end of file diff --git a/source/view/_includes/hippie/partials/frame-mode.liquid b/source/view/_includes/hippie/partials/frame-mode.liquid new file mode 100644 index 0000000..4e87985 --- /dev/null +++ b/source/view/_includes/hippie/partials/frame-mode.liquid @@ -0,0 +1,10 @@ +
+ + +
\ No newline at end of file diff --git a/source/view/_includes/hippie/partials/frame-status.liquid b/source/view/_includes/hippie/partials/frame-status.liquid new file mode 100644 index 0000000..98c94f9 --- /dev/null +++ b/source/view/_includes/hippie/partials/frame-status.liquid @@ -0,0 +1,11 @@ +
+ + +
\ No newline at end of file diff --git a/source/view/_includes/hippie/partials/game-menu.liquid b/source/view/_includes/hippie/partials/game-menu.liquid new file mode 100644 index 0000000..c59d802 --- /dev/null +++ b/source/view/_includes/hippie/partials/game-menu.liquid @@ -0,0 +1,15 @@ +
+ +
diff --git a/source/view/_includes/hippie/partials/gate-list.liquid b/source/view/_includes/hippie/partials/gate-list.liquid new file mode 100644 index 0000000..7ef18bd --- /dev/null +++ b/source/view/_includes/hippie/partials/gate-list.liquid @@ -0,0 +1,19 @@ + diff --git a/source/view/_includes/hippie/partials/gate-simple.liquid b/source/view/_includes/hippie/partials/gate-simple.liquid new file mode 100644 index 0000000..9d0b54e --- /dev/null +++ b/source/view/_includes/hippie/partials/gate-simple.liquid @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/source/view/_includes/hippie/partials/header-page.liquid b/source/view/_includes/hippie/partials/header-page.liquid new file mode 100644 index 0000000..a37637a --- /dev/null +++ b/source/view/_includes/hippie/partials/header-page.liquid @@ -0,0 +1,3 @@ +
+
+
\ No newline at end of file diff --git a/source/view/_includes/hippie/partials/header-status.liquid b/source/view/_includes/hippie/partials/header-status.liquid new file mode 100644 index 0000000..725e305 --- /dev/null +++ b/source/view/_includes/hippie/partials/header-status.liquid @@ -0,0 +1,21 @@ +
+

+ {{ hippie.brand | upcase }} +

+ +
+

{% render 'hippie/partials/status-coord', id: "log" %} + / + {% render 'hippie/partials/status-date', id: "date" %} + / + {% render 'hippie/partials/status-time', id: "time" %}

+
+
diff --git a/source/view/_includes/hippie/partials/links.liquid b/source/view/_includes/hippie/partials/links.liquid new file mode 100644 index 0000000..32d854d --- /dev/null +++ b/source/view/_includes/hippie/partials/links.liquid @@ -0,0 +1,3 @@ +{% comment %}{% endcomment %} + + diff --git a/source/view/_includes/hippie/partials/log-assets.liquid b/source/view/_includes/hippie/partials/log-assets.liquid new file mode 100644 index 0000000..a34b417 --- /dev/null +++ b/source/view/_includes/hippie/partials/log-assets.liquid @@ -0,0 +1,3 @@ + diff --git a/source/view/_includes/hippie/partials/log-log.liquid b/source/view/_includes/hippie/partials/log-log.liquid new file mode 100644 index 0000000..ba21f2a --- /dev/null +++ b/source/view/_includes/hippie/partials/log-log.liquid @@ -0,0 +1,3 @@ + diff --git a/source/view/_includes/hippie/partials/log-setup.liquid b/source/view/_includes/hippie/partials/log-setup.liquid new file mode 100644 index 0000000..04fd9b2 --- /dev/null +++ b/source/view/_includes/hippie/partials/log-setup.liquid @@ -0,0 +1,6 @@ +{% comment %}{% assign hippie.debugMode = state %}{% endcomment %} + diff --git a/source/view/_includes/hippie/partials/log-start.liquid b/source/view/_includes/hippie/partials/log-start.liquid new file mode 100644 index 0000000..e137e33 --- /dev/null +++ b/source/view/_includes/hippie/partials/log-start.liquid @@ -0,0 +1,4 @@ + diff --git a/source/view/_includes/hippie/partials/meta.liquid b/source/view/_includes/hippie/partials/meta.liquid new file mode 100644 index 0000000..a4b3cc2 --- /dev/null +++ b/source/view/_includes/hippie/partials/meta.liquid @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/source/view/_includes/hippie/partials/nav-page.liquid b/source/view/_includes/hippie/partials/nav-page.liquid new file mode 100644 index 0000000..cf52d72 --- /dev/null +++ b/source/view/_includes/hippie/partials/nav-page.liquid @@ -0,0 +1,33 @@ +
+ +
+{% comment %}
+ ? +
{% endcomment %} \ No newline at end of file diff --git a/source/view/_includes/hippie/partials/placeholder-flag.liquid b/source/view/_includes/hippie/partials/placeholder-flag.liquid new file mode 100644 index 0000000..0534104 --- /dev/null +++ b/source/view/_includes/hippie/partials/placeholder-flag.liquid @@ -0,0 +1,43 @@ +{% assign height = width | divided_by: 1.6 %} + +{% if type == 'svg' or type == '' %} + + {% comment %} + + + + + + + + + + + {% endcomment %} + {% if desc %} + {{ desc }} + {% endif %} + + + + + + + + + + +{% elsif type == 'img' %} + {% if src == 'file' %} + + + {{ desc }} + + {% else %} + {{ desc }} + {% endif %} +{% endif %} diff --git a/source/view/_includes/hippie/partials/script-log.liquid b/source/view/_includes/hippie/partials/script-log.liquid new file mode 100644 index 0000000..7e270c7 --- /dev/null +++ b/source/view/_includes/hippie/partials/script-log.liquid @@ -0,0 +1,113 @@ + \ No newline at end of file diff --git a/source/view/_includes/hippie/partials/song.liquid b/source/view/_includes/hippie/partials/song.liquid new file mode 100644 index 0000000..534da59 --- /dev/null +++ b/source/view/_includes/hippie/partials/song.liquid @@ -0,0 +1,10 @@ +
+
+

{{ data.title }}

+
{{ data.releaseDate }}
+

{{ data.description }}

+
+ {% comment %}
{{ content }}
{% endcomment %} + {{ content }} +
{{ index }}
+
\ No newline at end of file diff --git a/source/view/_includes/hippie/partials/status-coord.liquid b/source/view/_includes/hippie/partials/status-coord.liquid new file mode 100644 index 0000000..29e592f --- /dev/null +++ b/source/view/_includes/hippie/partials/status-coord.liquid @@ -0,0 +1 @@ +{{ text | default: 'X: #, Y: ##' }} diff --git a/source/view/_includes/hippie/partials/status-date.liquid b/source/view/_includes/hippie/partials/status-date.liquid new file mode 100644 index 0000000..296a866 --- /dev/null +++ b/source/view/_includes/hippie/partials/status-date.liquid @@ -0,0 +1,6 @@ + + Wochentag, + ##. + Monat + #### + diff --git a/source/view/_includes/hippie/partials/status-time.liquid b/source/view/_includes/hippie/partials/status-time.liquid new file mode 100644 index 0000000..f981e80 --- /dev/null +++ b/source/view/_includes/hippie/partials/status-time.liquid @@ -0,0 +1 @@ +{{ text | default: '00:00:00' }}{{ postfix | default: ' Uhr' }} diff --git a/source/view/_includes/hippie/simple.liquid b/source/view/_includes/hippie/simple.liquid new file mode 100644 index 0000000..b888886 --- /dev/null +++ b/source/view/_includes/hippie/simple.liquid @@ -0,0 +1,9 @@ +{% assign pageId = page.fileSlug -%} +{% layout 'hippie/default.liquid' %} + +{% block title %}{{ title }}{% endblock %} + +{% block links %} +{{ block.super -}} + +{% endblock %} diff --git a/source/view/_includes/hippie/status.liquid b/source/view/_includes/hippie/status.liquid new file mode 100644 index 0000000..86499ed --- /dev/null +++ b/source/view/_includes/hippie/status.liquid @@ -0,0 +1,37 @@ + +{% if pageClass %} +{%- capture classAttr %} class="{{ pageClass }}"{% endcapture -%} +{% endif -%} +{% if bodyClass %} + {%- capture bodyClassAttr %} class="{{ bodyClass }}"{% endcapture -%} +{% endif -%} + + + + {% block head %} + + {{- hippie.titlePrefix -}} + {% block title %}{{ title }}{% endblock -%} + {{ hippie.titlePostfix -}} + + {% block meta -%} + {% render 'hippie/partials/meta.liquid' %} + {% endblock -%} + {% block links -%} + + + {% endblock -%} + {% endblock -%} + + + +{%- block body %} +
+

{{ title }}

+ {% block main %}{% endblock -%} +
+{% render 'hippie/partials/footer-status' %} +{% endblock -%} + + \ No newline at end of file diff --git a/source/view/_includes/hippie/world.liquid b/source/view/_includes/hippie/world.liquid new file mode 100644 index 0000000..ca935dc --- /dev/null +++ b/source/view/_includes/hippie/world.liquid @@ -0,0 +1,11 @@ + + + + + {{ title }} + + + +{{ content }} + + \ No newline at end of file diff --git a/source/view/demo/art/10print.liquid b/source/view/demo/art/10print.liquid index 2a62d3d..761218c 100644 --- a/source/view/demo/art/10print.liquid +++ b/source/view/demo/art/10print.liquid @@ -3,7 +3,7 @@ title: 10print tags: - demoArt --- -{% layout 'hippie-view/simple.liquid' %} +{% layout 'hippie/simple.liquid' %} {% block style %}