Merge pull request #971 from nextcloud/fix/print

Printing fixes
nextcloud · Oct 30, 2023 · 9681cdc · 9681cdc
2 parents ce6bf90 + e7b40fd
commit 9681cdc
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 7 deletions.
diff --git a/src/Collectives.vue b/src/Collectives.vue
@@ -162,13 +162,34 @@ export default {
 }
 
 @media print {
+	html, body {
+		background: var(--color-main-background, white) !important;
+	}
+
+	/* hide toast notifications for printing */
+	.toastify.dialogs {
+		display: none;
+	}
+
 	#header {
 		display: none !important;
 	}
 
 	#content-vue {
 		display: block !important;
 	}
+
+	#text-wrapper #text .content-wrapper {
+		display: block;
+
+		div.ProseMirror {
+			margin-top: 0;
+			margin-bottom: 0;
+			padding-top: 0;
+			padding-bottom: 0;
+		}
+	}
+
 }
 
 /* Align toggle with page list header bar */

diff --git a/src/components/Collective/CollectiveActions.vue b/src/components/Collective/CollectiveActions.vue
@@ -143,6 +143,7 @@ export default {
 			'isCollectiveAdmin',
 			'isPublic',
 			'loading',
+			'shareTokenParam',
 		]),
 
 		circleLink() {

diff --git a/src/components/CollectivePrint.vue b/src/components/CollectivePrint.vue
@@ -129,8 +129,8 @@ export default {
 		},
 
 		waitForImages() {
-			const images = document.querySelectorAll('#text-container div.image')
-			const loading = document.querySelectorAll('#text-container div.image.icon-loading')
+			const images = document.querySelectorAll('#text-container figure.image')
+			const loading = document.querySelectorAll('#text-container figure.image.icon-loading')
 			this.loadImages.total = images.length
 			this.loadImages.count = images.length - loading.length
 

diff --git a/src/components/Page/LandingPageWidgets.vue b/src/components/Page/LandingPageWidgets.vue
@@ -32,4 +32,11 @@ export default {
 .landing-page-widgets {
 	padding-left: 12px;
 }
+
+@media print {
+	/* Don't print unwanted elements */
+	.landing-page-widgets {
+		display: none !important;
+	}
+}
 </style>
diff --git a/src/components/Page/RichText.vue b/src/components/Page/RichText.vue
@@ -252,9 +252,9 @@ export default {
 
 <style lang="scss">
 @media print {
-
 	h1, h2, h3 {
 		page-break-after: avoid;
+		break-after: avoid;
 	}
 }
 </style>
diff --git a/src/components/Page/TextEditor.vue b/src/components/Page/TextEditor.vue
@@ -279,4 +279,11 @@ export default {
 		}
 	}
 }
+
+@media print {
+	/* Don't print unwanted elements */
+	.text-container-heading {
+		display: none !important;
+	}
+}
 </style>
diff --git a/src/components/PageList/Item.vue b/src/components/PageList/Item.vue
@@ -57,8 +57,9 @@
 				{{ pageTitleString }}
 			</div>
 		</router-link>
-		<div v-if="canEdit" class="page-list-item-actions">
-			<PageActionMenu :page-id="pageId"
+		<div class="page-list-item-actions">
+			<PageActionMenu v-if="canEdit || isLandingPage"
+				:page-id="pageId"
 				:page-url="to"
 				:parent-id="parentId"
 				:timestamp="timestamp"
@@ -67,7 +68,7 @@
 				:is-landing-page="isLandingPage"
 				:is-template="isTemplate"
 				:in-page-list="true" />
-			<NcActions>
+			<NcActions v-if="canEdit">
 				<NcActionButton class="action-button-add" @click="newPage(pageId)">
 					<template #icon>
 						<PlusIcon :size="20" fill-color="var(--color-main-text)" />

diff --git a/src/components/PagePrint.vue b/src/components/PagePrint.vue
@@ -106,6 +106,7 @@ export default {
 
 	&-subpage {
 		page-break-before: always;
+		break-before: always;
 	}
 }
 
@@ -114,10 +115,14 @@ export default {
 }
 
 .editor__content {
+	display: block;
 	position: relative;
 }
 
 :deep(#read-only-editor div.ProseMirror) {
-	margin-top: revert;
+	margin-top: 0;
+	margin-bottom: 0;
+	padding-top: 0;
+	padding-bottom: 0;
 }
 </style>