diff -r de7c56ce0654 -r ba89bccede7e base/src/sqwl/cms/layout/Navbar.scala --- a/base/src/sqwl/cms/layout/Navbar.scala Tue Dec 04 12:35:12 2018 +0100 +++ b/base/src/sqwl/cms/layout/Navbar.scala Tue Dec 04 13:18:02 2018 +0100 @@ -1,17 +1,18 @@ package sqwl.cms.layout +import scalatags.Text.TypedTag import scalatags.Text.all._ -import scalatags.Text.tags2 -import scalatags.Text.TypedTag import sqwl.cms.{ViewState, config, iContent} object Navbar extends config { def apply(cnt: iContent, st: ViewState): TypedTag[String] = { + /* val navMenu = ul(cls:="nav navbar-nav navbar-right", li(a(href:="#about", "O aplikaci")) ) + */ val navSections = ul(cls:="nav navbar-nav navbar-section", width:="100%", cnt.categories map(c => @@ -19,11 +20,12 @@ ) ) - header(cls:="navbar navbar-default navbar-fixed-top", id:="topnavbar", + header(cls:="navbar navbar-default navbar-fixed-top", div(cls:="navbar-inner", div(cls:="container", div(cls:="navbar-header", - button(`type`:="button", cls:="navbar-toggle", + button(`type`:="button", cls:="navbar-toggle collapsed", + attr("data-toggle"):="collapse", attr("data-target"):="#navbar1", span(cls:="sr-only", "Navigation"), span(cls:="icon-bar"), @@ -31,17 +33,20 @@ span(cls:="icon-bar") ), a(href:="#", cls:="navbar-brand", paddingTop:=4, paddingBottom:=4, - img(src:=s"/${http.prefix}/public/images/icon.png", alt:="SQWL", width:=40, height:=40)), + img(src:=s"/${http.prefix}/public/images/icon.png", alt:="SQWL", + width:=40, height:=40)), a(href:="#", cls:="navbar-brand visible-xs", span("KPŽ")), a(href:="#", cls:="navbar-brand hidden-xs", span("Kvalita pracovního života v České republice")) - ), - tag("nav")(cls:="hidden-xs", navMenu) + ) + //tag("nav")(cls:="hidden-xs", navMenu) ) ), - div(cls:="navbar-inner hidden-xs", div(id:="navbar1", cls:="container", tag("nav")(navSections))) + div(cls:="collapse navbar-collapse", id:="navbar1", + div(cls:="container", navSections)) ) } } +