From 513553667ff2f3bb49cd0fbdbbc814c6d14e0ecc Mon Sep 17 00:00:00 2001 From: Sara Boutej <40363501+SaraBoutej@users.noreply.github.com> Date: Fri, 5 Jul 2024 15:15:25 +0100 Subject: [PATCH] feat: Review UX to add node - MEED-6834 - Meeds-io/MIPs#137 (#154) --- .../SiteNavigationElementDrawer.vue | 2 +- .../SiteNavigationExistingPageElement.vue | 5 ++--- .../SiteNavigationNewPageElementItem.vue | 15 +++++++++++---- .../site-navigation/SiteNavigationNodeDrawer.vue | 6 +++--- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationElementDrawer.vue b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationElementDrawer.vue index 12e527b49..ce9f689ca 100644 --- a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationElementDrawer.vue +++ b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationElementDrawer.vue @@ -74,7 +74,7 @@ export default { navigationNode: null, elementName: null, elementTitle: null, - pageTemplate: 'empty', + pageTemplate: null, selectedPage: null, loading: false, resetDrawer: true, diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationExistingPageElement.vue b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationExistingPageElement.vue index c574c557b..01e59ac0a 100644 --- a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationExistingPageElement.vue +++ b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationExistingPageElement.vue @@ -31,13 +31,12 @@ v-if="!allSites" v-model="selectedSiteNavigation" :all-sites="allSites" - class="mb-6" /> + :class="!allSites && 'mb-8'" /> + :site-name="selectedSiteNavigation?.name" /> diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationNewPageElementItem.vue b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationNewPageElementItem.vue index 802d70a68..2d8f2df9e 100644 --- a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationNewPageElementItem.vue +++ b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationNewPageElementItem.vue @@ -21,7 +21,8 @@

+ class="mb-0 font-weight-regular text-truncate">

+ class="mb-0 text-subtitle text-truncate-2">

@@ -48,6 +49,11 @@ export default { default: null }, }, + data() { + return { + selected: false + }; + }, computed: { title() { return this.pageTemplate?.name; @@ -79,11 +85,12 @@ export default { 'max-height': '100px', 'height': '100px' }; - }, + } }, methods: { selectTemplate() { this.$root.$emit('page-template-changed', this.pageTemplate); + this.selected = !this.selected; } } }; diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationNodeDrawer.vue b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationNodeDrawer.vue index 9e144b634..ffefff534 100644 --- a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationNodeDrawer.vue +++ b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationNodeDrawer.vue @@ -112,7 +112,7 @@ -
+
{{ $t('siteNavigation.label.openSameTab') }} @@ -272,7 +272,7 @@ export default { isScheduled: false, disableNodeId: false, displayNodeName: false, - elementType: 'Group', + elementType: 'PAGE', allSites: true, nodeTarget: true, parentNavigationNodeUrl: '', @@ -388,7 +388,7 @@ export default { this.visible = true; this.isScheduled = false; this.displayNodeName = false; - this.elementType = 'Group'; + this.elementType = 'PAGE'; this.nodeTarget = true; this.disableNodeId = false; this.editMode= false;