Commit 8574bc4e authored by Alexandre Delanoë's avatar Alexandre Delanoë

[ERGO] logo top bar. Issue: tabs are not clickable + CSS.

parent d4606c88
...@@ -80,12 +80,12 @@ appCpt = R.hooksComponent "G.C.App.app" cpt where ...@@ -80,12 +80,12 @@ appCpt = R.hooksComponent "G.C.App.app" cpt where
forestLayout :: Frontends -> Sessions -> AppRoute -> R2.Setter Boolean -> R.Element -> R.Element forestLayout :: Frontends -> Sessions -> AppRoute -> R2.Setter Boolean -> R.Element -> R.Element
forestLayout frontends sessions route showLogin child = do forestLayout frontends sessions route showLogin child = do
R.fragment [ topBar {}, R2.row [main], footer {} ] R.fragment [ topBar' frontends sessions route showLogin, R2.row [main], footer {} ]
where where
main = main =
R.fragment R.fragment
[ H.div {className: "col-md-2", style: {paddingTop: "60px"}} [ H.div {className: "col-md-2", style: {paddingTop: "60px"}}
[ forest {sessions, route, frontends, showLogin } ] [ {-forest {sessions, route, frontends, showLogin }-} ]
, mainPage child , mainPage child
] ]
...@@ -99,6 +99,24 @@ mainPage child = ...@@ -99,6 +99,24 @@ mainPage child =
[ H.div {id: "page-wrapper"} [ H.div {id: "page-wrapper"}
[ H.div {className: "container-fluid"} [ child ] ] ] [ H.div {className: "container-fluid"} [ child ] ] ]
topBar' :: Frontends -> Sessions -> AppRoute -> R2.Setter Boolean -> R.Element
topBar' frontends sessions route showLogin =
H.div { id: "dafixedtop", role: "navigation"
, className: "navbar navbar-inverse navbar-fixed-top" }
[ H.div { className: "container-fluid" }
[ H.div { className: "navbar-inner" }
[ logo
-- , H.div {className: "col-md-2", style: {paddingTop: "60px"}} [forest {sessions, route, frontends, showLogin}]
, forest {sessions, route, frontends, showLogin}
, H.div { className: "collapse navbar-collapse" } [ divDropdownInfo ]
]
]
]
-- SB.searchBar {session, databases: allDatabases}
topBar :: {} -> R.Element topBar :: {} -> R.Element
topBar _ = topBar _ =
H.div { id: "dafixedtop", role: "navigation" H.div { id: "dafixedtop", role: "navigation"
...@@ -107,7 +125,7 @@ topBar _ = ...@@ -107,7 +125,7 @@ topBar _ =
[ H.div { className: "navbar-inner" } [ H.div { className: "navbar-inner" }
[ logo [ logo
, H.div { className: "collapse navbar-collapse" } , H.div { className: "collapse navbar-collapse" }
[ divDropdownLeft ] ] ] ] [ divDropdownInfo ] ] ] ]
-- SB.searchBar {session, databases: allDatabases} -- SB.searchBar {session, databases: allDatabases}
logo :: R.Element logo :: R.Element
...@@ -119,18 +137,18 @@ logo = ...@@ -119,18 +137,18 @@ logo =
src = "images/logoSmall.png" src = "images/logoSmall.png"
title = "Back to home." title = "Back to home."
divDropdownLeft :: R.Element divDropdownInfo :: R.Element
divDropdownLeft = divDropdownInfo =
divDropdownLeft' $ divDropdownInfo' $
LiNav { title : "About Gargantext" LiNav { title : "About Gargantext"
, href : "#" , href : "#"
, icon : "glyphicon glyphicon-info-sign" , icon : "glyphicon glyphicon-info-sign"
, text : "Info" } , text : "Info" }
divDropdownLeft' :: LiNav -> R.Element divDropdownInfo' :: LiNav -> R.Element
divDropdownLeft' mb = divDropdownInfo' mb =
H.ul {className: "nav navbar-nav"} H.ul {className: "nav navbar-nav"}
[ H.ul {className: "nav navbar-nav pull-left"} [ H.ul {className: "nav navbar-nav pull-right"}
[ H.li {className: "dropdown"} [ menuButton mb, menuElements' ] ] ] [ H.li {className: "dropdown"} [ menuButton mb, menuElements' ] ] ]
menuButton :: LiNav -> R.Element menuButton :: LiNav -> R.Element
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment