Fixed links to category, article
authorTomas Zeman <tzeman@volny.cz>
Thu, 06 Dec 2018 13:35:32 +0100
changeset 8 8e0809dad9f7
parent 7 50a354e5bda4
child 9 7d5ed4c927ce
Fixed links to category, article
base/src/sqwl/cms/Layout.scala
base/src/sqwl/cms/layout/Navbar.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 _ => ""
--- 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))
       )
     )