diff options
| author | Valentin Popov <info@valentineus.link> | 2020-01-23 19:21:21 +0300 |
|---|---|---|
| committer | Valentin Popov <info@valentineus.link> | 2020-01-23 19:23:28 +0300 |
| commit | 11c402a2938935111fc6c82f53b720eb71e355c7 (patch) | |
| tree | 5be50a926a746832df84e7a4abd04eb967f0bb79 | |
| parent | 28aec1dfdd90b7ffdd11321895ac37c0c2ab6fc6 (diff) | |
| download | valentineus.github.io-11c402a2938935111fc6c82f53b720eb71e355c7.tar.xz valentineus.github.io-11c402a2938935111fc6c82f53b720eb71e355c7.zip | |
Simplified data generation code
Signed-off-by: Valentin Popov <info@valentineus.link>
| -rw-r--r-- | _includes/contacts.html | 4 | ||||
| -rw-r--r-- | _includes/head.html | 12 | ||||
| -rw-r--r-- | _includes/links.html | 4 | ||||
| -rw-r--r-- | _includes/posts.html | 4 | ||||
| -rw-r--r-- | _layouts/default.html | 2 | ||||
| -rw-r--r-- | _layouts/page.html | 2 | ||||
| -rw-r--r-- | _layouts/post.html | 6 |
7 files changed, 17 insertions, 17 deletions
diff --git a/_includes/contacts.html b/_includes/contacts.html index 1389c30..6a9cef4 100644 --- a/_includes/contacts.html +++ b/_includes/contacts.html @@ -3,9 +3,9 @@ <ul> {% for contact in site.data.contacts %} <li> - <a href="{{ contact.url | strip_newlines | strip_html | strip | normalize_whitespace | relative_url | uri_escape }}" target="_blank">{{ contact.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}</a> + <a href="{{ contact.url | relative_url | uri_escape }}" target="_blank">{{ contact.title | strip | normalize_whitespace | xml_escape }}</a> <span>—</span> - <span>{{ contact.description | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}</span> + <span>{{ contact.description | strip | normalize_whitespace | xml_escape }}</span> </li> {% endfor %} </ul> diff --git a/_includes/head.html b/_includes/head.html index aa6fb4f..e7fe582 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -8,20 +8,20 @@ <!-- Advanced meta tags --> {% for tag in site.data.meta_tags %} - <meta name="{{ tag.name | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}" content="{{ tag.content | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}" /> + <meta name="{{ tag.name | strip | normalize_whitespace | xml_escape }}" content="{{ tag.content | strip | normalize_whitespace | xml_escape }}" /> {% endfor %} <!-- Open Graph --> - <meta property="og:title" content="{{ page.title | default: site.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}" /> - <meta property="og:description" content="{{ page.description | default: site.description | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}" /> + <meta property="og:title" content="{{ page.title | default: site.title | strip | normalize_whitespace | xml_escape }}" /> + <meta property="og:description" content="{{ page.description | default: site.description | strip | normalize_whitespace | xml_escape }}" /> <meta property="og:type" content="{{ page.layout | replace: 'post', 'article' | replace: 'page', 'website' | default: 'website' }}" /> <meta property="og:image" content="{{ page.image | absolute_url | uri_escape }}" /> <meta property="og:url" content="{{ page.url | absolute_url | uri_escape }}" /> <!-- Title / Description --> - <meta name="application-name" content="{{ page.title | default: site.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}" /> - <meta name="description" content="{{ page.description | default: site.description | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}" /> - <title>{{ page.title | default: site.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}</title> + <meta name="application-name" content="{{ page.title | default: site.title | strip | normalize_whitespace | xml_escape }}" /> + <meta name="description" content="{{ page.description | default: site.description | strip | normalize_whitespace | xml_escape }}" /> + <title>{{ page.title | default: site.title | strip | normalize_whitespace | xml_escape }}</title> <!-- CSS --> <link rel="stylesheet" href="{{ '/assets/css/styles.css' | relative_url | uri_escape }}" /> diff --git a/_includes/links.html b/_includes/links.html index e7a2801..8d40d6d 100644 --- a/_includes/links.html +++ b/_includes/links.html @@ -3,9 +3,9 @@ <ul> {% for link in site.data.links %} <li> - <a href="{{ link.url | strip_newlines | strip_html | strip | normalize_whitespace | relative_url | uri_escape }}" target="_blank">{{ link.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}</a> + <a href="{{ link.url | relative_url | uri_escape }}" target="_blank">{{ link.title | strip | normalize_whitespace | xml_escape }}</a> <span>—</span> - <span>{{ link.description | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}</span> + <span>{{ link.description | strip | normalize_whitespace | xml_escape }}</span> </li> {% endfor %} </ul> diff --git a/_includes/posts.html b/_includes/posts.html index fee0c31..4638c9b 100644 --- a/_includes/posts.html +++ b/_includes/posts.html @@ -3,8 +3,8 @@ <ul> {% for post in site.posts %} <li> - <a href="{{ post.url | relative_url | uri_escape }}">{{ post.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}</a> - (<time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date: '%d-%m-%Y' | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}</time>) + <a href="{{ post.url | relative_url | uri_escape }}">{{ post.title | strip | normalize_whitespace | xml_escape }}</a> + (<time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date: '%d-%m-%Y' | strip | normalize_whitespace | xml_escape }}</time>) </li> {% endfor %} </ul> diff --git a/_layouts/default.html b/_layouts/default.html index ee363a2..cabcd0b 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -3,7 +3,7 @@ layout: compress --- <!DOCTYPE html> -<html lang="{{ site.lang | strip_newlines | strip_html | strip | slugify }}"> +<html lang="{{ site.lang | strip | slugify | xml_escape }}"> {% include head.html %} <body> diff --git a/_layouts/page.html b/_layouts/page.html index 28cdb0f..32c9b9f 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -4,7 +4,7 @@ layout: default <main class="container"> <header> - <h1>{{ page.title | default: site.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}</h1> + <h1>{{ page.title | default: site.title | strip | normalize_whitespace | xml_escape }}</h1> </header> {{ content }} diff --git a/_layouts/post.html b/_layouts/post.html index 7731828..edbc5b7 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -5,15 +5,15 @@ layout: default <article class="container"> <small> <span>Published</span> - <time datetime="{{ page.date | date_to_xmlschema }}">{{ page.date | date: '%Y-%m-%d' | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}</time> + <time datetime="{{ page.date | date_to_xmlschema }}">{{ page.date | date: '%Y-%m-%d' | strip | normalize_whitespace | xml_escape }}</time> <span>on</span> - <a href="{{ site.url | absolute_url | uri_escape }}" target="_self">{{ site.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}</a> + <a href="{{ site.url | absolute_url | uri_escape }}" target="_self">{{ site.title | strip | normalize_whitespace | xml_escape }}</a> <span>|</span> <a href="{{ page.url | absolute_url | uri_escape }}" target="_blank">Permalink</a> </small> <header> - <h1>{{ site.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}</h1> + <h1>{{ site.title | strip | normalize_whitespace | xml_escape }}</h1> </header> {{ content }} |