diff --git a/webapp/locales/de.json b/webapp/locales/de.json index a91b599ae..e80749cbb 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -536,7 +536,7 @@ }, "description": "Beschreibung", "editGroupSettings": { - "groupName": "Einstellungen für „{name}“", + "groupTitle": "Einstellungen für ", "title": "Meine Gruppe ändern" }, "errors": { @@ -829,23 +829,17 @@ "submitted": "Kommentar gesendet", "updated": "Änderungen gespeichert" }, - "createNewEvent": { - "forGroup": { - "title": "Für die Gruppe „{name}“" - }, - "title": "Erstelle eine Veranstaltung" - }, - "createNewPost": { - "forGroup": { - "title": "Für die Gruppe „{name}“" - }, + "createNewArticle": { "title": "Erstelle einen Beitrag" }, + "createNewEvent": { + "title": "Erstelle eine Veranstaltung" + }, "edited": "bearbeitet", "editPost": { "event": "Bearbeite deine Veranstaltung", "forGroup": { - "title": "Für die Gruppe „{name}“" + "title": "Für die Gruppe " }, "title": "Bearbeite deinen Beitrag" }, @@ -881,7 +875,7 @@ }, "viewPost": { "forGroup": { - "title": "In der Gruppe „{name}“" + "title": "In der Gruppe " }, "title": "Beitrag" } diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 2da47250d..7d13677b8 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -536,7 +536,7 @@ }, "description": "Description", "editGroupSettings": { - "groupName": "Settings Of “{name}”", + "groupTitle": "Settings of ", "title": "Edit My Group" }, "errors": { @@ -829,23 +829,17 @@ "submitted": "Comment submitted!", "updated": "Changes saved!" }, - "createNewEvent": { - "forGroup": { - "title": "For The Group “{name}”" - }, - "title": "Create an Event" - }, - "createNewPost": { - "forGroup": { - "title": "For The Group “{name}”" - }, + "createNewArticle": { "title": "Create an Article" }, + "createNewEvent": { + "title": "Create an Event" + }, "edited": "edited", "editPost": { "event": "Edit Your Event", "forGroup": { - "title": "For The Group “{name}”" + "title": "For The Group " }, "title": "Edit Your Post" }, @@ -881,7 +875,7 @@ }, "viewPost": { "forGroup": { - "title": "In The Group “{name}”" + "title": "In The Group " }, "title": "Post" } diff --git a/webapp/locales/es.json b/webapp/locales/es.json index 4c89aa027..bea05d33a 100644 --- a/webapp/locales/es.json +++ b/webapp/locales/es.json @@ -536,7 +536,7 @@ }, "description": null, "editGroupSettings": { - "groupName": null, + "groupTitle": null, "title": null }, "errors": { @@ -829,13 +829,10 @@ "submitted": "Comentario enviado", "updated": "Cambios guardados" }, - "createNewEvent": { - "forGroup": { - "title": null - }, + "createNewArticle": { "title": null }, - "createNewPost": { + "createNewEvent": { "forGroup": { "title": null }, diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json index 1d0327759..0f5f85cf5 100644 --- a/webapp/locales/fr.json +++ b/webapp/locales/fr.json @@ -536,7 +536,7 @@ }, "description": null, "editGroupSettings": { - "groupName": null, + "groupTitle": null, "title": null }, "errors": { @@ -829,13 +829,10 @@ "submitted": "Commentaire soumis", "updated": "Changements sauvegardés" }, - "createNewEvent": { - "forGroup": { - "title": null - }, + "createNewArticle": { "title": null }, - "createNewPost": { + "createNewEvent": { "forGroup": { "title": null }, diff --git a/webapp/locales/it.json b/webapp/locales/it.json index 88e58a1fd..29be26a5e 100644 --- a/webapp/locales/it.json +++ b/webapp/locales/it.json @@ -536,7 +536,7 @@ }, "description": null, "editGroupSettings": { - "groupName": null, + "groupTitle": null, "title": null }, "errors": { @@ -829,13 +829,10 @@ "submitted": null, "updated": null }, - "createNewEvent": { - "forGroup": { - "title": null - }, + "createNewArticle": { "title": null }, - "createNewPost": { + "createNewEvent": { "forGroup": { "title": null }, diff --git a/webapp/locales/nl.json b/webapp/locales/nl.json index e20308c2c..c6852996c 100644 --- a/webapp/locales/nl.json +++ b/webapp/locales/nl.json @@ -536,7 +536,7 @@ }, "description": null, "editGroupSettings": { - "groupName": null, + "groupTitle": null, "title": null }, "errors": { @@ -829,13 +829,10 @@ "submitted": null, "updated": null }, - "createNewEvent": { - "forGroup": { - "title": null - }, + "createNewArticle": { "title": null }, - "createNewPost": { + "createNewEvent": { "forGroup": { "title": null }, diff --git a/webapp/locales/pl.json b/webapp/locales/pl.json index 6e60634fa..8c83ce9d0 100644 --- a/webapp/locales/pl.json +++ b/webapp/locales/pl.json @@ -536,7 +536,7 @@ }, "description": null, "editGroupSettings": { - "groupName": null, + "groupTitle": null, "title": null }, "errors": { @@ -829,13 +829,10 @@ "submitted": "Komentarz dodany", "updated": null }, - "createNewEvent": { - "forGroup": { - "title": null - }, + "createNewArticle": { "title": null }, - "createNewPost": { + "createNewEvent": { "forGroup": { "title": null }, diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json index 049598e53..4f37e22ab 100644 --- a/webapp/locales/pt.json +++ b/webapp/locales/pt.json @@ -536,7 +536,7 @@ }, "description": null, "editGroupSettings": { - "groupName": null, + "groupTitle": null, "title": null }, "errors": { @@ -829,13 +829,10 @@ "submitted": "Comentário Enviado", "updated": "Alterações salvas" }, - "createNewEvent": { - "forGroup": { - "title": null - }, + "createNewArticle": { "title": null }, - "createNewPost": { + "createNewEvent": { "forGroup": { "title": null }, diff --git a/webapp/locales/ru.json b/webapp/locales/ru.json index dcd2eff48..e2da0187d 100644 --- a/webapp/locales/ru.json +++ b/webapp/locales/ru.json @@ -536,7 +536,7 @@ }, "description": null, "editGroupSettings": { - "groupName": null, + "groupTitle": null, "title": null }, "errors": { @@ -829,13 +829,10 @@ "submitted": "Комментарий отправлен", "updated": "Изменения сохраненные" }, - "createNewEvent": { - "forGroup": { - "title": null - }, + "createNewArticle": { "title": null }, - "createNewPost": { + "createNewEvent": { "forGroup": { "title": null }, diff --git a/webapp/pages/groups/_id/_slug.vue b/webapp/pages/groups/_id/_slug.vue index f1b14a643..66730f03f 100644 --- a/webapp/pages/groups/_id/_slug.vue +++ b/webapp/pages/groups/_id/_slug.vue @@ -206,7 +206,12 @@ - + {{ $t('group.editGroupSettings.title') }} - {{ $t('group.editGroupSettings.groupName', { name: group.name }) }} + {{ $t('group.editGroupSettings.groupTitle') }} + + {{ group.name }} + @@ -25,6 +28,11 @@ import { groupQuery } from '~/graphql/groups.js' import { mapGetters } from 'vuex' export default { + data() { + return { + group: {}, + } + }, computed: { ...mapGetters({ user: 'auth/user', @@ -46,11 +54,6 @@ export default { ] }, }, - data() { - return { - group: {}, - } - }, async asyncData(context) { const { app, @@ -78,3 +81,9 @@ export default { }, } + + diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue index 5484c2a2e..ee6185a03 100644 --- a/webapp/pages/index.vue +++ b/webapp/pages/index.vue @@ -3,7 +3,7 @@
- + {{ heading }} - - {{ $t('post.viewPost.forGroup.title', { name: post.group.name }) }} + + {{ $t('post.viewPost.forGroup.title') }} + + {{ post.group.name }} + @@ -451,4 +456,8 @@ export default { margin-top: $space-small; margin-bottom: calc($space-base * 2); } + +.ds-heading { + margin-top: 0; +} diff --git a/webapp/pages/post/create.vue b/webapp/pages/post/create.vue deleted file mode 100644 index 25b4ed44e..000000000 --- a/webapp/pages/post/create.vue +++ /dev/null @@ -1,137 +0,0 @@ - - - - diff --git a/webapp/pages/post/create.spec.js b/webapp/pages/post/create/_type.spec.js similarity index 89% rename from webapp/pages/post/create.spec.js rename to webapp/pages/post/create/_type.spec.js index 0166a31b5..03d1ff4ca 100644 --- a/webapp/pages/post/create.spec.js +++ b/webapp/pages/post/create/_type.spec.js @@ -1,5 +1,5 @@ import { mount } from '@vue/test-utils' -import create from './create.vue' +import create from './_type.vue' import Vuex from 'vuex' const localVue = global.localVue @@ -10,6 +10,9 @@ describe('create.vue', () => { const mocks = { $t: jest.fn(), $route: { + params: { + type: 'article', + }, query: { groupId: null, }, diff --git a/webapp/pages/post/create/_type.vue b/webapp/pages/post/create/_type.vue new file mode 100644 index 000000000..bc2bac31a --- /dev/null +++ b/webapp/pages/post/create/_type.vue @@ -0,0 +1,135 @@ + + + + + diff --git a/webapp/pages/post/edit/_id.vue b/webapp/pages/post/edit/_id.vue index aad1bc70e..de6b7d2e0 100644 --- a/webapp/pages/post/edit/_id.vue +++ b/webapp/pages/post/edit/_id.vue @@ -2,14 +2,23 @@
- {{ - contribution && contribution.postType[0] === 'Event' - ? $t('post.editPost.event') - : $t('post.editPost.title') - }} + {{ heading }} - - {{ $t('post.editPost.forGroup.title', { name: contribution.group.name }) }} + + {{ $t('post.editPost.forGroup.title') }} + + {{ contribution.group.name }} + @@ -39,6 +48,11 @@ export default { ...mapGetters({ user: 'auth/user', }), + heading() { + return this.contribution && this.contribution.postType[0] === 'Event' + ? this.$t('post.editPost.event') + : this.$t('post.editPost.title') + }, }, data() { return { @@ -70,3 +84,9 @@ export default { }, } + + diff --git a/webapp/pages/profile/_id/__snapshots__/_slug.spec.js.snap b/webapp/pages/profile/_id/__snapshots__/_slug.spec.js.snap index 9eec4e96a..d4fa08457 100644 --- a/webapp/pages/profile/_id/__snapshots__/_slug.spec.js.snap +++ b/webapp/pages/profile/_id/__snapshots__/_slug.spec.js.snap @@ -1727,7 +1727,6 @@ exports[`ProfileSlug given an authenticated user given the logged in user as pro