[jboss-svn-commits] JBL Code SVN: r28958 - in labs/jbossforums/branches/forums130P27/forums/src: main/org/jboss/portlet/forums/ui/action/converters and 11 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Aug 17 07:54:57 EDT 2009
Author: sviluppatorefico
Date: 2009-08-17 07:54:57 -0400 (Mon, 17 Aug 2009)
New Revision: 28958
Added:
labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/ForumsJSFPortlet.java
Modified:
labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/action/converters/PollDurationConverter.java
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/WEB-INF/forums-config.xml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/WEB-INF/portlet.xml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/admin/index.xhtml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/common/common.xhtml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/moderator/modcp_split.xhtml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/myforums/myforums_editforums.xhtml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/myforums/myforums_main.xhtml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/myforums/myforums_viewall.xhtml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/profile/viewprofile_body.xhtml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/search/view_asposts.xhtml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/search/view_astopics.xhtml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/search/viewsearch_body.xhtml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/summary/viewsummary_body.xhtml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/attachmentsview.xhtml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_ballot.xhtml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_result.xhtml
Log:
conversion from outputLink to commandLink. PortletBridge needs JSF about navigation
Added: labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/ForumsJSFPortlet.java
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/ForumsJSFPortlet.java (rev 0)
+++ labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/ForumsJSFPortlet.java 2009-08-17 11:54:57 UTC (rev 28958)
@@ -0,0 +1,245 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, 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.portlet.forums.ui;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletException;
+import javax.portlet.faces.GenericFacesPortlet;
+
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.portlet.PortletFileUpload;
+import org.jboss.portal.portlet.impl.jsr168.PortletRequestParameterMap;
+import org.jboss.portal.portlet.impl.jsr168.api.PortletRequestImpl;
+import org.jboss.portlet.forums.helper.TempFileBinding;
+
+/**
+ * @author <a href="mailto:sohil.shah at jboss.com">Sohil Shah</a>
+ * @author <a href="mailto:ryszard.kozmik at jboss.com">Ryszard Kozmik</a>
+ * @author <a href="mailto:l.stancapiano at sourcesense.com">Luca Stancapiano</a>
+ *
+ */
+public class ForumsJSFPortlet extends GenericFacesPortlet {
+
+ /**
+ * Called by the portlet container to allow the portlet to process an action
+ * request.
+ */
+ public void processAction(ActionRequest request, ActionResponse response)
+ throws PortletException, IOException {
+
+ this.setupRenderParameters(request, response);
+
+ try {
+ // parse and setup any attachments if they are sent in
+ if ((request.getContentType() != null)
+ && request.getContentType().startsWith(
+ "multipart/form-data")) {
+ this.processAttachments(request, response);
+ }
+ } catch (Throwable t) {
+ throw new PortletException(t);
+ }
+ super.processAction(request, response);
+
+ }
+
+ /**
+ * Not sure why this needs to be done... This method tends to propagate the
+ * request parameters over to the JSF layer this is a workaround for a bug
+ * in either portal or MyFacesGenericPortlet...
+ *
+ * @author sshah
+ *
+ */
+ private void setupRenderParameters(ActionRequest request,
+ ActionResponse response) throws PortletException, IOException {
+ String categoryId = ForumUtil.getParameter(request,
+ Constants.p_categoryId);
+ String forumId = ForumUtil.getParameter(request, Constants.p_forumId);
+ String pollTitle = ForumUtil.getParameter(request,
+ Constants.p_poll_title);
+ String option = ForumUtil.getParameter(request, Constants.p_option);
+ String pollDelete = ForumUtil.getParameter(request,
+ Constants.p_poll_delete);
+ String attachment = ForumUtil.getParameter(request,
+ Constants.p_attachment);
+ String topicId = ForumUtil.getParameter(request, Constants.p_topicId);
+ String postId = ForumUtil.getParameter(request, Constants.p_postId);
+ String userId = ForumUtil.getParameter(request, Constants.p_userId);
+ String vote = ForumUtil.getParameter(request, Constants.p_vote);
+ String results = ForumUtil.getParameter(request, Constants.p_results);
+ String page = ForumUtil.getParameter(request, Constants.p_page);
+ String watchId = ForumUtil.getParameter(request, Constants.p_watchId);
+ String viewId = ForumUtil.getParameter(request, Constants.p_viewId);
+ String adminEditCatMode = ForumUtil.getParameter(request,
+ Constants.EDIT_CATEGORY);
+ String adminEditForMode = ForumUtil.getParameter(request,
+ Constants.EDIT_FORUM);
+ String adminAddCatMode = ForumUtil.getParameter(request,
+ Constants.ADD_CATEGORY);
+ String adminAddForMode = ForumUtil.getParameter(request,
+ Constants.ADD_FORUM);
+ String editWatch = ForumUtil
+ .getParameter(request, Constants.EDIT_WATCH);
+ if (categoryId != null && categoryId.trim().length() > 0) {
+ response.setRenderParameter(Constants.p_categoryId, categoryId);
+ }
+ if (forumId != null && forumId.trim().length() > 0) {
+ response.setRenderParameter(Constants.p_forumId, forumId);
+ }
+ if (pollTitle != null && pollTitle.trim().length() > 0) {
+ response.setRenderParameter(Constants.p_poll_title, pollTitle);
+ }
+ if (option != null && option.trim().length() > 0) {
+ response.setRenderParameter(Constants.p_option, option);
+ }
+ if (pollDelete != null && pollDelete.trim().length() > 0) {
+ response.setRenderParameter(Constants.p_poll_delete, pollDelete);
+ }
+ if (attachment != null && attachment.trim().length() > 0) {
+ response.setRenderParameter(Constants.p_attachment, attachment);
+ }
+ if (topicId != null && topicId.trim().length() > 0) {
+ response.setRenderParameter(Constants.p_topicId, topicId);
+ }
+ if (userId != null && userId.trim().length() > 0) {
+ response.setRenderParameter(Constants.p_userId, userId);
+ }
+ if (postId != null && postId.trim().length() > 0) {
+ response.setRenderParameter(Constants.p_postId, postId);
+ }
+ if (vote != null && vote.trim().length() > 0) {
+ response.setRenderParameter(Constants.p_vote, vote);
+ }
+ if (results != null && results.trim().length() > 0) {
+ response.setRenderParameter(Constants.p_results, results);
+ }
+ if (page != null && page.trim().length() > 0) {
+ response.setRenderParameter(Constants.p_page, page);
+ }
+ if (watchId != null && watchId.trim().length() > 0) {
+ response.setRenderParameter(Constants.p_watchId, watchId);
+ }
+ if (viewId != null && viewId.trim().length() > 0) {
+ response.setRenderParameter(Constants.p_viewId, viewId);
+ }
+ if (adminEditCatMode != null && adminEditCatMode.trim().length() > 0) {
+ response.setRenderParameter(Constants.EDIT_CATEGORY,
+ adminEditCatMode);
+ }
+ if (adminEditForMode != null && adminEditForMode.trim().length() > 0) {
+ response.setRenderParameter(Constants.EDIT_FORUM, adminEditForMode);
+ }
+ if (adminAddCatMode != null && adminAddCatMode.trim().length() > 0) {
+ response
+ .setRenderParameter(Constants.ADD_CATEGORY, adminAddCatMode);
+ }
+ if (adminAddForMode != null && adminAddForMode.trim().length() > 0) {
+ response.setRenderParameter(Constants.ADD_FORUM, adminAddForMode);
+ }
+ if (editWatch != null && editWatch.trim().length() > 0) {
+ response.setRenderParameter(Constants.EDIT_WATCH, editWatch);
+ }
+ }
+
+ /**
+ *
+ *
+ */
+ private void processAttachments(ActionRequest req, ActionResponse response)
+ throws Exception {
+ // We need to have new map to which we collect request parameters from
+ // multipart - we'll inject it little later
+ Map newParams = new HashMap();
+ newParams.putAll(req.getParameterMap());
+
+ DiskFileItemFactory factory = new DiskFileItemFactory();
+ PortletFileUpload upload = new PortletFileUpload(factory);
+
+ // Merge with upload fields
+ for (Iterator i = upload.parseRequest(req).iterator(); i.hasNext();) {
+ FileItem item = (FileItem) i.next();
+ if (item.isFormField()) {
+ // if it's form field just add it to request params map
+ // TODO:Be aware that this adds single value as we won't have
+ // multiply values in new topic form for now...
+ newParams.put(item.getFieldName(), new String[] { item
+ .getString(req.getCharacterEncoding()) });
+
+ // setup the render parameters properly to propagate to the JSF
+ // layer
+ String parameter = item.getFieldName();
+ String value = item.getString(req.getCharacterEncoding());
+ if (value != null && value.trim().length() > 0) {
+ if (parameter.equals(Constants.p_forumId)) {
+ response.setRenderParameter(Constants.p_forumId, value);
+ } else if (parameter.equals(Constants.p_topicId)) {
+ response.setRenderParameter(Constants.p_topicId, value);
+ } else if (parameter.equals(Constants.p_page)) {
+ response.setRenderParameter(Constants.p_page, value);
+ } else if (parameter.equals(Constants.p_postId)) {
+ response.setRenderParameter(Constants.p_postId, value);
+ }
+ }
+
+ } else {
+ // create the proper attachment file for the managed bean and
+ // put it as a ThreadLocal value
+ // the managed bean should pick this up from the thread
+ TempFileBinding file = new TempFileBinding(item
+ .getContentType(), item.get(), item.getName(), String
+ .valueOf(System.currentTimeMillis())
+ + "_" + item.getSize() // unique fileId for this
+ // collection of files
+ );
+
+ // place it as a ThreadLocal variable
+ PortalUtil.setUploadedAttachment(file);
+ }
+ }
+ // we need to hack the request class and inject newly created Parameters
+ // map using reflection as this are
+ // protected fields
+ try {
+ Class requestClass = PortletRequestImpl.class;
+ Field field = requestClass.getDeclaredField("requestParameterMap");
+ field.setAccessible(true);
+ field.set(req,
+ new PortletRequestParameterMap(newParams, null, null) {
+ });
+
+ } catch (NoSuchFieldException e) {
+ e.printStackTrace();
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ }
+ }
+}
Modified: labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/action/converters/PollDurationConverter.java
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/action/converters/PollDurationConverter.java 2009-08-17 06:30:12 UTC (rev 28957)
+++ labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/action/converters/PollDurationConverter.java 2009-08-17 11:54:57 UTC (rev 28958)
@@ -53,7 +53,7 @@
{
try
{
- return value;
+ return Integer.valueOf(value);
}
catch (NumberFormatException e)
{
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/WEB-INF/forums-config.xml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/WEB-INF/forums-config.xml 2009-08-17 06:30:12 UTC (rev 28957)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/WEB-INF/forums-config.xml 2009-08-17 11:54:57 UTC (rev 28958)
@@ -65,11 +65,78 @@
</converter>
<navigation-rule>
- <from-view-id>/views/category/viewcategory_body.xhtml</from-view-id>
<navigation-case>
<from-outcome>viewForum</from-outcome>
<to-view-id>/views/forums/viewforum_body.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>viewSearch</from-outcome>
+ <to-view-id>/views/search/viewsearch_body.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>viewCategory</from-outcome>
+ <to-view-id>/views/category/viewcategory_body.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>viewPreferences</from-outcome>
+ <to-view-id>/views/pref/index.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>myForums</from-outcome>
+ <to-view-id>/views/myforums/myforums_main.xhtml</to-view-id>
</navigation-case>
+ <navigation-case>
+ <from-outcome>adminPanel</from-outcome>
+ <to-view-id>/views/admin/index.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>deleteCategory</from-outcome>
+ <to-view-id>/views/admin/deleteCategory.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>deleteForum</from-outcome>
+ <to-view-id>/views/admin/deleteForum.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>viewProfile</from-outcome>
+ <to-view-id>/views/profile/viewprofile_body.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>forumWatch</from-outcome>
+ <to-view-id>/views/watches/forumWatch.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>viewTopic</from-outcome>
+ <to-view-id>/views/topics/viewtopic_body.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>viewModerator</from-outcome>
+ <to-view-id>/views/moderator/modcp_body.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>viewModeratorSplit</from-outcome>
+ <to-view-id>/views/moderator/modcp_split.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>myForumsAll</from-outcome>
+ <to-view-id>/views/myforums/myforums_viewall.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>myForumsEdit</from-outcome>
+ <to-view-id>/views/myforums/myforums_editforums.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>viewSearchResults</from-outcome>
+ <to-view-id>/views/search/viewsearch_results.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>topicWatch</from-outcome>
+ <to-view-id>/views/watches/topicWatch.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>deletePost</from-outcome>
+ <to-view-id>/views/topics/delete_post.xhtml</to-view-id>
+ </navigation-case>
</navigation-rule>
<!-- configuration for the shared EmptyController -->
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/WEB-INF/portlet.xml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/WEB-INF/portlet.xml 2009-08-17 06:30:12 UTC (rev 28957)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/WEB-INF/portlet.xml 2009-08-17 11:54:57 UTC (rev 28958)
@@ -7,14 +7,17 @@
<portlet>
<portlet-name>JSFForumsPortlet</portlet-name>
- <!--portlet-class>org.apache.myfaces.portlet.MyFacesGenericPortlet</portlet-class-->
- <portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class>
+ <portlet-class>org.jboss.portlet.forums.ui.ForumsJSFPortlet</portlet-class>
<display-name>JBoss Forums</display-name>
<description>JBoss Forums 1.2.0 for JBoss Portal 2.7</description>
<init-param>
<name>javax.portlet.faces.defaultViewId.view</name>
<value>/views/index.xhtml</value>
</init-param>
+ <init-param>
+ <name>javax.portlet.faces.defaultViewId.edit</name>
+ <value>/views/pref/index.xhtml</value>
+ </init-param>
<expiration-cache>-1</expiration-cache>
<supports>
<mime-type>text/html</mime-type>
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/admin/index.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/admin/index.xhtml 2009-08-17 06:30:12 UTC (rev 28957)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/admin/index.xhtml 2009-08-17 11:54:57 UTC (rev 28958)
@@ -182,7 +182,12 @@
<f:param name="c" value="#{category.id}"/>
<img src="${forums:themeURL('resourceTopicModeDeleteURL')}"
alt="${resource.Delete}" name="delete" border="0" />
- </h:outputLink>
+ </h:outputLink>
+ <h:commandLink action="deleteCategory">
+ <f:param name="c" value="#{category.id}"/>
+ <img src="${forums:themeURL('resourceTopicModeDeleteURL')}"
+ alt="${resource.Delete}" name="delete" border="0" />
+ </h:commandLink>
</forums:isAllowedWhen>
<forums:isAllowedOtherwise>
@@ -321,7 +326,12 @@
<f:param name="f" value="#{forum.id}"/>
<img src="${forums:themeURL('resourceTopicModeDeleteURL')}"
alt="${resource.Delete}" name="delete" border="0" />
- </h:outputLink>
+ </h:outputLink>
+ <h:commandLink action="/views/admin/deleteForum.xhtml">
+ <f:param name="f" value="#{forum.id}"/>
+ <img src="${forums:themeURL('resourceTopicModeDeleteURL')}"
+ alt="${resource.Delete}" name="delete" border="0" />
+ </h:commandLink>
</forums:isAllowedWhen>
<forums:isAllowedOtherwise>
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml 2009-08-17 06:30:12 UTC (rev 28957)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml 2009-08-17 11:54:57 UTC (rev 28958)
@@ -34,6 +34,7 @@
<ui:composition template="/views/common/common.xhtml">
<ui:define name="mainContent">
+ <h:form>
<div class="forumbread">
<ul>
<li class="first">
@@ -41,6 +42,8 @@
<h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
<h:outputText value="#{shared.mainPageName}"/>
</h:outputLink>
+
+ <h:commandLink value="#{shared.mainPageName}" action="viewCategory"/>
<c:if test="#{category.categories ne null and category.categorySelected eq true}" >
<ul>
@@ -50,6 +53,9 @@
<f:param name="c" value="#{catrow.id}"/>
<h:outputText value="#{catrow.title}"/>
</h:outputLink>
+ <h:commandLink value="#{catrow.title}" action="viewCategory">
+ <f:param name="c" value="#{catrow.id}"/>
+ </h:commandLink>
</c:forEach>
</li>
</ul>
@@ -58,7 +64,7 @@
</li>
</ul>
</div>
-
+ </h:form>
<c:if test="${forums:feedsConfigured()}">
<div class="forumfloatright">
@@ -97,6 +103,9 @@
<f:param name="c" value="#{catrow.id}"/>
<h:outputText value="#{catrow.title}"/>
</h:outputLink>
+ <h:commandLink value="#{catrow.title}" action="viewCategory">
+ <f:param name="c" value="#{catrow.id}"/>
+ </h:commandLink>
</h3>
</td>
</tr>
@@ -158,6 +167,9 @@
<f:param name="uid" value="#{category.forumLastPosts[forumrow.id].poster.user.id}"/>
<h:outputText value="${category.forumLastPosts[forumrow.id].poster.user.userName}"/>
</h:outputLink>
+ <h:commandLink value="${category.forumLastPosts[forumrow.id].poster.user.userName}" action="/views/profile/viewprofile_body.xhtml">
+ <f:param name="uid" value="#{category.forumLastPosts[forumrow.id].poster.user.id}"/>
+ </h:commandLink>
</c:otherwise>
</c:choose>
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/common/common.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/common/common.xhtml 2009-08-17 06:30:12 UTC (rev 28957)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/common/common.xhtml 2009-08-17 11:54:57 UTC (rev 28958)
@@ -1,25 +1,25 @@
<!--
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, 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. *
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, 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. *
******************************************************************************/
-->
@@ -30,61 +30,67 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
class="forumscontainer"
->
-
-<ui:composition template="/views/common/common_decoration.xhtml">
+>
+
+<ui:composition template="/views/common/common_decoration.xhtml">
<ui:define name="content">
<!-- resourceBundle to be used by this entire application -->
<f:loadBundle basename="ResourceJSF" var="resource"/>
-
- <!-- display the function tray -->
- <div class="forumsectionhdr">
- <ul>
-
- <li>
- <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
- ${resource.Home}
- </h:outputLink>
- </li>
+ <h:form>
+ <!-- display the function tray -->
+ <div class="forumsectionhdr">
+ <ul>
+
+ <li>
+ <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
+ ${resource.Home}
+ </h:outputLink>
+ <h:commandLink value="${resource.Home}" action="viewCategory"/>
+ </li>
<li>
  |  
<h:outputLink value="#{forums:outputLink(shared.links['search'],true)}">Search </h:outputLink>
+ <h:commandLink value="Search " action="viewSearch"/>
</li>
-
- <c:if test="#{shared.anonymous==false && forums:isRunningInPortal()==false}">
- <li>
-   |  
- <h:outputLink value="#{forums:outputLink(shared.links['pref'],true)}">
- ${resource.Preferences}
- </h:outputLink>
- </li>
- </c:if>
-
- <c:if test="#{shared.anonymous==false}">
- <li>
-   |  
- <h:outputLink value="#{forums:outputLink(shared.links['myForums'],true)}">
- ${resource.My_Forums}
- </h:outputLink>
- </li>
- </c:if>
-
- <c:if test="#{shared.anonymous==false}">
- <forums:isAllowed fragment="acl://accessAdminTool">
- <li>
-   |  
- <h:outputLink value="#{forums:outputLink(shared.links['admin'],true)}">
- ${resource.Admin_panel}
- </h:outputLink>
- </li>
- </forums:isAllowed>
- </c:if>
-
- </ul>
- </div>
-
+
+ <c:if test="#{shared.anonymous==false && forums:isRunningInPortal()==false}">
+ <li>
+   |  
+ <h:outputLink value="#{forums:outputLink(shared.links['pref'],true)}">
+ ${resource.Preferences}
+ </h:outputLink>
+ <h:commandLink value="${resource.Preferences}" action="viewPreferences"/>
+ </li>
+ </c:if>
+
+ <c:if test="#{shared.anonymous==false}">
+ <li>
+   |  
+ <h:outputLink value="#{forums:outputLink(shared.links['myForums'],true)}">
+ ${resource.My_Forums}
+ </h:outputLink>
+ <h:commandLink action="myForums" value="${resource.My_Forums}"/>
+ </li>
+ </c:if>
+
+ <c:if test="#{shared.anonymous==false}">
+ <forums:isAllowed fragment="acl://accessAdminTool">
+ <li>
+   |  
+ <h:outputLink value="#{forums:outputLink(shared.links['admin'],true)}">
+ ${resource.Admin_panel}
+ </h:outputLink>
+ <h:commandLink action="adminPanel" value="${resource.Admin_panel}"/>
+ </li>
+ </forums:isAllowed>
+ </c:if>
+
+ </ul>
+ </div>
+</h:form>
+
<!-- body of the page -->
<c:choose>
<c:when test="#{(forums:errorMsg())!=null}">
@@ -97,9 +103,9 @@
</c:otherwise>
</c:choose>
- <!-- footer -->
- <div class="PoweredBy">${resource.Powered_by} <a href="http://labs.jboss.com/jbossforums"><img border="0" src="${forums:themeURL('resourceIconForumsLogoURL')}" /></a></div>
-
-</ui:define>
+ <!-- footer -->
+ <div class="PoweredBy">${resource.Powered_by} <a href="http://labs.jboss.com/jbossforums"><img border="0" src="${forums:themeURL('resourceIconForumsLogoURL')}" /></a></div>
+
+</ui:define>
</ui:composition>
-</div>
\ No newline at end of file
+</div>
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml 2009-08-17 06:30:12 UTC (rev 28957)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml 2009-08-17 11:54:57 UTC (rev 28958)
@@ -1,25 +1,25 @@
<!--
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, 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. *
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, 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. *
******************************************************************************/
-->
@@ -41,7 +41,7 @@
<!-- make sure the user is allowed to access both the specified forum and the category that this forum belongs to -->
<forums:isAllowed fragment="acl://readCategory" contextData="#{forum.forum.category}">
<forums:isAllowed fragment="acl://readForum" contextData="#{forum.forum}">
-
+<h:form>
<div class="forumbread">
<ul>
<li class="first">
@@ -49,6 +49,7 @@
<h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
<h:outputText value="#{shared.mainPageName}"/>
</h:outputLink>
+ <h:commandLink action="viewCategory" value="#{shared.mainPageName}"/>
<ul>
<li>>
@@ -56,6 +57,9 @@
<f:param name="c" value="#{forum.forum.category.id}"/>
<h:outputText value="#{forum.forum.category.title}"/>
</h:outputLink>
+ <h:commandLink action="viewCategory" value="#{forum.forum.category.title}">
+ <f:param name="c" value="#{forum.forum.category.id}"/>
+ </h:commandLink>
<ul>
<li>>
@@ -63,6 +67,9 @@
<f:param name="f" value="#{forum.forum.id}"/>
<h:outputText value="#{forum.forum.name}"/>
</h:outputLink>
+ <h:commandLink action="viewForum" value="#{forum.forum.name}">
+ <f:param name="f" value="#{forum.forum.id}"/>
+ </h:commandLink>
</li>
</ul>
@@ -72,26 +79,24 @@
</li>
</ul>
</div>
+
+ <div class="forumfloatright">
-<h:form>
-
- <div class="forumfloatright">
-
- <c:if test="${forums:feedsConfigured()}">
- <!-- feeds -->
- <a href="#{forum.rssFeed}">
- <img src="#{forums:themeURL('resourceIconFeedURL')}" border="0" />
- RSS
- </a>
-  
- <a href="#{forum.atomFeed}" class="imglink">
- <img src="#{forums:themeURL('resourceIconFeedURL')}" border="0" />
- ATOM
- </a>
-  
- </c:if>
+ <c:if test="${forums:feedsConfigured()}">
+ <!-- feeds -->
+ <a href="#{forum.rssFeed}">
+ <img src="#{forums:themeURL('resourceIconFeedURL')}" border="0" />
+ RSS
+ </a>
+  
+ <a href="#{forum.atomFeed}" class="imglink">
+ <img src="#{forums:themeURL('resourceIconFeedURL')}" border="0" />
+ ATOM
+ </a>
+  
+ </c:if>
- <c:if test="#{shared.anonymous==false}">
+ <c:if test="#{shared.anonymous==false}">
<c:choose>
<c:when test="#{forums:isWatchingForum(forum.forum) ne null}">
@@ -105,7 +110,7 @@
</h:commandLink>
</c:when>
<c:otherwise>
- <h:outputLink value="#{forums:outputLink(shared.links['forumWatch'],true)}">
+ <h:outputLink value="#{forums:outputLink(shared.links['forumWatch'],true)}">
<f:param name="f" value="${forum.forum.id}" />
<img src="#{forums:themeURL('resourceIconSubscribeURL')}"
alt="${resource.Subscribe_to_forum}"
@@ -113,9 +118,17 @@
border="0"
id="subscribe" />
</h:outputLink>
+ <h:commandLink action="forumWatch">
+ <f:param name="f" value="${forum.forum.id}" />
+ <img src="#{forums:themeURL('resourceIconSubscribeURL')}"
+ alt="${resource.Subscribe_to_forum}"
+ name="subscribe"
+ border="0"
+ id="subscribe" />
+ </h:commandLink>
</c:otherwise>
</c:choose>
- </c:if>
+ </c:if>
</div>
<div class="forumtitletext">
@@ -123,7 +136,7 @@
<h4>
${forum.forum.name}
</h4>
- </div>
+ </div>
<!-- PAGINATION -->
<c:if test="#{forum.pageNavigator.totalPages gt 1}">
@@ -152,6 +165,10 @@
<f:param name="page" value="0"/>
<h:outputText value="${resource.First}"/>
</h:outputLink>
+ <h:commandLink action="viewForum" value="${resource.First}">
+ <f:param name="f" value="#{forum.forum.id}"/>
+ <f:param name="page" value="0"/>
+ </h:commandLink>
</li>
<li>
<h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
@@ -159,6 +176,10 @@
<f:param name="page" value="${forum.pageNavigator.currentPage-1}"/>
<h:outputText value="< ${resource.Previous}"/>
</h:outputLink>
+ <h:commandLink action="viewForum" value="< ${resource.Previous}">
+ <f:param name="f" value="#{forum.forum.id}"/>
+ <f:param name="page" value="${forum.pageNavigator.currentPage-1}"/>
+ </h:commandLink>
</li>
</c:otherwise>
</c:choose>
@@ -170,6 +191,10 @@
<f:param name="page" value="${pageNumber-1}"/>
<h:outputText value="${pageNumber}"/>
</h:outputLink>
+ <h:commandLink action="viewForum" value="${pageNumber}">
+ <f:param name="f" value="#{forum.forum.id}"/>
+ <f:param name="page" value="${pageNumber-1}"/>
+ </h:commandLink>
</li>
</c:forEach>
@@ -184,6 +209,10 @@
<f:param name="page" value="${pageNumber-1}"/>
<h:outputText value="${pageNumber}"/>
</h:outputLink>
+ <h:commandLink action="viewForum" value="${pageNumber}">
+ <f:param name="f" value="#{forum.forum.id}"/>
+ <f:param name="page" value="${pageNumber-1}"/>
+ </h:commandLink>
</li>
</c:forEach>
@@ -203,6 +232,10 @@
<f:param name="page" value="${forum.pageNavigator.currentPage+1}"/>
<h:outputText value="${resource.Next} >"/>
</h:outputLink>
+ <h:commandLink action="viewForum" value="${resource.Next} >">
+ <f:param name="f" value="#{forum.forum.id}"/>
+ <f:param name="page" value="${forum.pageNavigator.currentPage+1}"/>
+ </h:commandLink>
</li>
<li>
<h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
@@ -210,6 +243,10 @@
<f:param name="page" value="${forum.pageNavigator.totalPages-1}"/>
<h:outputText value="${resource.Last}"/>
</h:outputLink>
+ <h:commandLink action="viewForum" value="${resource.Last}">
+ <f:param name="f" value="#{forum.forum.id}"/>
+ <f:param name="page" value="${forum.pageNavigator.totalPages-1}"/>
+ </h:commandLink>
</li>
</c:otherwise>
</c:choose>
@@ -274,12 +311,15 @@
alt="${resource.Topic_Moved}" title="${resource.Topic_Moved}"/>
</td>
<td>
- <h3>
+ <h3>
${forums:folderType(topicrow)} 
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
<f:param name="t" value="${topicrow.id}"/>
<h:outputText value="${topicrow.subject}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${topicrow.subject}">
+ <f:param name="t" value="${topicrow.id}"/>
+ </h:commandLink>
</h3>
<!-- mini post navigator for this topic -->
@@ -290,12 +330,20 @@
<f:param name="page" value="0"/>
<h:outputText value="${1}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${1}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="0"/>
+ </h:commandLink>
 
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
<f:param name="t" value="#{topicrow.id}"/>
<f:param name="page" value="1"/>
<h:outputText value="${2}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="{2}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="1"/>
+ </h:commandLink>
<c:if test="#{forum.topicNavigator[topicrow.id].totalPages gt 2}">
 
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
@@ -303,6 +351,10 @@
<f:param name="page" value="2"/>
<h:outputText value="${3}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="{3}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="2"/>
+ </h:commandLink>
</c:if>
<c:if test="#{forum.topicNavigator[topicrow.id].totalPages gt 3}">
 … 
@@ -311,6 +363,10 @@
<f:param name="page" value="#{forum.topicNavigator[topicrow.id].totalPages-1}"/>
<h:outputText value="${resource.Last_page}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${resource.Last_page}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="#{forum.topicNavigator[topicrow.id].totalPages-1}"/>
+ </h:commandLink>
</c:if>
 )
</c:if>
@@ -327,6 +383,9 @@
<f:param name="uid" value="${topicrow.poster.user.id}"/>
<h:outputText value="${topicrow.poster.user.userName}"/>
</h:outputLink>
+ <h:commandLink action="viewProfile" value="${topicrow.poster.user.userName}">
+ <f:param name="uid" value="${topicrow.poster.user.id}"/>
+ </h:commandLink>
</c:otherwise>
</c:choose>
@@ -361,6 +420,9 @@
<f:param name="uid" value="#{forum.topicLastPosts[topicrow.id].poster.user.id}"/>
<h:outputText value="${forum.topicLastPosts[topicrow.id].poster.user.userName}"/>
</h:outputLink>
+ <h:commandLink action="viewProfile" value="${forum.topicLastPosts[topicrow.id].poster.user.userName}">
+ <f:param name="uid" value="#{forum.topicLastPosts[topicrow.id].poster.user.id}"/>
+ </h:commandLink>
</c:otherwise>
</c:choose>
@@ -391,12 +453,15 @@
alt="${resource.Topic_Moved}" title="${resource.Topic_Moved}"/>
</td>
<td>
- <h3>
+ <h3>
${forums:folderType(topicrow)} 
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
<f:param name="t" value="${topicrow.id}"/>
<h:outputText value="${topicrow.subject}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${topicrow.subject}">
+ <f:param name="t" value="${topicrow.id}"/>
+ </h:commandLink>
</h3>
<!-- mini post navigator for this topic -->
@@ -407,12 +472,20 @@
<f:param name="page" value="0"/>
<h:outputText value="${1}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${1}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="0"/>
+ </h:commandLink>
 
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
<f:param name="t" value="#{topicrow.id}"/>
<f:param name="page" value="1"/>
<h:outputText value="${2}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${2}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="1"/>
+ </h:commandLink>
<c:if test="#{forum.topicNavigator[topicrow.id].totalPages gt 2}">
 
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
@@ -420,6 +493,10 @@
<f:param name="page" value="2"/>
<h:outputText value="${3}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${3}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="2"/>
+ </h:commandLink>
</c:if>
<c:if test="#{forum.topicNavigator[topicrow.id].totalPages gt 3}">
 … 
@@ -428,6 +505,10 @@
<f:param name="page" value="#{forum.topicNavigator[topicrow.id].totalPages-1}"/>
<h:outputText value="${resource.Last_page}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${resource.Last_page}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="#{forum.topicNavigator[topicrow.id].totalPages-1}"/>
+ </h:commandLink>
</c:if>
 )
