From 04d5b943dc64bbaeee59294fb4bfdc6bbc9d872b Mon Sep 17 00:00:00 2001
From: MayTekayaa <100131287+MayTekayaa@users.noreply.github.com>
Date: Fri, 6 Feb 2026 14:36:57 +0100
Subject: [PATCH] fix: Adjust the toolbar of the tasks list portlet -
 MEED-10206 - Meeds-io/meeds#4037 (#567)

This change will add some enhancements to the toolbar of the tasks list portlet.
---
 .../portlet/taskManagement_en.properties      |  4 ++-
 .../vue-app/tasks/components/TasksApp.vue     | 29 ++++++++++---------
 .../settings/TasksSettingsDrawer.vue          |  4 +--
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/webapps/src/main/resources/locale/portlet/taskManagement_en.properties b/webapps/src/main/resources/locale/portlet/taskManagement_en.properties
index 36da4b67f..cc304303d 100644
--- a/webapps/src/main/resources/locale/portlet/taskManagement_en.properties
+++ b/webapps/src/main/resources/locale/portlet/taskManagement_en.properties
@@ -453,4 +453,6 @@ tasks.settings.edit.drawer.title=Edit task list
 tasks.settings.edit.drawer.updateSeeMore.label=Update see more
 tasks.settings.edit.drawer.opensInSameTab=Opens in same tab
 tasks.settings.save.success.message=Settings saved successfully
-tasks.settings.save.error.message=Error while saving settings
\ No newline at end of file
+tasks.settings.save.error.message=Error while saving settings
+tasks.settings.save.label=Save
+tasks.settings.cancel.label=Cancel
\ No newline at end of file
diff --git a/webapps/src/main/webapp/vue-app/tasks/components/TasksApp.vue b/webapps/src/main/webapp/vue-app/tasks/components/TasksApp.vue
index 9d60bb8b9..7b029f05e 100644
--- a/webapps/src/main/webapp/vue-app/tasks/components/TasksApp.vue
+++ b/webapps/src/main/webapp/vue-app/tasks/components/TasksApp.vue
@@ -23,7 +23,7 @@
         <template #title>
           <span class="widget-text-header text-truncate"> {{ $t('label.tasks.header') }} </span>
         </template>
-        <template v-if="tasksSize" #action>
+        <template #action>
           <div>
             <v-btn
               v-if="!hover"
@@ -38,19 +38,7 @@
             </v-btn>
             <div v-else>
               <v-btn
-                v-if="$root.canEdit"
-                :title="$t('label.editSettings')"
-                class="text-font-size"
-                small
-                link
-                icon
-                @click="openSettingsDrawer">
-                <v-icon
-                  :size="18">
-                  fas fa-cog
-                </v-icon>
-              </v-btn>
-              <v-btn
+                v-if="tasksSize"
                 :title="$t('label.addTask')"
                 small
                 link
@@ -74,6 +62,19 @@
                   fas fa-external-link-alt
                 </v-icon>
               </v-btn>
+              <v-btn
+                v-if="$root.canEdit"
+                :title="$t('label.editSettings')"
+                class="text-font-size"
+                small
+                link
+                icon
+                @click="openSettingsDrawer">
+                <v-icon
+                  size="18">
+                  fas fa-cog
+                </v-icon>
+              </v-btn>
             </div>
           </div>
         </template>
diff --git a/webapps/src/main/webapp/vue-app/tasks/components/settings/TasksSettingsDrawer.vue b/webapps/src/main/webapp/vue-app/tasks/components/settings/TasksSettingsDrawer.vue
index f39f47078..2ba193626 100644
--- a/webapps/src/main/webapp/vue-app/tasks/components/settings/TasksSettingsDrawer.vue
+++ b/webapps/src/main/webapp/vue-app/tasks/components/settings/TasksSettingsDrawer.vue
@@ -57,14 +57,14 @@
         <v-btn
           class="me-5 btn"
           @click="reset">
-          {{ $t('myApplications.settings.cancel.label') }}
+          {{ $t('tasks.settings.cancel.label') }}
         </v-btn>
         <v-btn
           class="btn btn-primary"
           :disabled="!saveEnabled"
           :loading="isSaving"
           @click="save">
-          {{ $t('myApplications.settings.save.label') }}
+          {{ $t('tasks.settings.save.label') }}
         </v-btn>
       </div>
     </template>