diff options
author | Hidenori MATSUKI <MATSUKI.Hidenori@gmail.com> | 2018-03-20 15:38:00 +0300 |
---|---|---|
committer | Hidenori MATSUKI <MATSUKI.Hidenori@gmail.com> | 2018-03-20 15:38:00 +0300 |
commit | 11a24d53d726dae84c829ce3250b7417291e568f (patch) | |
tree | 8e018f1b7e26cc3f5506a07d4680519baba2f61a /layouts | |
parent | 1149715fb00e094afa49c601271176580950cc64 (diff) |
Use badge for translated link.
Diffstat (limited to 'layouts')
-rw-r--r-- | layouts/_default/list.html | 29 | ||||
-rw-r--r-- | layouts/_default/single.html | 6 | ||||
-rw-r--r-- | layouts/partials/article.html | 5 | ||||
-rw-r--r-- | layouts/partials/footer.html | 1 | ||||
-rw-r--r-- | layouts/partials/header.html | 11 |
5 files changed, 32 insertions, 20 deletions
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 091bb4c..515d262 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,17 +1,20 @@ {{ partial "header.html" . }} -<div class="col-sm-3"> -</div> -<div class="col-sm-6"> - {{ $paginator := .Paginate ( .Data.Pages ) }} - {{ range $paginator.Pages }} - {{ partial "article.html" . }} - {{ end }} -</div> -<div class="col-sm-3"> - <ul> - {{ range .Data.Pages }} - <li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li> +<div class="row"> + <div class="col-sm-9"> + {{ $paginator := .Paginate ( .Data.Pages ) }} + {{ range $idx, $page := $paginator.Pages }} + {{ partial "article.html" $page }} + {{ if lt (add $idx 1) (len $paginator.Pages) }} + <hr/> + {{ end }} {{ end }} - </ul> + </div> + <div class="col-sm-3"> + <ul> + {{ range .Data.Pages }} + <li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li> + {{ end }} + </ul> + </div> </div> {{ partial "footer.html" . }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 6a91d7b..161948d 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,5 +1,7 @@ {{ partial "header.html" . }} -<div class="col-sm-12"> - {{ partial "article.html" . }} +<div class="row"> + <div class="col-sm-12"> + {{ partial "article.html" . }} + </div> </div> {{ partial "footer.html" . }} diff --git a/layouts/partials/article.html b/layouts/partials/article.html index 6e21a5e..19e273c 100644 --- a/layouts/partials/article.html +++ b/layouts/partials/article.html @@ -1,6 +1,7 @@ <article> - <h1><a href="{{ .RelPermalink}}">{{ .Title }}</a></h1> - <p>{{ .Date.Format "2006.01.02" }}</p> + <div class="row"> + <h1><a href="{{ .RelPermalink}}">{{ .Title }}</a></h1> + </div> <div class="row"> {{ .Content }} </div> diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index d6dc0a8..33dc620 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,4 +1,3 @@ - </div><!-- / .row --> <div class="row"> <footer class="col-sm-12"> <hr/> diff --git a/layouts/partials/header.html b/layouts/partials/header.html index b9858e6..ade4005 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -52,11 +52,19 @@ </a> <div class="dropdown-menu" aria-labelledby="navbar_dropdown_lang"> {{ range .Translations }} - <a class="dropdown-item" href="{{ .Permalink }}">({{ .Language.LanguageName }}) {{ .Title }}</a> + <a class="dropdown-item" href="{{ .Permalink }}"> + <span class="badge badge-light">{{ .Language.LanguageName }}</span> + {{ .Title }} + </a> {{ end }} </div> </li> {{ end }} + {{ if not .IsHome }} + <li class="nav-item"> + <span class="nav-link disabled">Updated At: {{ .Date.Format "2006.01.02" }}</span> + </li> + {{ end }} </ul> <!-- /left, right --> <ul class="navbar-nav ml-auto"> @@ -80,4 +88,3 @@ </div> </nav> <main role="main" class="container-fluid col-sm-10 offset-sm-1"> - <div class="row"> |