From e142c9fbcc1fa39140ff3d5b5a5212c598226e7e Mon Sep 17 00:00:00 2001
From: Raggini Marco <93598699+MarkRagg@users.noreply.github.com>
Date: Fri, 29 Aug 2025 17:19:51 +0200
Subject: [PATCH 1/6] feat: add info button for scripts permissions page

---
 .../AutomationAndTaskPermissionsView.vue      | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/src/views/admin/automations-task-permissions/AutomationAndTaskPermissionsView.vue b/src/views/admin/automations-task-permissions/AutomationAndTaskPermissionsView.vue
index 135cd47..c78dc6c 100644
--- a/src/views/admin/automations-task-permissions/AutomationAndTaskPermissionsView.vue
+++ b/src/views/admin/automations-task-permissions/AutomationAndTaskPermissionsView.vue
@@ -70,6 +70,40 @@
       </div>
     </div>
   </div>
+  <template #actions>
+    <button
+      class="fa-circle-info fa-solid fa-xl btn btn-ghost btn-circle"
+      onclick="permissions_info.showModal()"
+    ></button>
+  </template>
+  <dialog id="permissions_info" class="modal modal-sm">
+      <div class="modal-box max-w-sm">
+        <h2 class="card-title mb-2">Scripts permissions info</h2>
+        <p>
+          In this page, an admin can modify the editlist (task/automation), whitelist and blacklist (only for tasks).
+        </p>
+        <p>
+          The admins are not showed in these lists since they already have every permission to modify and execute every task and automation.
+        </p>
+        <ul class="list-disc list-inside">
+          <li>
+            <span class="font-bold">Editlist</span>: every user inside it can edit the task/automation.
+          </li>
+          <li>
+            <span class="font-bold">Whitelist</span>: a whitelisted user can execute the task
+              even if he doesn't have the permissions for executing devices inside it.
+          </li>
+          <li>
+            <span class="font-bold">Blacklist</span>: a blacklisted user can't execute the task
+              even if he has the permissions for executing devices inside it.
+          </li>
+        </ul>
+        <p> A blacklisted user can't be added in the whitelist and vice versa.</p>
+      </div>
+      <form method="dialog" class="modal-backdrop">
+        <button>Ok</button>
+      </form>
+    </dialog>
   </NavbarLayout>
 </template>
 

From f900f25e5a4a9bc5c861f553b72f1b435c7f87b2 Mon Sep 17 00:00:00 2001
From: Raggini Marco <93598699+MarkRagg@users.noreply.github.com>
Date: Fri, 29 Aug 2025 19:42:50 +0200
Subject: [PATCH 2/6] fix: fix info text

---
 .../AutomationAndTaskPermissionsView.vue                  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/admin/automations-task-permissions/AutomationAndTaskPermissionsView.vue b/src/views/admin/automations-task-permissions/AutomationAndTaskPermissionsView.vue
index c78dc6c..25c6660 100644
--- a/src/views/admin/automations-task-permissions/AutomationAndTaskPermissionsView.vue
+++ b/src/views/admin/automations-task-permissions/AutomationAndTaskPermissionsView.vue
@@ -80,10 +80,10 @@
       <div class="modal-box max-w-sm">
         <h2 class="card-title mb-2">Scripts permissions info</h2>
         <p>
-          In this page, an admin can modify the editlist (task/automation), whitelist and blacklist (only for tasks).
+          In this page, you can modify the editlist (task/automation), whitelist and blacklist (only for tasks).
         </p>
         <p>
-          The admins are not showed in these lists since they already have every permission to modify and execute every task and automation.
+          You are not showed in these lists since they already have every permission to modify and execute every task and automation.
         </p>
         <ul class="list-disc list-inside">
           <li>
@@ -91,11 +91,11 @@
           </li>
           <li>
             <span class="font-bold">Whitelist</span>: a whitelisted user can execute the task
-              even if he doesn't have the permissions for executing devices inside it.
+              even if he doesn't have the permissions for user-device permissions inside it.
           </li>
           <li>
             <span class="font-bold">Blacklist</span>: a blacklisted user can't execute the task
-              even if he has the permissions for executing devices inside it.
+              even if he has the permissions for user-device permissions inside it.
           </li>
         </ul>
         <p> A blacklisted user can't be added in the whitelist and vice versa.</p>

From dd7beda3af2642289ad6c95a4d8f1c8be47594eb Mon Sep 17 00:00:00 2001
From: Raggini Marco <93598699+MarkRagg@users.noreply.github.com>
Date: Sat, 30 Aug 2025 09:23:21 +0200
Subject: [PATCH 3/6] refactor: move info button in the general scripts
 permissions page

