Skip to content

Commit a35a76a

Browse files
committed
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.
1 parent 6e264e4 commit a35a76a

File tree

3 files changed

+20
-17
lines changed

3 files changed

+20
-17
lines changed

webapps/src/main/resources/locale/portlet/taskManagement_en.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,4 +453,6 @@ tasks.settings.edit.drawer.title=Edit task list
453453
tasks.settings.edit.drawer.updateSeeMore.label=Update see more
454454
tasks.settings.edit.drawer.opensInSameTab=Opens in same tab
455455
tasks.settings.save.success.message=Settings saved successfully
456-
tasks.settings.save.error.message=Error while saving settings
456+
tasks.settings.save.error.message=Error while saving settings
457+
tasks.settings.save.label=Save
458+
tasks.settings.cancel.label=Cancel

webapps/src/main/webapp/vue-app/tasks/components/TasksApp.vue

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<template #title>
2424
<span class="widget-text-header text-truncate"> {{ $t('label.tasks.header') }} </span>
2525
</template>
26-
<template v-if="tasksSize" #action>
26+
<template #action>
2727
<div>
2828
<v-btn
2929
v-if="!hover"
@@ -38,19 +38,7 @@
3838
</v-btn>
3939
<div v-else>
4040
<v-btn
41-
v-if="$root.canEdit"
42-
:title="$t('label.editSettings')"
43-
class="text-font-size"
44-
small
45-
link
46-
icon
47-
@click="openSettingsDrawer">
48-
<v-icon
49-
:size="18">
50-
fas fa-cog
51-
</v-icon>
52-
</v-btn>
53-
<v-btn
41+
v-if="tasksSize"
5442
:title="$t('label.addTask')"
5543
small
5644
link
@@ -74,6 +62,19 @@
7462
fas fa-external-link-alt
7563
</v-icon>
7664
</v-btn>
65+
<v-btn
66+
v-if="$root.canEdit"
67+
:title="$t('label.editSettings')"
68+
class="text-font-size"
69+
small
70+
link
71+
icon
72+
@click="openSettingsDrawer">
73+
<v-icon
74+
size="18">
75+
fas fa-cog
76+
</v-icon>
77+
</v-btn>
7778
</div>
7879
</div>
7980
</template>

webapps/src/main/webapp/vue-app/tasks/components/settings/TasksSettingsDrawer.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@
5757
<v-btn
5858
class="me-5 btn"
5959
@click="reset">
60-
{{ $t('myApplications.settings.cancel.label') }}
60+
{{ $t('tasks.settings.cancel.label') }}
6161
</v-btn>
6262
<v-btn
6363
class="btn btn-primary"
6464
:disabled="!saveEnabled"
6565
:loading="isSaving"
6666
@click="save">
67-
{{ $t('myApplications.settings.save.label') }}
67+
{{ $t('tasks.settings.save.label') }}
6868
</v-btn>
6969
</div>
7070
</template>

0 commit comments

Comments
 (0)