diff options
| -rw-r--r-- | layouts/partials/nav-list.html | 19 | ||||
| -rw-r--r-- | layouts/partials/nav-single.html | 23 |
2 files changed, 30 insertions, 12 deletions
diff --git a/layouts/partials/nav-list.html b/layouts/partials/nav-list.html index 66debd6..1c6869a 100644 --- a/layouts/partials/nav-list.html +++ b/layouts/partials/nav-list.html @@ -7,18 +7,23 @@ </span> <div id="nav-menu" class="nav-left nav-menu"> <span class="nav-item"> - <a href="/">Main</a> + <a href="{{ "/" | relURL }}">Main</a> </span> <span class="nav-item"> - <a href="/#about">About</a> + <a href="{{ "/about" | relURL }}">About</a> </span> - {{ if .Site.Params.showProjects }} + {{ if and (.Site.Params.showProjects) (ne .Page.Section "projects") }} <span class="nav-item"> - <a href="/#projects">Projects</a> + <a href="{{ "/projects" | relURL }}">Projects</a> </span> - {{ end }} + {{ end }} + {{ if and (.Site.Params.showBlog) (ne .Page.Section "blog") }} + <span class="nav-item"> + <a href="{{ "/blog" | relURL }}">Blog</a> + </span> + {{ end }} <span class="nav-item"> - <a href="/#contact">Contact</a> + <a href="{{ "/contact" | relURL }}">Contact</a> </span> {{ if .Site.RSSLink }} <span class="nav-item"> @@ -27,4 +32,4 @@ {{ end }} </div> </nav> -<hr>
\ No newline at end of file +<hr> diff --git a/layouts/partials/nav-single.html b/layouts/partials/nav-single.html index ee5822e..b088ab0 100644 --- a/layouts/partials/nav-single.html +++ b/layouts/partials/nav-single.html @@ -7,18 +7,31 @@ </span> <div id="nav-menu" class="nav-left nav-menu"> <span class="nav-item"> - <a href="/">Main</a> + <a href="{{ "/" | relURL }}">Main</a> </span> <span class="nav-item"> - <a href="/#about">About</a> + <a href="{{ "/about" | relURL }}">About</a> </span> - {{ with .Section }} + {{ if .Site.Params.showProjects }} <span class="nav-item"> - <a href="/{{ . }}">Back to {{ . }}</a> + {{ if ne .Section "projects" }} + <a href="{{ "/projects" | relURL }}">Projects</a> + {{ else }} + <a href="{{ "/projects" | relURL }}">Back to Projects</a> + {{ end }} </span> {{ end }} + {{ if .Site.Params.showBlog }} <span class="nav-item"> - <a href="/#contact">Contact</a> + {{ if ne .Section "blog" }} + <a href="{{ "/blog" | relURL }}">Blog</a> + {{ else }} + <a href="{{ "/blog" | relURL }}">Back to Blog</a> + {{ end }} + </span> + {{ end }} + <span class="nav-item"> + <a href="{{ "/contact" | relURL }}">Contact</a> </span> {{ if .Site.RSSLink }} <span class="nav-item"> |