You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2006/09/21 14:33:31 UTC
svn commit: r448532 - in /maven/continuum/trunk/continuum-webapp/src/main:
java/org/apache/maven/continuum/web/action/component/ resources/ webapp/
webapp/components/
Author: evenisse
Date: Thu Sep 21 05:33:30 2006
New Revision: 448532
URL: http://svn.apache.org/viewvc?view=rev&rev=448532
Log:
[CONTINUUM-898] Replace links by icons in buildDefinitionGroupSummaryComponent and refactored projectGroupTab
Submitted by: Marvin King
Added:
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/ContinuumTabAction.java (with props)
maven/continuum/trunk/continuum-webapp/src/main/webapp/components/projectGroupTabComponent.jsp (with props)
Modified:
maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
maven/continuum/trunk/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupMembers.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupNotifier.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupSummary.jsp
Added: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/ContinuumTabAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/ContinuumTabAction.java?view=auto&rev=448532
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/ContinuumTabAction.java (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/ContinuumTabAction.java Thu Sep 21 05:33:30 2006
@@ -0,0 +1,26 @@
+package org.apache.maven.continuum.web.action.component;
+
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
+
+/**
+ *
+ * @plexus.component
+ * role="com.opensymphony.xwork.Action" role-hint="continuumTab"
+ *
+**/
+
+public class ContinuumTabAction
+ extends PlexusActionSupport
+{
+ protected String tabName;
+
+ public String getTabName()
+ {
+ return tabName;
+ }
+
+ public void setTabName( String name )
+ {
+ tabName = name;
+ }
+}
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/ContinuumTabAction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/ContinuumTabAction.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?view=diff&rev=448532&r1=448531&r2=448532
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Thu Sep 21 05:33:30 2006
@@ -357,6 +357,11 @@
<result name="error">/components/failureComponent.jsp</result>
</action>
+ <action name="projectGroupTab" class="continuumTab">
+ <result name="success">/components/projectGroupTabComponent.jsp</result>
+ <result name="error">/components/failureComponent.jsp</result>
+ </action>
+
<action name="projectSummary" class="summary">
<result name="success">/components/projectSummaryComponent.jsp</result>
<result name="error">/components/failureComponent.jsp</result>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp?view=diff&rev=448532&r1=448531&r2=448532
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp Thu Sep 21 05:33:30 2006
@@ -20,19 +20,24 @@
<ec:column property="scheduleName" title="schedule"/>
<ec:column property="from" title="projectView.buildDefinition.from"/>
<ec:column property="isDefault" title="projectView.buildDefinition.default"/>
- <ec:column property="actions" title=" ">
+ <ec:column property="editActions" title="Edit">
<ww:url id="editUrl" action="buildDefinition" method="input" namespace="/">
<ww:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
<ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
</ww:url>
+ <ww:a href="%{editUrl}">
+ <img src="<ww:url value='/images/edit.gif'/>" alt="Edit" title="Edit" border="0">
+ </ww:a>
+ </ec:column>
+ <ec:column property="deleteActions" title="Remove">
<ww:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">
<ww:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
<ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
<ww:param name="confirmed" value="false"/>
</ww:url>
- <ww:a href="%{editUrl}"><ww:text name="edit"/></ww:a>
-
- <ww:a href="%{removeUrl}"><ww:text name="delete"/></ww:a>
+ <ww:a href="%{removeUrl}">
+ <img src="<ww:url value='/images/delete.gif'/>" alt="Delete" title="Delete" border="0">
+ </ww:a>
</ec:column>
</ec:row>
</ec:table>
@@ -61,19 +66,24 @@
<ec:column property="scheduleName" title="schedule"/>
<ec:column property="from" title="projectView.buildDefinition.from"/>
<ec:column property="isDefault" title="projectView.buildDefinition.default"/>
- <ec:column property="actions" title=" ">
+ <ec:column property="editAction" title=" ">
<ww:url id="editUrl" action="buildDefinition" method="input" namespace="/">
<ww:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</ww:param>
<ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
</ww:url>
+ <ww:a href="%{editUrl}">
+ <img src="<ww:url value='/images/edit.gif'/>" alt="Edit" title="Edit" border="0">
+ </ww:a>
+ </ec:column>
+ <ec:column property="removeAction" title=" ">
<ww:url id="removeUrl" action="removeProjectBuildDefinition" namespace="/">
<ww:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</ww:param>
<ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
<ww:param name="confirmed" value="false"/>
</ww:url>
- <ww:a href="%{editUrl}"><ww:text name="edit"/></ww:a>
-
- <ww:a href="%{removeUrl}"><ww:text name="delete"/></ww:a>
+ <ww:a href="%{removeUrl}">
+ <img src="<ww:url value='/images/edit.gif'/>" alt="Edit" title="Edit" border="0">
+ </ww:a>
</ec:column>
</ec:row>
</ec:table>
Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/components/projectGroupTabComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/components/projectGroupTabComponent.jsp?view=auto&rev=448532
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/components/projectGroupTabComponent.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/components/projectGroupTabComponent.jsp Thu Sep 21 05:33:30 2006
@@ -0,0 +1,93 @@
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
+<%@ taglib uri="continuum" prefix="c1" %>
+
+ <div id="h3">
+ <div>
+ <p style="border-top: 1px solid transparent; border-bottom: 1px solid #DFDEDE;">
+ <ww:url id="projectGroupSummaryUrl" action="projectGroupSummary">
+ <ww:param name="projectGroupId" value="projectGroupId"/>
+ </ww:url>
+ <ww:url id="projectGroupMembersUrl" action="projectGroupMembers">
+ <ww:param name="projectGroupId" value="projectGroupId"/>
+ </ww:url>
+ <ww:url id="projectGroupBuildDefinitionUrl" action="projectGroupBuildDefinition">
+ <ww:param name="projectGroupId" value="projectGroupId"/>
+ </ww:url>
+ <ww:url id="projectGroupNotifierUrl" action="projectGroupNotifier">
+ <ww:param name="projectGroupId" value="projectGroupId"/>
+ </ww:url>
+
+ <ww:set name="tabName" value="tabName"/>
+ <c:choose>
+ <c:when test="${tabName != 'Summary'}">
+ <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${projectGroupSummaryUrl}">
+ </c:when>
+ <c:otherwise>
+ <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;">
+ </c:otherwise>
+ </c:choose>
+ Summary
+ <c:choose>
+ <c:when test="${tabName != 'Summary'}">
+ </a>
+ </c:when>
+ <c:otherwise>
+ </b>
+ </c:otherwise>
+ </c:choose>
+ <c:choose>
+ <c:when test="${tabName != 'Members'}">
+ <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${projectGroupMembersUrl}">
+ </c:when>
+ <c:otherwise>
+ <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;">
+ </c:otherwise>
+ </c:choose>
+ Members
+ <c:choose>
+ <c:when test="${tabName != 'Members'}">
+ </a>
+ </c:when>
+ <c:otherwise>
+ </b>
+ </c:otherwise>
+ </c:choose>
+ <c:choose>
+ <c:when test="${tabName != 'Build Definitions'}">
+ <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${projectGroupBuildDefinitionUrl}">
+ </c:when>
+ <c:otherwise>
+ <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;">
+ </c:otherwise>
+ </c:choose>
+ Build Definition
+ <c:choose>
+ <c:when test="${tabName != 'Build Definitions'}">
+ </a>
+ </c:when>
+ <c:otherwise>
+ </b>
+ </c:otherwise>
+ </c:choose>
+ <c:choose>
+ <c:when test="${tabName != 'Notifier'}">
+ <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${projectGroupNotifierUrl}">
+ </c:when>
+ <c:otherwise>
+ <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;">
+ </c:otherwise>
+ </c:choose>
+ Notifier
+ <c:choose>
+ <c:when test="${tabName != 'Notifier'}">
+ </a>
+ </c:when>
+ <c:otherwise>
+ </b>
+ </c:otherwise>
+ </c:choose>
+ </p>
+ </div>
+ </div>
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/components/projectGroupTabComponent.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/components/projectGroupTabComponent.jsp
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp?view=diff&rev=448532&r1=448531&r2=448532
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp Thu Sep 21 05:33:30 2006
@@ -7,30 +7,12 @@
<head>
<title><ww:text name="projectView.page.title"/></title>
</head>
- <body>
+ <body>
<div id="h3">
- <div>
- <p style="border-top: 1px solid transparent; border-bottom: 1px solid #DFDEDE;">
- <ww:url id="projectGroupSummaryUrl" action="projectGroupSummary">
- <ww:param name="projectGroupId" value="projectGroupId"/>
- </ww:url>
- <ww:url id="projectGroupMembersUrl" action="projectGroupMembers">
- <ww:param name="projectGroupId" value="projectGroupId"/>
- </ww:url>
- <ww:url id="projectGroupBuildDefinitionUrl" action="projectGroupBuildDefinition">
- <ww:param name="projectGroupId" value="projectGroupId"/>
- </ww:url>
- <ww:url id="projectGroupNotifierUrl" action="projectGroupNotifier">
- <ww:param name="projectGroupId" value="projectGroupId"/>
- </ww:url>
-
- <ww:a cssStyle="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="%{projectGroupSummaryUrl}">Summary</ww:a>
- <ww:a cssStyle="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="%{projectGroupManageUrl}">Manage</ww:a>
- <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;">Build Definition</b>
- <ww:a cssStyle="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="%{projectGroupNotifierUrl}">Notifier</ww:a>
- </p>
- </div>
-
+ <ww:action name="projectGroupTab" executeResult="true">
+ <ww:param name="tabName" value="'Build Definitions'"/>
+ </ww:action>
+
<h3>Project Group Build Definitions</h3>
<div class="axial">
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupMembers.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupMembers.jsp?view=diff&rev=448532&r1=448531&r2=448532
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupMembers.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupMembers.jsp Thu Sep 21 05:33:30 2006
@@ -10,30 +10,9 @@
<body>
<div id="h3">
- <div>
- <p style="border-top: 1px solid transparent; border-bottom: 1px solid #DFDEDE;">
- <ww:url id="projectGroupSummaryUrl" action="projectGroupSummary">
- <ww:param name="projectGroupId" value="projectGroupId"/>
- </ww:url>
- <ww:url id="projectGroupMembersUrl" action="projectGroupMembers">
- <ww:param name="projectGroupId" value="projectGroupId"/>
- </ww:url>
- <ww:url id="projectGroupBuildDefinitionUrl" action="projectGroupBuildDefinition">
- <ww:param name="projectGroupId" value="projectGroupId"/>
- </ww:url>
- <ww:url id="projectGroupNotifierUrl" action="projectGroupNotifier">
- <ww:param name="projectGroupId" value="projectGroupId"/>
- </ww:url>
-
- <ww:a cssStyle="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;"
- href="%{projectGroupSummaryUrl}">Summary</ww:a>
- <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;">Members</b>
- <ww:a cssStyle="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;"
- href="%{projectGroupBuildDefinitionUrl}">Build Definitions</ww:a>
- <ww:a cssStyle="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;"
- href="%{projectGroupNotifierUrl}">Notifiers</ww:a>
- </p>
- </div>
+ <ww:action name="projectGroupTab" executeResult="true">
+ <ww:param name="tabName" value="'Members'"/>
+ </ww:action>
<h3>Project Group Information</h3>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupNotifier.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupNotifier.jsp?view=diff&rev=448532&r1=448531&r2=448532
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupNotifier.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupNotifier.jsp Thu Sep 21 05:33:30 2006
@@ -10,30 +10,9 @@
<body>
<div id="h3">
- <div>
- <p style="border-top: 1px solid transparent; border-bottom: 1px solid #DFDEDE;">
- <ww:url id="projectGroupSummaryUrl" action="projectGroupSummary">
- <ww:param name="projectGroupId" value="projectGroupId"/>
- </ww:url>
- <ww:url id="projectGroupMembersUrl" action="projectGroupMembers">
- <ww:param name="projectGroupId" value="projectGroupId"/>
- </ww:url>
- <ww:url id="projectGroupBuildDefinitionUrl" action="projectGroupBuildDefinition">
- <ww:param name="projectGroupId" value="projectGroupId"/>
- </ww:url>
- <ww:url id="projectGroupNotifierUrl" action="projectGroupNotifier">
- <ww:param name="projectGroupId" value="projectGroupId"/>
- </ww:url>
- <ww:a cssStyle="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;"
- href="%{projectGroupSummaryUrl}">Summary</ww:a>
- <ww:a cssStyle="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;"
- href="%{projectGroupMembersUrl}">Members</ww:a>
- <ww:a cssStyle="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;"
- href="%{projectGroupBuildDefinitionUrl}">Build Definitions</ww:a>
- <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;">Notifier</b>
-
- </p>
- </div>
+ <ww:action name="projectGroupTab" executeResult="true">
+ <ww:param name="tabName" value="'Notifier'"/>
+ </ww:action>
<h3>PROJECT GROUP Notifiers<ww:text name="projectView.section.title"/></h3>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupSummary.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupSummary.jsp?view=diff&rev=448532&r1=448531&r2=448532
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupSummary.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupSummary.jsp Thu Sep 21 05:33:30 2006
@@ -7,29 +7,12 @@
<head>
<title><ww:text name="projectView.page.title"/></title>
</head>
- <body>
+ <body>
<div id="h3">
- <div>
- <p style="border-top: 1px solid transparent; border-bottom: 1px solid #DFDEDE;">
- <ww:url id="projectGroupSummaryUrl" action="projectGroupSummary">
- <ww:param name="projectGroupId" value="projectGroupId"/>
- </ww:url>
- <ww:url id="projectGroupMembersUrl" action="projectGroupMembers">
- <ww:param name="projectGroupId" value="projectGroupId"/>
- </ww:url>
- <ww:url id="projectGroupBuildDefinitionUrl" action="projectGroupBuildDefinition">
- <ww:param name="projectGroupId" value="projectGroupId"/>
- </ww:url>
- <ww:url id="projectGroupNotifierUrl" action="projectGroupNotifier">
- <ww:param name="projectGroupId" value="projectGroupId"/>
- </ww:url>
-
- <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;">Summary</b>
- <ww:a cssStyle="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="%{projectGroupMembersUrl}">Members</ww:a>
- <ww:a cssStyle="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="%{projectGroupBuildDefinitionUrl}">Build Definitions</ww:a>
- <ww:a cssStyle="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="%{projectGroupNotifierUrl}">Notifiers</ww:a>
- </p>
- </div>
+ <ww:action name="projectGroupTab" executeResult="true">
+ <ww:param name="tabName" value="'Summary'"/>
+ </ww:action>
+
<h3>Project Group Information</h3>
<div class="axial">