From 71a35a9cf8869967e57d160696fffb07bf153c8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakob=20R=C3=B6hrl?= <jakob.roehrl@web.de>
Date: Fri, 26 Jun 2020 10:34:03 +0200
Subject: [PATCH] Add a button to the modal to switch back to the sidebar view
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakob Röhrl <jakob.roehrl@web.de>
---
 src/App.vue                         |  1 -
 src/components/card/CardSidebar.vue | 14 +++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 29ad67698..d1ac8069e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -93,7 +93,6 @@ export default {
 	},
 	methods: {
 		hideModal() {
-			// this.$store.dispatch('setCardDetailsInModal', false)
 			this.$router.push({ name: 'board' })
 		},
 	},
diff --git a/src/components/card/CardSidebar.vue b/src/components/card/CardSidebar.vue
index 4a0819243..524822053 100644
--- a/src/components/card/CardSidebar.vue
+++ b/src/components/card/CardSidebar.vue
@@ -26,9 +26,14 @@
 		:subtitle="subtitle"
 		:title-editable.sync="titleEditable"
 		@update:title="updateTitle"
+		:class="{ 'app-sidebar-modal': cardDetailsInModal}"
 		@close="closeSidebar">
 		<template #secondary-actions>
-			<ActionButton icon="icon-external" @click.stop="showModal()">
+			<ActionButton v-if="cardDetailsInModal" icon="icon-menu-sidebar" @click.stop="showModal()">
+				{{ t('deck', 'Open in sidebar view') }}
+			</ActionButton>
+
+			<ActionButton v-else icon="icon-external" @click.stop="showModal()">
 				{{ t('deck', 'Open in bigger view') }}
 			</ActionButton>
 		</template>
@@ -140,6 +145,7 @@ export default {
 	computed: {
 		...mapState({
 			currentBoard: state => state.currentBoard,
+			cardDetailsInModal: state => state.cardDetailsInModal,
 		}),
 		...mapGetters(['canEdit', 'assignables']),
 		attachments() {
@@ -384,6 +390,12 @@ export default {
 </style>
 
 <style lang="scss" scoped>
+	.app-sidebar-modal {
+		border-left: 0;
+		width: 800px;
+		max-width: 780px;
+		top: 0px;
+	}
 
 	h5 {
 		border-bottom: 1px solid var(--color-border);