From 77eac9e1b7f5cb096fff71b24d92f315b66dd96d Mon Sep 17 00:00:00 2001 From: "mathieu.brunot" Date: Thu, 21 Feb 2019 23:13:23 +0100 Subject: [PATCH] :bug: Add tooltip to not editable multiselect-nav --- frontend/src/uxbox/main/ui/dashboard/colors.cljs | 10 ++++++---- frontend/src/uxbox/main/ui/dashboard/icons.cljs | 11 ++++++++--- frontend/src/uxbox/main/ui/dashboard/images.cljs | 13 ++++++++----- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/frontend/src/uxbox/main/ui/dashboard/colors.cljs b/frontend/src/uxbox/main/ui/dashboard/colors.cljs index a20955e3a..0c6c94442 100644 --- a/frontend/src/uxbox/main/ui/dashboard/colors.cljs +++ b/frontend/src/uxbox/main/ui/dashboard/colors.cljs @@ -225,15 +225,16 @@ ;; if editable [:div.multiselect-nav {} [:span.move-item.tooltip.tooltip-top - {:on-click on-toggle-copy :alt (tr "ds.multiselect-bar.copy")} + {:alt (tr "ds.multiselect-bar.copy") + :on-click on-toggle-copy} (when (:show-copy-tooltip @local) (grid-options-tooltip :selected id :title (tr "ds.multiselect-bar.copy-to-library") :on-select on-copy)) - i/copy] [:span.move-item.tooltip.tooltip-top - {:on-click on-toggle-move :alt (tr "ds.multiselect-bar.move")} + {:alt (tr "ds.multiselect-bar.move") + :on-click on-toggle-move} (when (:show-move-tooltip @local) (grid-options-tooltip :selected id :title (tr "ds.multiselect-bar.move-to-library") @@ -247,7 +248,8 @@ ;; if not editable [:div.multiselect-nav {} [:span.move-item.tooltip.tooltip-top - {:on-click on-toggle-copy} + {:alt (tr "ds.multiselect-bar.copy") + :on-click on-toggle-copy} (when (:show-copy-tooltip @local) (grid-options-tooltip :selected id :title (tr "ds.multiselect-bar.copy-to-library") diff --git a/frontend/src/uxbox/main/ui/dashboard/icons.cljs b/frontend/src/uxbox/main/ui/dashboard/icons.cljs index 7bd3c09bc..6cc9bc771 100644 --- a/frontend/src/uxbox/main/ui/dashboard/icons.cljs +++ b/frontend/src/uxbox/main/ui/dashboard/icons.cljs @@ -288,14 +288,16 @@ (if editable? [:div.multiselect-nav {} [:span.move-item.tooltip.tooltip-top - {:on-click on-toggle-copy :alt (tr "ds.multiselect-bar.copy")} + {:alt (tr "ds.multiselect-bar.copy") + :on-click on-toggle-copy} (when (:show-copy-tooltip @local) (grid-options-tooltip :selected id :title (tr "ds.multiselect-bar.copy-to-library") :on-select on-copy)) i/copy] [:span.move-item.tooltip.tooltip-top - {:on-click on-toggle-move :alt (tr "ds.multiselect-bar.move")} + {:alt (tr "ds.multiselect-bar.move") + :on-click on-toggle-move} (when (:show-move-tooltip @local) (grid-options-tooltip :selected id :title (tr "ds.multiselect-bar.move-to-library") @@ -310,9 +312,12 @@ {:alt (tr "ds.multiselect-bar.delete") :on-click on-delete} i/trash]] + + ;; if not editable [:div.multiselect-nav [:span.move-item.tooltip.tooltip-top - {:on-click on-toggle-copy} + {:alt (tr "ds.multiselect-bar.copy") + :on-click on-toggle-copy} (when (:show-copy-tooltip @local) (grid-options-tooltip :selected id :title (tr "ds.multiselect-bar.copy-to-library") diff --git a/frontend/src/uxbox/main/ui/dashboard/images.cljs b/frontend/src/uxbox/main/ui/dashboard/images.cljs index ed57d8d13..4f0bced1b 100644 --- a/frontend/src/uxbox/main/ui/dashboard/images.cljs +++ b/frontend/src/uxbox/main/ui/dashboard/images.cljs @@ -290,14 +290,16 @@ ;; If editable [:div.multiselect-nav {} [:span.move-item.tooltip.tooltip-top - {:on-click on-toggle-copy :alt (tr "ds.multiselect-bar.copy")} + {:alt (tr "ds.multiselect-bar.copy") + :on-click on-toggle-copy} (when (:show-copy-tooltip @local) (grid-options-tooltip :selected id - :title (tr "ds.multiselect-bar.copy-to-library") - :on-select on-copy)) + :title (tr "ds.multiselect-bar.copy-to-library") + :on-select on-copy)) ^:inline i/copy] [:span.move-item.tooltip.tooltip-top - {:on-click on-toggle-move :alt (tr "ds.multiselect-bar.move")} + {:alt (tr "ds.multiselect-bar.move") + :on-click on-toggle-move} (when (:show-move-tooltip @local) (grid-options-tooltip :selected id :title (tr "ds.multiselect-bar.move-to-library") @@ -316,7 +318,8 @@ ;; If not editable [:div.multiselect-nav {} [:span.move-item.tooltip.tooltip-top - {:on-click on-toggle-copy} + {:alt (tr "ds.multiselect-bar.copy") + :on-click on-toggle-copy} (when (:show-copy-tooltip @local) (grid-options-tooltip :selected id :title (tr "ds.multiselect-bar.copy-to-library")