From 8e4f2d663c5656e0aa8e20701ed389a972cbc0c2 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Sun, 17 Jan 2016 16:24:54 -0800
Subject: [PATCH] Corrected/improved news print layout.

---
 .../shortcodes/batch/news_shortcodes.php      |  2 +-
 e107_core/templates/footer_default.php        |  2 +-
 e107_handlers/form_handler.php                |  2 +-
 e107_plugins/news/templates/news_template.php |  4 +-
 e107_plugins/social/e_shortcode.php           |  6 +-
 print.php                                     | 77 +++++++++++++------
 6 files changed, 61 insertions(+), 32 deletions(-)

diff --git a/e107_core/shortcodes/batch/news_shortcodes.php b/e107_core/shortcodes/batch/news_shortcodes.php
index ba0ef629b..f0fa64495 100644
--- a/e107_core/shortcodes/batch/news_shortcodes.php
+++ b/e107_core/shortcodes/batch/news_shortcodes.php
@@ -198,7 +198,7 @@ class news_shortcodes extends e_shortcode
 			
 		$caption = vartrue($parm['text'],LAN_BACK);
 		
-		$text = '<ul class="pager">
+		$text = '<ul class="pager hidden-print">
   			<li><a href="'.$url.'">'.e107::getParser()->toHtml($caption,false,'defs').'</a></li>
 		</ul>';
 		
diff --git a/e107_core/templates/footer_default.php b/e107_core/templates/footer_default.php
index 045695121..7323900de 100644
--- a/e107_core/templates/footer_default.php
+++ b/e107_core/templates/footer_default.php
@@ -161,7 +161,7 @@ if (varset($e107_popup) != 1)
 	}
 	else
 	{
-		echo($rinfo ? "\n<div class='e-footer-info muted smalltext'><small>{$rinfo}</small></div>\n" : "");
+		echo($rinfo ? "\n<div class='e-footer-info muted smalltext hidden-print'><small>{$rinfo}</small></div>\n" : "");
 	}
 	
 } // End of regular-page footer (the above NOT done for popups)
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 957c1e7be..9e6ee8f97 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -2847,7 +2847,7 @@ class e_form
 		
 		if(count($list))
 		{
-			return "<div class='e-related clearfix'><hr><h4>".defset('LAN_RELATED', 'Related')."</h4><ul class='e-related'>".implode("\n",$list)."</ul></div>"; //XXX Tablerender?
+			return "<div class='e-related clearfix hidden-print'><hr><h4>".defset('LAN_RELATED', 'Related')."</h4><ul class='e-related'>".implode("\n",$list)."</ul></div>"; //XXX Tablerender?
 		}
 		
 	}		
diff --git a/e107_plugins/news/templates/news_template.php b/e107_plugins/news/templates/news_template.php
index 0ae0f6279..26507419f 100644
--- a/e107_plugins/news/templates/news_template.php
+++ b/e107_plugins/news/templates/news_template.php
@@ -99,7 +99,7 @@ $NEWS_TEMPLATE['default']['item'] = '
           {NEWSBODY}
 		  <hr>
 			<div class="options">
-			<div class="btn-group">{NEWSCOMMENTLINK: glyph=comments&class=btn btn-default}{PRINTICON: class=btn btn-default}{PDFICON}{SOCIALSHARE}{ADMINOPTIONS: class=btn btn-default}</div>
+			<div class="btn-group hidden-print">{NEWSCOMMENTLINK: glyph=comments&class=btn btn-default}{PRINTICON: class=btn btn-default}{PDFICON}{SOCIALSHARE}{ADMINOPTIONS: class=btn btn-default}</div>
 			</div>
 
 ';
@@ -161,7 +161,7 @@ $NEWS_TEMPLATE['view']['item'] = '
 		</div>
 		<hr>
 		
-		<div class="options ">
+		<div class="options hidden-print ">
 			<div class="btn-group">{NEWSCOMMENTLINK: glyph=comments&class=btn btn-default}{PRINTICON: class=btn btn-default}{ADMINOPTIONS: class=btn btn-default}{SOCIALSHARE}</div>
 		</div>
 			
diff --git a/e107_plugins/social/e_shortcode.php b/e107_plugins/social/e_shortcode.php
index 3999c418e..3a621dcde 100644
--- a/e107_plugins/social/e_shortcode.php
+++ b/e107_plugins/social/e_shortcode.php
@@ -93,7 +93,7 @@ class social_shortcodes extends e_shortcode
 
 		if($text !='')
 		{
-			return 	'<p class="xurl-social-icons">'.$text.'</p>';
+			return 	'<p class="xurl-social-icons hidden-print">'.$text.'</p>';
 		}
 
 	}	
@@ -273,7 +273,7 @@ class social_shortcodes extends e_shortcode
 		{
 			$dir = ($parm['dropdown'] == 'right') ? 'pull-right' : '';
 	
-			$text = '<div class="btn-group '.$dir.'">
+			$text = '<div class="btn-group hidden-print '.$dir.'">
 				  <a class="e-tip btn btn-dropdown btn-default btn-'.$size.' dropdown-toggle" data-toggle="dropdown" href="#" title="Share">'.$label.'</a>
 				 
 				  <ul class="dropdown-menu" role="menu"  style="min-width:435px">
@@ -290,7 +290,7 @@ class social_shortcodes extends e_shortcode
 		
 			
 			
-			return '<div class="btn-group text-center">'.implode("\n",$opt)."</div>";
+			return '<div class="btn-group text-center hidden-print">'.implode("\n",$opt)."</div>";
 		
 		}	
 		
