# HG changeset patch # User Tomas Zeman # Date 1544099732 -3600 # Node ID 8e0809dad9f7e55c837f1e68b8a74e6591b90cd3 # Parent 50a354e5bda4a0662db44c6eea4645b6574afcbe Fixed links to category, article diff -r 50a354e5bda4 -r 8e0809dad9f7 base/src/sqwl/cms/Layout.scala --- a/base/src/sqwl/cms/Layout.scala Thu Dec 06 13:27:14 2018 +0100 +++ b/base/src/sqwl/cms/Layout.scala Thu Dec 06 13:35:32 2018 +0100 @@ -25,12 +25,11 @@ link(rel:="stylesheet", href:=bootstrapCss), link(rel:="stylesheet", href:=fontAwesomeCss), link(rel:="stylesheet", href:=siteCss), - link(rel:="icon", href:="favicon.ico"), tags2.title(st match { - case ViewArticle(v) => v.title + case ViewArticle(v) => s"${v.title} | ${content.appTitleShort}" case ViewCategory(v) => v.name case ViewTag(v) => v.name - case Dashboard => "SQWL" + case Dashboard => content.appTitle case News => "Novinky" }) ), @@ -39,7 +38,7 @@ div(role:="main", cls:="container", st match { case ViewArticle(article) => div( - a(href:=article.pathSegment, article.title), + a(href:=s"/${http.prefix}/${article.pathSegment}", article.title), raw(article.htmlContent) ) case _ => "" diff -r 50a354e5bda4 -r 8e0809dad9f7 base/src/sqwl/cms/layout/Navbar.scala --- a/base/src/sqwl/cms/layout/Navbar.scala Thu Dec 06 13:27:14 2018 +0100 +++ b/base/src/sqwl/cms/layout/Navbar.scala Thu Dec 06 13:35:32 2018 +0100 @@ -16,7 +16,7 @@ val navSections = ul(cls:="nav navbar-nav navbar-section", width:="100%", cnt.categories map(c => - li(cls:="text-center", a(href:=c.pathSegment, c.name)) + li(cls:="text-center", a(href:=s"/${http.prefix}/${c.pathSegment}", c.name)) ) )