---
 .../AutomationAndTaskPermissionsView.vue      | 34 -------------------
 .../AutomationsAndTasksPermissionsView.vue    | 34 +++++++++++++++++++
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/views/admin/automations-task-permissions/AutomationAndTaskPermissionsView.vue b/src/views/admin/automations-task-permissions/AutomationAndTaskPermissionsView.vue
index 25c6660..135cd47 100644
--- a/src/views/admin/automations-task-permissions/AutomationAndTaskPermissionsView.vue
+++ b/src/views/admin/automations-task-permissions/AutomationAndTaskPermissionsView.vue
@@ -70,40 +70,6 @@
       </div>
     </div>
   </div>
-  <template #actions>
-    <button
-      class="fa-circle-info fa-solid fa-xl btn btn-ghost btn-circle"
-      onclick="permissions_info.showModal()"
-    ></button>
-  </template>
-  <dialog id="permissions_info" class="modal modal-sm">
-      <div class="modal-box max-w-sm">
-        <h2 class="card-title mb-2">Scripts permissions info</h2>
-        <p>
-          In this page, you can modify the editlist (task/automation), whitelist and blacklist (only for tasks).
-        </p>
-        <p>
-          You are not showed in these lists since they already have every permission to modify and execute every task and automation.
-        </p>
-        <ul class="list-disc list-inside">
-          <li>
-            <span class="font-bold">Editlist</span>: every user inside it can edit the task/automation.
-          </li>
-          <li>
-            <span class="font-bold">Whitelist</span>: a whitelisted user can execute the task
-              even if he doesn't have the permissions for user-device permissions inside it.
-          </li>
-          <li>
-            <span class="font-bold">Blacklist</span>: a blacklisted user can't execute the task
-              even if he has the permissions for user-device permissions inside it.
-          </li>
-        </ul>
-        <p> A blacklisted user can't be added in the whitelist and vice versa.</p>
-      </div>
-      <form method="dialog" class="modal-backdrop">
-        <button>Ok</button>
-      </form>
-    </dialog>
   </NavbarLayout>
 </template>
 
