From 636fc5ae0613f72ad26b7d9e5bec2cfc40f61aba Mon Sep 17 00:00:00 2001 From: Nico Jensen Date: Mon, 25 Mar 2019 13:54:51 +0100 Subject: [PATCH] some changes Add new compress Change header edit errorpage --- _includes/head.html | 45 +++++++++++++++++++++++++++++++++++++++++ _layouts/compress.html | 10 +++++++++ _layouts/default.html | 24 ++++++---------------- _layouts/errorpage.html | 1 + 4 files changed, 62 insertions(+), 18 deletions(-) create mode 100644 _includes/head.html create mode 100644 _layouts/compress.html diff --git a/_includes/head.html b/_includes/head.html new file mode 100644 index 0000000..f8aeeef --- /dev/null +++ b/_includes/head.html @@ -0,0 +1,45 @@ +{% capture title %} + {% if page.title and page.title != "Home" %} + {{ page.title }} · {{ site.title }} + {% else %} + {{ site.title }} + {% endif %} +{% endcapture %} + +{% capture description %} + {% if page.date %} + {{ page.date | date: "%d.%m.%Y" }} + {% endif %} + {% if page.location %} +  / {{ page.location }} + {% endif %} +{% endcapture %} +{% if description == "" %} + {% assign description = site.description %} +{% endif %} + + + + + + + {{ title }} + + + + + + + + + {% if description %}{% endif %} + + + + + + + + + + \ No newline at end of file diff --git a/_layouts/compress.html b/_layouts/compress.html new file mode 100644 index 0000000..bb34487 --- /dev/null +++ b/_layouts/compress.html @@ -0,0 +1,10 @@ +--- +# Jekyll layout that compresses HTML +# v3.1.0 +# http://jch.penibelst.de/ +# © 2014–2015 Anatol Broder +# MIT License +--- + +{% capture _LINE_FEED %} +{% endcapture %}{% if site.compress_html.ignore.envs contains jekyll.environment or site.compress_html.ignore.envs == "all" %}{{ content }}{% else %}{% capture _content %}{{ content }}{% endcapture %}{% assign _profile = site.compress_html.profile %}{% if site.compress_html.endings == "all" %}{% assign _endings = "html head body li dt dd optgroup option colgroup caption thead tbody tfoot tr td th" | split: " " %}{% else %}{% assign _endings = site.compress_html.endings %}{% endif %}{% for _element in _endings %}{% capture _end %}{% endcapture %}{% assign _content = _content | remove: _end %}{% endfor %}{% if _profile and _endings %}{% assign _profile_endings = _content | size | plus: 1 %}{% endif %}{% for _element in site.compress_html.startings %}{% capture _start %}<{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _start %}{% endfor %}{% if _profile and site.compress_html.startings %}{% assign _profile_startings = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.comments == "all" %}{% assign _comments = "" | split: " " %}{% else %}{% assign _comments = site.compress_html.comments %}{% endif %}{% if _comments.size == 2 %}{% capture _comment_befores %}.{{ _content }}{% endcapture %}{% assign _comment_befores = _comment_befores | split: _comments.first %}{% for _comment_before in _comment_befores %}{% if forloop.first %}{% continue %}{% endif %}{% capture _comment_outside %}{% if _carry %}{{ _comments.first }}{% endif %}{{ _comment_before }}{% endcapture %}{% capture _comment %}{% unless _carry %}{{ _comments.first }}{% endunless %}{{ _comment_outside | split: _comments.last | first }}{% if _comment_outside contains _comments.last %}{{ _comments.last }}{% assign _carry = false %}{% else %}{% assign _carry = true %}{% endif %}{% endcapture %}{% assign _content = _content | remove_first: _comment %}{% endfor %}{% if _profile %}{% assign _profile_comments = _content | size | plus: 1 %}{% endif %}{% endif %}{% assign _pre_befores = _content | split: "" %}{% assign _pres_after = "" %}{% if _pres.size != 0 %}{% if site.compress_html.blanklines %}{% assign _lines = _pres.last | split: _LINE_FEED %}{% capture _pres_after %}{% for _line in _lines %}{% assign _trimmed = _line | split: " " | join: " " %}{% if _trimmed != empty or forloop.last %}{% unless forloop.first %}{{ _LINE_FEED }}{% endunless %}{{ _line }}{% endif %}{% endfor %}{% endcapture %}{% else %}{% assign _pres_after = _pres.last | split: " " | join: " " %}{% endif %}{% endif %}{% capture _content %}{{ _content }}{% if _pre_before contains "" %}{% endif %}{% unless _pre_before contains "" and _pres.size == 1 %}{{ _pres_after }}{% endunless %}{% endcapture %}{% endfor %}{% if _profile %}{% assign _profile_collapse = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.clippings == "all" %}{% assign _clippings = "html head title base link meta style body article section nav aside h1 h2 h3 h4 h5 h6 hgroup header footer address p hr blockquote ol ul li dl dt dd figure figcaption main div table caption colgroup col tbody thead tfoot tr td th" | split: " " %}{% else %}{% assign _clippings = site.compress_html.clippings %}{% endif %}{% for _element in _clippings %}{% assign _edges = " ;; ;" | replace: "e", _element | split: ";" %}{% assign _content = _content | replace: _edges[0], _edges[1] | replace: _edges[2], _edges[3] | replace: _edges[4], _edges[5] %}{% endfor %}{% if _profile and _clippings %}{% assign _profile_clippings = _content | size | plus: 1 %}{% endif %}{{ _content }}{% if _profile %}
Step Bytes
raw {{ content | size }}{% if _profile_endings %}
endings {{ _profile_endings }}{% endif %}{% if _profile_startings %}
startings {{ _profile_startings }}{% endif %}{% if _profile_comments %}
comments {{ _profile_comments }}{% endif %}{% if _profile_collapse %}
collapse {{ _profile_collapse }}{% endif %}{% if _profile_clippings %}
clippings {{ _profile_clippings }}{% endif %}
{% endif %}{% endif %} diff --git a/_layouts/default.html b/_layouts/default.html index 158e1e2..216e030 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,22 +1,10 @@ +--- +layout: compress +--- + - - - - - - - {% if page.title and page.title != "Home" %} - {{ page.title }} · {{ site.title }} - {% else %} - {{ site.title }} - {% endif %} - - - - - {% feed_meta %} - {% seo %} + {% include head.html %} {% include header.html %} @@ -26,4 +14,4 @@ {% include footer.html %} - + \ No newline at end of file diff --git a/_layouts/errorpage.html b/_layouts/errorpage.html index 04d6b70..7d2b3b7 100644 --- a/_layouts/errorpage.html +++ b/_layouts/errorpage.html @@ -1,3 +1,4 @@ +{% include head.html %}