</c:if>
@@ -444,6 +525,9 @@
<f:param name="uid" value="${topicrow.poster.user.id}"/>
<h:outputText value="${topicrow.poster.user.userName}"/>
</h:outputLink>
+ <h:commandLink action="viewProfile" value="${topicrow.poster.user.userName}">
+ <f:param name="uid" value="${topicrow.poster.user.id}"/>
+ </h:commandLink>
</c:otherwise>
</c:choose>
@@ -478,6 +562,9 @@
<f:param name="uid" value="#{forum.topicLastPosts[topicrow.id].poster.user.id}"/>
<h:outputText value="${forum.topicLastPosts[topicrow.id].poster.user.userName}"/>
</h:outputLink>
+ <h:commandLink action="viewProfile" value="${forum.topicLastPosts[topicrow.id].poster.user.userName}">
+ <f:param name="uid" value="#{forum.topicLastPosts[topicrow.id].poster.user.id}"/>
+ </h:commandLink>
</c:otherwise>
</c:choose>
@@ -512,6 +599,9 @@
<f:param name="t" value="${topicrow.id}"/>
<h:outputText value="${topicrow.subject}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${topicrow.subject}">
+ <f:param name="t" value="${topicrow.id}"/>
+ </h:commandLink>
</h3>
<!-- mini post navigator for this topic -->
@@ -522,12 +612,20 @@
<f:param name="page" value="0"/>
<h:outputText value="${1}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${1}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="0"/>
+ </h:commandLink>
 
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
<f:param name="t" value="#{topicrow.id}"/>
<f:param name="page" value="1"/>
<h:outputText value="${2}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="{2}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="1"/>
+ </h:commandLink>
<c:if test="#{forum.topicNavigator[topicrow.id].totalPages gt 2}">
 
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
@@ -535,6 +633,10 @@
<f:param name="page" value="2"/>
<h:outputText value="${3}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${3}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="2"/>
+ </h:commandLink>
</c:if>
<c:if test="#{forum.topicNavigator[topicrow.id].totalPages gt 3}">
 … 
