Skip to content

Commit 2165e2b

Browse files
committed
fix/ui: use dropdown instead of toolbar in nodedoc inner options.
1 parent 51e4ecb commit 2165e2b

File tree

4 files changed

+54
-5
lines changed

4 files changed

+54
-5
lines changed

Diff for: src/Bulk/Bulma.elm

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ type alias DropdownData msg =
6464
OnToggleTargetFilter
6565
""
6666
(div []
67-
[ div [ class "dropdown-item button-light" ] [ A.icon1 "icon-edit-2" T.edit ]
67+
[ div [ class "dropdown-item" ] [ A.icon1 "icon-edit-2" T.edit ]
6868
, hr [ class "dropdown-divider" ] []
69-
, div [ class "dropdown-item button-light" ] [ A.icon1 "icon-plus" T.addTensionColumn ]
69+
, div [ class "dropdown-item" ] [ A.icon1 "icon-plus" T.addTensionColumn ]
7070
])
7171
7272
-}

Diff for: src/Components/Board.elm

+2
Original file line numberDiff line numberDiff line change
@@ -1176,6 +1176,7 @@ viewMediaTension cardid isHovered isEdited focus t =
11761176
div
11771177
[ class "tooltip has-tooltip-left has-tooltip-arrow"
11781178
, attribute "data-tooltip" (action2str tc.action)
1179+
, style "left" "15px"
11791180
]
11801181
[ A.icon0 (action2icon tc ++ " icon-sm") ]
11811182

@@ -1185,6 +1186,7 @@ viewMediaTension cardid isHovered isEdited focus t =
11851186
div
11861187
[ class "tooltip has-tooltip-left has-tooltip-arrow"
11871188
, attribute "data-tooltip" T.closedTension
1189+
, style "left" "15px"
11881190
]
11891191
[ A.icon ("icon-alert-circle icon-sm has-text-" ++ statusColor t.status) ]
11901192

Diff for: src/Components/Comments.elm

+2-2
Original file line numberDiff line numberDiff line change
@@ -826,10 +826,10 @@ viewComment conf c form result highlightedCommentId userInput =
826826
]
827827
, div [ id ("edit-ellipsis-" ++ c.id), class "dropdown-menu", attribute "role" "menu" ]
828828
[ div [ class "dropdown-content p-0" ] <|
829-
[ div [ class "dropdown-item button-light", attribute "data-clipboard" reflink ] [ text "Copy link" ] ]
829+
[ div [ class "dropdown-item", attribute "data-clipboard" reflink ] [ text "Copy link" ] ]
830830
++ (if isAuthor then
831831
[ hr [ class "dropdown-divider" ] []
832-
, div [ class "dropdown-item button-light", onClick (OnUpdateComment c) ] [ text T.edit ]
832+
, div [ class "dropdown-item", onClick (OnUpdateComment c) ] [ text T.edit ]
833833
]
834834

835835
else

Diff for: src/Components/NodeDoc.elm

+48-1
Original file line numberDiff line numberDiff line change
@@ -536,6 +536,52 @@ viewToolbar mode data =
536536
]
537537

538538

539+
viewToolbarDropdown : NodeView -> OrgaNodeData -> Html msg
540+
viewToolbarDropdown mode data =
541+
let
542+
tid =
543+
withDefaultData "" data.tid_r
544+
545+
iconOpts =
546+
ternary data.hasInnerToolbar "icon-xs" ""
547+
in
548+
div [ class "dropdown is-right has-text-weight-normal" ]
549+
[ div [ class "dropdown-trigger is-w is-h" ]
550+
[ div
551+
[ class "ellipsis"
552+
, attribute "aria-controls" "edit-ellipsis-card"
553+
, attribute "aria-haspopup" "true"
554+
]
555+
[ A.icon "icon-more-vertical icon-lg" ]
556+
]
557+
, div [ id "edit-ellipsis-card", class "dropdown-menu", attribute "role" "menu" ]
558+
[ div [ class "dropdown-content p-0" ] <|
559+
[ div [ class "dropdown-item" ]
560+
[ a
561+
[ class "stealth-link"
562+
563+
--, classList [ ( "is-active", mode == NodeEdit ) ]
564+
, href
565+
(Route.Tension_Dynamic_Dynamic_Action { param1 = data.focus.rootnameid, param2 = tid } |> toHref)
566+
]
567+
[ A.icon1 ("icon-edit-2 " ++ iconOpts) T.edit ]
568+
]
569+
, hr [ class "dropdown-divider" ] []
570+
, div [ class "dropdown-item" ]
571+
[ a
572+
[ class "stealth-link"
573+
574+
--, classList [ ( "is-active", mode == NodeVersions ) ]
575+
, href
576+
((Route.Tension_Dynamic_Dynamic_Action { param1 = data.focus.rootnameid, param2 = tid } |> toHref) ++ "?v=history")
577+
]
578+
[ A.icon1 ("icon-history " ++ iconOpts) T.revisions ]
579+
]
580+
]
581+
]
582+
]
583+
584+
539585
viewNodeStatus : Op msg -> Html msg
540586
viewNodeStatus op =
541587
case op.blob.pushedFlag of
@@ -717,7 +763,8 @@ viewAboutSection data op_m =
717763
span [ class "is-name" ] [ unwrap "" .name data.node |> text ]
718764
]
719765
, if data.hasInnerToolbar && isSuccess data.tid_r && not (List.member (unwrap Nothing .role_type data.node) (List.map Just [ RoleType.Guest, RoleType.Owner, RoleType.Pending, RoleType.Retired ])) then
720-
div [ class "level-right is-marginless is-small is-hidden-mobile" ] [ viewToolbar NoView data ]
766+
div [ class "level-right is-marginless is-small is-hidden-mobile" ]
767+
[ viewToolbarDropdown NoView data ]
721768

722769
else
723770
Maybe.map

0 commit comments

Comments
 (0)