Fix subdirectory references

5 files changed, 26 insertions, 8 deletions

diff --git a/config.codekit3 b/config.codekit3
index 81d76f1..aa0ed49 100644
--- a/config.codekit3
+++ b/config.codekit3
@@ -4689,6 +4689,12 @@
 		"oAP": "\/exampleSite\/.gitignore",
 		"oF": 0
 		},
+	"\/exampleSite\/config.toml": {
+		"ft": 8192,
+		"oA": 2,
+		"oAP": "\/exampleSite\/config.toml",
+		"oF": 0
+		},
 	"\/exampleSite\/content\/about\/about.md": {
 		"cS": 0,
 		"eF": 1,
@@ -7740,6 +7746,12 @@
 		"oAP": "\/layouts\/partials\/meta.html",
 		"oF": 0
 		},
+	"\/layouts\/partials\/row.html": {
+		"ft": 8192,
+		"oA": 2,
+		"oAP": "\/layouts\/partials\/row.html",
+		"oF": 0
+		},
 	"\/layouts\/partials\/sidebar.html": {
 		"ft": 8192,
 		"oA": 0,
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index bcd58ee..7f3828e 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -40,7 +40,7 @@ themesdir = "../.."
 
 [params]
 site_theme = "orange"
-site_layout = "row"
+site_layout = "grid"
 # about_logo = "/img/hugocast.png"
 copyright_notice = "Copyright 2016 [Matt Stratton](https://www.mattstrattion.io)"
 itunes_subscribe = "http://itunes.apple.com/us/podcast/arrested-devops/id773888088?mt=2&uo=4&at=11lsCi"
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>