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

Merge remote-tracking branch 'origin/dev-ihaskell' into dev-merge

parents a0974175 138dba79
...@@ -83,7 +83,7 @@ type Base = String ...@@ -83,7 +83,7 @@ type Base = String
type FrameId = String type FrameId = String
hframeUrl :: NodeType -> Base -> FrameId -> String hframeUrl :: NodeType -> Base -> FrameId -> String
hframeUrl NodeFrameNotebook _ frame_id = frame_id -- Temp fix : frame_id is currently the whole url created hframeUrl NodeFrameNotebook _ frame_id = base <> "/" <> frame_id -- Temp fix : frame_id is currently the whole url created
hframeUrl NodeFrameCalc base frame_id = base <> "/" <> frame_id hframeUrl NodeFrameCalc base frame_id = base <> "/" <> frame_id
hframeUrl NodeFrameVisio base frame_id = base <> "/" <> frame_id hframeUrl NodeFrameVisio base frame_id = base <> "/" <> frame_id
hframeUrl _ base frame_id = base <> "/" <> frame_id <> "?view" -- "?both" hframeUrl _ base frame_id = base <> "/" <> frame_id <> "?view" -- "?both"
......
...@@ -356,7 +356,6 @@ getIcon NodeFrameVisio true = "video-camera" ...@@ -356,7 +356,6 @@ getIcon NodeFrameVisio true = "video-camera"
getIcon NodeFrameVisio false = "video-camera" getIcon NodeFrameVisio false = "video-camera"
getIcon (NodePublic nt) b = getIcon nt b getIcon (NodePublic nt) b = getIcon nt b
getIcon _ true = "folder-open" getIcon _ true = "folder-open"
......
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