diff --git a/.gitmodules b/.gitmodules index 068fd29..410b0db 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,6 @@ 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/source/view/_includes/hippie-view b/source/view/_includes/hippie-view new file mode 160000 index 0000000..980b611 --- /dev/null +++ b/source/view/_includes/hippie-view @@ -0,0 +1 @@ +Subproject commit 980b611a319c34004be536238814ff9b093059cd diff --git a/source/view/_includes/hippie/app.liquid b/source/view/_includes/hippie/app.liquid deleted file mode 100644 index 87db0cb..0000000 --- a/source/view/_includes/hippie/app.liquid +++ /dev/null @@ -1,41 +0,0 @@ -{% 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 deleted file mode 100644 index 4ff5f5a..0000000 --- a/source/view/_includes/hippie/default.liquid +++ /dev/null @@ -1,39 +0,0 @@ - -{% 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 deleted file mode 100644 index dbbe4ae..0000000 --- a/source/view/_includes/hippie/full.liquid +++ /dev/null @@ -1,49 +0,0 @@ - -{% 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 deleted file mode 100644 index 37c890b..0000000 --- a/source/view/_includes/hippie/game.liquid +++ /dev/null @@ -1,15 +0,0 @@ -{% 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 deleted file mode 100644 index 5cf93c9..0000000 --- a/source/view/_includes/hippie/page.liquid +++ /dev/null @@ -1,64 +0,0 @@ -{% 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 deleted file mode 100644 index 7aa500a..0000000 --- a/source/view/_includes/hippie/partials/footer-page.liquid +++ /dev/null @@ -1,3 +0,0 @@ -
-
-
\ 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 deleted file mode 100644 index 5f4160a..0000000 --- a/source/view/_includes/hippie/partials/footer-pinned.liquid +++ /dev/null @@ -1,3 +0,0 @@ -
-

Unten fixiert

-
diff --git a/source/view/_includes/hippie/partials/footer-status.liquid b/source/view/_includes/hippie/partials/footer-status.liquid deleted file mode 100644 index b46ecf2..0000000 --- a/source/view/_includes/hippie/partials/footer-status.liquid +++ /dev/null @@ -1,9 +0,0 @@ -
-
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 deleted file mode 100644 index 14d04bc..0000000 --- a/source/view/_includes/hippie/partials/frame-header.liquid +++ /dev/null @@ -1,20 +0,0 @@ -
- - -
\ 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 deleted file mode 100644 index 4e87985..0000000 --- a/source/view/_includes/hippie/partials/frame-mode.liquid +++ /dev/null @@ -1,10 +0,0 @@ -
- - -
\ 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 deleted file mode 100644 index 98c94f9..0000000 --- a/source/view/_includes/hippie/partials/frame-status.liquid +++ /dev/null @@ -1,11 +0,0 @@ -
- - -
\ 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 deleted file mode 100644 index c59d802..0000000 --- a/source/view/_includes/hippie/partials/game-menu.liquid +++ /dev/null @@ -1,15 +0,0 @@ -
- -
diff --git a/source/view/_includes/hippie/partials/gate-list.liquid b/source/view/_includes/hippie/partials/gate-list.liquid deleted file mode 100644 index 7ef18bd..0000000 --- a/source/view/_includes/hippie/partials/gate-list.liquid +++ /dev/null @@ -1,19 +0,0 @@ - diff --git a/source/view/_includes/hippie/partials/gate-simple.liquid b/source/view/_includes/hippie/partials/gate-simple.liquid deleted file mode 100644 index 9d0b54e..0000000 --- a/source/view/_includes/hippie/partials/gate-simple.liquid +++ /dev/null @@ -1,7 +0,0 @@ - \ 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 deleted file mode 100644 index a37637a..0000000 --- a/source/view/_includes/hippie/partials/header-page.liquid +++ /dev/null @@ -1,3 +0,0 @@ -
-
-
\ 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 deleted file mode 100644 index 725e305..0000000 --- a/source/view/_includes/hippie/partials/header-status.liquid +++ /dev/null @@ -1,21 +0,0 @@ -
-

- {{ 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 deleted file mode 100644 index 32d854d..0000000 --- a/source/view/_includes/hippie/partials/links.liquid +++ /dev/null @@ -1,3 +0,0 @@ -{% comment %}{% endcomment %} - - diff --git a/source/view/_includes/hippie/partials/log-assets.liquid b/source/view/_includes/hippie/partials/log-assets.liquid deleted file mode 100644 index a34b417..0000000 --- a/source/view/_includes/hippie/partials/log-assets.liquid +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/source/view/_includes/hippie/partials/log-log.liquid b/source/view/_includes/hippie/partials/log-log.liquid deleted file mode 100644 index ba21f2a..0000000 --- a/source/view/_includes/hippie/partials/log-log.liquid +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/source/view/_includes/hippie/partials/log-setup.liquid b/source/view/_includes/hippie/partials/log-setup.liquid deleted file mode 100644 index 04fd9b2..0000000 --- a/source/view/_includes/hippie/partials/log-setup.liquid +++ /dev/null @@ -1,6 +0,0 @@ -{% 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 deleted file mode 100644 index e137e33..0000000 --- a/source/view/_includes/hippie/partials/log-start.liquid +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/source/view/_includes/hippie/partials/meta.liquid b/source/view/_includes/hippie/partials/meta.liquid deleted file mode 100644 index a4b3cc2..0000000 --- a/source/view/_includes/hippie/partials/meta.liquid +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ 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 deleted file mode 100644 index cf52d72..0000000 --- a/source/view/_includes/hippie/partials/nav-page.liquid +++ /dev/null @@ -1,33 +0,0 @@ -
- -
-{% 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 deleted file mode 100644 index 0534104..0000000 --- a/source/view/_includes/hippie/partials/placeholder-flag.liquid +++ /dev/null @@ -1,43 +0,0 @@ -{% 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 deleted file mode 100644 index 7e270c7..0000000 --- a/source/view/_includes/hippie/partials/script-log.liquid +++ /dev/null @@ -1,113 +0,0 @@ - \ No newline at end of file diff --git a/source/view/_includes/hippie/partials/song.liquid b/source/view/_includes/hippie/partials/song.liquid deleted file mode 100644 index 534da59..0000000 --- a/source/view/_includes/hippie/partials/song.liquid +++ /dev/null @@ -1,10 +0,0 @@ -
-
-

{{ 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 deleted file mode 100644 index 29e592f..0000000 --- a/source/view/_includes/hippie/partials/status-coord.liquid +++ /dev/null @@ -1 +0,0 @@ -{{ text | default: 'X: #, Y: ##' }} diff --git a/source/view/_includes/hippie/partials/status-date.liquid b/source/view/_includes/hippie/partials/status-date.liquid deleted file mode 100644 index 296a866..0000000 --- a/source/view/_includes/hippie/partials/status-date.liquid +++ /dev/null @@ -1,6 +0,0 @@ - - Wochentag, - ##. - Monat - #### - diff --git a/source/view/_includes/hippie/partials/status-time.liquid b/source/view/_includes/hippie/partials/status-time.liquid deleted file mode 100644 index f981e80..0000000 --- a/source/view/_includes/hippie/partials/status-time.liquid +++ /dev/null @@ -1 +0,0 @@ -{{ text | default: '00:00:00' }}{{ postfix | default: ' Uhr' }} diff --git a/source/view/_includes/hippie/simple.liquid b/source/view/_includes/hippie/simple.liquid deleted file mode 100644 index b888886..0000000 --- a/source/view/_includes/hippie/simple.liquid +++ /dev/null @@ -1,9 +0,0 @@ -{% 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 deleted file mode 100644 index 86499ed..0000000 --- a/source/view/_includes/hippie/status.liquid +++ /dev/null @@ -1,37 +0,0 @@ - -{% 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 deleted file mode 100644 index ca935dc..0000000 --- a/source/view/_includes/hippie/world.liquid +++ /dev/null @@ -1,11 +0,0 @@ - - - - - {{ 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 761218c..2a62d3d 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/simple.liquid' %} +{% layout 'hippie-view/simple.liquid' %} {% block style %}