[jboss-svn-commits] JBL Code SVN: r8274 - in labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src: java/org/jboss/wiki/helper java/org/jboss/wiki/ui web web/WEB-INF web/views
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Dec 12 19:01:44 EST 2006
Author: szimano
Date: 2006-12-12 19:01:35 -0500 (Tue, 12 Dec 2006)
New Revision: 8274
Added:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.xhtml
Removed:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/index.xhtml
Modified:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/helper/WikiHelper.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/WEB-INF/faces-config.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/portlet.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml
Log:
history view
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/helper/WikiHelper.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/helper/WikiHelper.java 2006-12-12 23:24:36 UTC (rev 8273)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/helper/WikiHelper.java 2006-12-13 00:01:35 UTC (rev 8274)
@@ -22,6 +22,9 @@
package org.jboss.wiki.helper;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIOutput;
+import javax.faces.component.html.HtmlOutputText;
import javax.faces.context.FacesContext;
import javax.portlet.PortletRequest;
import javax.portlet.RenderRequest;
@@ -108,4 +111,13 @@
return (WikiCommonSession) fc.getApplication().createValueBinding(
WIKI_COMMON_SESSION).getValue(fc);
}
+
+ public static UIOutput getText(String text) {
+ UIOutput comp = (UIOutput) FacesContext.getCurrentInstance()
+ .getApplication().createComponent(HtmlOutputText.COMPONENT_TYPE);
+
+ comp.setValue(text);
+
+ return comp;
+ }
}
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 2006-12-12 23:24:36 UTC (rev 8273)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java 2006-12-13 00:01:35 UTC (rev 8274)
@@ -22,6 +22,14 @@
package org.jboss.wiki.ui;
+import java.util.List;
+
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIOutput;
+import javax.faces.component.UIPanel;
+import javax.faces.component.html.HtmlPanelGrid;
+import javax.faces.context.FacesContext;
+
import org.jboss.logging.Logger;
import org.jboss.wiki.WikiCommon;
import org.jboss.wiki.WikiContext;
@@ -104,4 +112,25 @@
return currentPage;
}
+
+ public UIPanel getHistoryTable() {
+ UIPanel hTable = (UIPanel) FacesContext.getCurrentInstance()
+ .getApplication().createComponent(HtmlPanelGrid.COMPONENT_TYPE);
+
+ List children = hTable.getChildren();
+
+ WikiEngine engine = WikiHelper.getWikiEngine();
+ WikiPage currentPage = getCurrentPage();
+
+ for (int i = currentPage.getLastVersion(); i > 0; i--) {
+ WikiPage histPage = engine.getPageAtVersion(currentPage, true, i, currentPage.getLangCode());
+ children.add(WikiHelper.getText(String.valueOf(i)));
+ children.add(WikiHelper.getText(histPage.getEditDate().toString()));
+ children.add(WikiHelper.getText(histPage.getLastAuthor().getName()));
+ children.add(WikiHelper.getText(String.valueOf(histPage.getLength())));
+ }
+
+ return hTable;
+ }
+
}
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 2006-12-12 23:24:36 UTC (rev 8273)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties 2006-12-13 00:01:35 UTC (rev 8274)
@@ -1,3 +1,7 @@
edit_instruction = Here's a short reminder on what elements you have at your disposal:\n\n\n---- Horizontal ruler\n\\ Forced line break\n[link] Create hyperlink to "link", where "link" can be either an internal \n WikiName or an external link (http://)\n[text|link] Create a hyperlink where the link text is different from the actual \n hyperlink link.\n[text|wiki:link] Create a hyperlink where the link text is different from the \n actual hyperlink link, and the hyperlink points to a named Wiki. \n This supports interWiki linking.\n\n* Make a bulleted list (must be in first column). Use more (**) \n for deeper indentations.\n# Make a numbered list (must be in first column). Use more (##, ###) \n for deeper indentations.\n\n!, !!, !!! Start a line with an exclamation mark (!) to make a heading. \n !
More exclamation marks mean bigger headings.\n\n__text__ Makes text bold.\n''text'' Makes text in italics (notice that these are single quotes ('))\n{{text}} Makes text in monospaced font.\n;term:def Defines 'term' with 'def'. Use this with empty 'term' to make short comments.\n\n|text|more text| Makes a table. Double bars for a table heading.\n\nDon't try to use HTML, since it just won't work.\n\nTo embed images just put them available on the web using one of the approved formats, and they will get inlined automatically.\\nTo make a code block, use triple {'s to open, and triple }'s to close.
edit_cancel = Cancel
edit_save = Save
+permaLinkButton = permaLinkButton.png
+editButton = editButton.png
+historyButton = historyButton.png
+historytitle = History of page :
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/faces-config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/faces-config.xml 2006-12-12 23:24:36 UTC (rev 8273)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/faces-config.xml 2006-12-13 00:01:35 UTC (rev 8274)
@@ -36,7 +36,7 @@
</managed-bean>
<navigation-rule>
- <from-view-id>/views/index.xhtml</from-view-id>
+ <from-view-id>/views/wiki_view.xhtml</from-view-id>
<navigation-case>
<from-outcome>edit</from-outcome>
<to-view-id>/views/wiki_edit.xhtml</to-view-id>
@@ -44,10 +44,18 @@
</navigation-rule>
<navigation-rule>
+ <from-view-id>/views/wiki_view.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>history</from-outcome>
+ <to-view-id>/views/wiki_history.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
<from-view-id>/views/wiki_edit.xhtml</from-view-id>
<navigation-case>
<from-outcome>save</from-outcome>
- <to-view-id>/views/index.xhtml</to-view-id>
+ <to-view-id>/views/wiki_view.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
@@ -55,7 +63,7 @@
<from-view-id>/views/wiki_edit.xhtml</from-view-id>
<navigation-case>
<from-outcome>cancel</from-outcome>
- <to-view-id>/views/index.xhtml</to-view-id>
+ <to-view-id>/views/wiki_view.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
</faces-config>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/portlet.xml 2006-12-12 23:24:36 UTC (rev 8273)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/portlet.xml 2006-12-13 00:01:35 UTC (rev 8274)
@@ -6,7 +6,7 @@
<portlet-name>WikiPortlet</portlet-name>
<init-param>
<name>default-view</name>
- <value>/views/index.xhtml</value>
+ <value>/views/wiki_view.xhtml</value>
</init-param>
<portlet-class>org.jboss.wiki.portlet.WikiPortletMyFaces</portlet-class>
<supported-locale>en</supported-locale>
Deleted: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/index.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/index.xhtml 2006-12-12 23:24:36 UTC (rev 8273)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/index.xhtml 2006-12-13 00:01:35 UTC (rev 8274)
@@ -1,8 +0,0 @@
-<div xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:c="http://java.sun.com/jstl/core"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:blog="http://www.jboss.org/portal/jbossblog">
-<ui:include src="wiki_view.xhtml" />
-</div>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml 2006-12-12 23:24:36 UTC (rev 8273)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml 2006-12-13 00:01:35 UTC (rev 8274)
@@ -2,8 +2,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jstl/core"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:blog="http://www.jboss.org/portal/jbossblog">
+ xmlns:f="http://java.sun.com/jsf/core">
<ui:composition template="wiki_template.xhtml">
<ui:define name="content">
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.xhtml 2006-12-12 23:24:36 UTC (rev 8273)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.xhtml 2006-12-13 00:01:35 UTC (rev 8274)
@@ -0,0 +1,21 @@
+<div xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+<ui:composition template="wiki_template.xhtml">
+
+ <ui:define name="content">
+ <h:panelGrid columns="4" binding="#{wikiView.historyTable}" >
+ <f:facet name="header">
+ <h:outputText value="#{msg.historytitle} #{wikiCommon.pageName}"/>
+ </f:facet>
+ <f:facet name="header">
+ <h:outputText value="#{msg.historytitle} #{wikiCommon.pageName}"/>
+ </f:facet>
+ </h:panelGrid>
+ </ui:define>
+
+</ui:composition>
+
+</div>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml 2006-12-12 23:24:36 UTC (rev 8273)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml 2006-12-13 00:01:35 UTC (rev 8274)
@@ -6,8 +6,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jstl/core"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:blog="http://www.jboss.org/portal/jbossblog">
+ xmlns:f="http://java.sun.com/jsf/core">
<head>
<title></title>
<link rel="stylesheet" href="#{wikiView.wikiImagesURL}wikiStyle.css" type="text/css" media="all" />
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 2006-12-12 23:24:36 UTC (rev 8273)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml 2006-12-13 00:01:35 UTC (rev 8274)
@@ -2,15 +2,14 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jstl/core"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:blog="http://www.jboss.org/portal/jbossblog">
+ xmlns:f="http://java.sun.com/jsf/core">
<ui:composition template="wiki_template.xhtml">
<ui:define name="content">
<h:panelGrid columns="2">
<h:panelGroup>
<h:outputLink value="#{wikiView.wikiFriendlyURL}">
- <h:graphicImage value="#{wikiView.wikiImagesURL}permaLinkButton.png"/>
+ <h:graphicImage value="#{wikiView.wikiImagesURL}#{msg.permaLinkButton}"/>
</h:outputLink>
<h:outputLink value="#{wikiView.wikiFriendlyURL}">
@@ -20,8 +19,11 @@
<h:panelGroup>
<h:form>
<h:commandLink action="edit">
- <h:graphicImage value="#{wikiView.wikiImagesURL}editButton.png"/>
+ <h:graphicImage value="#{wikiView.wikiImagesURL}#{msg.editButton}"/>
</h:commandLink>
+ <h:commandLink action="history">
+ <h:graphicImage value="#{wikiView.wikiImagesURL}#{msg.historyButton}"/>
+ </h:commandLink>
</h:form>
</h:panelGroup>
</h:panelGrid>
More information about the jboss-svn-commits
mailing list