@@ -543,6 +645,10 @@
<f:param name="page" value="#{forum.topicNavigator[topicrow.id].totalPages-1}"/>
<h:outputText value="${resource.Last_page}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${resource.Last_page}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="#{forum.topicNavigator[topicrow.id].totalPages-1}"/>
+ </h:commandLink>
</c:if>
 )
</c:if>
@@ -559,6 +665,9 @@
<f:param name="uid" value="${topicrow.poster.user.id}"/>
<h:outputText value="${topicrow.poster.user.userName}"/>
</h:outputLink>
+ <h:commandLink action="viewProfile" value="${topicrow.poster.user.userName}">
+ <f:param name="uid" value="${topicrow.poster.user.id}"/>
+ </h:commandLink>
</c:otherwise>
</c:choose>
@@ -593,6 +702,9 @@
<f:param name="uid" value="#{forum.topicLastPosts[topicrow.id].poster.user.id}"/>
<h:outputText value="${forum.topicLastPosts[topicrow.id].poster.user.userName}"/>
</h:outputLink>
+ <h:commandLink action="viewProfile" value="${forum.topicLastPosts[topicrow.id].poster.user.userName}">
+ <f:param name="uid" value="#{forum.topicLastPosts[topicrow.id].poster.user.id}"/>
+ </h:commandLink>
</c:otherwise>
</c:choose>
@@ -644,7 +756,11 @@
<f:param name="f" value="#{forum.forum.id}"/>
<f:param name="page" value="0"/>
<h:outputText value="${resource.First}"/>
- </h:outputLink>
+ </h:outputLink>
+ <h:commandLink action="viewForum" value="${resource.First}">
+ <f:param name="f" value="#{forum.forum.id}"/>
+ <f:param name="page" value="0"/>
+ </h:commandLink>
</li>
<li>
<h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
@@ -652,6 +768,10 @@
<f:param name="page" value="${forum.pageNavigator.currentPage-1}"/>
<h:outputText value="< ${resource.Previous}"/>
</h:outputLink>
+ <h:commandLink action="viewForum" value="< ${resource.Previous}">
+ <f:param name="f" value="#{forum.forum.id}"/>
+ <f:param name="page" value="${forum.pageNavigator.currentPage-1}"/>
+ </h:commandLink>
</li>
</c:otherwise>
</c:choose>
@@ -663,6 +783,10 @@
<f:param name="page" value="${pageNumber-1}"/>
<h:outputText value="${pageNumber}"/>
</h:outputLink>
+ <h:commandLink action="viewForum" value="${pageNumber}">
+ <f:param name="f" value="#{forum.forum.id}"/>
+ <f:param name="page" value="${pageNumber-1}"/>
+ </h:commandLink>
</li>
</c:forEach>
@@ -677,6 +801,10 @@
<f:param name="page" value="${pageNumber-1}"/>
<h:outputText value="${pageNumber}"/>
</h:outputLink>
+ <h:commandLink action="viewForum" value="${pageNumber}">
+ <f:param name="f" value="#{forum.forum.id}"/>
+ <f:param name="page" value="${pageNumber-1}"/>
+ </h:commandLink>
</li>
</c:forEach>
@@ -696,6 +824,10 @@
<f:param name="page" value="${forum.pageNavigator.currentPage+1}"/>
<h:outputText value="${resource.Next} >"/>
</h:outputLink>
+ <h:commandLink action="viewForum" value="${resource.Next} >">
+ <f:param name="f" value="#{forum.forum.id}"/>
+ <f:param name="page" value="${forum.pageNavigator.currentPage+1}"/>
+ </h:commandLink>
</li>
<li>
<h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
@@ -703,6 +835,10 @@
<f:param name="page" value="${forum.pageNavigator.totalPages-1}"/>
<h:outputText value="${resource.Last}"/>
</h:outputLink>
+ <h:commandLink action="viewForum" value="${resource.Last}">
+ <f:param name="f" value="#{forum.forum.id}"/>
+ <f:param name="page" value="${forum.pageNavigator.totalPages-1}"/>
+ </h:commandLink>
</li>
</c:otherwise>
</c:choose>
@@ -752,6 +888,12 @@
<img src="${forums:themeURL('resourceIconModerateURL')}" alt="${resource.Moderate}" border="0" />
</f:verbatim>
</h:outputLink>
+ <h:commandLink action=viewModerator>
+ <f:param name="f" value="#{forum.forum.id}"/>
+ <f:verbatim>
+ <img src="${forums:themeURL('resourceIconModerateURL')}" alt="${resource.Moderate}" border="0" />
+ </f:verbatim>
+ </h:commandLink>
</li>
</ul>
</div>
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml 2009-08-17 06:30:12 UTC (rev 28957)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml 2009-08-17 11:54:57 UTC (rev 28958)
@@ -47,6 +47,7 @@
<h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
<h:outputText value="#{shared.mainPageName}"/>
</h:outputLink>
+ <h:commandLink action="viewCategory" value="#{shared.mainPageName}"/>
<ul>
<li>>
@@ -54,6 +55,9 @@
<f:param name="c" value="#{moderator.forum.category.id}"/>
<h:outputText value="#{moderator.forum.category.title}"/>
</h:outputLink>
+ <h:commandLink action="viewCategory" value="#{moderator.forum.category.title}">
+ <f:param name="c" value="#{moderator.forum.category.id}"/>
+ </h:commandLink>
<ul>
<li>>
@@ -61,6 +65,9 @@
<f:param name="f" value="#{moderator.forum.id}"/>
<h:outputText value="#{moderator.forum.name}"/>
</h:outputLink>
+ <h:commandLink action="viewForum" value="#{moderator.forum.name}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ </h:commandLink>
<ul>
<li>>
@@ -68,6 +75,9 @@
<f:param name="f" value="#{moderator.forum.id}"/>
<h:outputText value="${resource.Mod_CP}"/>
</h:outputLink>
+ <h:commandLink action="viewModerator" value="${resource.Mod_CP}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ </h:commandLink>
</li>
</ul>
</li>
@@ -116,13 +126,21 @@
<f:param name="page" value="0"/>
<h:outputText value="${resource.First}"/>
</h:outputLink>
+ <h:commandLink action="viewModerator" value="${resource.First}">
+ <f:param name="f" value="#{modaerator.forum.id}"/>
+ <f:param name="page" value="0"/>
+ </h:commandLink>
</li>
<li>
<h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
<f:param name="f" value="#{moderator.forum.id}"/>
<f:param name="page" value="${moderator.pageNavigator.currentPage-1}"/>
<h:outputText value="< ${resource.Previous}"/>
- </h:outputLink>
+ </h:outputLink>
+ <h:commandLink action="viewModerator" value="< ${resource.Previous}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ <f:param name="page" value="${moderator.pageNavigator.currentPage-1}"/>
+ </h:commandLink>
</li>
</c:otherwise>
</c:choose>
@@ -134,6 +152,10 @@
<f:param name="page" value="${pageNumber-1}"/>
<h:outputText value="${pageNumber}"/>
</h:outputLink>
+ <h:commandLink action="viewModerator" value="${pageNumber}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ <f:param name="page" value="${pageNumber-1}"/>
+ </h:commandLink>
</li>
</c:forEach>
@@ -148,6 +170,10 @@
<f:param name="page" value="${pageNumber-1}"/>
<h:outputText value="${pageNumber}"/>
</h:outputLink>
+ <h:commandLink action="viewModerator" value="${pageNumber}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ <f:param name="page" value="${pageNumber-1}"/>
+ </h:commandLink>
</li>
</c:forEach>
@@ -167,6 +193,10 @@
<f:param name="page" value="${moderator.pageNavigator.currentPage+1}"/>
<h:outputText value="${resource.Next} >"/>
</h:outputLink>
+ <h:commandLink action="viewModerator" value="${resource.Next} >">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ <f:param name="page" value="${moderator.pageNavigator.currentPage+1}"/>
+ </h:commandLink>
</li>
<li>
<h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
@@ -174,6 +204,10 @@
<f:param name="page" value="${moderator.pageNavigator.totalPages-1}"/>
<h:outputText value="${resource.Last}"/>
</h:outputLink>
+ <h:commandLink action="viewModerator" value="${resource.Last}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ <f:param name="page" value="${moderator.pageNavigator.totalPages-1}"/>
+ </h:commandLink>
</li>
</c:otherwise>
</c:choose>
@@ -207,6 +241,9 @@
<f:param name="t" value="${topicrow.id}"/>
<h:outputText value="${topicrow.subject}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${topicrow.subject}">
+ <f:param name="t" value="${topicrow.id}"/>
+ </h:commandLink>
</td>
<td class='rowline ${(status.last)?"bottomline":""} forumheadercentered' width="30px">
${topicrow.replies}
@@ -280,13 +317,21 @@
<f:param name="page" value="0"/>
<h:outputText value="${resource.First}"/>
</h:outputLink>
+ <h:commandLink action="viewModerator" value="${resource.First}">
+ <f:param name="f" value="#{modaerator.forum.id}"/>
+ <f:param name="page" value="0"/>
+ </h:commandLink>
</li>
<li>
<h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
<f:param name="f" value="#{moderator.forum.id}"/>
<f:param name="page" value="${moderator.pageNavigator.currentPage-1}"/>
<h:outputText value="< ${resource.Previous}"/>
- </h:outputLink>
+ </h:outputLink>
+ <h:commandLink action="viewModerator" value="< ${resource.Previous}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ <f:param name="page" value="${moderator.pageNavigator.currentPage-1}"/>
+ </h:commandLink>
</li>
</c:otherwise>
</c:choose>
@@ -298,6 +343,10 @@
<f:param name="page" value="${pageNumber-1}"/>
<h:outputText value="${pageNumber}"/>
</h:outputLink>
+ <h:commandLink action="viewModerator" value="${pageNumber}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ <f:param name="page" value="${pageNumber-1}"/>
+ </h:commandLink>
</li>
</c:forEach>
@@ -312,6 +361,10 @@
<f:param name="page" value="${pageNumber-1}"/>
<h:outputText value="${pageNumber}"/>
</h:outputLink>
+ <h:commandLink action="viewModerator" value="${pageNumber}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ <f:param name="page" value="${pageNumber-1}"/>
+ </h:commandLink>
</li>
</c:forEach>
@@ -331,6 +384,10 @@
<f:param name="page" value="${moderator.pageNavigator.currentPage+1}"/>
<h:outputText value="${resource.Next} >"/>
</h:outputLink>
+ <h:commandLink action="viewModerator" value="${resource.Next} >">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ <f:param name="page" value="${moderator.pageNavigator.currentPage+1}"/>
+ </h:commandLink>
</li>
<li>
<h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
@@ -338,6 +395,10 @@
<f:param name="page" value="${moderator.pageNavigator.totalPages-1}"/>
<h:outputText value="${resource.Last}"/>
</h:outputLink>
+ <h:commandLink action="viewModerator" value="${resource.Last}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ <f:param name="page" value="${moderator.pageNavigator.totalPages-1}"/>
+ </h:commandLink>
</li>
</c:otherwise>
</c:choose>
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/moderator/modcp_split.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/moderator/modcp_split.xhtml 2009-08-17 06:30:12 UTC (rev 28957)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/moderator/modcp_split.xhtml 2009-08-17 11:54:57 UTC (rev 28958)
@@ -50,6 +50,7 @@
<h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
<h:outputText value="#{shared.mainPageName}"/>
</h:outputLink>
+ <h:commandLink action="viewCategory" value="#{shared.mainPageName}"/>
<ul>
<li>>
@@ -57,6 +58,9 @@
<f:param name="c" value="#{splitTopic.topic.forum.category.id}"/>
<h:outputText value="#{splitTopic.topic.forum.category.title}"/>
</h:outputLink>
+ <h:commandLink action="viewCategory" value="#{shared.mainPageName}">
+ <f:param name="c" value="#{splitTopic.topic.forum.category.id}"/>
+ </h:commandLink>
<ul>
<li>>
@@ -64,6 +68,9 @@
<f:param name="f" value="#{splitTopic.topic.forum.id}"/>
<h:outputText value="#{splitTopic.topic.forum.name}"/>
</h:outputLink>
+ <h:commandLink action="viewForum" value="#{shared.mainPageName}">
+ <f:param name="f" value="#{splitTopic.topic.forum.id}"/>
+ </h:commandLink>
<ul>
<li>>
@@ -71,6 +78,9 @@
<f:param name="t" value="#{splitTopic.topic.id}"/>
<h:outputText value="${resource.L_SPLIT_TOPIC}"/>
</h:outputLink>
+ <h:commandLink action="viewModeratorSplit" value="${resource.L_SPLIT_TOPIC}">
+ <f:param name="t" value="#{splitTopic.topic.id}"/>
+ </h:commandLink>
</li>
</ul>
@@ -176,6 +186,9 @@
<f:param name="uid" value="${postrow.poster.user.id}"/>
<h:outputText value="${postrow.poster.user.userName}"/>
</h:outputLink>
+ <h:commandLink action="viewProfile" value="${postrow.poster.user.userName}">
+ <f:param name="uid" value="${postrow.poster.user.id}"/>
+ </h:commandLink>
</c:otherwise>
</c:choose>
@@ -190,6 +203,11 @@
<h:outputText value="${resource.Permalink}"/>
</f:verbatim>
</h:outputLink>
+ <h:commandLink action="#{forums:postPermlink(postrow.id)}" style="text-decoration: none;">
+ <f:verbatim>
+ <h:outputText value="${resource.Permalink}"/>
+ </f:verbatim>
+ </h:commandLink>
</li>
<li>${resource.L_POSTED}:#{forums:dateStr(postrow.createDate)}</li>
<li>${resource.L_POST_SUBJECT}:${postrow.message.subject}</li>
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/myforums/myforums_editforums.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/myforums/myforums_editforums.xhtml 2009-08-17 06:30:12 UTC (rev 28957)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/myforums/myforums_editforums.xhtml 2009-08-17 11:54:57 UTC (rev 28958)
@@ -74,6 +74,9 @@
<f:param name="f" value="${forumrow.id}"/>
<h:outputText value="${forumrow.name}"/>
</h:outputLink>
+ <h:commandLink action="viewForum" value="${forumrow.name}">
+ <f:param name="f" value="${forumrow.id}"/>
+ </h:commandLink>
</h3>
${forumrow.description}
</td>
@@ -109,6 +112,9 @@
<f:param name="uid" value="#{myForumsEdit.forumsLastPosts[forumrow.id].poster.user.id}"/>
<h:outputText value="${myForumsEdit.forumsLastPosts[forumrow.id].poster.user.userName}"/>
</h:outputLink>
+ <h:commandLink action="viewProfile" value="${myForumsEdit.forumsLastPosts[forumrow.id].poster.user.userName}">
+ <f:param name="uid" value="#{myForumsEdit.forumsLastPosts[forumrow.id].poster.user.id}"/>
+ </h:commandLink>
</c:otherwise>
</c:choose>
@@ -188,6 +194,9 @@
<f:param name="f" value="${forumrow.id}"/>
<h:outputText value="${forumrow.name}"/>
</h:outputLink>
+ <h:commandLink action="viewForum" value="${forumrow.name}">
+ <f:param name="f" value="${forumrow.id}"/>
+ </h:commandLink>
</h3>
${forumrow.description}
</td>
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/myforums/myforums_main.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/myforums/myforums_main.xhtml 2009-08-17 06:30:12 UTC (rev 28957)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/myforums/myforums_main.xhtml 2009-08-17 11:54:57 UTC (rev 28958)
@@ -66,6 +66,9 @@
<f:param name="t" value="${topicrow.id}"/>
<h:outputText value="${topicrow.subject}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${topicrow.subject}">
+ <f:param name="t" value="${topicrow.id}"/>
+ </h:commandLink>
</h3>
<!-- mini post navigator for this topic -->
@@ -76,12 +79,20 @@
<f:param name="page" value="0"/>
<h:outputText value="${1}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${1}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="0"/>
+ </h:commandLink>
 
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
<f:param name="t" value="#{topicrow.id}"/>
<f:param name="page" value="1"/>
<h:outputText value="${2}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${2}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="1"/>
+ </h:commandLink>
<c:if test="#{myForums.topicNavigator[topicrow.id].totalPages gt 2}">
 
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
@@ -89,6 +100,10 @@
<f:param name="page" value="2"/>
<h:outputText value="${3}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${3}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="2"/>
+ </h:commandLink>
</c:if>
<c:if test="#{myForums.topicNavigator[topicrow.id].totalPages gt 3}">
 … 
