From e9f372765fd74f1cd60a2351b1a3c1eef0625e36 Mon Sep 17 00:00:00 2001 From: quassy Date: Tue, 28 Apr 2015 04:15:46 +0200 Subject: [PATCH] Follow some changes of Jekyll Now (Not all of them, encoding SVG into base64 inside a stylesheet file is a weird idea...) --- _includes/analytics.html | 7 +++++-- _includes/app_content.html | 24 ++++++++++++------------ _includes/meta.html | 18 ++++++++++++++++++ _layouts/default-beta.html | 7 +------ _layouts/default.html | 17 ++++++----------- _layouts/post.html | 30 +++++++++++++++--------------- 6 files changed, 57 insertions(+), 46 deletions(-) create mode 100644 _includes/meta.html diff --git a/_includes/analytics.html b/_includes/analytics.html index dc75d72..bfb466d 100644 --- a/_includes/analytics.html +++ b/_includes/analytics.html @@ -5,9 +5,12 @@ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); - + ga('create', '{{ site.google_analytics }}', 'auto'); - ga('send', 'pageview'); + ga('send', 'pageview', { + 'page': '{{ page.url }}', + 'title': '{{ page.title | replace: "'", "\\'" }}' + }); {% endif %} \ No newline at end of file diff --git a/_includes/app_content.html b/_includes/app_content.html index 6b3ed93..37c18e7 100644 --- a/_includes/app_content.html +++ b/_includes/app_content.html @@ -6,35 +6,35 @@

Screenshots

{% if post.package %}

Installation

{% if post.repository or post.repository-unstable %} -

Behold! Third-party repositories are usually not verified by others. Follow these instructions at your own risk and only if you trust the owner of the repository / developer of the software.

+

Behold! Third-party repositories are usually not verified by others. Follow these instructions at your own risk and only if you trust the owner of the repository / developer of the software.

{% endif %} {% if post.repository %}
    sudo apt-add-repository {{ post.repository }}
-    sudo apt-get update  
+    sudo apt-get update
     sudo apt-get install {{ post.package }}
{% endif %} - + {% if post.repository-unstable %} -

The following code adds an unstable repository, use with even higher caution as things might break.

- 
    sudo apt-add-repository {{ post.repository-unstable }}
+      
The following code adds an unstable repository, use with even higher caution as things might break. 

+    
    sudo apt-add-repository {{ post.repository-unstable }}
     sudo apt-get update
     sudo apt-get install {{ post.package }}
{% endif %}
-	
+
 {% elseif post.installation %}
   
Installation

 
   {% foreach post.installation as dist %}
-    
+
   {% endforeach %}
 
   {% if post.installation %}
-	
Behold! Third-party repositories are usually not verified by others. Follow these instructions at your own risk and only if you trust the owner of the repository / developer of the software.

+    
Behold! Third-party repositories are usually not verified by others. Follow these instructions at your own risk and only if you trust the owner of the repository / developer of the software.

   {% endif %}
     {% if post.repository %}
    sudo apt-add-repository {{ post.repository }}
-    sudo apt-get update  
+    sudo apt-get update
     sudo apt-get install {{ post.package }}
{% endif %}
-    
+
     {% if post.repository-unstable %}
-	  
The following code adds an unstable repository, use with even higher caution as things might break. 

-	
    sudo apt-add-repository {{ post.repository-unstable }}
+      
The following code adds an unstable repository, use with even higher caution as things might break. 

+    
    sudo apt-add-repository {{ post.repository-unstable }}
     sudo apt-get update
     sudo apt-get install {{ post.package }}
{% endif %}
 
diff --git a/_includes/meta.html b/_includes/meta.html
new file mode 100644
index 0000000..b8f4a33
--- /dev/null
+++ b/_includes/meta.html
@@ -0,0 +1,18 @@
+    
+    
+    
+    
+
+    {% if page.excerpt %}
+    
+    
+    {% else %}
+    
+    
+    {% endif %}
+    
+
+    {% if page.title %}
+    
+    
+    {% endif %}
\ No newline at end of file
diff --git a/_layouts/default-beta.html b/_layouts/default-beta.html
index 48fccfb..ef968b0 100644
--- a/_layouts/default-beta.html
+++ b/_layouts/default-beta.html
@@ -1,17 +1,12 @@
 
 
 
-  
-  
-  
+  {% include meta.html %}
 
   
     {% if page.title %}{{ page.title }} – {% endif %}{{ site.name }}
   
 
-  
-  
-
   
diff --git a/_layouts/default.html b/_layouts/default.html
index d89332d..d503862 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -1,17 +1,12 @@
 
 
   
-    
-    
-    
+    {% include meta.html %}
 
     
       {% if page.title %}{{ page.title }} – {% endif %}{{ site.name }}
     
 
-    
-    
-
     
@@ -27,11 +22,11 @@
 
     
     
-    
+
     
 
     
-    
+
     
     
     
@@ -53,7 +48,7 @@
     
     
     
-    
+
   
 
   
@@ -61,12 +56,12 @@
       

         

           
-          
+
           

             
{{ site.name }}

             
{% if site.description_html %}{{ site.description_html }}{% else %}{{ site.description }}{% endif %}

           

-          
+
           

+
+
     {% if post.category %}
       {% for site_category in site.data.categories %}
         {% if site_category.slug == post.category %}
@@ -39,8 +39,8 @@ 
{{ post.title }}

       {% assign category_content = 'Posted in no particular category.' %}
     {% endif %}
 
-    
{{ category_content }}    
-    
+    
{{ category_content }}
+
     {% if post.tags.size > 0 %}
       {% capture tags_content %}Tagged with {% endcapture %}
       {% for post_tag in post.tags %}
@@ -51,16 +51,16 @@ 
{{ post.title }}

         {% endfor %}
         {% if tag %}
           {% capture tags_content_temp %}{{ tags_content }}{{ tag.name }}{% if forloop.last == false %}, {% endif %}{% endcapture %}
-          {% assign tags_content = tags_content_temp %}    
+          {% assign tags_content = tags_content_temp %}
         {% endif %}
       {% endfor %}
     {% else %}
       {% assign tags_content = '' %}
     {% endif %}
-    
+
     {{ tags_content }}

-    
+
   
-  
-  {% include disqus.html disqus_identifier=post.disqus_identifier %}
+
+  {% include disqus.html %}
 
\ No newline at end of file