diff --git a/src/views/admin/automations-task-permissions/AutomationsAndTasksPermissionsView.vue b/src/views/admin/automations-task-permissions/AutomationsAndTasksPermissionsView.vue
index d615e2e..c7d3ba5 100644
--- a/src/views/admin/automations-task-permissions/AutomationsAndTasksPermissionsView.vue
+++ b/src/views/admin/automations-task-permissions/AutomationsAndTasksPermissionsView.vue
@@ -67,6 +67,40 @@ onMounted(async () => {
       </div>
     </div>
   </div>
+  <template #actions>
+    <button
+      class="fa-circle-info fa-solid fa-xl btn btn-ghost btn-circle"
+      onclick="permissions_info.showModal()"
+    ></button>
+  </template>
+  <dialog id="permissions_info" class="modal modal-sm">
+      <div class="modal-box max-w-sm">
+        <h2 class="card-title mb-2">Scripts permissions info</h2>
+        <p>
+          In this page, you can modify the editlist (task/automation), whitelist and blacklist (only for tasks).
+        </p>
+        <p>
+          You are not showed in these lists since they already have every permission to modify and execute every task and automation.
+        </p>
+        <ul class="list-disc list-inside">
+          <li>
+            <span class="font-bold">Editlist</span>: every user inside it can edit the task/automation.
+          </li>
+          <li>
+            <span class="font-bold">Whitelist</span>: a whitelisted user can execute the task
+              even if he doesn't have the permissions for user-device permissions inside it.
+          </li>
+          <li>
+            <span class="font-bold">Blacklist</span>: a blacklisted user can't execute the task
+              even if he has the permissions for user-device permissions inside it.
+          </li>
+        </ul>
+        <p> A blacklisted user can't be added in the whitelist and vice versa.</p>
+      </div>
+      <form method="dialog" class="modal-backdrop">
+        <button>Ok</button>
+      </form>
+    </dialog>
   </NavbarLayout>
 </template>
 

From 81f4ba53e1c9181d0b12e59acac3cd70b0655842 Mon Sep 17 00:00:00 2001
From: Raggini Marco <93598699+MarkRagg@users.noreply.github.com>
Date: Sat, 30 Aug 2025 09:53:07 +0200
Subject: [PATCH 4/6] fix: fix wrong word in info text

---
 .../AutomationsAndTasksPermissionsView.vue                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/admin/automations-task-permissions/AutomationsAndTasksPermissionsView.vue b/src/views/admin/automations-task-permissions/AutomationsAndTasksPermissionsView.vue
index c7d3ba5..606cacf 100644
--- a/src/views/admin/automations-task-permissions/AutomationsAndTasksPermissionsView.vue
+++ b/src/views/admin/automations-task-permissions/AutomationsAndTasksPermissionsView.vue
@@ -80,7 +80,7 @@ onMounted(async () => {
           In this page, you can modify the editlist (task/automation), whitelist and blacklist (only for tasks).
         </p>
         <p>
-          You are not showed in these lists since they already have every permission to modify and execute every task and automation.
+          You are not showed in these lists since you already have every permission to modify and execute every task and automation.
         </p>
         <ul class="list-disc list-inside">
           <li>

From e076f045386599e81fda98185e9122a4dbde9e1a Mon Sep 17 00:00:00 2001
From: Raggini Marco <93598699+MarkRagg@users.noreply.github.com>
Date: Sat, 30 Aug 2025 09:53:35 +0200
Subject: [PATCH 5/6] feat: add info button to users permissions

---
 .../UsersPermissionsView.vue                  | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/views/admin/users-permissions/UsersPermissionsView.vue b/src/views/admin/users-permissions/UsersPermissionsView.vue
index 0bd1116..f69b545 100644
--- a/src/views/admin/users-permissions/UsersPermissionsView.vue
+++ b/src/views/admin/users-permissions/UsersPermissionsView.vue
@@ -17,6 +17,33 @@
       </RouterLink>
     </ul>
     <ListSkeleton v-else />
+    <template #actions>
+    <button
+      class="fa-circle-info fa-solid fa-xl btn btn-ghost btn-circle"
+      onclick="permissions_info.showModal()"
+    ></button>
+  </template>
+  <dialog id="permissions_info" class="modal modal-sm">
+      <div class="modal-box max-w-sm">
+        <h2 class="card-title mb-2">Users permissions info</h2>
+        <p>
+          On this page, the list of registered users is shown.
+        </p>
+        <p>
+          By clicking on a user, you are shown a list of device permissions that you can add or remove for the selected user.
+          The device permission allows the user to use that device.
+        </p>
+        <p>
+          When a user has all the device permissions required by a task, he can execute it.
+        </p>
+        <p>
+          You are not showed in these lists since you already have every permission to execute every device.
+        </p>
+      </div>
+      <form method="dialog" class="modal-backdrop">
+        <button>Ok</button>
+      </form>
+    </dialog>
   </NavbarLayout>
 </template>
 

From def70e1cf7ebedf2ea7b531ac021096b8b2ca8d4 Mon Sep 17 00:00:00 2001
From: Raggini Marco <93598699+MarkRagg@users.noreply.github.com>
Date: Sun, 31 Aug 2025 10:39:50 +0200
Subject: [PATCH 6/6] fix: fix info text

---
 .../AutomationsAndTasksPermissionsView.vue                   | 5 ++---
 src/views/admin/users-permissions/UsersPermissionsView.vue   | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/views/admin/automations-task-permissions/AutomationsAndTasksPermissionsView.vue b/src/views/admin/automations-task-permissions/AutomationsAndTasksPermissionsView.vue
index 606cacf..92aab32 100644
--- a/src/views/admin/automations-task-permissions/AutomationsAndTasksPermissionsView.vue
+++ b/src/views/admin/automations-task-permissions/AutomationsAndTasksPermissionsView.vue
@@ -88,11 +88,10 @@ onMounted(async () => {
           </li>
           <li>
             <span class="font-bold">Whitelist</span>: a whitelisted user can execute the task
-              even if he doesn't have the permissions for user-device permissions inside it.
+              even if he doesn't have all the necessary user-device permissions.
           </li>
           <li>
-            <span class="font-bold">Blacklist</span>: a blacklisted user can't execute the task
-              even if he has the permissions for user-device permissions inside it.
+            <span class="font-bold">Blacklist</span>: A blacklisted user can't execute the task even if he has all the necessary user-device permissions.
           </li>
         </ul>
         <p> A blacklisted user can't be added in the whitelist and vice versa.</p>
diff --git a/src/views/admin/users-permissions/UsersPermissionsView.vue b/src/views/admin/users-permissions/UsersPermissionsView.vue
index f69b545..65f915c 100644
--- a/src/views/admin/users-permissions/UsersPermissionsView.vue
+++ b/src/views/admin/users-permissions/UsersPermissionsView.vue
@@ -31,10 +31,10 @@
         </p>
         <p>
           By clicking on a user, you are shown a list of device permissions that you can add or remove for the selected user.
-          The device permission allows the user to use that device.
+          The device permission allows the user to execute actions of that device.
         </p>
         <p>
-          When a user has all the device permissions required by a task, he can execute it.
+          When a user has all the device permissions required by a task, he can execute that task.
         </p>
         <p>
           You are not showed in these lists since you already have every permission to execute every device.