Commit c2b428d7 authored by Alexandre Delanoë's avatar Alexandre Delanoë

[DESIGN] Table Headers.

parent 8a840d6c
...@@ -449,7 +449,7 @@ tableContainer { pageParams ...@@ -449,7 +449,7 @@ tableContainer { pageParams
[ text "Import a Termlist" ] [ text "Import a Termlist" ]
] ]
,-} ,-}
div [className "col-md-4", style {marginTop : "37px"}] div [className "col-md-3", style {marginTop : "6px"}]
[ input [ className "form-control " [ input [ className "form-control "
, name "search", placeholder "Search" , name "search", placeholder "Search"
, _type "value" , _type "value"
...@@ -457,8 +457,7 @@ tableContainer { pageParams ...@@ -457,8 +457,7 @@ tableContainer { pageParams
, onInput \e -> setSearchQuery (unsafeEventValue e) , onInput \e -> setSearchQuery (unsafeEventValue e)
] ]
] ]
, div [_id "filter_terms", className "col-md-6", style{ marginTop : "2.1em",paddingLeft :"1em"}] , div [className "col-md-2", style {marginTop : "6px"}]
[ div [className "col-md-10 list-group", style {marginTop : "6px"}]
[ li [className " list-group-item"] [ li [className " list-group-item"]
[ select [ _id "picklistmenu" [ select [ _id "picklistmenu"
, className "form-control custom-select" , className "form-control custom-select"
...@@ -466,20 +465,25 @@ tableContainer { pageParams ...@@ -466,20 +465,25 @@ tableContainer { pageParams
, onChange (\e -> setTermListFilter $ readTermList $ unsafeEventValue e) , onChange (\e -> setTermListFilter $ readTermList $ unsafeEventValue e)
] $ map optps1 termLists ] $ map optps1 termLists
] ]
, li [className "list-group-item"] ]
, div [className "col-md-2", style {marginTop : "6px"}]
[ li [className "list-group-item"]
[ select [ _id "picktermtype" [ select [ _id "picktermtype"
, className "form-control custom-select" , className "form-control custom-select"
, value (maybe "" show pageParams.termSizeFilter) , value (maybe "" show pageParams.termSizeFilter)
, onChange (\e -> setTermSizeFilter $ readTermSize $ unsafeEventValue e) , onChange (\e -> setTermSizeFilter $ readTermSize $ unsafeEventValue e)
] $ map optps1 termSizes ] $ map optps1 termSizes
] ]
, li [className " list-group-item"] [ props.pageSizeControl ]
]
] ]
, div [className "col-md-6", style {marginTop : "24px", marginBottom : "14px"}]
[ props.pageSizeDescription , div [className "col-md-4", style {marginTop : "6px", marginBottom : "1px"}]
[ li [className " list-group-item"] [ props.pageSizeDescription
, props.pageSizeControl
, text " items / "
, props.paginationLinks , props.paginationLinks
] ]
--, li [className " list-group-item"] [ props.pageSizeControl ]
]
] ]
] ]
, div [] (maybe [] (\ngrams -> , div [] (maybe [] (\ngrams ->
......
...@@ -218,7 +218,7 @@ tableElt props = createElement tableClass props [] ...@@ -218,7 +218,7 @@ tableElt props = createElement tableClass props []
sizeDD :: PageSizes -> (Action -> Effect Unit) -> ReactElement sizeDD :: PageSizes -> (Action -> Effect Unit) -> ReactElement
sizeDD ps d sizeDD ps d
= span [] = span []
[ text "Show : " [ text " "
, select [onChange (\e -> d (ChangePageSize $ string2PageSize $ (unsafeCoerce e).target.value))] $ map (optps ps) aryPS , select [onChange (\e -> d (ChangePageSize $ string2PageSize $ (unsafeCoerce e).target.value))] $ map (optps ps) aryPS
] ]
...@@ -239,7 +239,7 @@ effectLink eff msg = a [onClick $ const eff] [text msg] ...@@ -239,7 +239,7 @@ effectLink eff msg = a [onClick $ const eff] [text msg]
pagination :: ChangePageAction -> Int -> Int -> ReactElement pagination :: ChangePageAction -> Int -> Int -> ReactElement
pagination changePage tp cp pagination changePage tp cp
= span [] $ = span [] $
[ text "Pages: ", prev, first, ldots] [ text " ", prev, first, ldots]
<> <>
lnums lnums
<> <>
...@@ -250,9 +250,9 @@ pagination changePage tp cp ...@@ -250,9 +250,9 @@ pagination changePage tp cp
[ rdots, last, next ] [ rdots, last, next ]
where where
prev = if cp == 1 then prev = if cp == 1 then
text " Previous " text " Prev. "
else else
changePageLink (cp - 1) "Previous" changePageLink (cp - 1) "Prev."
next = if cp == tp then next = if cp == tp then
text " Next " text " Next "
else else
......
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