[jboss-svn-commits] JBL Code SVN: r9711 - in labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war: views/common and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Feb 22 16:10:35 EST 2007
Author: unibrew
Date: 2007-02-22 16:10:34 -0500 (Thu, 22 Feb 2007)
New Revision: 9711
Modified:
labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties
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
Log:
[JBFORUMS-167] common.xhtml and common_noMenu.xhtml templates for Forums pages rewritten.
Modified: labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties 2007-02-22 21:08:16 UTC (rev 9710)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties 2007-02-22 21:10:34 UTC (rev 9711)
@@ -108,6 +108,7 @@
Admin_panel=Administration
Home=Home
+My_Forums=My Forums
Board_disable=Sorry, but this board is currently unavailable. Please try again later.
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-02-22 21:08:16 UTC (rev 9710)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/common/common.xhtml 2007-02-22 21:10:34 UTC (rev 9711)
@@ -28,67 +28,72 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
- class="bb"
+ class="forumscontainer"
>
<!-- stylesheet for this application -->
- <link rel='stylesheet' type='text/css' href='/portal-forums/subSilver/styles.css' media='screen'/>
+ <link rel='stylesheet'
+ type='text/css'
+ href='/portal-forums/default_graphics/forums_styles.css'
+ media='screen'/>
<!-- resourceBundle to be used by this entire application -->
<f:loadBundle basename="ResourceJSF" var="resource"/>
- <!-- display the function tray -->
- <div align="center">
- <table cellspacing="0" cellpadding="2" border="0">
- <tr>
- <td align="center" valign="top" nowrap="nowrap">
- <span class="mainmenu">  
- <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}" styleClass="mainmenu">
- <img src="/portal-forums/subSilver/images/icon_mini_search.gif" width="12" height="13" border="0" alt="Home" hspace="3"/>
- ${resource.Home}
- </h:outputLink>  
- </span>
- <c:if test="#{shared.anonymous==false && forums:isRunningInPortal()==false}">
- <span class="mainmenu">  
- <h:outputLink value="#{forums:outputLink(shared.links['pref'],true)}" styleClass="mainmenu">
- <img src="/portal-forums/subSilver/images/icon_mini_watch.gif" width="12" height="13" border="0" alt="Preferences" hspace="3"/>
- ${resource.Preferences}
- </h:outputLink>  
- </span>
- </c:if>
- <c:if test="#{shared.anonymous==false}">
- <span class="mainmenu">  
- <h:outputLink value="#{forums:outputLink(shared.links['forumWatch'],true)}" styleClass="mainmenu">
- <img src="/portal-forums/subSilver/images/icon_mini_watch.gif" width="12" height="13" border="0" alt="Watched Forums" hspace="3"/>
- ${resource.Watched_Forums}
- </h:outputLink>  
- </span>
- </c:if>
- <c:if test="#{shared.anonymous==false}">
- <forums:isAllowed fragment="acl://accessAdminTool">
- <span class="mainmenu">  
- <h:outputLink value="#{forums:outputLink(shared.links['admin'],true)}" styleClass="mainmenu">
- <img src="/portal-forums/subSilver/images/icon_mini_admin.gif" width="12" height="13" border="0" alt="Administration" hspace="3"/>
- ${resource.Admin_panel}
- </h:outputLink>  
- </span>
- </forums:isAllowed>
- </c:if>
- </td>
- </tr>
- </table>
- </div>
-
- <!-- body of the page -->
+ <!-- display the function tray -->
+ <div class="forumsectionhdr">
+ <ul>
+
+ <li>
+ <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
+ ${resource.Home}
+ </h:outputLink>
+ </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['forumWatch'],true)}"
+ styleClass="mainmenu">
+ ${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>
+
+ <!-- body of the page -->
<c:choose>
<c:when test="#{(forums:errorMsg())!=null}">
<!-- generic error handling -->
<ui:include src="/views/errors/error_body.xhtml"/>
</c:when>
- <c:otherwise>
+ <c:otherwise>
<!-- main content for this page -->
<ui:insert name="mainContent"/>
</c:otherwise>
</c:choose>
- <!-- footer -->
+ <!-- footer -->
+
</div>
\ No newline at end of file
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-02-22 21:08:16 UTC (rev 9710)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/common/common_noMenu.xhtml 2007-02-22 21:10:34 UTC (rev 9711)
@@ -28,10 +28,13 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
- class="bb"
+ class="forumscontainer"
>
<!-- stylesheet for this application -->
- <link rel='stylesheet' type='text/css' href='/portal-forums/subSilver/styles.css' media='screen'/>
+ <link rel='stylesheet'
+ type='text/css'
+ href='/portal-forums/default_graphics/forums_styles.css'
+ media='screen'/>
<!-- resourceBundle to be used by this entire application -->
<f:loadBundle basename="ResourceJSF" var="resource"/>
@@ -43,11 +46,12 @@
<!-- generic error handling -->
<ui:include src="/views/errors/error_body.xhtml"/>
</c:when>
- <c:otherwise>
+ <c:otherwise>
<!-- main content for this page -->
<ui:insert name="mainContent"/>
</c:otherwise>
</c:choose>
- <!-- footer -->
+ <!-- footer -->
+
</div>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list