Commit 0d355da0 authored by Alexandre Delanoë's avatar Alexandre Delanoë

Merge remote-tracking branch 'origin/509-improve-global-theme' into dev

parents b1c8abf0 41490168
......@@ -2736,6 +2736,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
.fa-sidebar:before {
content: "\e905";
}
.fa-reload-with-settings:before {
content: "\e906";
}
.sr-only {
position: absolute;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -37,7 +37,7 @@ icon :: Action -> String
icon (AddNode _ _) = glyphiconNodeAction (Add [])
icon (DeleteNode _) = glyphiconNodeAction Delete
icon (RenameNode _) = glyphiconNodeAction Config
icon (UpdateNode _) = glyphiconNodeAction Refresh
icon (UpdateNode _) = glyphiconNodeAction ReloadWithSettings
icon (ShareTeam _) = glyphiconNodeAction Share
icon (AddContact _) = glyphiconNodeAction Share
icon (SharePublic _ ) = glyphiconNodeAction (Publish { subTreeParams : SubTreeParams {showtypes:[], valitypes:[] }})
......@@ -58,23 +58,23 @@ icon NoAction = "hand-o-right"
-- icon _ = "hand-o-right"
text :: Action -> String
text (AddNode _ _ ) = "Add !"
text (DeleteNode _ ) = "Delete !"
text (RenameNode _ ) = "Rename !"
text (UpdateNode _ ) = "Update !"
text (ShareTeam _ ) = "Share with team !"
text (AddContact _ ) = "Add contact !"
text (SharePublic _ ) = "Publish !"
text (DoSearch _ ) = "Launch search !"
text (UploadFile _ _ _ _ _ _ _) = "Upload File !"
text (UploadArbitraryFile _ _ _ _) = "Upload arbitrary file !"
text (AddNode _ _ ) = "Add!"
text (DeleteNode _ ) = "Delete!"
text (RenameNode _ ) = "Rename!"
text (UpdateNode _ ) = "Update!"
text (ShareTeam _ ) = "Share with team!"
text (AddContact _ ) = "Add contact!"
text (SharePublic _ ) = "Publish!"
text (DoSearch _ ) = "Launch search!"
text (UploadFile _ _ _ _ _ _ _) = "Upload File!"
text (UploadArbitraryFile _ _ _ _) = "Upload arbitrary file!"
text (UploadFrameCalc _ _) = "Upload frame calc"
text RefreshTree = "Refresh Tree !"
text CloseBox = "Close Box !"
text DownloadNode = "Download !"
text (MoveNode _ ) = "Move !"
text (MergeNode _ ) = "Merge !"
text (LinkNode _ ) = "Link !"
text (DocumentsFromWriteNodes _ ) = "Documents from Write Nodes !"
text RefreshTree = "Refresh Tree!"
text CloseBox = "Close Box!"
text DownloadNode = "Download!"
text (MoveNode _ ) = "Move!"
text (MergeNode _ ) = "Merge!"
text (LinkNode _ ) = "Link!"
text (DocumentsFromWriteNodes _ ) = "Documents from Write Nodes!"
text NoAction = "No Action"
-----------------------------------------------------------------------
......@@ -340,6 +340,7 @@ panelActionCpt = here.component "panelAction" cpt
cpt { action: Add xs, dispatch, id, name, nodeType} _ =
pure $ addNodeView {dispatch, id, name, nodeType, nodeTypes: xs} []
cpt { action: Refresh , dispatch, nodeType } _ = pure $ update { dispatch, nodeType } []
cpt { action: ReloadWithSettings , dispatch, nodeType } _ = pure $ update { dispatch, nodeType } []
cpt { action: Config, nodeType } _ =
pure $ fragmentPT $ "Config " <> show nodeType
-- Functions using SubTree
......
......@@ -13,7 +13,12 @@ if user has access to node then he can do all his related actions
------------------------------------------------------------------------
data NodeAction = Documentation NodeType
| SearchBox
| Download | Upload | Refresh | Config | Reconstruct
| Download
| Upload
| Refresh
| ReloadWithSettings
| Config
| Reconstruct
| Delete
| Share
| ManageTeam
......@@ -34,6 +39,7 @@ instance Eq NodeAction where
eq Download Download = true
eq Upload Upload = true
eq Refresh Refresh = true
eq ReloadWithSettings ReloadWithSettings = true
eq (Move x) (Move y) = x == y
eq Clone Clone = true
eq Delete Delete = true
......@@ -56,6 +62,7 @@ instance Show NodeAction where
show Download = "Download"
show Upload = "Upload"
show Refresh = "Refresh"
show ReloadWithSettings = "Reload (with settings)"
show (Move _) = "Move with subtree params" -- <> show t
show Clone = "Clone"
show Delete = "Delete"
......@@ -81,6 +88,7 @@ glyphiconNodeAction (Link _) = "arrows-h"
glyphiconNodeAction Download = "download"
glyphiconNodeAction (Merge _) = "random"
glyphiconNodeAction Refresh = "refresh"
glyphiconNodeAction ReloadWithSettings = "reload-with-settings"
glyphiconNodeAction Config = "wrench"
glyphiconNodeAction Reconstruct = "cogs"
glyphiconNodeAction Share = "user-plus"
......@@ -204,7 +212,7 @@ settingsBox NodeTexts =
SettingsBox { show : true
, edit : true
, doc : Documentation NodeTexts
, buttons : [ Refresh
, buttons : [ ReloadWithSettings
, Upload
, Download
, Delete
......@@ -215,7 +223,7 @@ settingsBox Graph =
SettingsBox { show : true
, edit : true
, doc : Documentation Graph
, buttons : [ Refresh
, buttons : [ ReloadWithSettings
, Config
, Download -- TODO as GEXF or JSON
-- , Publish publishParams
......@@ -275,7 +283,7 @@ settingsBox NodeList =
SettingsBox { show : true
, edit : true
, doc : Documentation NodeList
, buttons : [ Refresh
, buttons : [ ReloadWithSettings
, Config
, Upload
, Download
......@@ -298,7 +306,7 @@ settingsBox Dashboard =
SettingsBox { show : true
, edit : false
, doc : Documentation Dashboard
, buttons : [ Refresh
, buttons : [ ReloadWithSettings
, Publish publishParams
, Delete
]
......
......@@ -8,14 +8,15 @@ import Gargantext.Components.Forest.Tree.Node.Settings (NodeAction(..))
data Status = Stable | Test | Dev
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
hasStatus NodeTexts Upload = Dev
hasStatus Corpus (Add _) = Dev
hasStatus _ _ = Stable
hasStatus _ SearchBox = Test
hasStatus _ Refresh = Dev
hasStatus _ ReloadWithSettings = Dev
hasStatus _ Config = Dev
hasStatus _ Reconstruct = Dev
hasStatus _ (Merge _) = Dev
hasStatus _ (Documentation _) = Dev
hasStatus Annuaire Upload = Dev
hasStatus NodeTexts Upload = Dev
hasStatus Corpus (Add _) = Dev
hasStatus _ _ = Stable
......@@ -575,6 +575,7 @@ glyphiconToCharCode = _toString <<< case _ of
"reddit-square" -> 0xf1a2
"refresh" -> 0xf021
"registered" -> 0xf25d
"reload-with-settings" -> 0xe906
"renren" -> 0xf18b
"repeat" -> 0xf01e
"reply" -> 0xf112
......
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