Merge pull request #31 from sandipb/dev

Links to tags/categories now respect permalink configuration

6 files changed, 30 insertions, 19 deletions

diff --git a/layouts/partials/article_footer.html b/layouts/partials/article_footer.html
index 242b095..aa87db1 100644
--- a/layouts/partials/article_footer.html
+++ b/layouts/partials/article_footer.html
@@ -19,16 +19,17 @@
       <time class="entry-date published" datetime="{{ .Date }}" itemprop="datePublished">{{ .Date.Format $date_format }}</time>

     </span>

     {{ end }}

-    

+

     {{ if isset .Params "categories" }}

     {{ $categoriesLen := len .Params.categories }}

     {{ if gt $categoriesLen 0 }}

     <span class="category">

       {{ range $k, $v := .Params.categories }}

-      {{ $url := printf "%s/%s" "categories" (. | urlize | lower) }}

-      <a class="article-category-link" href="{{ $url | absURL }}">{{ . }}</a>

+      {{ with site.GetPage (printf "/%s/%s" "categories" ($v | urlize)) }}

+      <a class="article-category-link" href="{{ .Permalink }}">{{ $v }}</a>

       {{ if lt $k (sub $categoriesLen 1) }},{{ end }}

       {{ end }}

+      {{ end }}

     </span>

     {{ end }}

     {{ end }}

diff --git a/layouts/partials/article_list.html b/layouts/partials/article_list.html
index a62d2f0..c935768 100644
--- a/layouts/partials/article_list.html
+++ b/layouts/partials/article_list.html
@@ -6,26 +6,27 @@
     {{ if and (isset .Params "banner") (not (eq .Params.banner "")) }}

     <figure class="post-featured-image">

       <a href="{{ .RelPermalink }}" itemprop="url">

-	<img src="{{ .Params.banner | absURL }}" class="attachment-featured size-featured wp-post-image"/>

+      <img src="{{ .Params.banner | absURL }}" class="attachment-featured size-featured wp-post-image"/>

       </a>

-    </figure> 

+    </figure>

     {{ end }}

-    

+

     {{ partial "article_header" . }}

     <div class="article-entry entry-content clearfix" itemprop="articleBody">

       <p>

-        {{ printf "%s" .Summary | markdownify }}

+        {{ .Summary }}

         <br>

       </p>

       {{ partial "share" . }}

     </div>

     {{ partial "article_footer" . }}

+    {{ if .Truncated }}

     <span>

-      <a class="readmore" href="{{ .Permalink }}">

-	{{ with .Site.Data.l10n.articles.read_more }}{{ . }}{{ end }}

+      <a class="readmore" href="{{ .RelPermalink }}">

+      {{ with .Site.Data.l10n.articles.read_more }}{{ . }}{{ end }}

       </a>

     </span>

-    

+    {{ end }}{{/* if .Truncated */}}

     </div>

 

 

diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 97ae602..504571b 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -75,5 +75,8 @@
      ga('send', 'pageview');

 

     </script>

-{{ end }}

+    {{ end }}

+    {{ range $i, $src := .Site.Params.custom_css }}

+    <link rel='stylesheet' id='custom_css_{{ $i }}'  href="{{ $src | absURL }}" type='text/css' media='all' />

+    {{ end }}

 </head>

diff --git a/layouts/partials/single_article.html b/layouts/partials/single_article.html
index 5d00a24..cfa8f56 100644
--- a/layouts/partials/single_article.html
+++ b/layouts/partials/single_article.html
@@ -4,7 +4,7 @@
 {{ end }}

 {{ end }}

 

-    <div id="content">	

+    <div id="content">

 	<section id="post" class="post type-post status-publish format-standard has-post-thumbnail hentry">

 	    <article>

 		<div class="article-inner">

@@ -14,18 +14,21 @@
 		</div>

 		<div class="entry-content" itemprop="articleBody">

 		    {{ .Content }}

-		    <!-- -    {{ partial "share" . }}  -->	

+		    <!-- -    {{ partial "share" . }}  -->

 		</div>

 		{{ if (.Params.tags) }}

 		<div class="tags">

 		    {{ range $k, $tag := .Params.tags }}

-		    <a href="/tags/{{ $tag | urlize }}" rel="tag">{{ $tag }}</a>&middot;

+			{{ if $k }} &middot; {{ end }}

+			{{ with site.GetPage (printf "/%s/%s" "tags" ($tag | urlize)) }}

+		    <a href="{{ .Permalink }}" rel="tag">{{ $tag }}</a>

+			{{ end }}

 		    {{ end }}

 		</div>

 		{{ end }}

 		{{ partial "prev_next_post" . }}

 	    </article>

-	    

+

 	    {{ if and (and (not (eq .Site.Params.privacy.DisqusShortname "")) (not .Params.disable_comments)) (not .Site.Params.privacy.enable) }}

 	    <section id="comments">

 		<div id="disqus_thread">

@@ -34,7 +37,7 @@
 	    </section>

 	    {{ end }}

 	</section>

-	

+

     </div><!-- #content -->

 {{ if .Site.Params.widgets }}

 {{ if (not .Params.disable_profile) | and (not .Params.disable_widgets) }}

diff --git a/layouts/partials/widgets/categories.html b/layouts/partials/widgets/categories.html
index 12f49fd..791dc32 100644
--- a/layouts/partials/widgets/categories.html
+++ b/layouts/partials/widgets/categories.html
@@ -2,10 +2,11 @@
   <h3 class="widget-title">{{with .Site.Data.l10n.widgets.categories.title}}{{.}}{{end}}</h3>

   <ul>

     {{ range $name, $items := .Site.Taxonomies.categories }}

+    {{ with site.GetPage (printf "/%s/%s" "categories" ($name | urlize)) }}

     <li class="cat-item">

-      {{ $url := printf "%s/%s" "categories" ($name | urlize)}}

-      <a href="{{ $url | absURL }}">{{ $name | title }}</a> ({{ len $items }})

+      <a href="{{ .Permalink }}">{{ $name | title }}</a> ({{ len $items }})

     </li>

     {{ end }}

+    {{ end }}

   </ul>

 </aside>

diff --git a/layouts/partials/widgets/tag_cloud.html b/layouts/partials/widgets/tag_cloud.html
index 21cdb8d..a161aae 100644
--- a/layouts/partials/widgets/tag_cloud.html
+++ b/layouts/partials/widgets/tag_cloud.html
@@ -9,12 +9,14 @@
 {{ $baseurl := .Site.BaseURL }}

 {{ range $name, $value := .Site.Taxonomies.tags }}

     {{ if (gt $value.Count $min_count) }}

-    <a href="{{ $baseurl }}tags/{{ $name | urlize }}" style="font-size: {{ add ($value.Count) $mag_factor }}px;" title="{{ ($value.Count) }} topics">

+    {{ with site.GetPage (printf "/%s/%s" "tags" ($name | urlize)) }}

+    <a href="{{ .Permalink }}" style="font-size: {{ add ($value.Count) $mag_factor }}px;" title="{{ ($value.Count) }} topics">

       <!--a href="{{ $baseurl }}/tags/{{ $name | urlize }}"-->

       {{ $name | title }}

     </a>

       {{ end }}

       {{ end }}

+      {{ end }}

   </div>

 

 </aside>