From fff71b8863de0165ce8c7226df88dcb00f1c55d0 Mon Sep 17 00:00:00 2001
From: Matt Stratton <matt.stratton@gmail.com>
Date: Wed, 3 May 2017 11:07:02 -0500
Subject: Fix subdirectory references

---
 layouts/partials/grid.html      | 9 ++++++---
 layouts/partials/jumbotron.html | 2 +-
 layouts/partials/row.html       | 9 ++++++---
 3 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'layouts/partials')

diff --git a/layouts/partials/grid.html b/layouts/partials/grid.html
index 25374ac..4232cc8 100644
--- a/layouts/partials/grid.html
+++ b/layouts/partials/grid.html
@@ -39,22 +39,25 @@
 
 <ul class="pagination pagination-lg">
   {{ with $paginator.First }}
+  {{ $url := trim (string .URL) "/" | absURL  }}
   <li class="page-item">
-      <a href="{{ .URL | absURL }}" aria-label="First" class="page-link"><span aria-hidden="true">&laquo;&laquo;</span></a>
+      <a href="{{ $url }}" aria-label="First" class="page-link"><span aria-hidden="true">&laquo;&laquo;</span></a>
   </li>
   {{ end }}
   <li class="{{ if not $paginator.HasPrev }}disabled {{ end }}page-item">
       <a href="{{ if $paginator.HasPrev }}{{ $paginator.Prev.URL }}{{ end }}" aria-label="Previous" class="page-link"><span aria-hidden="true">&laquo;</span></a>
   </li>
   {{ range $paginator.Pagers }}
-  <li class="{{ if eq . $paginator }}active {{ end }}page-item"><a href="{{ .URL | absURL }}" class="page-link hidden-md-down">{{ .PageNumber }}</a></li>
+  {{ $url := trim (string .URL) "/" | absURL  }}
+  <li class="{{ if eq . $paginator }}active {{ end }}page-item"><a href="{{ $url }}" class="page-link hidden-md-down">{{ .PageNumber }}</a></li>
   {{ end }}
   <li class="{{ if not $paginator.HasNext }}disabled {{ end }}page-item">
       <a href="{{ if $paginator.HasNext }}{{ $paginator.Next.URL }}{{ end }}" aria-label="Next" class="page-link"><span aria-hidden="true">&raquo;</span></a>
   </li>
   {{ with $paginator.Last }}
+  {{ $url := trim (string .URL) "/" | absURL  }}
   <li class="page-item">
-      <a href="{{ .URL | absURL }}" aria-label="Last" class="page-link"><span aria-hidden="true">&raquo;&raquo;</span></a>
+      <a href="{{ $url }}" aria-label="Last" class="page-link"><span aria-hidden="true">&raquo;&raquo;</span></a>
   </li>
   {{ end }}
 </ul>
diff --git a/layouts/partials/jumbotron.html b/layouts/partials/jumbotron.html
index f7a38f8..20dcc94 100644
--- a/layouts/partials/jumbotron.html
+++ b/layouts/partials/jumbotron.html
@@ -40,7 +40,7 @@
       </div>
     {{ else }}
       <div class = "col subscribe_buttons">
-        <a class="btn btn-default" href="/episode/index.xml"><i class="fa fa-rss"></i>&nbsp;Subscribe via RSS</a>
+        <a class="btn btn-default" href="{{"episode/index.xml" | absURL }}"><i class="fa fa-rss"></i>&nbsp;Subscribe via RSS</a>
       </div>
     {{ end }}
 
diff --git a/layouts/partials/row.html b/layouts/partials/row.html
index 5477a9a..c1646e6 100644
--- a/layouts/partials/row.html
+++ b/layouts/partials/row.html
@@ -74,22 +74,25 @@
 
 <ul class="pagination pagination-lg">
   {{ with $paginator.First }}
+  {{ $url := trim (string .URL) "/" | absURL  }}
   <li class="page-item">
-      <a href="{{ $.Site.BaseURL }}" aria-label="First" class="page-link"><span aria-hidden="true">&laquo;&laquo;</span></a>
+      <a href="{{ $url }}" aria-label="First" class="page-link"><span aria-hidden="true">&laquo;&laquo;</span></a>
   </li>
   {{ end }}
   <li class="{{ if not $paginator.HasPrev }}disabled {{ end }}page-item">
       <a href="{{ if $paginator.HasPrev }}{{ $paginator.Prev.URL }}{{ end }}" aria-label="Previous" class="page-link"><span aria-hidden="true">&laquo;</span></a>
   </li>
   {{ range $paginator.Pagers }}
-  <li class="{{ if eq . $paginator }}active {{ end }}page-item"><a href="{{ $.Site.BaseURL}}{{ .URL }}" class="page-link hidden-md-down">{{ .PageNumber }}</a></li>
+  {{ $url := trim (string .URL) "/" | absURL  }}
+  <li class="{{ if eq . $paginator }}active {{ end }}page-item"><a href="{{ $url }}" class="page-link hidden-md-down">{{ .PageNumber }}</a></li>
   {{ end }}
   <li class="{{ if not $paginator.HasNext }}disabled {{ end }}page-item">
       <a href="{{ if $paginator.HasNext }}{{ $paginator.Next.URL }}{{ end }}" aria-label="Next" class="page-link"><span aria-hidden="true">&raquo;</span></a>
   </li>
   {{ with $paginator.Last }}
+  {{ $url := trim (string .URL) "/" | absURL  }}
   <li class="page-item">
-      <a href="{{ $.Site.BaseURL}}{{ .URL }}" aria-label="Last" class="page-link"><span aria-hidden="true">&raquo;&raquo;</span></a>
+      <a href="{{ $url }}" aria-label="Last" class="page-link"><span aria-hidden="true">&raquo;&raquo;</span></a>
   </li>
   {{ end }}
 </ul>
-- 
cgit v1.2.3