@@ -97,6 +112,10 @@
<f:param name="page" value="#{myForums.topicNavigator[topicrow.id].totalPages-1}"/>
<h:outputText value="${resource.Last_page}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${resource.Last_page}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="#{myForums.topicNavigator[topicrow.id].totalPages-1}"/>
+ </h:commandLink>
</c:if>
 )
</c:if>
@@ -113,6 +132,9 @@
<f:param name="uid" value="${topicrow.poster.user.id}"/>
<h:outputText value="${topicrow.poster.user.userName}"/>
</h:outputLink>
+ <h:commandLink action="viewProfile" value="${topicrow.poster.user.userName}">
+ <f:param name="uid" value="${topicrow.poster.user.id}"/>
+ </h:commandLink>
</c:otherwise>
</c:choose>
@@ -146,6 +168,9 @@
<f:param name="uid" value="#{myForums.topicsLastPosts[topicrow.id].poster.user.id}"/>
<h:outputText value="${myForums.topicsLastPosts[topicrow.id].poster.user.userName}"/>
</h:outputLink>
+ <h:commandLink action="viewProfile" value="${myForums.topicsLastPosts[topicrow.id].poster.user.userName}">
+ <f:param name="uid" value="#{myForums.topicsLastPosts[topicrow.id].poster.user.id}"/>
+ </h:commandLink>
</c:otherwise>
</c:choose>
@@ -187,6 +212,7 @@
<h:outputLink value="#{forums:outputLink(shared.links['myForumsAll'],true)}">
${resource.ViewAllSubscribed}
</h:outputLink>
+ <h:commandLink action="myForumsAll" value="${resource.ViewAllSubscribed}"/>
</td>
</tr>
<tr>
@@ -217,6 +243,9 @@
<f:param name="f" value="#{forumrow.id}"/>
<h:outputText value="#{forumrow.name}"/>
</h:outputLink>
+ <h:commandLink action="viewForum" value="#{forumrow.name}">
+ <f:param name="f" value="#{forumrow.id}"/>
+ </h:commandLink>
</h3>
${forumrow.description}
</td>
@@ -252,6 +281,9 @@
<f:param name="uid" value="#{myForums.forumsLastPosts[forumrow.id].poster.user.id}"/>
<h:outputText value="${myForums.forumsLastPosts[forumrow.id].poster.user.userName}"/>
</h:outputLink>
+ <h:commandLink action="viewProfile" value="${myForums.forumsLastPosts[forumrow.id].poster.user.userName}">
+ <f:param name="uid" value="#{myForums.forumsLastPosts[forumrow.id].poster.user.id}"/>
+ </h:commandLink>
</c:otherwise>
</c:choose>
@@ -294,6 +326,7 @@
<h:outputLink value="#{forums:outputLink(shared.links['myForumsEdit'],true)}">
${resource.EditAllSubscribed}
</h:outputLink>
+ <h:commandLink action="myForumsEdit" value="${resource.EditAllSubscribed}"/>
</td>
</tr>
<tr>
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/myforums/myforums_viewall.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/myforums/myforums_viewall.xhtml 2009-08-17 06:30:12 UTC (rev 28957)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/myforums/myforums_viewall.xhtml 2009-08-17 11:54:57 UTC (rev 28958)
@@ -70,6 +70,9 @@
<f:param name="t" value="${topicrow.id}"/>
<h:outputText value="${topicrow.subject}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${topicrow.subject}">
+ <f:param name="t" value="${topicrow.id}"/>
+ </h:commandLink>
</h3>
<!-- mini post navigator for this topic -->
@@ -80,12 +83,20 @@
<f:param name="page" value="0"/>
<h:outputText value="${1}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${1}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="0"/>
+ </h:commandLink>
 
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
<f:param name="t" value="#{topicrow.id}"/>
<f:param name="page" value="1"/>
<h:outputText value="${2}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${2}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="1"/>
+ </h:commandLink>
<c:if test="#{myForumsAll.topicNavigator[topicrow.id].totalPages gt 2}">
 
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
@@ -93,6 +104,10 @@
<f:param name="page" value="2"/>
<h:outputText value="${3}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="{3}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="2"/>
+ </h:commandLink>
</c:if>
<c:if test="#{myForumsAll.topicNavigator[topicrow.id].totalPages gt 3}">
 … 
