diff --git a/src/ui/client/dashboard/components/Form/Advanced.vue b/src/ui/client/dashboard/components/Form/Advanced.vue index 4b072e31c..1c6d3edeb 100644 --- a/src/ui/client/dashboard/components/Form/Advanced.vue +++ b/src/ui/client/dashboard/components/Form/Advanced.vue @@ -12,7 +12,7 @@ import Filter from "@components/Widget/Filter.vue"; import GroupMultiple from "@components/Forms/Group/Multiple.vue"; import { plugin_types } from "@utils/variables"; import { useAdvancedForm } from "@store/form.js"; -import { useCheckPluginsValidity } from "@utils/form.js"; +import { useCheckPluginsValidity } from "@utils/global.js"; import { v4 as uuidv4 } from "uuid"; /** diff --git a/src/ui/client/dashboard/components/Form/Easy.vue b/src/ui/client/dashboard/components/Form/Easy.vue index 905349de2..e97bcb93a 100644 --- a/src/ui/client/dashboard/components/Form/Easy.vue +++ b/src/ui/client/dashboard/components/Form/Easy.vue @@ -7,7 +7,7 @@ import Subtitle from "@components/Widget/Subtitle.vue"; import Button from "@components/Widget/Button.vue"; import Text from "@components/Widget/Text.vue"; import { v4 as uuidv4 } from "uuid"; -import { useCheckPluginsValidity } from "@utils/form.js"; +import { useCheckPluginsValidity } from "@utils/global.js"; import { useEasyForm } from "@store/form.js"; /** diff --git a/src/ui/client/dashboard/components/Icons/Document.vue b/src/ui/client/dashboard/components/Icons/Document.vue new file mode 100644 index 000000000..521e31146 --- /dev/null +++ b/src/ui/client/dashboard/components/Icons/Document.vue @@ -0,0 +1,52 @@ + + diff --git a/src/ui/client/dashboard/components/Icons/Eye.vue b/src/ui/client/dashboard/components/Icons/Eye.vue new file mode 100644 index 000000000..7bf6ca0fd --- /dev/null +++ b/src/ui/client/dashboard/components/Icons/Eye.vue @@ -0,0 +1,52 @@ + + diff --git a/src/ui/client/dashboard/components/Icons/Pen.vue b/src/ui/client/dashboard/components/Icons/Pen.vue index 3b874c3a8..b61d59885 100644 --- a/src/ui/client/dashboard/components/Icons/Pen.vue +++ b/src/ui/client/dashboard/components/Icons/Pen.vue @@ -43,9 +43,10 @@ const icon = reactive({ fill="currentColor" > + diff --git a/src/ui/client/dashboard/components/Widget/Button.vue b/src/ui/client/dashboard/components/Widget/Button.vue index b07301f83..958e3fac9 100644 --- a/src/ui/client/dashboard/components/Widget/Button.vue +++ b/src/ui/client/dashboard/components/Widget/Button.vue @@ -13,7 +13,6 @@ import { contentIndex } from "@utils/tabindex.js"; import Container from "@components/Widget/Container.vue"; import Icons from "@components/Widget/Icons.vue"; import { useUUID } from "@utils/global.js"; -import { useForm } from "@utils/form.js"; /** @name Widget/Button.vue @description This component is a standard button. @@ -136,7 +135,6 @@ onBeforeMount(() => { }); onMounted(() => { - window.addEventListener("click", useForm); // Case modal, add accessibility data if (typeof props.modal === "object") { btnEl.value.setAttribute("aria-controls", btn.modalId); @@ -156,10 +154,6 @@ watch( } } ); - -onUnmounted(() => { - window.removeEventListener("click", useForm); -}); diff --git a/src/ui/client/dashboard/components/Widget/ButtonGroup.vue b/src/ui/client/dashboard/components/Widget/ButtonGroup.vue index cacca06f3..dc47865f4 100644 --- a/src/ui/client/dashboard/components/Widget/ButtonGroup.vue +++ b/src/ui/client/dashboard/components/Widget/ButtonGroup.vue @@ -64,6 +64,15 @@ onMounted(() => { .closest("[data-is]") .getAttribute("data-is")}` : "button-group-default"; + + // Additionnal class for modal + if (group.class.includes("modal")) { + // Check if next sibling exists + // Else, this is the last element, we can add a margin top because this is main modal action buttons + if (!groupEl.value.nextElementSibling) { + group.class += " last"; + } + } }); diff --git a/src/ui/client/dashboard/components/Widget/Icons.vue b/src/ui/client/dashboard/components/Widget/Icons.vue index 13b0c7ef8..0b5b7a72b 100644 --- a/src/ui/client/dashboard/components/Widget/Icons.vue +++ b/src/ui/client/dashboard/components/Widget/Icons.vue @@ -1,5 +1,6 @@