Migrated project menu include from jstl to struts tags.
git-svn-id: https://svn.apache.org/repos/asf/continuum/trunk@1679088 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/ProjectMenu.jsp b/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/ProjectMenu.jsp
index ef64798..c734f57 100644
--- a/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/ProjectMenu.jsp
+++ b/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/ProjectMenu.jsp
@@ -18,57 +18,51 @@
--%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
+<s:set var="tab">${param.tab}</s:set>
+<s:set var="textStyle" value="'border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;'"/>
+<s:set var="linkStyle" value="%{#textStyle + ' text-decoration: none;'}"/>
+
+<s:url var="projectGroupSummaryUrl" action="projectGroupSummary" includeParams="none">
+ <s:param name="projectGroupId" value="project.projectGroup.id"/>
+</s:url>
+<s:url var="viewUrl" action="projectView" includeParams="none">
+ <s:param name="projectId" value="projectId"/>
+ <s:param name="projectGroupId" value="project.projectGroup.id"/>
+</s:url>
+<s:url var="buildResultsUrl" action="buildResults" includeParams="none">
+ <s:param name="projectId" value="projectId"/>
+ <s:param name="projectGroupId" value="project.projectGroup.id"/>
+</s:url>
+<s:url var="workingCopyUrl" action="workingCopy" includeParams="none">
+ <s:param name="projectId" value="projectId"/>
+ <s:param name="projectGroupId" value="project.projectGroup.id"/>
+</s:url>
<div>
<p style="border-top: 1px solid transparent; border-bottom: 1px solid #DFDEDE;">
- <s:url id="projectGroupSummaryUrl" action="projectGroupSummary" includeParams="none">
- <s:param name="projectGroupId" value="project.projectGroup.id"/>
- </s:url>
- <s:url id="viewUrl" action="projectView" includeParams="none">
- <s:param name="projectId" value="projectId"/>
- <s:param name="tab" value="view"/>
- <s:param name="projectGroupId" value="project.projectGroup.id"/>
- </s:url>
- <s:url id="buildResultsUrl" action="buildResults" includeParams="none">
- <s:param name="projectId" value="projectId"/>
- <s:param name="tab" value="buildResults"/>
- <s:param name="projectGroupId" value="project.projectGroup.id"/>
- </s:url>
- <s:url id="workingCopyUrl" action="workingCopy" includeParams="none">
- <s:param name="projectId" value="projectId"/>
- <s:param name="tab" value="workingCopy"/>
- <s:param name="projectGroupId" value="project.projectGroup.id"/>
- </s:url>
+ <s:a href="%{projectGroupSummaryUrl}" cssStyle="%{#linkStyle}"><s:text name="projectGroup.tab.summary"/></s:a>
- <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${projectGroupSummaryUrl}"><s:text name="projectGroup.tab.summary"/></a>
- <c:choose>
- <c:when test="${param.tab == 'view'}">
- <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;"><s:text name="info"/></b>
- </c:when>
- <c:otherwise>
- <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${viewUrl}"><s:text name="info"/></a>
- </c:otherwise>
- </c:choose>
+ <s:if test="#tab == 'view'">
+ <b style="<s:property value="#textStyle"/>"><s:text name="info"/></b>
+ </s:if>
+ <s:else>
+ <s:a href="%{viewUrl}" cssStyle="%{#linkStyle}"><s:text name="info"/></s:a>
+ </s:else>
- <c:choose>
- <c:when test="${param.tab == 'buildResults'}">
- <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;"><s:text name="builds"/></b>
- </c:when>
- <c:otherwise>
- <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${buildResultsUrl}"><s:text name="builds"/></a>
- </c:otherwise>
- </c:choose>
+ <s:if test="#tab == 'buildResults'">
+ <b style="<s:property value="#textStyle"/>"><s:text name="builds"/></b>
+ </s:if>
+ <s:else>
+ <s:a href="%{buildResultsUrl}" cssStyle="%{#linkStyle}"><s:text name="builds"/></s:a>
+ </s:else>
- <c:choose>
- <c:when test="${param.tab == 'workingCopy'}">
- <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;"><s:text name="workingCopy"/></b>
- </c:when>
- <c:otherwise>
- <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${workingCopyUrl}"><s:text name="workingCopy"/></a>
- </c:otherwise>
- </c:choose>
+ <s:if test="#tab == 'workingCopy'">
+ <b style="<s:property value="#textStyle"/>"><s:text name="workingCopy"/></b>
+ </s:if>
+ <s:else>
+ <s:a href="%{workingCopyUrl}" cssStyle="%{#linkStyle}"><s:text name="workingCopy"/></s:a>
+ </s:else>
</p>
</div>
