[jboss-svn-commits] JBL Code SVN: r9808 - in labs/jbosslabs/trunk/portal-extensions/jbosswiki: forge-wiki/src/java/org/jboss/wiki/ui and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Feb 27 10:54:32 EST 2007
Author: szimano
Date: 2007-02-27 10:54:32 -0500 (Tue, 27 Feb 2007)
New Revision: 9808
Added:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/PrintPlugin.java
Modified:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java
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/Messages.properties
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/WikiTypes.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiType.java
Log:
printable version
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2007-02-27 15:29:21 UTC (rev 9807)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2007-02-27 15:54:32 UTC (rev 9808)
@@ -307,6 +307,9 @@
httpResponse.setContentLength(page.getPageContent()
.length());
+
+ httpResponse.setCharacterEncoding(wikiEngine.getWikiType(
+ wikiTypeName).getCharacterEncoding());
httpResponse.getWriter().print(page.getPageContent());
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java 2007-02-27 15:29:21 UTC (rev 9807)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java 2007-02-27 15:54:32 UTC (rev 9808)
@@ -213,4 +213,5 @@
public String getLockMsg() {
return lockMsg;
}
+
}
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 15:29:21 UTC (rev 9807)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java 2007-02-27 15:54:32 UTC (rev 9808)
@@ -226,4 +226,9 @@
public void setSearchQuery(String searchQuery) {
this.searchQuery = searchQuery;
}
+
+ public String getPrintURL() {
+ return attrExtractor.getHostURL() + attrExtractor.getAppContext() + "/"
+ + "print" + "/" + currentPage.getName();
+ }
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties 2007-02-27 15:29:21 UTC (rev 9807)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties 2007-02-27 15:54:32 UTC (rev 9808)
@@ -30,3 +30,6 @@
search = Search
new_att = /Add new attachment/
+
+print = 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 15:29:21 UTC (rev 9807)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml 2007-02-27 15:54:32 UTC (rev 9808)
@@ -26,6 +26,9 @@
<h:outputLink value="#{wikiView.atomURL}">
<h:graphicImage value="#{wikiView.wikiImagesURL}#{msg.atomButton}"/>
</h:outputLink>
+ <h:outputLink value="#{wikiView.printURL}">
+ <h:outputText value="#{msg.print}"/>
+ </h:outputLink>
<h:form>
<h:commandLink action="recentChanges">
<f:param name="type" value="recentChanges" />
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/WikiTypes.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/WikiTypes.xml 2007-02-27 15:29:21 UTC (rev 9807)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/WikiTypes.xml 2007-02-27 15:54:32 UTC (rev 9808)
@@ -189,4 +189,28 @@
<class>org.jboss.wiki.plugins.HTMLTranslatorParts</class>
</plugin>
</wikiType>
+ <wikiType>
+ <name>print</name>
+ <class>org.jboss.wiki.plugins.DefaultWikiType</class>
+ <plugin>
+ <name>addTranslatorPart</name>
+ <class>org.jboss.wiki.plugins.AddTranslatorPartsPlugin</class>
+ </plugin>
+ <plugin>
+ <name>wikiToHtmlTranslator</name>
+ <class>org.jboss.wiki.plugins.HTMLTranslatorParts</class>
+ </plugin>
+ <plugin>
+ <name>wikiToHtmlTranslatorNoPlugins</name>
+ <class>org.jboss.wiki.plugins.HTMLTranslatorNoPlugins</class>
+ </plugin>
+ <plugin>
+ <name>friendlyLinks</name>
+ <class>org.jboss.wiki.plugins.FriendlyLinkPlugin</class>
+ </plugin>
+ <plugin>
+ <name>print</name>
+ <class>org.jboss.wiki.plugins.PrintPlugin</class>
+ </plugin>
+ </wikiType>
</wikiTypes>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiType.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiType.java 2007-02-27 15:29:21 UTC (rev 9807)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiType.java 2007-02-27 15:54:32 UTC (rev 9808)
@@ -151,6 +151,10 @@
}
public String getContentType() {
- return "text/html";
+ return "text/html; charset=UTF-8";
}
+
+ public String getCharacterEncoding() {
+ return "UTF-8";
+ }
}
Added: 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 (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/PrintPlugin.java 2007-02-27 15:54:32 UTC (rev 9808)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.wiki.plugins;
+
+import org.jboss.wiki.WikiPage;
+import org.jboss.wiki.WikiPlugin;
+import org.jboss.wiki.WikiSession;
+
+/**
+ * PrintPlugin.java
+ *
+ * Adds pritning stuff aroung wiki page.
+ *
+ * @author <a href="mailto:tomasz.szymanski at jboss.com">Tomasz Szymanski</a>
+ */
+
+public class PrintPlugin extends WikiPlugin {
+
+ private static final String PRINT_PREF = "<html>\n"
+ + "<head>\n"
+ + "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"/>\n"
+ + "</head>\n" + "<body onLoad=\"window.print();\" >\n";
+
+ private static final String PRINT_SUF = "\n</body>\n</html>\n";
+
+ @Override
+ public void init() {
+
+ }
+
+ @Override
+ public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) {
+ StringBuffer result = new StringBuffer(PRINT_PREF).append(
+ wikiPage.getContent()).append(PRINT_SUF);
+
+ wikiPage.setContent(result.toString());
+
+ return wikiPage;
+ }
+
+}
More information about the jboss-svn-commits
mailing list