document.layout, print.css, content-linker

app/app/components/document/document-view.js

@@ -114,7 +114,6 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 		let level = 1;
 		let beforePage = this.get('beforePage');
 
-
 		if (is.not.null(beforePage)) {
 			level = beforePage.get('level');
 

app/app/models/document.js

@@ -25,7 +25,6 @@ export default Model.extend({
 	userId: attr('string'),
 	tags: attr('string'),
 	template: attr('boolean'),
-	layout: attr('string'),
 
 	// client-side property
 	selected: attr('boolean', { defaultValue: false }),

app/app/services/link.js

@@ -112,21 +112,13 @@ export default Ember.Service.extend({
 		let documentSlug = is.null(targetDocument) ? "d" : targetDocument.get('slug');
 
 		// handle section link
-		if (link.linkType === "section") {
+		if (link.linkType === "section" || link.linkType === "tab") {
 			let options = {};
-			options['page'] = link.targetId;
+			options['pageId'] = link.targetId;
 			router.transitionTo('document', link.folderId, folderSlug, link.documentId, documentSlug, { queryParams: options });
 			return;
 		}
 
-		// handle tab link
-		if (link.linkType === "tab") {
-			let options = {};
-			options['mode'] = 'view';
-			router.transitionTo('document.section', link.targetId, { queryParams: options });
-			return;
-		}
-
 		// handle document link
 		if (link.linkType === "document") {
 			router.transitionTo('document', link.folderId, folderSlug, link.documentId, documentSlug);

app/app/styles/print.scss

@@ -11,31 +11,30 @@
 @media print {
 	.non-printable,
 	.zone-navigation,
-	.zone-sidebar {
+	.zone-sidebar,
+	#sidebar-wrapper,
+	.document-heading,
+	.edit-document-heading,
+	#sidebar-toggle,
+	.back-to-space,
+	.start-section,
+	.new-section-wizard {
 		display: none !important;
 	}
 
-	.zone-content {
+	#page-content-wrapper, #wrapper {
 		padding: 0 !important;
-	}
-
-	.document-view {
-		.attachment-zone,
-		.document-summary,
-		.document-tags,
-		.page-toolbar {
-			display: none !important;
-		}
-
-		.non-printable-message,
-		.print-title {
-			display: block !important;
-		}
-	}
-
-	.doc-layout {
-		padding: 0 !important;
-		box-shadow: none !important;
 		margin: 0 !important;
 	}
+
+	.non-printable-message,
+	.print-title {
+		display: block !important;
+	}
+
+	.is-a-tab, .is-a-page {
+		padding: 0 !important;
+		margin: 0 !important;
+		box-shadow: none !important;
+	}
 }

app/app/styles/view/document/view.scss

@@ -129,7 +129,7 @@
 		padding: 0px 50px;
 		height: 65px;
 		overflow: hidden;
-		cursor: normal;
+		cursor: default;
 
 		.page-title {
 			> .page-toolbar {

app/app/templates/components/document/document-heading.hbs

@@ -1,5 +1,5 @@
 {{#unless editMode}}
-	<div class="{{if isEditor 'cursor-pointer'}}" onclick={{if isEditor (action 'toggleEdit')}}>
+	<div class="document-heading {{if isEditor 'cursor-pointer'}}" onclick={{if isEditor (action 'toggleEdit')}}>
 		<h1 class="doc-title">{{document.name}}</h1>
 		<div class="doc-excerpt">{{document.excerpt}}</div>
 	</div>