[jboss-svn-commits] JBL Code SVN: r9812 - in labs/jbosslabs/trunk/portal-extensions/jbosswiki: forge-wiki/src/web/views and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: szimano
Date: 2007-02-27 12:37:52 -0500 (Tue, 27 Feb 2007)
New Revision: 9812

Modified:
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/PrintPlugin.java
Log:
print version in new window + print header

Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java	2007-02-27 16:42:25 UTC (rev 9811)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java	2007-02-27 17:37:52 UTC (rev 9812)
@@ -226,9 +226,17 @@
 	public void setSearchQuery(String searchQuery) {
 		this.searchQuery = searchQuery;
 	}
-	
+
 	public String getPrintURL() {
-		return attrExtractor.getHostURL() + attrExtractor.getAppContext() + "/"
-		+ "print" + "/" + currentPage.getName();
+		String print = "window.open('"
+				+ attrExtractor.getHostURL()
+				+ attrExtractor.getAppContext()
+				+ "/print/"
+				+ getCurrentPage().getName()
+				+ "', 'printerfriendly', 'menubar=no,toolbar=no,location=no,directories=no,status=no,scrollbars=yes,resizable=no,fullscreen=no,channelmode=no'); return false";
+
+		log.info(print);
+
+		return print;
 	}
 }

Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml	2007-02-27 16:42:25 UTC (rev 9811)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml	2007-02-27 17:37:52 UTC (rev 9812)
@@ -26,7 +26,7 @@
 				<h:outputLink value="#{wikiView.atomURL}">  
 					<h:graphicImage value="#{wikiView.wikiImagesURL}#{msg.atomButton}"/>
 				</h:outputLink>
-				<h:outputLink value="#{wikiView.printURL}">  
+				<h:outputLink value="http://false.link.print.to" onclick="#{wikiView.printURL}">  
 					<h:outputText value="#{msg.print}"/>
 				</h:outputLink>
 				<h:form>

Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/PrintPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/PrintPlugin.java	2007-02-27 16:42:25 UTC (rev 9811)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/PrintPlugin.java	2007-02-27 17:37:52 UTC (rev 9812)
@@ -51,7 +51,13 @@
 	@Override
 	public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) {
 		StringBuffer result = new StringBuffer(PRINT_PREF).append(
-				wikiPage.getContent()).append(PRINT_SUF);
+				"<div style='font-size: 8pt;'><em>Printed by JBoss Wiki; <b>Page:</b> ").append(
+				wikiPage.getName()).append(" <b>Revision:</b> ").append(
+				wikiPage.getLastVersion()).append(" <b>Author:</b> ").append(
+				wikiPage.getLastAuthor().getName()).append(" <b>Date:</b> ")
+				.append(wikiPage.getEditDate()).append(
+						"</em></div>\n<br/>").append(
+						wikiPage.getContent()).append(PRINT_SUF);
 
 		wikiPage.setContent(result.toString());