More fixed for links to categories and tags

3 files changed, 6 insertions, 5 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/widgets/categories.html b/layouts/partials/widgets/categories.html
index 058e779..791dc32 100644
--- a/layouts/partials/widgets/categories.html
+++ b/layouts/partials/widgets/categories.html
@@ -2,7 +2,7 @@
   <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) }}

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

     <li class="cat-item">

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

     </li>

diff --git a/layouts/partials/widgets/tag_cloud.html b/layouts/partials/widgets/tag_cloud.html
index 236dfdb..a161aae 100644
--- a/layouts/partials/widgets/tag_cloud.html
+++ b/layouts/partials/widgets/tag_cloud.html
@@ -9,7 +9,7 @@
 {{ $baseurl := .Site.BaseURL }}

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

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

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

+    {{ 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 }}