Simplify site title handling, automatically suffix site title to all pages

This commit is contained in:
Danielle McLean 2017-10-09 13:50:26 +11:00
parent 4088735c69
commit 1b8a07a5f6
Signed by: 00dani
GPG key ID: 5A5D2D1AFF12EEC5
8 changed files with 17 additions and 13 deletions

View file

@ -5,7 +5,10 @@ $doctype 5
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="generator" content="#{packageName package} #{packageVersion package}">
<title>#{pageTitle pc}
<title>
$if hasPageTitle
#{pageTitle pc} ~ #
#{siteTitle $ appSettings master}
$maybe route <- mcurrentRoute
<link rel="canonical" href=@{route}>
<link rel="sitemap" href=@{SitemapR}>

View file

@ -1,7 +1,6 @@
<header>
<nav .navbar .navbar-expand-lg .navbar-dark.bg-dark>
$maybe title <- appTitle $ appSettings master
<a .navbar-brand rel="home" href=@{HomeR}>#{title}
<a .navbar-brand rel="home" href=@{HomeR}>#{siteTitle $ appSettings master}
<button type="button" .navbar-toggler data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar" aria-label="Toggle navigation">
<span .navbar-toggler-icon>