@@ -101,6 +116,10 @@
<f:param name="page" value="#{myForumsAll.topicNavigator[topicrow.id].totalPages-1}"/>
<h:outputText value="${resource.Last_page}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${resource.Last_page}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="#{myForumsAll.topicNavigator[topicrow.id].totalPages-1}"/>
+ </h:commandLink>
</c:if>
 )
</c:if>
@@ -117,6 +136,9 @@
<f:param name="uid" value="${topicrow.poster.user.id}"/>
<h:outputText value="${topicrow.poster.user.userName}"/>
</h:outputLink>
+ <h:commandLink action="viewProfile" value="${topicrow.poster.user.userName}">
+ <f:param name="uid" value="${topicrow.poster.user.id}"/>
+ </h:commandLink>
</c:otherwise>
</c:choose>
@@ -148,6 +170,9 @@
<f:param name="uid" value="#{myForumsAll.topicsLastPosts[topicrow.id].poster.user.id}"/>
<h:outputText value="${myForumsAll.topicsLastPosts[topicrow.id].poster.user.userName}"/>
</h:outputLink>
+ <h:commandLink action="viewProfile" value="${myForumsAll.topicsLastPosts[topicrow.id].poster.user.userName}">
+ <f:param name="uid" value="#{myForumsAll.topicsLastPosts[topicrow.id].poster.user.id}"/>
+ </h:commandLink>
</c:otherwise>
</c:choose>
@@ -216,6 +241,9 @@
<f:param name="t" value="${topicrow.id}"/>
<h:outputText value="${topicrow.subject}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${topicrow.subject}">
+ <f:param name="t" value="${topicrow.id}"/>
+ </h:commandLink>
</h3>
<!-- mini post navigator for this topic -->
<c:if test="#{myForumsAll.topicNavigator[topicrow.id] ne null && myForumsAll.topicNavigator[topicrow.id].totalPages gt 1}">
@@ -225,12 +253,20 @@
<f:param name="page" value="0"/>
<h:outputText value="${1}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${1}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="0"/>
+ </h:commandLink>
 
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
<f:param name="t" value="#{topicrow.id}"/>
<f:param name="page" value="1"/>
<h:outputText value="${2}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${2}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="1"/>
+ </h:commandLink>
<c:if test="#{myForumsAll.topicNavigator[topicrow.id].totalPages gt 2}">
 
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
@@ -238,6 +274,10 @@
<f:param name="page" value="2"/>
<h:outputText value="${3}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${3}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="2"/>
+ </h:commandLink>
</c:if>
<c:if test="#{myForumsAll.topicNavigator[topicrow.id].totalPages gt 3}">
 … 
