diff options
author | karthik <kskarthik@gitlab.io> | 2019-10-28 14:38:10 +0300 |
---|---|---|
committer | karthik <kskarthik@gitlab.io> | 2019-10-28 14:38:10 +0300 |
commit | b8c87200bb8cc7aaab1d874397505b8ba49a8152 (patch) | |
tree | ef9ae5f05583dc56e8c12ea23408f31eaa774b24 | |
parent | ff1495651764daf7f9ef3921ecf4f1454559435c (diff) |
fix tag section, URLs
-rw-r--r-- | layouts/_default/list.html | 30 | ||||
-rw-r--r-- | layouts/_default/single.html | 27 | ||||
-rw-r--r-- | layouts/index.html | 8 | ||||
-rw-r--r-- | layouts/partials/header.html | 6 | ||||
-rw-r--r-- | layouts/partials/nav.html | 14 |
5 files changed, 50 insertions, 35 deletions
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 3ad4bf6..79d31aa 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,13 +1,21 @@ {{define "main"}} -<h2 class="text-center">{{.Site.Title}} - Blog</h2> -<br> -<div class="container"> - {{range .Pages}} - <div class="container"> - <h5><a href="{{.Permalink}}">{{ .Title }}</a></h5> - <small class="text-secondary">{{.PublishDate.Format "January 2, 2006"}} | {{.ReadingTime}} minute read</small> - </div> - <br> - {{end}} -</div> +<section class="container"> + <h2 class="text-center">{{.Title}}</h2> + {{if eq .Kind "taxonomyTerm"}} + {{range $key, $value := .Data.Terms.Alphabetical}} + <span class='badge badge-dark'><a class='text-white' href='{{ "tags/" | absURL }}{{ $value.Name | lower }}'>{{ $value.Name }}</a></span> + {{end}} + {{else}} + <div class="container row"> + {{range .Pages}} + <div class="container-fluid col-md-5 m-3"> + <h5><a href="{{.Permalink}}">{{ .Title }}</a></h5> + {{if eq .Section "blog"}} + <small class="text-secondary">Published on: {{.PublishDate.Format "January 2, 2006"}} | {{.ReadingTime}} minute read</small> + {{end}} + </div> + {{end}} + </div> + {{end }} +</section> {{end}}
\ No newline at end of file diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 112aec6..f7baa41 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,14 +1,21 @@ {{define "main" }} -<br> -<div class="container-fluid text-center"> +<section class="container"> + {{ if eq .Section "blog"}} <h2>{{ .Title }}</h2> - <small class="text-secondary">Published on: {{.PublishDate.Format "January 2, 2006"}} | {{.ReadingTime}} minute read</small> - <div class="container text-left"> - <p>{{ .Content }} </p> - {{if .Site.Params.enableDisqus}} - {{ template "_internal/disqus.html" . }} - {{end}} - </div> -</div> + <small class="text-secondary">Published on: {{.PublishDate.Format "January 2, 2006"}} | {{.ReadingTime}} minute read</small><br> + <small class="text-secondary">Tags: </small> + {{- range .Params.tags -}} + <span class='badge badge-dark'><a class='text-white' href='{{ "tags/" | absURL }}{{ . | lower }}'>{{ . }}</a></span> + {{ end }} + <p>{{ .Content }}</p> + + {{if .Site.Params.enableDisqus}} + {{ template "_internal/disqus.html" . }} + {{end}} + {{else}} + <h2 class="text-center">{{.Title}}</h2> + <p>{{.Content}}</p> + {{end}} +</section> {{ end }} diff --git a/layouts/index.html b/layouts/index.html index 4e1265b..1ec9e30 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -7,7 +7,7 @@ <h1 class="display-4 mb-5">{{ .Site.Params.heroText | safeHTML }}</h1> <div class="mb-2"> <a class="btn btn-primary btn-shadow btn-lg" href="{{ .Site.BaseURL | absURL }}#gtco-menu" role="button">Explore Menu</a> - <a class="btn btn-icon btn-lg" href="https://player.vimeo.com/video/33110953" data-featherlight="iframe" data-featherlight-iframe-allowfullscreen="true"> + <a class="btn btn-icon btn-lg" href="{{.Site.Params.videoUrl}}" data-featherlight="iframe" data-featherlight-iframe-allowfullscreen="true"> <span class="lnr lnr-film-play"></span> Play Video </a> @@ -38,13 +38,13 @@ <div class="col-lg-6 hero-right"> <div class="owl-carousel owl-theme hero-carousel"> <div class="item"> - <img class="img-fluid" src="img/hero-1.jpg" alt=""> + <img class="img-fluid" src='{{ "img/hero-1.jpg" | absURL }}' alt=""> </div> <div class="item"> - <img class="img-fluid" src="img/hero-2.jpg" alt=""> + <img class="img-fluid" src='{{ "img/hero-2.jpg" | absURL }}' alt=""> </div> <div class="item"> - <img class="img-fluid" src="img/hero-3.jpg" alt=""> + <img class="img-fluid" src='{{ "img/hero-3.jpg" | absURL }}' alt=""> </div> </div> </div> diff --git a/layouts/partials/header.html b/layouts/partials/header.html index ac6316b..8e56f0f 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,10 +1,10 @@ <head> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <title>{{.Site.Title}}</title> - <meta name="description" content="Resto"> + <title>{{if .IsHome }} {{ .Site.Title }} {{else}} {{ .Title }} {{end}}</title> + <meta name="description" content="{{ .Site.Title }}"> + <meta name="keywords" content="{{ .Site.Params.keywords }}"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> - <!-- External CSS --> <link rel="stylesheet" href="{{.Site.BaseURL}}vendor/bootstrap/bootstrap.min.css"> <link rel="stylesheet" href="{{.Site.BaseURL}}vendor/select2/select2.min.css"> diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html index 0084c9f..e0c52ea 100644 --- a/layouts/partials/nav.html +++ b/layouts/partials/nav.html @@ -53,11 +53,11 @@ <li class="nav-item"> <a class="nav-link" href="{{ .Site.BaseURL }}#gtco-welcome">About</a> </li> - + <li class="nav-item active"> + <a class="nav-link" href="{{ .Site.BaseURL }}#gtco-menu">Menu</a> + </li> <li class="nav-item dropdown"> - <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - Special Dishes - </a> + <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Specials</a> <div class="dropdown-menu" aria-labelledby="navbarDropdown"> <a class="dropdown-item" href="{{ .Site.BaseURL }}#gtco-special-dishes">Beef Steak Sauce</a> <a class="dropdown-item" href="{{ .Site.BaseURL }}#gtco-special-dishes">Salmon Zucchini</a> @@ -71,15 +71,15 @@ </a> <ul class="navbar-nav d-flex justify-content-between"> <div class="d-flex flex-lg-row flex-column"> - <li class="nav-item active"> - <a class="nav-link" href="{{ .Site.BaseURL }}#gtco-menu">Menu</a> - </li> <li class="nav-item"> <a class="nav-link" href="{{ .Site.BaseURL }}#gtco-team">Team</a> </li> <li class="nav-item"> <a class="nav-link" href="{{ .Site.BaseURL }}blog">Blog</a> </li> + <li class="nav-item"> + <a class="nav-link" href="{{ .Site.BaseURL }}tags">Tags</a> + </li> <li class="nav-item dropdown"> <a class="nav-link" href="{{ .Site.BaseURL }}#gtco-reservation">Reservation</a> </li> |