From b8bb118fe30361fff9a87471c8f6f6f7168e7341 Mon Sep 17 00:00:00 2001
From: Jessica Lawshe <jelawshe@gmail.com>
Date: Wed, 20 Feb 2019 12:20:45 -0600
Subject: [PATCH] Merge pull request #1528 from sharelatex/jel-portal-print

Update portals for printing

GitOrigin-RevId: ad3861b8464f0e5a8d8e70daa0166ebcf7d2312d
---
 services/web/app/views/_mixins/links.pug      | 15 ++++++------
 services/web/app/views/layout/footer.pug      |  2 +-
 .../web/public/stylesheets/app/portals.less   | 23 +++++++++++++++++++
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/services/web/app/views/_mixins/links.pug b/services/web/app/views/_mixins/links.pug
index d0f39d565a..4bc66f0fbf 100644
--- a/services/web/app/views/_mixins/links.pug
+++ b/services/web/app/views/_mixins/links.pug
@@ -18,16 +18,16 @@ mixin linkAdvisors(linkText, linkClass, track)
 		| #{linkText ? linkText : 'advisor programme'}
 
 mixin linkBenefits(linkText, linkClass)
-	a(href="/for/authors" class=linkClass ? linkClass : '')
+	a(href=(settings.siteUrl ? settings.siteUrl : '') + "/for/authors" class=linkClass ? linkClass : '')
 		| #{linkText ? linkText : 'benefits'}
 		
 mixin linkBlog(linkText, linkClass, slug)
 	if slug
-		a(href="/blog/#{slug}" class=linkClass ? linkClass : '')
+		a(href=(settings.siteUrl ? settings.siteUrl : '') + "/blog/" + slug class=linkClass ? linkClass : '')
 			| #{linkText ? linkText : 'blog'}
 
 mixin linkContact(linkText, linkClass)
-	a(href="/contact" class=linkClass ? linkClass : '')
+	a(href=(settings.siteUrl ? settings.siteUrl : '') + "/contact" class=linkClass ? linkClass : '')
 		| #{linkText ? linkText : 'contact'}
 
 mixin linkDash(linkText, linkClass)
@@ -35,13 +35,12 @@ mixin linkDash(linkText, linkClass)
 		| #{linkText ? linkText : 'project dashboard'}
 
 mixin linkEducation(linkText, linkClass)
-	a(href="/for/edu" class=linkClass ? linkClass : '')
+	a(href=(settings.siteUrl ? settings.siteUrl : '') + "/for/edu" class=linkClass ? linkClass : '')
 		| #{linkText ? linkText : 'teaching toolkit'}
 
 mixin linkEmail(linkText, linkClass, email)
-	//- To Do: env var?
-	- var emailDomain = 'overleaf.com'
-	a(href="mailto:#{email ? email : 'contact'}@#{emailDomain}" class=linkClass ? linkClass : '')
+	- var emailAddress = email ? email : 'contact'
+	a(href="mailto:" + emailAddress + "@overleaf.com" class=linkClass ? linkClass : '')
 		| #{linkText ? linkText : 'email'}
 
 mixin linkInvite(linkText, linkClass, track)
@@ -118,5 +117,5 @@ mixin linkTweet(linkText, linkClass, tweetText, track)
 	) #{linkText ? linkText : 'tweet'}
 
 mixin linkUniversities(linkText, linkClass)
-	a(href="/for/universities" class=linkClass ? linkClass : '')
+	a(href=(settings.siteUrl ? settings.siteUrl : '') + "/for/universities" class=linkClass ? linkClass : '')
 		| #{linkText ? linkText : 'universities'}
diff --git a/services/web/app/views/layout/footer.pug b/services/web/app/views/layout/footer.pug
index fc2327794b..2f71435031 100644
--- a/services/web/app/views/layout/footer.pug
+++ b/services/web/app/views/layout/footer.pug
@@ -1,7 +1,7 @@
 
 
 footer.site-footer
-	.site-footer-content
+	.site-footer-content.hidden-print
 		.row
 			ul.col-md-9
 				
diff --git a/services/web/public/stylesheets/app/portals.less b/services/web/public/stylesheets/app/portals.less
index 7ef506c6a0..afe822dfb3 100644
--- a/services/web/public/stylesheets/app/portals.less
+++ b/services/web/public/stylesheets/app/portals.less
@@ -98,9 +98,32 @@
     Begin Print
   */
   .print {
+    .basic-metrics {
+      margin-bottom: 50px; /* get Departments header on next page */
+    }
+    .container {
+      width: auto;
+    }
+    .custom-donut-container svg {
+      max-width: 570px; /* safe width for printing */
+    }
     .hidden-print {
       display: none;
     }
+    .portal-col {
+      /* for firefox */
+      margin: 0;
+      width: 100%;
+    }
+    .portal-name {
+      padding: 0;
+    }
+    .visible-print {
+      display: block !important;
+    }
+  }
+  @media print and (color) {
+    &:extend(.print);
   }
   // End Print