diff options
Diffstat (limited to 'nikola/data/themes/bootstrap/templates')
| -rw-r--r-- | nikola/data/themes/bootstrap/templates/bootstrap_helper.tmpl | 5 | ||||
| -rw-r--r-- | nikola/data/themes/bootstrap/templates/gallery.tmpl | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/nikola/data/themes/bootstrap/templates/bootstrap_helper.tmpl b/nikola/data/themes/bootstrap/templates/bootstrap_helper.tmpl index 763ac20..f0d1986 100644 --- a/nikola/data/themes/bootstrap/templates/bootstrap_helper.tmpl +++ b/nikola/data/themes/bootstrap/templates/bootstrap_helper.tmpl @@ -29,6 +29,7 @@ <link href="/assets/css/custom.css" rel="stylesheet" type="text/css"> %endif %endif + <link rel="canonical" href="${abs_link(permalink)}"> <!--[if lt IE 9]> <script src="http://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script> <![endif]--> @@ -79,7 +80,7 @@ <ul class="dropdown-menu"> %for suburl, text in url: % if rel_link(permalink, suburl) == "#": - <li class="active"><a href="${suburl}">${text}</a> + <li class="active"><a href="${permalink}">${text}</a> %else: <li><a href="${suburl}">${text}</a> %endif @@ -87,7 +88,7 @@ </ul> % else: % if rel_link(permalink, url) == "#": - <li class="active"><a href="${url}">${text}</a> + <li class="active"><a href="${permalink}">${text}</a> %else: <li><a href="${url}">${text}</a> %endif diff --git a/nikola/data/themes/bootstrap/templates/gallery.tmpl b/nikola/data/themes/bootstrap/templates/gallery.tmpl index 17ae61c..0dd5eea 100644 --- a/nikola/data/themes/bootstrap/templates/gallery.tmpl +++ b/nikola/data/themes/bootstrap/templates/gallery.tmpl @@ -6,14 +6,18 @@ <%block name="content"> ${ui.bar(crumbs)} + %if title: + <h1>${title}</h1> + %endif %if text: <p> ${text} </p> %endif <ul> - % for folder in folders: - <li><a href="${folder}"><i class="icon-folder-open"></i> ${folder}</a></li> + % for folder, ftitle in folders: + <li><a href="${folder}"><i + class="icon-folder-open"></i> ${ftitle}</a></li> % endfor </ul> |