interaktionsweise/hippie
1
1
Fork 0
Code Issues Pull requests Releases 3 Activity Actions

Korrekturen für vorherigen Push

Browse source 
- Details der nunjucks Vorlagen korrigiert
- Fehler der <titel> Einbindung in nunjucks Vorlagen behoben
This commit is contained in:
Stephan 2018-10-10 22:41:15 +02:00
parent 92d1609213
commit c0ab137753
11 changed files with 20 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/pages/demo.njk
View file

@ -4,7 +4,7 @@
{% extends "demo/default.njk" %}
{% block title %}index - HIPPIE{% endblock %}
{% block title %}Index{% endblock %}
{% block head %}
{{ super() }}
<link rel="stylesheet" type="text/css" media="all" href="css/demo.css"/>

2
source/pages/demo/blank.njk
View file

@ -4,7 +4,7 @@
{% extends "demo/default.njk" %}
{% block title %}blank - HIPPIE{% endblock %}
{% block title %}Blank{% endblock %}
{% block head %}
{{ super() }}

12
source/pages/demo/examples.njk
View file

@ -35,7 +35,7 @@
<h2>&lt;section&gt;</h2>
<pre class="pre_code"><code>section>div.float_space_left>img^p+p</code></pre>
<section class="overflow">
<div class="float_space_left demo__avatar"><img src="./art/bullet.gif" width="256" height="256" alt="Avatar"></div>
<div class="float_space_left demo__avatar"><img src="../art/demo/flag_websafe_128x80.gif" width="256" height="160" alt="Fahne von interaktionsweise"></div>
<p>Vorname Name<br>Straße 1, 01234 Stadt</p><p>+49 (0)123 1337 0000<br><a class="lineLink" href="mailto:name@domain.tld">name@domain.tld</a></p>
</section>
<pre class="pre_code"><code>div.space_left_fourth</code></pre>
@ -167,8 +167,8 @@
<h2>Gruppierung</h2>
<pre class="pre_code"><code>ul.list_link>(li>a>img)*2+li>a</code></pre>
<ul class="list_link">
<li><a href=""><img src="./art/letter.gif" alt="">name@domain.tld</a></li>
<li><a href=""><img src="./art/bullet.gif" alt="">Work</a></li>
<li><a href=""><img src="../art/letter.gif" alt="">name@domain.tld</a></li>
<li><a href="">Work</a></li>
<li><a href="">Projects</a></li>
</ul>
@ -238,7 +238,7 @@
<p class="quote_source"><a href="https://de.wikipedia.org/wiki/HTTP-Statuscode#4xx_.E2.80.93_Client-Fehler">Wikipedia</a></p>
</blockquote>
</div>
{% include "hippie/partials/footer-status.njk" %}
{% include "demo/partials/footer-status.njk" %}
</section>
<section class="sec_main_status demo__status">
<div class="wrap_center">
@ -249,7 +249,7 @@
<p class="quote_source"><a href="https://de.wikipedia.org/wiki/HTTP-Statuscode#4xx_.E2.80.93_Client-Fehler">Wikipedia</a></p>
</blockquote>
</div>
{% include "hippie/partials/footer-status.njk" %}
{% include "demo/partials/footer-status.njk" %}
</section>
<section class="sec_main_status demo__status">
<div class="wrap_center">
@ -260,7 +260,7 @@
<p class="quote_source"><a href="https://de.wikipedia.org/wiki/HTTP-Statuscode#4xx_.E2.80.93_Client-Fehler">Wikipedia</a></p>
</blockquote>
</div>
{% include "hippie/partials/footer-status.njk" %}
{% include "demo/partials/footer-status.njk" %}
</section>
</article>
</section>

2
source/pages/demo/maintenance.njk
View file

@ -4,7 +4,7 @@
{% extends "demo/maintenance.njk" %}
{% block title %}Wartung{% endblock %}
{% block title %}Maintenance{% endblock %}
{% block head %}
{{ super() }}

2
source/pages/demo/os.njk
View file

@ -4,7 +4,7 @@
{% extends "demo/extended.njk" %}
{% block title %}demo{% endblock %}
{% block title %}OS{% endblock %}
{% block head %}
{{ super() }}
{% endblock %}

7
source/pages/demo/tests.njk
View file

@ -1,10 +1,10 @@
<!-- page-tests.njk -->
{% set pageId = "blank" %}
{% set pageId = "tests" %}
{% set pageClass = "height_full" %}
{% extends "demo/default.njk" %}
{% block title %}tests - HIPPIE{% endblock %}
{% block title %}Tests{% endblock %}
{% block head %}
{{ super() }}
<link rel="stylesheet" type="text/css" media="all" href="../css/demo.css"/>
@ -29,8 +29,9 @@
<input id="txtName" type="text" /><span id="error">Caps Lock is ON.</span>
</form>
<p>Navigation</p>
{% import "demo/macros/nav-macro.njk" as forms %}
{{ forms.active('zubereitung') }}
{{ forms.active('Beispiel') }}
{% endblock %}
{% block script %}

2
source/templates/demo/default.njk
View file

@ -5,6 +5,8 @@
<meta charset="utf-8">
{% block head %}
<title>{% block title %}{% endblock %} - HIPPIE</title>
{% include "demo/partials/head-meta.njk" %}
<link rel="icon" href="./favicon.ico" type="image/vnd.microsoft.icon">

2
source/templates/demo/extended.njk
View file

@ -5,6 +5,8 @@
<meta charset="utf-8">
{% block head %}
<title>{% block title %}{% endblock %} - HIPPIE</title>
{% include "demo/partials/head-meta.njk" %}
<!--[if lte IE 9]>

8
source/templates/demo/macros/nav-macro.njk
View file

@ -1,18 +1,10 @@
{% set item = [['one', 'filename'], ['two', 'filename']] %}
{% macro active(activePage='') %}<!-- nav.macro -->
<nav class="nav_site">
<span id="js_nav_tog" class="nav_site_toggle"><img src="./art/more.svg" width="22" height="22"/></span>
<ul class="nav_site_main">
{% for a, b in item -%}
<li{%if activePage == a %} class="active_txt"{% endif %}>{%if activePage == a %}{{ a }}{%else%}<a href="{{ b }}.html">{{ a }}</a>{% endif %}</li>
{% endfor -%}
</ul>
<ul class="nav_site_add">
<li><a href="dummy.html"><img src="./art/search.svg" width="22" height="22"/></a></li>
<li><img src="./art/cart.svg" width="22" height="22"/></li>
</ul>
</nav>
{%- endmacro %}
{% macro top() %}<!-- top.macro -->
<div id="js_top" class="overlay_btn hidden"><span class="span_solo"><img src="./art/top.svg" width="44" height="44"/></span></div>
{%- endmacro %}

2
source/templates/demo/maintenance.njk
View file

@ -5,6 +5,8 @@
<meta charset="utf-8">
{% block head %}
<title>{% block title %}{% endblock %} - HIPPIE</title>
{% include "demo/partials/head-meta.njk" %}
<link rel="icon" href="./favicon.ico" type="image/vnd.microsoft.icon">

2
source/templates/demo/partials/head-meta.njk
View file

@ -1,6 +1,4 @@
<!-- head-meta.partial -->
<title>{% block title %}{% endblock %} - HIPPIE</title>
<meta name="author" content="Interaktionsweise">
<meta name="description" content="hippie">
<meta name="generator" content="Notepad++, Atom">