[jboss-svn-commits] JBL Code SVN: r16924 - in labs/jbossforums/branches/forums101P26/forums/src: resources/portal-forums-war/views/common and 1 other directories.

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

Author: sviluppatorefico
Date: 2007-11-29 18:20:49 -0500 (Thu, 29 Nov 2007)
New Revision: 16924

Modified:
   labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/properties/TCCLXProperties.java
   labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/common/common.xhtml
   labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/common/common_noMenu.xhtml
   labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/attachmentsview.xhtml
Log:
[JBFORUMS-266] I put off hard coded links and I add use of JSFUtil

Modified: labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/properties/TCCLXProperties.java
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/properties/TCCLXProperties.java	2007-11-29 23:20:00 UTC (rev 16923)
+++ labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/properties/TCCLXProperties.java	2007-11-29 23:20:49 UTC (rev 16924)
@@ -18,6 +18,7 @@
 import java.util.Properties;
 
 import org.jboss.portlet.forums.ForumsConstants;
+import org.jboss.portlet.forums.ui.JSFUtil;
 import org.jboss.portal.common.util.Tools;
 
 /**
@@ -75,9 +76,8 @@
          {
             Map.Entry entry = (Map.Entry)i.next();
 
-            // TODO: remove hardcoded link
             urls.put(entry.getKey(),
-               "/portal-forums/" + ForumsConstants.THEMENAME + "/" + entry.getValue());
+            		JSFUtil.getContextPath() + "/" + ForumsConstants.THEMENAME + "/" + entry.getValue());
          }
       }
       finally

Modified: labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/common/common.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/common/common.xhtml	2007-11-29 23:20:00 UTC (rev 16923)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/common/common.xhtml	2007-11-29 23:20:49 UTC (rev 16924)
@@ -33,7 +33,7 @@
 	<!-- stylesheet for this application -->
 	<link rel='stylesheet' 
           type='text/css'
-          href='/portal-forums/default_graphics/forums_styles.css'
+          href='#{forums:contextPath()}/default_graphics/forums_styles.css'
           media='screen'/>
 
 	<!-- resourceBundle to be used by this entire application -->

Modified: labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/common/common_noMenu.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/common/common_noMenu.xhtml	2007-11-29 23:20:00 UTC (rev 16923)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/common/common_noMenu.xhtml	2007-11-29 23:20:49 UTC (rev 16924)
@@ -33,7 +33,7 @@
 	<!-- stylesheet for this application -->
 	<link rel='stylesheet' 
           type='text/css'
-          href='/portal-forums/default_graphics/forums_styles.css'
+          href='#{forums:contextPath()}/default_graphics/forums_styles.css'
           media='screen'/>
 
 	<!-- resourceBundle to be used by this entire application -->

Modified: labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/attachmentsview.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/attachmentsview.xhtml	2007-11-29 23:20:00 UTC (rev 16923)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/attachmentsview.xhtml	2007-11-29 23:20:49 UTC (rev 16924)
@@ -49,7 +49,7 @@
             ${attachment.comment}
         </td>
         <td rowspan="3" class="downloadCell">
-            <h:outputLink value="/portal-forums/downloadAttachment">
+            <h:outputLink value="#{forums:contextPath()}/downloadAttachment">
                 <f:param name="id" value="${attachment.id}"/>
                 ${resource.Download}
             </h:outputLink>
@@ -84,7 +84,7 @@
             </table>
          </td>
          <td rowspan="4" align="center" width="10%" class="attachrow"><br/>
-            <h:outputLink value="/portal-forums/downloadAttachment" styleClass="genmed">
+            <h:outputLink value="#{forums:contextPath()}/downloadAttachment" styleClass="genmed">
                 <f:param name="id" value="${attachment.id}"/>
                 <b>${resource.Download} </b>
             </h:outputLink>