[jboss-svn-commits] JBL Code SVN: r16348 - in labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki: src/java/org/jboss/wiki/attributesextractor/impl and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Nov 5 11:29:27 EST 2007
Author: szimano
Date: 2007-11-05 11:29:27 -0500 (Mon, 05 Nov 2007)
New Revision: 16348
Modified:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/project.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/redirect/WikiRedirectFilter.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/WEB-INF/faces-config.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/web.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml
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:
some bugs fixed
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/project.xml 2007-11-05 15:38:39 UTC (rev 16347)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/project.xml 2007-11-05 16:29:27 UTC (rev 16348)
@@ -33,7 +33,7 @@
</organization>
<dependencies>
- <dependency>
+ <!--<dependency>
<groupId>ajax4jsf</groupId>
<artifactId>ajax4jsf</artifactId>
<version>1.1.0</version>
@@ -49,7 +49,7 @@
<properties>
<war.bundle>true</war.bundle>
</properties>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>jboss</groupId>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java 2007-11-05 15:38:39 UTC (rev 16347)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java 2007-11-05 16:29:27 UTC (rev 16348)
@@ -23,6 +23,7 @@
package org.jboss.wiki.attributesextractor.impl;
import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
import java.net.URLEncoder;
import javax.faces.context.FacesContext;
@@ -102,11 +103,14 @@
credentials = wikiEngine.getCredentialsInstance(request);
secure = rReq.isSecure();
+ try {
+ page = decode(rReq.getParameter("page"));
- page = rReq.getParameter("page");
+ language = decode(rReq.getParameter("language"));
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
- language = rReq.getParameter("language");
-
log.debug("Version = " + rReq.getParameter("version"));
pageVersion = (rReq.getParameter("version") != null) ? Integer
@@ -126,6 +130,14 @@
}
}
+ private String decode(String parameter) throws UnsupportedEncodingException {
+ if (parameter == null) {
+ return null;
+ }
+
+ return URLDecoder.decode(parameter, "UTF-8");
+ }
+
public String getHostURL() {
return hostURL;
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java 2007-11-05 15:38:39 UTC (rev 16347)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java 2007-11-05 16:29:27 UTC (rev 16348)
@@ -24,6 +24,9 @@
import java.io.File;
import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -63,7 +66,7 @@
.getLogger(WikiPortletMyFaces.class);
private static final String EDIT_VIEW = "/views/wiki_preferences.xhtml";
-
+
public static String DEFAULT_VIEW_LINK;
protected void facesRender(RenderRequest request, RenderResponse response)
@@ -201,7 +204,8 @@
if (item.isFormField()) {
// pass along to render request
String fieldName = item.getFieldName();
- String value = item.getString();
+ String value = item.getString(request
+ .getCharacterEncoding());
response.setRenderParameter(fieldName, value);
paramMap.put(fieldName, new String[] { value });
@@ -265,13 +269,15 @@
}
}
- private void prepareParams(ActionRequest request, ActionResponse response) {
+ private void prepareParams(ActionRequest request, ActionResponse response)
+ throws UnsupportedEncodingException {
log.debug("pp param");
Map paramMap = request.getParameterMap();
for (String key : (Set<String>) paramMap.keySet()) {
if (paramMatches(key)) {
- response.setRenderParameter(key, request.getParameter(key));
+ response.setRenderParameter(key, URLEncoder.encode(request
+ .getParameter(key), request.getCharacterEncoding()));
log.debug("Param: " + key + " = " + request.getParameter(key));
}
}
@@ -290,8 +296,13 @@
@Override
public void init() throws PortletException, UnavailableException {
DEFAULT_VIEW_LINK = getInitParameter(DEFAULT_VIEW);
-
+
super.init();
}
+ protected void setContentType(RenderRequest request, RenderResponse response) {
+
+ response.setContentType("text/html; charset=UTF-8");
+ }
+
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/redirect/WikiRedirectFilter.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/redirect/WikiRedirectFilter.java 2007-11-05 15:38:39 UTC (rev 16347)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/redirect/WikiRedirectFilter.java 2007-11-05 16:29:27 UTC (rev 16348)
@@ -36,79 +36,79 @@
/**
* A filter that redirects from /wiki/Wiki.jsp?page=PageToGo to
* http://labs.jboss.com/wiki/PageToGo (by default, but it's configurable)
- *
+ *
* @author Tomasz Szymanski
*/
public class WikiRedirectFilter implements Filter {
- /**
- * Old link begginig
- */
- private static final String oldLink = "/wiki/Wiki.jsp";
+ /**
+ * Old link begginig
+ */
+ private static final String oldLink = "/wiki/Wiki.jsp";
- /**
- * Host with JBoss Wiki. This is configurable as initParameter
- */
- private static String redirectURI = "http://labs.jboss.com/wiki/";
+ /**
+ * Host with JBoss Wiki. This is configurable as initParameter
+ */
+ private static String redirectURI = "http://labs.jboss.com/wiki/";
- /**
- * Name of the initParameter to set redirectURI
- */
- private static final String REDIRECT_URI = "redirectURI";
+ /**
+ * Name of the initParameter to set redirectURI
+ */
+ private static final String REDIRECT_URI = "redirectURI";
- /**
- * Where to redirect when wrong uri is entered. This is configurable as
- * initParameter
- */
- private static String errorURI = "/errors/404";
+ /**
+ * Where to redirect when wrong uri is entered. This is configurable as
+ * initParameter
+ */
+ private static String errorURI = "/errors/404";
- /**
- * Name of the initParameter to set errorURI
- */
- private static final String ERROR_URI = "errorURI";
+ /**
+ * Name of the initParameter to set errorURI
+ */
+ private static final String ERROR_URI = "errorURI";
- public void init(FilterConfig conf) {
- // get REDIRECT_URI parameter
- if (conf.getInitParameter(REDIRECT_URI) != null) {
- redirectURI = conf.getInitParameter(REDIRECT_URI);
- }
+ public void init(FilterConfig conf) {
+ // get REDIRECT_URI parameter
+ if (conf.getInitParameter(REDIRECT_URI) != null) {
+ redirectURI = conf.getInitParameter(REDIRECT_URI);
+ }
- // get ERROR_URI parameter
- if (conf.getInitParameter(ERROR_URI) != null) {
- errorURI = conf.getInitParameter(ERROR_URI);
- }
- }
+ // get ERROR_URI parameter
+ if (conf.getInitParameter(ERROR_URI) != null) {
+ errorURI = conf.getInitParameter(ERROR_URI);
+ }
+ }
- public void doFilter(ServletRequest request, ServletResponse response,
- FilterChain chain) throws IOException, ServletException {
+ public void doFilter(ServletRequest request, ServletResponse response,
+ FilterChain chain) throws IOException, ServletException {
- if (request instanceof HttpServletRequest) {
- HttpServletRequest httpRequest = (HttpServletRequest) request;
- HttpServletResponse httpResponse = (HttpServletResponse) response;
+ if (request instanceof HttpServletRequest) {
+ HttpServletRequest httpRequest = (HttpServletRequest) request;
+ HttpServletResponse httpResponse = (HttpServletResponse) response;
- String requestURI = httpRequest.getRequestURI();
+ String requestURI = httpRequest.getRequestURI();
- // if requested URI starts with /wiki/Wiki.jsp?page=Page - do the redirection
- if (requestURI.startsWith(oldLink)
- && httpRequest.getParameter("page") != null) {
-
- // sends redirection to REDIRECT_URI/Page
- httpResponse.sendRedirect(redirectURI
- + httpRequest.getParameter("page"));
- } else {
-
- // if link is wrong - redirect to error page (ERROR_URI)
- httpResponse.sendRedirect(errorURI);
- }
+ // if requested URI starts with /wiki/Wiki.jsp?page=Page - do the redirection
+ if (requestURI.startsWith(oldLink)
+ && httpRequest.getParameter("page") != null) {
- } else {
- throw new IOException(
- "This servlet should be called as HTTPServletRequest");
- }
- }
+ // sends redirection to REDIRECT_URI/Page
+ httpResponse.sendRedirect(redirectURI
+ + httpRequest.getParameter("page"));
+ } else {
- public void destroy() {
+ // if link is wrong - redirect to error page (ERROR_URI)
+ httpResponse.sendRedirect(errorURI);
+ }
- }
+ } else {
+ throw new IOException(
+ "This servlet should be called as HTTPServletRequest");
+ }
+ }
+
+ public void destroy() {
+
+ }
}
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-11-05 15:38:39 UTC (rev 16347)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java 2007-11-05 16:29:27 UTC (rev 16348)
@@ -279,4 +279,9 @@
public Integer getPageVersion() {
return attrExtractor.getPageVersion();
}
+
+ public String foo() {
+ log.info("foo !!! AJAX");
+ return null;
+ }
}
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 2007-11-05 15:38:39 UTC (rev 16347)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/faces-config.xml 2007-11-05 16:29:27 UTC (rev 16348)
@@ -9,7 +9,6 @@
<!-- JBoss Portal-facelets integration -->
<property-resolver>org.jboss.portal.faces.el.DelegatingPropertyResolver</property-resolver>
- <!--<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>-->
<view-handler>com.sun.facelets.FaceletPortletViewHandler</view-handler>
<locale-config>
<default-locale>en</default-locale>
@@ -18,7 +17,7 @@
com.thoughtworks.guice.GuiceVariableResolver
</variable-resolver>
- </application>
+ </application>
<managed-bean>
<managed-bean-name>wikiView</managed-bean-name>
@@ -62,7 +61,7 @@
</navigation-case>
<navigation-case>
<from-outcome>attach</from-outcome>
- <to-view-id>/views/wiki_attach.html</to-view-id>
+ <to-view-id>/views/wiki_attach.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/web.xml 2007-11-05 15:38:39 UTC (rev 16347)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/web.xml 2007-11-05 16:29:27 UTC (rev 16348)
@@ -8,26 +8,56 @@
<param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name>
<param-value>true</param-value>
</context-param>
-
- <!-- <context-param>
- <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
- <param-value>com.sun.facelets.FaceletViewHandler</param-value>
- </context-param>
-
- <filter>
- <display-name>Ajax4jsf Filter</display-name>
- <filter-name>ajax4jsf</filter-name>
- <filter-class>org.ajax4jsf.Filter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>ajax4jsf</filter-name>
- <servlet-name>Faces Servlet</servlet-name>
- <dispatcher>REQUEST</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>INCLUDE</dispatcher>
- </filter-mapping> -->
+ <context-param>
+ <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
+ <param-value>false</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.apache.myfaces.AUTO_SCROLL</param-name>
+ <param-value>false</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.apache.myfaces.CHECK_EXTENSIONS_FILTER</param-name>
+ <param-value>false</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.apache.myfaces.PRETTY_HTML</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
+
+ <!-- Use Documents Saved as *.xhtml -->
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>facelets.SKIP_COMMENTS</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>facelets.VIEW_MAPPINGS</param-name>
+ <param-value>*.xhtml</param-value>
+ </context-param>
+
+ <!-- Special Debug Output for Development -->
+ <context-param>
+ <param-name>facelets.DEVELOPMENT</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>facelets.LIBRARIES</param-name>
+ <param-value>/WEB-INF/tomahawk.taglib.xml</param-value>
+ </context-param>
+
<filter>
<filter-name>MyFacesExtensionsFilter</filter-name>
<filter-class>
@@ -56,31 +86,14 @@
<url-pattern>/faces/myFacesExtensionResource/*</url-pattern>
</filter-mapping>
- <!-- Use Documents Saved as *.xhtml -->
- <context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
- <param-value>.xhtml</param-value>
- </context-param>
-
- <!-- Special Debug Output for Development -->
- <context-param>
- <param-name>facelets.DEVELOPMENT</param-name>
- <param-value>true</param-value>
- </context-param>
-
- <context-param>
- <param-name>facelets.LIBRARIES</param-name>
- <param-value>/WEB-INF/tomahawk.taglib.xml</param-value>
- </context-param>
-
<!-- <context-param>
<param-name>facelets.LIBRARIES</param-name>
<param-value>/WEB-INF/wiki.taglib.xml</param-value>
</context-param> -->
- <listener>
+ <!--<listener>
<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
- </listener>
+ </listener>-->
<listener>
<listener-class>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml 2007-11-05 15:38:39 UTC (rev 16347)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml 2007-11-05 16:29:27 UTC (rev 16348)
@@ -7,7 +7,7 @@
<ui:composition template="wiki_view.xhtml">
<ui:define name="attachment">
-
+
<h:panelGrid styleClass="wikiGreybkgSection">
<h:outputText styleClass="h2" value="#{msg.attachFile}" />
<h:form id="uploadForm" enctype="multipart/form-data">
@@ -26,7 +26,7 @@
</h:panelGrid>
</h:panelGrid>
</h:form>
-
+
<h:form>
<h:commandLink action="goback">
<h:outputText value="#{msg.close}" />
@@ -35,6 +35,6 @@
</h:panelGrid>
</ui:define>
-
+
</ui:composition>
</div>
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 2007-11-05 15:38:39 UTC (rev 16347)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml 2007-11-05 16:29:27 UTC (rev 16348)
@@ -11,9 +11,9 @@
</h:panelGrid>
<h:outputText value="#{wikiEdit.showEditHTML}" escape="false" />
- <h:form>
+ <h:form acceptCharset="UTF-8">
<h:panelGrid styleClass="editPageArea">
- <h:inputTextarea rows="40" cols="80" value="#{wikiEdit.pageContent}" styleClass="editPageArea" acceptcharset="UTF-8" />
+ <h:inputTextarea rows="40" cols="80" value="#{wikiEdit.pageContent}" styleClass="editPageArea" />
<h:panelGroup styleClass="formbuttons">
<h:commandButton styleClass="submit" value="#{msg.edit_save}" action="#{wikiEdit.save}" />
<h:commandButton styleClass="submit" value="#{msg.edit_cancel}" action="#{wikiEdit.cancel}" />
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 2007-11-05 15:38:39 UTC (rev 16347)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml 2007-11-05 16:29:27 UTC (rev 16348)
@@ -6,7 +6,8 @@
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:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j">
<head>
<title></title>
<link rel="stylesheet" href="#{wikiView.wikiImagesURL}wikiStyle.css" type="text/css" media="all" />
@@ -41,8 +42,10 @@
</h:panelGrid>
<h:messages />
-
- <ui:insert name="content" />
-
+ <f:view>
+ <a4j:page>
+ <ui:insert name="content" />
+ </a4j:page>
+ </f:view>
</body>
</html>
\ No newline at end of file
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-11-05 15:38:39 UTC (rev 16347)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml 2007-11-05 16:29:27 UTC (rev 16348)
@@ -3,19 +3,20 @@
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">
-
+
<link rel="alternate" type="application/rss+xml" title="JBoss Wiki: #{wikiView.pageName} RSS Feed" href="#{wikiView.rssURL}" />
<link rel="alternate" type="application/atom+xml" title="JBoss Wiki: #{wikiView.pageName} ATOM Feed" href="#{wikiView.atomURL}" />
<link rel="alternate" type="application/rss+xml" title="JBoss Wiki: #{wikiView.pageName} RDF Feed" href="#{wikiView.rdfURL}" />
-
- <h:panelGrid columns="8">
+
+ <h:panelGrid columns="8">
<h:panelGroup>
<h:outputText value="["/><h:outputLink value="#{wikiView.wikiFriendlyURL}"><h:outputText value="#{msg.permalink}" /></h:outputLink><h:outputText value="]"/>
</h:panelGroup>
-
+
<h:panelGroup><h:form>
<h:outputText value="["/>
<h:commandLink action="recentChanges">
@@ -24,68 +25,69 @@
</h:commandLink>
<h:outputText value="]"/>
</h:form></h:panelGroup>
-
+
<h:panelGroup><h:form rendered="#{wikiCommon.userLoggedIn}">
- <h:outputText value="["/><h:commandLink action="edit">
+ <h:outputText value="["/><h:commandLink action="edit" charset="utf-8">
<c:if test="#{wikiView.pageVersion ne null}">
<f:param name="version" value="#{wikiView.pageVersion}" />
</c:if>
- <f:param name="page" value="#{wikiView.pageName}" />
- <h:outputText value="#{msg.edit}" />
+ <f:param name="page" value="#{wikiView.pageName}" id="pageParam" />
+
+ <h:outputText value="#{msg.edit}" />
</h:commandLink>
- <h:outputText value="] [" />
+ <h:outputText value="] [" />
<h:commandLink action="attach">
<h:outputText value="#{msg.attach}" />
</h:commandLink>
<h:outputText value="] " />
</h:form></h:panelGroup>
-
+
<h:panelGroup><h:form>
<h:outputText value="[" />
<h:commandLink action="history">
- <h:outputText value="#{msg.history}" />
+ <h:outputText value="#{msg.history}" />
</h:commandLink>
<h:outputText value="]"/>
</h:form></h:panelGroup>
-
+
<h:panelGroup>
<h:outputText value="["/><h:outputLink value="#{wikiView.rssURL}" styleClass="standardFeedLink" ><h:outputText value="#{msg.rss}" /></h:outputLink><h:outputText value="]"/>
</h:panelGroup>
-
+
<h:panelGroup>
<h:outputText value="["/><h:outputLink value="#{wikiView.rdfURL}" styleClass="standardFeedLink" ><h:outputText value="#{msg.rdf}" /></h:outputLink><h:outputText value="]"/>
</h:panelGroup>
-
+
<h:panelGroup>
<h:outputText value="["/><h:outputLink value="#{wikiView.atomURL}" styleClass="standardFeedLink" ><h:outputText value="#{msg.atom}" /></h:outputLink><h:outputText value="]"/>
</h:panelGroup>
-
+
<h:panelGroup>
<h:outputText value="["/><h:outputLink value="http://false.link.print.to" onclick="#{wikiView.printURL}"><h:outputText value="#{msg.print}"/></h:outputLink><h:outputText value="]"/>
</h:panelGroup>
</h:panelGrid>
-
+
<h:panelGrid styleClass="wikiGreybkgSection" rendered="#{wikiView.otherVersion}" >
<h:panelGroup>
<h:outputText value="#{msg.thisIsVer} #{wikiView.pageVersion} #{msg.ofPage} " />
- <h:outputLink value="#{wikiView.wikiFriendlyURL}">
+ <h:outputLink value="#{wikiView.wikiFriendlyURL}">
<h:outputText value="#{wikiCommon.pageName}" />
</h:outputLink>
<h:outputText value=". #{msg.toRollback}" />
</h:panelGroup>
</h:panelGrid>
-
+
<ui:insert name="attachment" />
-
+
<hr />
-
+
<h:panelGroup styleClass="wikiContent">
<h:outputText value="#{wikiView.pageContent}" escape="false"/>
</h:panelGroup>
-
+
<hr />
-
- <h:outputText styleClass="lastEdited" value="#{msg.pageLastChanged} #{wikiView.date} #{msg.by} #{wikiView.lastAuthor}" />
+
+ <h:outputText styleClass="lastEdited" value="#{msg.pageLastChanged} #{wikiView.date} #{msg.by} #{wikiView.lastAuthor}" />
</ui:define>
</ui:composition>
More information about the jboss-svn-commits
mailing list