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

Merge remote-tracking branch 'origin/581-node-phylo-form-render-improvements' into dev

parents 3072d81a 003593fe
......@@ -6382,6 +6382,10 @@ h3 {
text-align: center;
}
.range-simple__input:focus {
box-shadow: none;
}
.b-tabs .nav-item:first-child {
margin-left: 16px;
}
......@@ -7085,6 +7089,26 @@ a:focus {
#portal .w-11\/12 {
width: 91.666667%;
}
#app .min-w-25,
#portal .min-w-25 {
min-width: 25%;
}
#app .min-w-33,
#portal .min-w-33 {
min-width: 33%;
}
#app .min-w-50,
#portal .min-w-50 {
min-width: 50%;
}
#app .min-w-75,
#portal .min-w-75 {
min-width: 75%;
}
#app .min-w-100,
#portal .min-w-100 {
min-width: 100%;
}
#app .h-auto,
#portal .h-auto {
height: auto;
......
......@@ -6193,6 +6193,10 @@ h3 {
text-align: center;
}
.range-simple__input:focus {
box-shadow: none;
}
.b-tabs .nav-item:first-child {
margin-left: 16px;
}
......@@ -6892,6 +6896,26 @@ a:focus {
#portal .w-11\/12 {
width: 91.666667%;
}
#app .min-w-25,
#portal .min-w-25 {
min-width: 25%;
}
#app .min-w-33,
#portal .min-w-33 {
min-width: 33%;
}
#app .min-w-50,
#portal .min-w-50 {
min-width: 50%;
}
#app .min-w-75,
#portal .min-w-75 {
min-width: 75%;
}
#app .min-w-100,
#portal .min-w-100 {
min-width: 100%;
}
#app .h-auto,
#portal .h-auto {
height: auto;
......
......@@ -5948,6 +5948,10 @@ h3 {
text-align: center;
}
.range-simple__input:focus {
box-shadow: none;
}
.b-tabs .nav-item:first-child {
margin-left: 16px;
}
......@@ -6651,6 +6655,26 @@ a:focus {
#portal .w-11\/12 {
width: 91.666667%;
}
#app .min-w-25,
#portal .min-w-25 {
min-width: 25%;
}
#app .min-w-33,
#portal .min-w-33 {
min-width: 33%;
}
#app .min-w-50,
#portal .min-w-50 {
min-width: 50%;
}
#app .min-w-75,
#portal .min-w-75 {
min-width: 75%;
}
#app .min-w-100,
#portal .min-w-100 {
min-width: 100%;
}
#app .h-auto,
#portal .h-auto {
height: auto;
......
......@@ -6196,6 +6196,10 @@ h3 {
text-align: center;
}
.range-simple__input:focus {
box-shadow: none;
}
.b-tabs .nav-item:first-child {
margin-left: 16px;
}
......@@ -6899,6 +6903,26 @@ a:focus {
#portal .w-11\/12 {
width: 91.666667%;
}
#app .min-w-25,
#portal .min-w-25 {
min-width: 25%;
}
#app .min-w-33,
#portal .min-w-33 {
min-width: 33%;
}
#app .min-w-50,
#portal .min-w-50 {
min-width: 50%;
}
#app .min-w-75,
#portal .min-w-75 {
min-width: 75%;
}
#app .min-w-100,
#portal .min-w-100 {
min-width: 100%;
}
#app .h-auto,
#portal .h-auto {
height: auto;
......
......@@ -6197,6 +6197,10 @@ h3 {
text-align: center;
}
.range-simple__input:focus {
box-shadow: none;
}
.b-tabs .nav-item:first-child {
margin-left: 16px;
}
......@@ -6900,6 +6904,26 @@ a:focus {
#portal .w-11\/12 {
width: 91.666667%;
}
#app .min-w-25,
#portal .min-w-25 {
min-width: 25%;
}
#app .min-w-33,
#portal .min-w-33 {
min-width: 33%;
}
#app .min-w-50,
#portal .min-w-50 {
min-width: 50%;
}
#app .min-w-75,
#portal .min-w-75 {
min-width: 75%;
}
#app .min-w-100,
#portal .min-w-100 {
min-width: 100%;
}
#app .h-auto,
#portal .h-auto {
height: auto;
......
......@@ -22,6 +22,9 @@ type Options =
, type :: String
, placeholder :: String
, size :: Sizing
, step :: String
, min :: String
, max :: String
)
options :: Record Options
......@@ -31,6 +34,9 @@ options =
, type : "text"
, placeholder : ""
, size : MediumSize
, step : ""
, min : ""
, max : ""
}
-- | Structural Component for the Bootstrap input
......@@ -73,6 +79,9 @@ component = R.hooksComponent componentName cpt where
, readOnly: elem status [ Idled ]
, placeholder: props.placeholder
, type: props.type
, step: props.step
, min: props.min
, max: props.max
, autoComplete: "off"
, value: props.value
}
......
......@@ -343,6 +343,7 @@ panelActionCpt = here.component "panelAction" cpt
cpt { action: Config, nodeType } _ =
pure $ fragmentPT $ "Config " <> show nodeType
-- Functions using SubTree
cpt { action: Reconstruct , dispatch, nodeType } _ = pure $ update { dispatch, nodeType } []
cpt { action: Merge {subTreeParams}, boxes, dispatch, id, nodeType, session } _ =
pure $ mergeNode { boxes, dispatch, id, nodeType, session, subTreeParams } []
cpt { action: Move {subTreeParams}, boxes, dispatch, id, nodeType, session } _ =
......
......@@ -13,7 +13,7 @@ if user has access to node then he can do all his related actions
------------------------------------------------------------------------
data NodeAction = Documentation NodeType
| SearchBox
| Download | Upload | Refresh | Config
| Download | Upload | Refresh | Config | Reconstruct
| Delete
| Share
| ManageTeam
......@@ -43,6 +43,7 @@ instance Eq NodeAction where
eq (Add x) (Add y) = x == y
eq (Merge x) (Merge y) = x == y
eq Config Config = true
eq Reconstruct Reconstruct = true
eq (Publish x) (Publish y) = x == y
eq AddingContact AddingContact = true
eq CloseNodePopover CloseNodePopover = true
......@@ -61,6 +62,7 @@ instance Show NodeAction where
show Share = "Share"
show ManageTeam = "Team"
show Config = "Config"
show Reconstruct = "Reconstruct"
show (Link _) = "Link to " -- <> show x
show (Add _) = "Add Child" -- foldl (\a b -> a <> show b) "Add " xs
show (Merge _) = "Merge with subtree" -- <> show t
......@@ -80,6 +82,7 @@ glyphiconNodeAction Download = "download"
glyphiconNodeAction (Merge _) = "random"
glyphiconNodeAction Refresh = "refresh"
glyphiconNodeAction Config = "wrench"
glyphiconNodeAction Reconstruct = "cogs"
glyphiconNodeAction Share = "user-plus"
glyphiconNodeAction ManageTeam = "users"
glyphiconNodeAction AddingContact = "user-plus"
......@@ -224,7 +227,7 @@ settingsBox Phylo =
SettingsBox { show : true
, edit : true
, doc : Documentation Phylo
, buttons : [ Refresh
, buttons : [ Reconstruct
, Delete
]
}
......
......@@ -11,6 +11,7 @@ hasStatus :: NodeType -> NodeAction -> Status
hasStatus _ SearchBox = Test
hasStatus _ Refresh = Dev
hasStatus _ Config = Dev
hasStatus _ Reconstruct = Dev
hasStatus _ (Merge _) = Dev
hasStatus _ (Documentation _) = Dev
hasStatus Annuaire Upload = Dev
......
......@@ -61,6 +61,12 @@
.w-10\/12 { width: 83.333333%; }
.w-11\/12 { width: 91.666667%; }
.min-w-25 { min-width: 25% }
.min-w-33 { min-width: 33% }
.min-w-50 { min-width: 50% }
.min-w-75 { min-width: 75% }
.min-w-100 { min-width: 100% }
/// Height
.h-auto { height: auto; }
.h-fluid,
......
......@@ -372,6 +372,12 @@
}
}
.range-simple__input {
&:focus {
box-shadow: none;
}
}
/// Tabs
///-----------------------------------------------------------------------------
......
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