@@ -246,6 +286,10 @@
<f:param name="page" value="#{myForumsAll.topicNavigator[topicrow.id].totalPages-1}"/>
<h:outputText value="${resource.Last_page}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${resource.Last_page}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="#{myForumsAll.topicNavigator[topicrow.id].totalPages-1}"/>
+ </h:commandLink>
</c:if>
 )
</c:if>
@@ -262,6 +306,9 @@
<f:param name="uid" value="${topicrow.poster.user.id}"/>
<h:outputText value="${topicrow.poster.user.userName}"/>
</h:outputLink>
+ <h:commandLink action="viewProfile" value="${topicrow.poster.user.userName}">
+ <f:param name="uid" value="${topicrow.poster.user.id}"/>
+ </h:commandLink>
</c:otherwise>
</c:choose>
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/profile/viewprofile_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/profile/viewprofile_body.xhtml 2009-08-17 06:30:12 UTC (rev 28957)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/profile/viewprofile_body.xhtml 2009-08-17 11:54:57 UTC (rev 28958)
@@ -44,6 +44,7 @@
<h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
<h:outputText value="#{shared.mainPageName}"/>
</h:outputLink>
+ <h:commandLink action="viewCategory" value="#{shared.mainPageName}"/>
<ul>
<li>
@@ -52,6 +53,9 @@
<f:param name="uid" value="${profile.poster.user.id}"/>
<h:outputText value="${resource.L_VIEWING_PROFILE}"/>
</h:outputLink>
+ <h:commandLink action="viewProfile" value="${resource.L_VIEWING_PROFILE}">
+ <f:param name="uid" value="${profile.poster.user.id}"/>
+ </h:commandLink>
</li>
</ul>
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/search/view_asposts.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/search/view_asposts.xhtml 2009-08-17 06:30:12 UTC (rev 28957)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/search/view_asposts.xhtml 2009-08-17 11:54:57 UTC (rev 28958)
@@ -70,13 +70,19 @@
<h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
<f:param name="page" value="0"/>
<h:outputText value="${resource.First}"/>
- </h:outputLink>
+ </h:outputLink>
+ <h:commandLink action="viewSearchResults" value="${resource.First}">
+ <f:param name="page" value="0"/>
+ </h:commandLink>
</li>
<li>
<h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
<f:param name="page" value="${viewSearch.pageNavigator.currentPage-1}"/>
<h:outputText value="< ${resource.Previous}"/>
- </h:outputLink>
+ </h:outputLink>
+ <h:commandLink action="viewSearchResults" value="< ${resource.Previous}">
+ <f:param name="page" value="${viewSearch.pageNavigator.currentPage-1}"/>
+ </h:commandLink>
</li>
</c:otherwise>
</c:choose>
@@ -87,6 +93,9 @@
<f:param name="page" value="${pageNumber-1}"/>
<h:outputText value="${pageNumber}"/>
</h:outputLink>
+ <h:commandLink action="viewSearchResults" value="${pageNumber}">
+ <f:param name="page" value="${pageNumber-1}"/>
+ </h:commandLink>
</li>
</c:forEach>
@@ -100,6 +109,9 @@
<f:param name="page" value="${pageNumber-1}"/>
<h:outputText value="${pageNumber}"/>
</h:outputLink>
+ <h:commandLink action="viewSearchResults" value="${pageNumber}">
+ <f:param name="page" value="${pageNumber-1}"/>
+ </h:commandLink>
</li>
</c:forEach>
@@ -118,12 +130,18 @@
<f:param name="page" value="${viewSearch.pageNavigator.currentPage+1}"/>
<h:outputText value="${resource.Next} >"/>
</h:outputLink>
+ <h:commandLink action="viewSearchResults" value="${resource.Next} >">
+ <f:param name="page" value="${viewSearch.pageNavigator.currentPage+1}"/>
+ </h:commandLink>
</li>
<li>
<h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
<f:param name="page" value="${viewSearch.pageNavigator.totalPages-1}"/>
<h:outputText value="${resource.Last}"/>
</h:outputLink>
+ <h:commandLink action="viewSearchResults" value="${resource.Last}">
+ <f:param name="page" value="${viewSearch.pageNavigator.totalPages-1}"/>
+ </h:commandLink>
</li>
</c:otherwise>
</c:choose>
@@ -153,6 +171,9 @@
<f:param name="uid" value="${postrow.poster.user.id}"/>
<h:outputText value="${postrow.poster.user.userName}"/>
</h:outputLink>
+ <h:commandLink action="viewProfile" value="${postrow.poster.user.userName}">
+ <f:param name="uid" value="${postrow.poster.user.id}"/>
+ </h:commandLink>
</c:otherwise>
</c:choose>
@@ -170,6 +191,11 @@
<h:outputText value="${resource.Permalink}"/>
</f:verbatim>
</h:outputLink>
+ <h:commandLink action="#{forums:postPermlink(postrow.id)}" style="text-decoration: none;">
+ <f:verbatim>
+ <h:outputText value="${resource.Permalink}"/>
+ </f:verbatim>
+ </h:commandLink>
</li>
<li>${resource.Posted}: #{forums:dateStr(postrow.createDate)}</li>
<li>${resource.Post_subject}: ${postrow.message.subject}</li>
@@ -237,6 +263,15 @@
alt="${resource.Read_profile}"/>
</f:verbatim>
</h:outputLink>
+ <h:commandLink action="viewProfile">
+ <f:param name="uid"
+ value="#{postrow.poster.user.id}"/>
+ <f:verbatim>
+ <img border="0"
+ src="#{forums:themeURL('resourceIconProfileURL')}"
+ alt="${resource.Read_profile}"/>
+ </f:verbatim>
+ </h:commandLink>
</li>
<c:if test="${forums:userProperty(postrow.poster.user,'INFO_USER_EMAIL_FAKE') ne null}">
@@ -296,6 +331,15 @@
alt="${resource.Read_profile}"/>
</f:verbatim>
</h:outputLink>
+ <h:commandLink action="viewProfile">
+ <f:param name="uid"
+ value="#{postrow.poster.user.id}"/>
+ <f:verbatim>
+ <img border="0"
+ src="#{forums:themeURL('resourceIconMSNMURL')}"
+ alt="${resource.Read_profile}"/>
+ </f:verbatim>
+ </h:commandLink>
</li>
</c:if>
<c:if test="${forums:userProperty(postrow.poster.user,'INFO_USER_IM_ICQ') ne null}">
@@ -346,13 +390,19 @@
<h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
<f:param name="page" value="0"/>
<h:outputText value="${resource.First}"/>
- </h:outputLink>
+ </h:outputLink>
+ <h:commandLink action="viewSearchResults" value="${resource.First}">
+ <f:param name="page" value="0"/>
+ </h:commandLink>
</li>
<li>
<h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
<f:param name="page" value="${viewSearch.pageNavigator.currentPage-1}"/>
<h:outputText value="< ${resource.Previous}"/>
</h:outputLink>
+ <h:commandLink action="viewSearchResults" value="< ${resource.Previous}">
+ <f:param name="page" value="${viewSearch.pageNavigator.currentPage-1}"/>
+ </h:commandLink>
</li>
</c:otherwise>
</c:choose>
@@ -363,6 +413,9 @@
<f:param name="page" value="${pageNumber-1}"/>
<h:outputText value="${pageNumber}"/>
</h:outputLink>
+ <h:commandLink action="viewSearchResults" value="${pageNumber}">
+ <f:param name="page" value="${pageNumber-1}"/>
+ </h:commandLink>
</li>
</c:forEach>
@@ -376,6 +429,9 @@
<f:param name="page" value="${pageNumber-1}"/>
<h:outputText value="${pageNumber}"/>
</h:outputLink>
+ <h:commandLink action="viewSearchResults" value="${pageNumber}">
+ <f:param name="page" value="${pageNumber-1}"/>
+ </h:commandLink>
</li>
</c:forEach>
@@ -394,12 +450,18 @@
<f:param name="page" value="${viewSearch.pageNavigator.currentPage+1}"/>
<h:outputText value="${resource.Next} >"/>
</h:outputLink>
+ <h:commandLink action="viewSearchResults" value="${resource.Next} >">
+ <f:param name="page" value="${viewSearch.pageNavigator.currentPage+1}"/>
+ </h:commandLink>
</li>
<li>
<h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
<f:param name="page" value="${viewSearch.pageNavigator.totalPages-1}"/>
<h:outputText value="${resource.Last}"/>
</h:outputLink>
+ <h:commandLink action="viewSearchResults" value="${resource.Last}">
+ <f:param name="page" value="${viewSearch.pageNavigator.totalPages-1}"/>
+ </h:commandLink>
</li>
</c:otherwise>
</c:choose>
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/search/view_astopics.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/search/view_astopics.xhtml 2009-08-17 06:30:12 UTC (rev 28957)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/search/view_astopics.xhtml 2009-08-17 11:54:57 UTC (rev 28958)
@@ -71,12 +71,18 @@
<f:param name="page" value="0"/>
<h:outputText value="${resource.First}"/>
</h:outputLink>
+ <h:commandLink action="viewSearchResults" value="${resource.First}">
+ <f:param name="page" value="0"/>
+ </h:commandLink>
</li>
<li>
<h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
<f:param name="page" value="${viewSearch.pageNavigator.currentPage-1}"/>
<h:outputText value="< ${resource.Previous}"/>
- </h:outputLink>
+ </h:outputLink>
+ <h:commandLink action="viewSearchResults" value="< ${resource.Previous}">
+ <f:param name="page" value="${viewSearch.pageNavigator.currentPage-1}"/>
+ </h:commandLink>
</li>
</c:otherwise>
</c:choose>
@@ -87,6 +93,9 @@
<f:param name="page" value="${pageNumber-1}"/>
<h:outputText value="${pageNumber}"/>
</h:outputLink>
+ <h:commandLink action="viewSearchResults" value="${pageNumber}">
+ <f:param name="page" value="${pageNumber-1}"/>
+ </h:commandLink>
</li>
</c:forEach>
@@ -100,6 +109,9 @@
<f:param name="page" value="${pageNumber-1}"/>
<h:outputText value="${pageNumber}"/>
</h:outputLink>
+ <h:commandLink action="viewSearchResults" value="${pageNumber}">
+ <f:param name="page" value="${pageNumber-1}"/>
+ </h:commandLink>
</li>
</c:forEach>
@@ -118,12 +130,18 @@
<f:param name="page" value="${viewSearch.pageNavigator.currentPage+1}"/>
<h:outputText value="${resource.Next} >"/>
</h:outputLink>
+ <h:commandLink action="viewSearchResults" value="${resource.Next} >">
+ <f:param name="page" value="${viewSearch.pageNavigator.currentPage+1}"/>
+ </h:commandLink>
</li>
<li>
<h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
<f:param name="page" value="${viewSearch.pageNavigator.totalPages-1}"/>
<h:outputText value="${resource.Last}"/>
</h:outputLink>
+ <h:commandLink action="viewSearchResults" value="${resource.Last}">
+ <f:param name="page" value="${viewSearch.pageNavigator.totalPages-1}"/>
+ </h:commandLink>
</li>
</c:otherwise>
</c:choose>
@@ -156,6 +174,9 @@
<f:param name="t" value="${topicrow.id}"/>
<h:outputText value="${topicrow.subject}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${topicrow.subject}">
+ <f:param name="t" value="${topicrow.id}"/>
+ </h:commandLink>
</h3>
<!-- mini post navigator for this topic -->
@@ -166,12 +187,20 @@
<f:param name="page" value="0"/>
<h:outputText value="${1}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${1}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="0"/>
+ </h:commandLink>
 
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
<f:param name="t" value="#{topicrow.id}"/>
<f:param name="page" value="1"/>
<h:outputText value="${2}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${2}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="1"/>
+ </h:commandLink>
<c:if test="#{forum.topicNavigator[topicrow.id].totalPages gt 2}">
 
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
@@ -179,6 +208,10 @@
<f:param name="page" value="2"/>
<h:outputText value="${3}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="{3}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="2"/>
+ </h:commandLink>
</c:if>
<c:if test="#{forum.topicNavigator[topicrow.id].totalPages gt 3}">
 … 
