Minor changes

Signed-off-by: Valentin Popov <info@valentineus.link>

9 files changed, 17 insertions, 19 deletions

diff --git a/_includes/disqus.html b/_includes/disqus.html
index 267e41d..c9b5d32 100644
--- a/_includes/disqus.html
+++ b/_includes/disqus.html
@@ -3,8 +3,8 @@
   <script type="text/javascript" defer>
     var disqus_config = function () {
       this.page.identifier = '{{ page.id | strip_newlines | strip_html | strip | normalize_whitespace | slugify }}';
-      this.page.title = '{{ page.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify }}';
-      this.page.url = '{{ page.url | absolute_url | uri_escape }}';
+      this.page.title = '{{ page.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}';
+      this.page.url = '{{ page.url | strip_newlines | strip_html | strip | normalize_whitespace | absolute_url | uri_escape }}';
     };
 
     (function () {
diff --git a/_includes/external_links.html b/_includes/external_links.html
index 4a04694..f18abed 100644
--- a/_includes/external_links.html
+++ b/_includes/external_links.html
@@ -1,7 +1,7 @@
 <p class="social-links">
   {% for link in site.data.external_links %}
     <a href="{{ link.url | strip_newlines | strip_html | strip | normalize_whitespace | uri_escape }}">
-      {{ link.name | strip_newlines | strip_html | strip | normalize_whitespace | smartify }}
+      {{ link.name | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}
     </a>
     <!-- Separation -->
     {% unless forloop.last %}
diff --git a/_includes/footer.html b/_includes/footer.html
index 4031b63..e60815d 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,8 +1,8 @@
 <footer class="footer">
   <small>
     {% for link in site.data.footer_links %}
-      <a href="{{ link.path | strip_newlines | strip_html | strip | normalize_whitespace | relative_url | uri_escape }}">
-        {{ link.name | strip_newlines | strip_html | strip | normalize_whitespace | smartify }}
+      <a href="{{ link.path | strip_newlines | strip_html | strip | normalize_whitespace | uri_escape }}">
+        {{ link.name | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}
       </a>
       <!-- Separation -->
       {% unless forloop.last %}
diff --git a/_includes/head.html b/_includes/head.html
index 012e8c7..e7766cb 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -13,9 +13,9 @@
   {% endfor %}
 
   <!-- Title / Description -->
-  <meta name="application-name" content="{{ page.title | default: site.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | downcase | capitalize }}" />
-  <meta name="description" content="{{ page.description | default: site.description | strip_newlines | strip_html | strip | normalize_whitespace | smartify | truncate: 100 }}" />
-  <title>{{ page.title | default: site.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | truncate: 64 }}</title>
+  <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 | truncate: 100 | xml_escape }}" />
+  <title>{{ page.title | default: site.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | truncate: 64 | xml_escape }}</title>
 
   <!-- CSS -->
   <link rel="stylesheet" href="{{ '/assets/css/fonts.css' | relative_url | uri_escape }}" />
diff --git a/_includes/image.html b/_includes/image.html
index d6be65c..f5684d1 100644
--- a/_includes/image.html
+++ b/_includes/image.html
@@ -1,6 +1,6 @@
-{% assign alternative = include.alt | strip_newlines | strip_html | strip | normalize_whitespace | smartify | downcase | capitalize %}
+{% assign alternative = include.alt | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %}
 {% assign identifier = include.id | strip_newlines | strip_html | strip | normalize_whitespace | slugify %}
-{% assign source = include.src | strip_newlines | strip_html | strip | normalize_whitespace | relative_url | uri_escape %}
+{% assign source = include.src | strip_newlines | strip_html | strip | normalize_whitespace | uri_escape %}
 
 <a href="#{{ identifier }}">
   <img alt="{{ alternative }}" src="{{ source }}" />
diff --git a/_includes/navbar.html b/_includes/navbar.html
index 7c0c8c4..c5d1de8 100644
--- a/_includes/navbar.html
+++ b/_includes/navbar.html
@@ -4,8 +4,8 @@
   <a href="{{ site.url | uri_escape }}">Home</a>
 
   {% for page in pages %}
-    <a href="{{ page.url | relative_url | uri_escape }}">
-      {{ page.title | default: "Page" | strip_newlines | strip_html | strip | normalize_whitespace | smartify | capitalize }}
+    <a href="{{ page.url | strip_newlines | strip_html | strip | normalize_whitespace | relative_url | uri_escape }}">
+      {{ page.title | default: "Page" | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}
     </a>
   {% endfor %}
 </nav>
diff --git a/_layouts/page.html b/_layouts/page.html
index 5e6d1de..8938b9d 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -5,7 +5,7 @@ layout: default
 <div class="content">
   <article>
     <header>
-      <h1>{{ page.title | default: site.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | capitalize }}</h1>
+      <h1>{{ page.title | default: site.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}</h1>
     </header>
 
     {{ content }}
diff --git a/_layouts/post.html b/_layouts/post.html
index 81d3b46..8cfd061 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -6,7 +6,7 @@ layout: default
   <article>
     <header>
       <small><time datetime="{{ page.date | date_to_xmlschema}}">{{ page.date | date_to_long_string }}</time></small>
-      <h1>{{ page.title | default: site.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | capitalize }}</h1>
+      <h1>{{ page.title | default: site.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}</h1>
     </header>
 
     {{ content }}
diff --git a/_pages/index.html b/_pages/index.html
index 30f8c6d..3257c6a 100644
--- a/_pages/index.html
+++ b/_pages/index.html
@@ -15,14 +15,12 @@ layout: page
     <div class="post-item">
       <small><time datetime="{{ post.date | date_to_xmlschema}}">{{ post.date | date_to_long_string }}</time></small>
       <h4>
-        <a href="{{ post.url | relative_url | uri_escape }}">
-          {{ post.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | capitalize }}
+        <a href="{{ post.url | strip_newlines | strip_html | strip | normalize_whitespace | relative_url | uri_escape }}">
+          {{ post.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}
         </a>
       </h4>
 
-      {% if post.description %}
-        <p>{{ post.description | strip_newlines | strip_html | strip | normalize_whitespace | smartify | truncatewords: 32 }}</p>
-      {% endif %}
+      <p>{{ post.description | strip_newlines | strip_html | strip | normalize_whitespace | smartify | truncatewords: 32 | xml_escape }}</p>
     </div>
   {% endfor %}
 {% endfor %}