Fixes.

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.2.0
+
+TODO
+
 ## 2.1.0
 
 - Italian translation [#60](https://github.com/alexandrevicenzi/Flex/issues/60)

README.md

@@ -23,17 +23,19 @@ DON'T send any questions, issues or anything related to Flex to my personal emai
 
 - [AddThis](http://www.addthis.com/) Share Buttons and Related Posts
 - [Disqus](https://disqus.com/)
-- [Gauges](http://get.gaug.es/)
+- [duoshuo](http://duoshuo.com/) (new in 2.2)
+- [Gauges Analytics](http://get.gaug.es/)
 - [Google AdSense](https://www.google.com.br/adsense/start/) (new in 2.1)
 - [Google Analytics](https://www.google.com/analytics/web/)
 - [Google Tag Manager](https://www.google.com/tagmanager/)
-- [Piwik](http://piwik.org/)
+- [Piwik Analytics](http://piwik.org/)
 - [StatusCake](https://www.statuscake.com/)
-- [Github Corners](https://github.com/tholman/github-corners) (new in 2.2)
 
 ## Plugins Support
 
+- [Github Corners](https://github.com/tholman/github-corners) (new in 2.2)
 - [I18N Sub-sites](https://github.com/getpelican/pelican-plugins/tree/master/i18n_subsites) (new in 2.0)
+- [Minute read](https://github.com/getpelican/pelican-plugins/tree/master/post_stats)) (new in 2.0)
 - [Related Posts](https://github.com/getpelican/pelican-plugins/tree/master/related_posts)
 - [Representative image](https://github.com/getpelican/pelican-plugins/tree/master/representative_image) (new in 2.2)
 

templates/article.html

@@ -2,12 +2,13 @@
 
 {% block meta %}
 <meta name="author" content="{{ article.author.name }}" />
-<meta name="description" content="{{ article.summary|striptags }}" />
+<meta name="description" content="{{ article.summary|striptags|escape }}" />
-<meta name="keywords" content="{{ article.tags|join(', ') }}">
+<meta name="keywords" content="{{ article.tags|join(', ')|escape }}">
+
 {% include "partial/og_article.html" %}
 {% endblock %}
 
-{% block title %} &ndash; {{ article.title|striptags }}{% endblock %}
+{% block title %} &ndash; {{ article.title|striptags|escape }}{% endblock %}
 
 {% block content %}
 <article class="single">

templates/authors.html

@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+
 {% block title %} – {{ _('Authors') }}{% endblock %}
 
 {% block content %}

templates/base.html

@@ -54,6 +54,8 @@
     <!-- iOS Safari -->
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+    <!-- Microsoft EDGE -->
+    <meta name="msapplication-TileColor" content="{{ BROWSER_COLOR }}">
   {% endif %}
 
   {% block meta %}

templates/categories.html

@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+
 {% block title %} – {{ _('Categories') }}{% endblock %}
 
 {% block content %}

templates/page.html

@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+
 {% block title %} – {{ page.title }}{% endblock %}
 
 {% block content %}

templates/partial/cc_license.html

@@ -1,5 +1,5 @@
 <p>
-  &copy; {{ AUTHOR }} {{ COPYRIGHT_YEAR }} - This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/{{ CC_LICENSE['slug'] }}/{{ CC_LICENSE['version'] }}/">{{ CC_LICENSE['name'] }} {{ CC_LICENSE['version'] }} International License</a>
+  &copy; {{ COPYRIGHT_NAME }} {{ COPYRIGHT_YEAR }} - This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/{{ CC_LICENSE['slug'] }}/{{ CC_LICENSE['version'] }}/">{{ CC_LICENSE['name'] }} {{ CC_LICENSE['version'] }} International License</a>
 </p>
 {% include "partial/flex.html" %}
 <p>

templates/partial/copyright.html

@@ -1,4 +1,4 @@
-<p>&copy; {{ AUTHOR }} {{ COPYRIGHT_YEAR }}</p>
+<p>&copy; {{ COPYRIGHT_NAME }} {{ COPYRIGHT_YEAR }}</p>
 {% include "partial/flex.html" %}
 {% if STATUSCAKE %}
   {% include "partial/statuscake.html" %}

templates/partial/disqus.html

@@ -1,4 +1,5 @@
 {% if DISQUS_SITENAME %}
+<!-- Disqus -->
 <div id="disqus_thread"></div>
 <script type="text/javascript">
     var disqus_shortname = '{{ DISQUS_SITENAME }}';
@@ -11,4 +12,5 @@
 <noscript>
     {{ _('Please enable JavaScript to view comments.') }}
 </noscript>
+<!-- End Disqus -->
 {% endif %}

templates/partial/duoshuo.html

@@ -1,8 +1,9 @@
 {% if DUOSHUO_SITENAME %}
+<!-- duoshuo -->
 <div class="ds-thread" data-thread-key="{{ article.slug }}" data-title="{{ article.title }}" data-url="{{ SITEURL }}/{{ article.url }}"></div>
 <script type="text/javascript">
-
     var duoshuoQuery = {short_name:'{{ DUOSHUO_SITENAME }}'};
+
     (function() {
         var ds = document.createElement('script');
         ds.type = 'text/javascript';ds.async = true;
@@ -11,5 +12,9 @@
         (document.getElementsByTagName('head')[0]
          || document.getElementsByTagName('body')[0]).appendChild(ds);
     })();
-	</script>
+</script>
- {% endif %}
+<noscript>
+    {{ _('Please enable JavaScript to view comments.') }}
+</noscript>
+<!-- End duoshuo -->
+{% endif %}

templates/partial/github.html

@@ -1,3 +1,19 @@
 <a href="{{ GITHUB_CORNER_URL }}" class="github-corner" aria-label="View source on Github">
-<svg width="80" height="80" viewBox="0 0 250 250" style="fill:#151513; color:#fff; position: absolute; top: 0; border: 0; right: 0;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
+    <svg width="80"
+         height="80"
+         viewBox="0 0 250 250"
+         style="fill:#151513; color:#fff; position: absolute; top: 0; border: 0; right: 0;"
+         aria-hidden="true">
+        <path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path>
+        <path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2"
+              fill="currentColor"
+              style="transform-origin: 130px 106px;"
+              class="octo-arm">
+        </path>
+        <path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z"
+              fill="currentColor"
+              class="octo-body">
+        </path>
+    </svg>
 </a>
+<style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>

templates/partial/gtm.html

@@ -1,9 +1,15 @@
 <!-- Google Tag Manager -->
-<noscript><iframe src="//www.googletagmanager.com/ns.html?id={{ GOOGLE_TAG_MANAGER }}"
+<noscript>
-height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+  <iframe src="//www.googletagmanager.com/ns.html?id={{ GOOGLE_TAG_MANAGER }}" height="0" width="0" style="display:none;visibility:hidden"></iframe>
-<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+</noscript>
-new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+<script>
-j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+  (function(w,d,s,l,i){
-'//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+    w[l]=w[l]||[];
-})(window,document,'script','dataLayer','{{ GOOGLE_TAG_MANAGER }}');</script>
+    w[l].push({'gtm.start':new Date().getTime(),event:'gtm.js'});
+    var f=d.getElementsByTagName(s)[0],j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';
+    j.async=true;
+    j.src='//www.googletagmanager.com/gtm.js?id='+i+dl;
+    f.parentNode.insertBefore(j,f);
+  })(window,document,'script','dataLayer','{{ GOOGLE_TAG_MANAGER }}');
+</script>
 <!-- End Google Tag Manager -->

templates/partial/og_article.html

@@ -4,8 +4,8 @@
   {% set default_locale = 'en_US' %}
 {% endif %}
 <meta property="og:site_name" content="{{ SITENAME }}"/>
-<meta property="og:title" content="{{ article.title|striptags }}"/>
+<meta property="og:title" content="{{ article.title|striptags|escape }}"/>
-<meta property="og:description" content="{{ article.summary|striptags }}"/>
+<meta property="og:description" content="{{ article.summary|striptags|escape }}"/>
 <meta property="og:locale" content="{{ article.metadata.get('og_locale', default_locale) }}"/>
 <meta property="og:url" content="{{ SITEURL }}/{{ article.url }}"/>
 <meta property="og:type" content="article"/>
@@ -14,7 +14,7 @@
 <meta property="article:author" content="{{ SITEURL }}/{{ article.author.url }}">
 <meta property="article:section" content="{{ article.category.name }}"/>
 {% for tag in article.tags %}
-<meta property="article:tag" content="{{ tag.name }}"/>
+<meta property="article:tag" content="{{ tag.name|escape }}"/>
 {% endfor %}
 {% if 'cover' in article.metadata %}
 <meta property="og:image" content="{{ SITEURL }}/{{ article.metadata['cover'] }}">

templates/tags.html

@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+
 {% block title %} – {{ _('Tags') }}{% endblock %}
 
 {% block content %}