@@ -187,6 +220,10 @@
<f:param name="page" value="#{forum.topicNavigator[topicrow.id].totalPages-1}"/>
<h:outputText value="${resource.Last_page}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${resource.Last_page}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ <f:param name="page" value="#{forum.topicNavigator[topicrow.id].totalPages-1}"/>
+ </h:commandLink>
</c:if>
 )
</c:if>
@@ -203,6 +240,9 @@
<f:param name="uid" value="${topicrow.poster.user.id}"/>
<h:outputText value="${topicrow.poster.user.userName}"/>
</h:outputLink>
+ <h:commandLink action="viewProfile" value="${topicrow.poster.user.userName}">
+ <f:param name="uid" value="${topicrow.poster.user.id}"/>
+ </h:commandLink>
</c:otherwise>
</c:choose>
@@ -238,6 +278,9 @@
<f:param name="uid" value="#{viewSearch.topicLastPosts[topicrow.id].poster.user.id}"/>
<h:outputText value="${viewSearch.topicLastPosts[topicrow.id].poster.user.userName}"/>
</h:outputLink>
+ <h:commandLink action="viewProfile" value="${viewSearch.topicLastPosts[topicrow.id].poster.user.userName}">
+ <f:param name="uid" value="#{viewSearch.topicLastPosts[topicrow.id].poster.user.id}"/>
+ </h:commandLink>
</c:otherwise>
</c:choose>
@@ -277,12 +320,18 @@
<f:param name="page" value="0"/>
<h:outputText value="${resource.First}"/>
</h:outputLink>
+ <h:commandLink action="" value="${resource.First}">
+ <f:param name="page" value="0"/>
+ </h:commandLink>
</li>
<li>
<h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
<f:param name="page" value="${viewSearch.pageNavigator.currentPage-1}"/>
<h:outputText value="< ${resource.Previous}"/>
- </h:outputLink>
+ </h:outputLink>
+ <h:commandLink action="viewSearchResults" value="< ${resource.Previous}">
+ <f:param name="page" value="${viewSearch.pageNavigator.currentPage-1}"/>
+ </h:commandLink>
</li>
</c:otherwise>
</c:choose>
@@ -293,6 +342,9 @@
<f:param name="page" value="${pageNumber-1}"/>
<h:outputText value="${pageNumber}"/>
</h:outputLink>
+ <h:commandLink action="viewSearchResults" value="${pageNumber}">
+ <f:param name="page" value="${pageNumber-1}"/>
+ </h:commandLink>
</li>
</c:forEach>
@@ -306,6 +358,9 @@
<f:param name="page" value="${pageNumber-1}"/>
<h:outputText value="${pageNumber}"/>
</h:outputLink>
+ <h:commandLink action="viewSearchResults" value="${pageNumber}">
+ <f:param name="page" value="${pageNumber-1}"/>
+ </h:commandLink>
</li>
</c:forEach>
@@ -324,12 +379,18 @@
<f:param name="page" value="${viewSearch.pageNavigator.currentPage+1}"/>
<h:outputText value="${resource.Next} >"/>
</h:outputLink>
+ <h:commandLink action="viewSearchResults" value="${resource.Next} >">
+ <f:param name="page" value="${viewSearch.pageNavigator.currentPage+1}"/>
+ </h:commandLink>
</li>
<li>
<h:outputLink value="#{forums:outputLink(shared.links['searchResults'],true)}">
<f:param name="page" value="${viewSearch.pageNavigator.totalPages-1}"/>
<h:outputText value="${resource.Last}"/>
</h:outputLink>
+ <h:commandLink action="viewSearchResults" value="${resource.Last}">
+ <f:param name="page" value="${viewSearch.pageNavigator.totalPages-1}"/>
+ </h:commandLink>
</li>
</c:otherwise>
</c:choose>
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/search/viewsearch_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/search/viewsearch_body.xhtml 2009-08-17 06:30:12 UTC (rev 28957)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/search/viewsearch_body.xhtml 2009-08-17 11:54:57 UTC (rev 28958)
@@ -37,7 +37,7 @@
<c:choose>
<c:when test="#{search.initialized}">
-
+ <h:form>
<div class="forumbread">
<ul>
<li class="first">
@@ -45,13 +45,13 @@
<h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
<h:outputText value="#{shared.mainPageName}"/>
</h:outputLink>
+ <h:commandLink action="viewCategory" value="#{shared.mainPageName}"/>
</li>
</ul>
</div>
- <h:form>
<table width="100%" border="0" cellpadding="0" cellspacing="0" class="forumtablestyle">
<tr class="header">
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/summary/viewsummary_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/summary/viewsummary_body.xhtml 2009-08-17 06:30:12 UTC (rev 28957)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/summary/viewsummary_body.xhtml 2009-08-17 11:54:57 UTC (rev 28958)
@@ -40,7 +40,8 @@
<li class="first">
<h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
<h:outputText value="#{shared.mainPageName}"/>
- </h:outputLink>
+ </h:outputLink>
+ <h:commandLink value="#{shared.mainPageName}"/>
</li>
</ul>
</div>
@@ -61,7 +62,10 @@
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}" id="_${status.index}">
<f:param name="t" value="#{topicrow.id}"/>
<h:outputText value="#{topicrow.subject}"/>
- </h:outputLink>
+ </h:outputLink>
+ <h:commandLink action="viewTopic" value="#{topicrow.subject}" id="_${status.index}">
+ <f:param name="t" value="#{topicrow.id}"/>
+ </h:commandLink>
</td>
</tr>
</c:forEach>
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/attachmentsview.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/attachmentsview.xhtml 2009-08-17 06:30:12 UTC (rev 28957)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/attachmentsview.xhtml 2009-08-17 11:54:57 UTC (rev 28958)
@@ -54,6 +54,9 @@
<f:param name="id" value="${attachment.id}"/>
${resource.Download}
</h:outputLink>
+ <h:commandLink action="#{forums:contextPath()}/downloadAttachment" value="${resource.Download}">
+ <f:param name="id" value="${attachment.id}"/>
+ </h:commandLink>
</td>
</tr>
<tr>
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml 2009-08-17 06:30:12 UTC (rev 28957)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml 2009-08-17 11:54:57 UTC (rev 28958)
@@ -51,6 +51,7 @@
<h:outputLink id="outputLink1" value="#{forums:outputLink(shared.links['category'],true)}">
<h:outputText value="#{shared.mainPageName}"/>
</h:outputLink>
+ <h:commandLink action="viewCategory" id="outputLink1" value="#{shared.mainPageName}"/>
<ul>
<li>>
@@ -58,6 +59,9 @@
<f:param name="c" value="#{topic.topic.forum.category.id}"/>
<h:outputText value="#{topic.topic.forum.category.title}"/>
</h:outputLink>
+ <h:commandLink action="viewCategory" id="outputLink2" value="#{topic.topic.forum.category.title}">
+ <f:param name="c" value="#{topic.topic.forum.category.id}"/>
+ </h:commandLink>
<ul>
<li>>
@@ -65,6 +69,10 @@
<f:param name="f" value="#{topic.topic.forum.id}"/>
<h:outputText value="#{topic.topic.forum.name}"/>
</h:outputLink>
+ <h:commandLink action="viewForum" id="outputLink3" value="#{topic.topic.forum.name}">
+ <f:param name="f" value="#{topic.topic.forum.id}"/>
+ <h:outputText value="#{topic.topic.forum.name}"/>
+ </h:commandLink>
<ul>
<li>>
@@ -72,7 +80,11 @@
<f:param name="f" value="#{topic.topic.forum.id}"/>
<f:param name="t" value="#{topic.topic.id}"/>
<h:outputText value="#{topic.topic.subject}"/>
- </h:outputLink>
+ </h:outputLink>
+ <h:commandLink action="viewTopic" id="outputLink4" value="#{topic.topic.subject}">
+ <f:param name="f" value="#{topic.topic.forum.id}"/>
+ <f:param name="t" value="#{topic.topic.id}"/>
+ </h:commandLink>
</li>
</ul>
@@ -129,6 +141,14 @@
border="0"
id="subscribe" />
</h:outputLink>
+ <h:commandLink action="topicWatch" id="outputLink5">
+ <f:param name="t" value="#{topic.topic.id}"/>
+ <img src="#{forums:themeURL('resourceIconSubscribeURL')}"
+ alt="${resource.Subscribe_to_topic}"
+ name="subscribe"
+ border="0"
+ id="subscribe" />
+ </h:commandLink>
</c:otherwise>
</c:choose>
@@ -170,13 +190,21 @@
<f:param name="page" value="0"/>
<h:outputText value="${resource.First}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" id="outputLink6" value="${resource.First}">
+ <f:param name="t" value="#{topic.topic.id}"/>
+ <f:param name="page" value="0"/>
+ </h:commandLink>
</li>
<li>
<h:outputLink id="outputLink7" value="#{forums:outputLink(shared.links['topic'],true)}">
<f:param name="t" value="#{topic.topic.id}"/>
<f:param name="page" value="${topic.pageNavigator.currentPage-1}"/>
<h:outputText value="< ${resource.Previous}"/>
- </h:outputLink>
+ </h:outputLink>
+ <h:commandLink action="viewTopic" id="outputLink7" value="< ${resource.Previous}">
+ <f:param name="t" value="#{topic.topic.id}"/>
+ <f:param name="page" value="${topic.pageNavigator.currentPage-1}"/>
+ </h:commandLink>
</li>
</c:otherwise>
</c:choose>
@@ -188,6 +216,10 @@
<f:param name="page" value="${pageNumber-1}"/>
<h:outputText value="${pageNumber}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" id="_${pageNumber-1}outputLink8" value="${pageNumber}">
+ <f:param name="t" value="#{topic.topic.id}"/>
+ <f:param name="page" value="${pageNumber-1}"/>
+ </h:commandLink>
</li>
</c:forEach>
@@ -202,6 +234,10 @@
<f:param name="page" value="${pageNumber-1}"/>
<h:outputText value="${pageNumber}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" id="_${pageNumber-1}outputLink9" value="${pageNumber}">
+ <f:param name="t" value="#{topic.topic.id}"/>
+ <f:param name="page" value="${pageNumber-1}"/>
+ </h:commandLink>
</li>
</c:forEach>
@@ -221,6 +257,10 @@
<f:param name="page" value="${topic.pageNavigator.currentPage+1}"/>
<h:outputText value="${resource.Next} >"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" id="outputLink10" value="${resource.Next} >">
+ <f:param name="t" value="#{topic.topic.id}"/>
+ <f:param name="page" value="${topic.pageNavigator.currentPage+1}"/>
+ </h:commandLink>
</li>
<li>
<h:outputLink id="outputLink11" value="#{forums:outputLink(shared.links['topic'],true)}">
@@ -228,6 +268,10 @@
<f:param name="page" value="${topic.pageNavigator.totalPages-1}"/>
<h:outputText value="${resource.Last}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" id="outputLink11" value="${resource.Last}">
+ <f:param name="t" value="#{topic.topic.id}"/>
+ <f:param name="page" value="${topic.pageNavigator.totalPages-1}"/>
+ </h:commandLink>
</li>
</c:otherwise>
</c:choose>
@@ -347,6 +391,9 @@
<f:param name="uid" value="${postrow.poster.user.id}"/>
<h:outputText value="${postrow.poster.user.userName}"/>
</h:outputLink>
+ <h:commandLink action="viewProfile" id="_#{postrow.id}outputLink12" value="${postrow.poster.user.userName}">
+ <f:param name="uid" value="${postrow.poster.user.id}"/>
+ </h:commandLink>
</c:otherwise>
</c:choose>
@@ -410,6 +457,14 @@
<img border="0" src="#{forums:themeURL('resourceIconDelpostURL')}"/>
</f:verbatim>
</h:outputLink>
+ <h:commandLink action="deletePost" id="_#{postrow.id}outputLink14">
+ <f:param name="p" value="#{postrow.id}"/>
+ <f:param name="t" value="#{topic.topic.id}"/>
+ <f:param name="f" value="#{topic.topic.forum.id}"/>
+ <f:verbatim>
+ <img border="0" src="#{forums:themeURL('resourceIconDelpostURL')}"/>
+ </f:verbatim>
+ </h:commandLink>
</li>
</forums:isAllowed>
@@ -424,6 +479,7 @@
<h:outputLink id="_${postrow.id}outputLink15" value="#{forums:postPermlink(postrow.id)}" style="text-decoration: none;">
<h:outputText value="${resource.Permalink}"/>
</h:outputLink>
+ <h:commandLink action="#{forums:postPermlink(postrow.id)}" id="_${postrow.id}outputLink15" value="${resource.Permalink}" style="text-decoration: none;"/>
</li>
<li>${resource.Posted}: #{forums:dateStr(postrow.createDate)}</li>
<li>${resource.Post_subject}: ${postrow.message.subject}</li>
@@ -491,6 +547,15 @@
alt="${resource.Read_profile}"/>
</f:verbatim>
</h:outputLink>
+ <h:commandLink action="viewProfile" id="_${postrow.id}outputLink16">
+ <f:param name="uid"
+ value="#{postrow.poster.user.id}"/>
+ <f:verbatim>
+ <img border="0"
+ src="#{forums:themeURL('resourceIconProfileURL')}"
+ alt="${resource.Read_profile}"/>
+ </f:verbatim>
+ </h:commandLink>
</li>
<!-- TODO: WAITING FOR MISSING FUNCTIONALITY -->
@@ -564,6 +629,15 @@
alt="${resource.Read_profile}"/>
</f:verbatim>
</h:outputLink>
+ <h:commandLink action="viewProfile" id="_${postrow.id}outputLink17">
+ <f:param name="uid"
+ value="#{postrow.poster.user.id}"/>
+ <f:verbatim>
+ <img border="0"
+ src="#{forums:themeURL('resourceIconMSNMURL')}"
+ alt="${resource.Read_profile}"/>
+ </f:verbatim>
+ </h:commandLink>
</li>
</c:if>
<c:if test="${forums:userProperty(postrow.poster.user,'INFO_USER_IM_ICQ') ne null}">
@@ -656,6 +730,10 @@
<f:param name="page" value="0"/>
<h:outputText value="${resource.First}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" id="outputLink18" value="${resource.First}">
+ <f:param name="t" value="#{topic.topic.id}"/>
+ <f:param name="page" value="0"/>
+ </h:commandLink>
</li>
<li>
<h:outputLink id="outputLink19" value="#{forums:outputLink(shared.links['topic'],true)}">
@@ -663,6 +741,10 @@
<f:param name="page" value="${topic.pageNavigator.currentPage-1}"/>
<h:outputText value="< ${resource.Previous}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" id="outputLink19" value="< ${resource.Previous}">
+ <f:param name="t" value="#{topic.topic.id}"/>
+ <f:param name="page" value="${topic.pageNavigator.currentPage-1}"/>
+ </h:commandLink>
</li>
</c:otherwise>
</c:choose>
@@ -674,6 +756,10 @@
<f:param name="page" value="${pageNumber-1}"/>
<h:outputText value="${pageNumber}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" id="_${pageNumber-1}outputLink20" value="${pageNumber}">
+ <f:param name="t" value="#{topic.topic.id}"/>
+ <f:param name="page" value="${pageNumber-1}"/>
+ </h:commandLink>
</li>
</c:forEach>
@@ -688,6 +774,10 @@
<f:param name="page" value="${pageNumber-1}"/>
<h:outputText value="${pageNumber}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" id="_${pageNumber-1}outputLink21" value="${pageNumber}">
+ <f:param name="t" value="#{topic.topic.id}"/>
+ <f:param name="page" value="${pageNumber-1}"/>
+ </h:commandLink>
</li>
</c:forEach>
@@ -707,6 +797,10 @@
<f:param name="page" value="${topic.pageNavigator.currentPage+1}"/>
<h:outputText value="${resource.Next} >"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" id="outputLink22" value="${resource.Next} >">
+ <f:param name="t" value="#{topic.topic.id}"/>
+ <f:param name="page" value="${topic.pageNavigator.currentPage+1}"/>
+ </h:commandLink>
</li>
<li>
<h:outputLink id="outputLink23" value="#{forums:outputLink(shared.links['topic'],true)}">
@@ -714,6 +808,10 @@
<f:param name="page" value="${topic.pageNavigator.totalPages-1}"/>
<h:outputText value="${resource.Last}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" id="outputLink23" value="${resource.Last}">
+ <f:param name="t" value="#{topic.topic.id}"/>
+ <f:param name="page" value="${topic.pageNavigator.totalPages-1}"/>
+ </h:commandLink>
</li>
</c:otherwise>
</c:choose>
@@ -935,6 +1033,14 @@
alt="${resource.Split_topic}"/>
</f:verbatim>
</h:outputLink>
+ <h:commandLink action="viewModeratorSplit" id="outputLink24">
+ <f:param name="t" value="#{topic.topic.id}"/>
+ <f:verbatim>
+ <img width="17" height="17" border="0"
+ src="#{forums:themeURL('resourceTopicModSplitURL')}"
+ alt="${resource.Split_topic}"/>
+ </f:verbatim>
+ </h:commandLink>
</li>
</forums:isAllowed>
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_ballot.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_ballot.xhtml 2009-08-17 06:30:12 UTC (rev 28957)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_ballot.xhtml 2009-08-17 11:54:57 UTC (rev 28958)
@@ -70,6 +70,10 @@
<f:param name="results" value="1"/>
<h:outputText value="${resource.View_results}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${resource.View_results}">
+ <f:param name="t" value="${t}"/>
+ <f:param name="results" value="1"/>
+ </h:commandLink>
</td>
</tr>
</table>
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_result.xhtml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_result.xhtml 2009-08-17 06:30:12 UTC (rev 28957)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_result.xhtml 2009-08-17 11:54:57 UTC (rev 28958)
@@ -80,6 +80,9 @@
<f:param name="t" value="${t}"/>
<h:outputText value="${resource.View_ballot}"/>
</h:outputLink>
+ <h:commandLink action="viewTopic" value="${resource.View_ballot}">
+ <f:param name="t" value="${t}"/>
+ </h:commandLink>
</td>
</tr>
</forums:isAllowed>
More information about the jboss-svn-commits
mailing list