diff --git a/print.php b/print.php
index 918bc6ba7..10fcfa1d7 100644
--- a/print.php
+++ b/print.php
@@ -21,18 +21,25 @@ require_once("class2.php");
 
 e107::coreLan('print');
 
-/*
-$HEADER="";
-$FOOTER="";
-$CUSTOMHEADER = "";
-$CUSTOMFOOTER = "";
-*/
-
 $qs = explode(".", e_QUERY,2);
 if ($qs[0] == "") {
 	header("location:".e_BASE."index.php");
 	 exit;
 }
+
+$CSS = <<<CSS
+@media print {
+
+  a[href]:after {
+    content: none;
+  }
+
+}
+CSS;
+
+
+e107::css('inline',$CSS);
+
 define('e_IFRAME', true); 
 
 $source = $qs[0];
@@ -56,13 +63,22 @@ if(strpos($source,'plugin:') !== FALSE)
 }
 else
 {
-	$con = new convert;
-	$sql->db_Select("news", "*", "news_id='{$parms}'");
-	$row = $sql->db_Fetch(); 
-	$newsUrl = e107::getUrl()->create('news/view/item', $row, 'full=1'); 
-	extract($row);
-	define("e_PAGETITLE", $news_title);
-	$news_body = $tp->toHTML($news_body, TRUE, 'BODY');
+	//$con = new convert;
+
+	$query = "SELECT n.*,c.* FROM `#news` AS n LEFT JOIN `#news_category` AS c ON n.news_category = c.category_id WHERE n.news_id=".intval($parms);
+
+	//$sql->db_Select("news", "*", "news_id='{$parms}'");
+	$sql = e107::getDb();
+	$sql->gen($query);
+	$row = $sql->fetch();
+	$newsUrl = e107::getUrl()->create('news/view/item', $row, 'full=1');
+
+
+//	extract($row);
+//	define("e_PAGETITLE", $news_title);
+	//$news_body = $tp->toHTML($news_body, TRUE, 'BODY');
+
+	/*
 	$news_extended = $tp->toHTML($news_extended, TRUE, 'BODY');
 	if ($news_author == 0)
 	{
@@ -78,7 +94,7 @@ else
 	}
 	$news_datestamp = $con->convert_date($news_datestamp, "long");
 	$print_text = "<span style=\"font-size: 13px; color: black; font-family: tahoma, verdana, arial, helvetica; text-decoration: none\">
-	<b>".LAN_PRINT_135.$news_title."</b>
+	<h2>".LAN_PRINT_135.$news_title."</h2>
 	<br />
 	(".LAN_PRINT_86." ".$tp->toHTML($category_name,FALSE,"defs").")
 	<br />
@@ -87,14 +103,27 @@ else
 	<br /><br />".
 	$news_body;
 
-	if ($news_extended != ""){ $print_text .= "<br /><br />".$news_extended; }
-	if ($news_source != ""){ $print_text .= "<br /><br />".$news_source; }
-	if ($news_url != ""){ $print_text .= "<br />".$news_url; }
-	 
-	$print_text .= "<br /><br /></span><hr />".
-	LAN_PRINT_303.SITENAME."
+	if (!empty($news_extended)){ $print_text .= "<br /><br />".$news_extended; }
+
+	if (!empty($news_extended)){ $print_text .= "<br /><br />".$news_extended; }
+	if (!empty($news_source)){ $print_text .= "<br /><br />".$news_source; }
+	if (!empty($news_url)){ $print_text .= "<br />".$news_url; }
+*/
+
+    $tmp = e107::getTemplate('news', 'news', 'view');
+	$template = $tmp['item'];
+	unset($tmp);
+//	ob_start();
+	require_once(e_HANDLER."news_class.php");
+	$ix = new news;
+
+	$print_text = $ix->render_newsitem($row, 'return', '', $template, null);
+	//$print_text = ob_get_flush();
+
+	$print_text .= "<br /><br /><hr />".
+	LAN_PRINT_303."<b>".SITENAME."</b>
 	<br />
-	( ".$newsUrl." )
+	".$newsUrl."
 	";
 	
 	
@@ -121,9 +150,9 @@ else
 {
 	echo "
 		<div style='background-color:white'>
-		<div style='text-align:".$align."'>".$tp->parseTemplate("{LOGO}", TRUE)."</div><hr /><br />
+		<div style='text-align:".$align."'>".$tp->parseTemplate("{LOGO: h=100}", TRUE)."</div><hr />
 		<div style='text-align:".$align."'>".$print_text."</div><br /><br />
-		<form action=''><div class='hidden-print' style='text-align:center'><input class='btn btn-primary ' type='button' value='".LAN_PRINT_307."' onclick='window.print()' /></div></form></div>";
+		<form action='#'><div class='hidden-print' style='text-align:center'><input class='btn btn-primary ' type='button' value='".LAN_PRINT_307."' onclick='window.print()' /></div></form></div>";
 }
 require_once(FOOTERF);