[FIX] merge

src/Gargantext/Components/App.purs

@@ -121,9 +121,9 @@ appCpt = R.hooksComponentWithModule thisModule "app" cpt where
                                  --, treeReload
                                  }
           RouteFile sid nodeId -> withSession sid $ \session -> forested $ fileLayout { nodeId, session }
-          RouteFrameCalc  sid nodeId -> withSession sid $ \session -> forested $ frameLayout { nodeId, session, nodeType: GT.NodeFrameCalc }
-          RouteFrameCode  sid nodeId -> withSession sid $ \session -> forested $ frameLayout { nodeId, session, nodeType: GT.NodeFrameCode }
-          RouteFrameWrite sid nodeId -> withSession sid $ \session -> forested $ frameLayout { nodeId, session, nodeType: GT.NodeFrameWrite}
+          RouteFrameCalc  sid nodeId -> withSession sid $ \session -> forested $ frameLayout { nodeId, session, nodeType: GT.NodeFrameCalc     }
+          RouteFrameWrite sid nodeId -> withSession sid $ \session -> forested $ frameLayout { nodeId, session, nodeType: GT.NodeFrameWrite    }
+          RouteFrameCode  sid nodeId -> withSession sid $ \session -> forested $ frameLayout { nodeId, session, nodeType: GT.NodeFrameNotebook }
           Team sid nodeId  -> withSession sid $ \session -> forested $ corpusLayout { nodeId, session }
           Texts sid nodeId         -> withSession sid $ \session -> forested $ textsLayout { frontends, nodeId, session, sessionUpdate }
           UserPage sid nodeId        -> withSession sid $ \session -> forested $ userLayout { asyncTasks, frontends, nodeId, session }

src/Gargantext/Components/Forest/Tree/Node/Settings.purs

@@ -126,7 +126,7 @@ settingsBox Team =
                                 , Annuaire
                                 , NodeFrameWrite
                                 , NodeFrameCalc
-                                , NodeFrameCode
+                                , NodeFrameNotebook
                                 ]
                           , Share
                           , Delete
@@ -317,13 +317,13 @@ settingsBox NodeFrameCalc =
                           ]
               }
 
-settingsBox NodeFrameCode =
+settingsBox NodeFrameNotebook =
   SettingsBox { show : true
               , edit : true
-              , doc  : Documentation NodeFrameCode
+              , doc  : Documentation NodeFrameNotebook
               , buttons : [ Add [ NodeFrameCalc
                                 , NodeFrameWrite
-                                , NodeFrameCode
+                                , NodeFrameNotebook
                                 ]
                           , Move moveFrameParameters
                           , Delete

src/Gargantext/Components/Nodes/Frame.purs

@@ -95,7 +95,7 @@ type Base = String
 type FrameId = String
 
 hframeUrl :: NodeType -> Base -> FrameId -> String
-hframeUrl NodeFrameCode _    frame_id = frame_id  -- Temp fix : frame_id is currently the whole url created
+hframeUrl NodeFrameNotebook _    frame_id = frame_id  -- Temp fix : frame_id is currently the whole url created
 hframeUrl _             base frame_id = base <> "/" <> frame_id <> "?both"
 
 frameLayoutView :: Record ViewProps -> R.Element

src/Gargantext/Types.purs

@@ -156,7 +156,7 @@ data NodeType = NodeUser
               -- TODO Optional Nodes
               | NodeFrameWrite
               | NodeFrameCalc
-              | NodeFrameCode
+              | NodeFrameNotebook
               | NodePublic NodeType
               | NodeFile
 
@@ -188,7 +188,7 @@ instance showNodeType :: Show NodeType where
   show Texts           = "NodeDocs"
   show NodeFrameWrite  = "NodeFrameWrite"
   show NodeFrameCalc   = "NodeFrameCalc"
-  show NodeFrameCode   = "NodeFrameCode"
+  show NodeFrameNotebook   = "NodeFrameNotebook"
   show (NodePublic nt) = "NodePublic" <> show nt
   show NodeFile        = "NodeFile"
 
@@ -216,7 +216,7 @@ instance readNodeType :: Read NodeType where
   read "Annuaire"          = Just Annuaire
   read "NodeFrameWrite"    = Just NodeFrameWrite
   read "NodeFrameCalc"     = Just NodeFrameCalc
-  read "NodeFrameCode"     = Just NodeFrameCode
+  read "NodeFrameNotebook"     = Just NodeFrameNotebook
   read "NodeFile"          = Just NodeFile
   -- TODO NodePublic read ?
   read _                   = Nothing
@@ -264,8 +264,8 @@ fldr NodeFrameWrite false = "fa fa-file-text"
 fldr NodeFrameCalc true  = "fa fa-calculator"
 fldr NodeFrameCalc false = "fa fa-calculator"
 
-fldr NodeFrameCode true  = "fa fa-terminal"
-fldr NodeFrameCode false = "fa fa-terminal"
+fldr NodeFrameNotebook true  = "fa fa-file-code-o"
+fldr NodeFrameNotebook false = "fa fa-code"
 
 
 fldr (NodePublic nt) b   = fldr nt b
@@ -323,7 +323,7 @@ nodeTypePath Texts           = "texts"
 nodeTypePath Team            = "team"
 nodeTypePath NodeFrameWrite  = "write"
 nodeTypePath NodeFrameCalc   = "calc"
-nodeTypePath NodeFrameCode   = "code"
+nodeTypePath NodeFrameNotebook   = "code"
 nodeTypePath (NodePublic nt) = nodeTypePath nt
 nodeTypePath NodeFile        = "file"