continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcconn...@apache.org
Subject svn commit: r433355 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/ resources/ webapp/
Date Mon, 21 Aug 2006 20:55:48 GMT
Author: jmcconnell
Date: Mon Aug 21 13:55:47 2006
New Revision: 433355

URL: http://svn.apache.org/viewvc?rev=433355&view=rev
Log:
reworked the group summary page so it is more of an actually summary which links off to the
projectGroupSummary which gives the detailed information about the particular project group.
 Left placeholders in spots on the front summary page as we will probably need to create another
model object for rendering that those project group tables since they are a different aggregation
of information then we have atm.

Added:
    maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupMembers.jsp   (contents,
props changed)
      - copied, changed from r432677, maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupView.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupSummary.jsp   (with
props)
Removed:
    maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupView.jsp
Modified:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
    maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
    maven/continuum/trunk/continuum-webapp/src/main/webapp/groupSummary.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupNotifier.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?rev=433355&r1=433354&r2=433355&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
Mon Aug 21 13:55:47 2006
@@ -37,7 +37,7 @@
 
     private boolean confirmed;
 
-    public String view()
+    public String summary()
     {
         try
         {
@@ -52,18 +52,24 @@
         return SUCCESS;
     }
 
+    public String members()
+    {
+        return summary();
+    }
+
     public String buildDefinitions()
     {
-        return view();
+        return summary();
     }
 
     public String notifiers()
     {
-        return view();
+        return summary();
     }
 
     public String remove()
     {
+        //todo add confirm page like removing build definition
         try
         {
             continuum.removeProjectGroup( projectGroupId );

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java?rev=433355&r1=433354&r2=433355&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
Mon Aug 21 13:55:47 2006
@@ -30,15 +30,13 @@
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
- *
- * @plexus.component
- *   role="com.opensymphony.xwork.Action"
- *   role-hint="summary"
+ * @plexus.component role="com.opensymphony.xwork.Action"
+ * role-hint="summary"
  */
 public class SummaryAction
     extends ContinuumActionSupport
-{    
-    private int projectGroupId = -1;
+{
+    private int projectGroupId;
 
     private int nbSuccesses;
 
@@ -47,26 +45,14 @@
     private int nbErrors;
 
     private List summary;
-    
+
     public String execute()
         throws ContinuumException
     {
         Collection projects;
 
-        // original logic on this page shows all projects across project groups, however
if projectGroupId
-        // is set then display only those projects in the given group.
-        if ( projectGroupId == -1 )
-        {
-            getLogger().debug("SummaryAction: serving up all projects");
-            projects = continuum.getProjects();
-        }
-        else
-        {
-            getLogger().debug("SummaryAction: serving up project id -> " + projectGroupId
);
-
-            //TODO: Create a summary jpox request so code will be more simple and performance
will be better
-            projects = continuum.getProjectsInGroup( projectGroupId );
-        }
+        //TODO: Create a summary jpox request so code will be more simple and performance
will be better
+        projects = continuum.getProjectsInGroup( projectGroupId );
 
         Map buildResults = continuum.getLatestBuildResults();
 

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?rev=433355&r1=433354&r2=433355&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Mon Aug 21 13:55:47
2006
@@ -128,8 +128,12 @@
     <!--
     * project group actions
     -->
-    <action name="projectGroupView" class="projectGroup" method="view">
-      <result name="success">projectGroupView.jsp</result>
+    <action name="projectGroupMembers" class="projectGroup" method="members">
+      <result name="success">projectGroupMembers.jsp</result>
+    </action>
+
+    <action name="projectGroupSummary" class="projectGroup" method="summary">
+      <result name="success">projectGroupSummary.jsp</result>
     </action>
 
     <action name="projectGroupBuildDefinition" class="projectGroup" method="buildDefinitions">
@@ -141,7 +145,7 @@
     </action>
 
     <action name="buildProjectGroup" class="projectGroup" method="build">
-      <result name="success" type="chain">projectGroupView</result>
+      <result name="success" type="chain">projectGroupSummary</result>
     </action>
 
     <action name="removeProjectGroup" class="projectGroup" method="remove">

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/groupSummary.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/groupSummary.jsp?rev=433355&r1=433354&r2=433355&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/groupSummary.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/groupSummary.jsp Mon Aug 21 13:55:47
2006
@@ -10,68 +10,72 @@
   <body>
   <div id="h3">
 
+    <h3>Project Groups</h3>
+
+    <p/>
+
+    <ww:if test="${groups == null }">
+      No Project Groups Known.
+    </ww:if>
+
     <c:forEach items="${groups}" var="group">
 
-      <ww:set name="group" value="${group}"/> 
-      <ww:url id="projectGroupViewUrl" action="projectGroupView" namespace="/">
+      <ww:set name="group" value="${group}"/>
+      <ww:url id="projectGroupSummaryUrl" action="projectGroupSummary" namespace="/">
         <ww:param name="projectGroupId" value="%{'${group.id}'}"/>
       </ww:url>
 
-      <h3><ww:text name="groups.section.title"/>&nbsp;<ww:a href="%{projectGroupViewUrl}">${group.name}</ww:a></h3>
-
-      <ec:table items="group.projects"
-                var="project"
-                showExports="false"
-                showPagination="false"
-                showStatusBar="false"
-                filterable="false">
-        <ec:row highlightRow="true">
-          <ec:column property="state" title="&nbsp;" width="1%" cell="org.apache.maven.continuum.web.view.StateCell"/>
-          <ec:column property="name" title="summary.projectTable.name" width="48%">
-            <a href='<ww:url action="projectView">
-              <ww:param name="projectId" value="${project.id}"/>
-            </ww:url>'>${project.name}</a>
-          </ec:column>
-          <ec:column property="version" title="summary.projectTable.version" width="13%"/>
-          <ec:column property="buildNumber" title="summary.projectTable.build" width="5%"
-                     cell="org.apache.maven.continuum.web.view.BuildCell"/>
-          <ec:column property="buildNowAction" title="&nbsp;" width="1%"
-                     cell="org.apache.maven.continuum.web.view.BuildNowCell" sortable="false"/>
-          <ec:column property="buildHistoryAction" title="&nbsp;" width="1%" sortable="false">
-            <c:choose>
-              <c:when test="${pageScope.project.latestBuildId > 0}">
-                <a href="<ww:url value="/buildResults.action?projectId="/>${pageScope.project.id}&projectName=${pageScope.project.name}"><img
-                    src="<ww:url value="/images/buildhistory.gif"/>" alt="Build History"
title="Build History"
-                    border="0"></a>
-              </c:when>
-              <c:otherwise>
-                <img src="<ww:url value="/images/buildhistory_disabled.gif"/>" alt="Build
History" title="Build History"
-                     border="0">
-              </c:otherwise>
-            </c:choose>
-          </ec:column>
-        </ec:row>
-      </ec:table>
-      <div class="functnbar3">
-        <ww:form action="buildProject.action" method="post">
-          <ww:submit value="%{getText('summary.buildAll')}">
-            <ww:param name="before">
-              <img src="<ww:url value="/images/icon_success_sml.gif"/>" alt="<ww:text
name="message.success"/>"
-                   title="<ww:text name="message.success"/>"/>
-              <ww:property value="${group.numSuccesses}"/>
-              <img src="<ww:url value="/images/icon_warning_sml.gif"/>" alt="<ww:text
name="message.failed"/>"
-                   title="<ww:text name="message.failed"/>"/>
-              <ww:property value="${group.numFailures}"/>
-              <img src="<ww:url value="/images/icon_error_sml.gif"/>" alt="<ww:text
name="message.error"/>"
-                   title="<ww:text name="message.error"/>"/>
-              <ww:property value="${group.numErrors}"/>
-            </ww:param>
-          </ww:submit>
-        </ww:form>
-      </div>
+      <table border="2" cellspacing="2" cellpadding="3" width="100%">
+        <tr>
+          <td>Name:</td>
+          <td><ww:a href="%{projectGroupSummaryUrl}">${group.name}</ww:a></td>
+        </tr>
+        <tr>
+          <td>Group Id:</td>
+          <td>${group.groupId}</td>
+        </tr>
+        <tr>
+          <td>Project Type:</td>
+          <td><- Maven2/Maven1/Ant/Shell -></td>
+        </tr>
+        <tr>
+          <td>Number of Projects:</td>
+          <td><- 15 -></td>
+        </tr>
+        <tr>
+          <td>Build Status:</td>
+          <td>
+            <table>
+              <tr>
+                <td><img src="<ww:url value="/images/icon_success_sml.gif"/>"
alt="<ww:text name="message.success"/>"
+                         title="<ww:text name="message.success"/>"/></td>
+                <td><ww:property value="${group.numSuccesses}"/></td>
+              </tr>
+              <tr>
+                <td><img src="<ww:url value="/images/icon_warning_sml.gif"/>"
alt="<ww:text name="message.failed"/>"
+                         title="<ww:text name="message.failed"/>"/></td>
+                <td><ww:property value="${group.numFailures}"/></td>
+              </tr>
+              <tr>
+                <td><img src="<ww:url value="/images/icon_error_sml.gif"/>"
alt="<ww:text name="message.error"/>"
+                         title="<ww:text name="message.error"/>"/></td>
+                <td><ww:property value="${group.numErrors}"/></td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+        <tr>
+          <td>Next Scheduled Build:</td>
+          <td><- timestamp -></td>
+        </tr>
+        <tr>
+          <td>Status Message:</td>
+          <td><- currently building Module X -></td>
+        </tr>
+      </table>
+      <hr/>
+      <p/>
     </c:forEach>
-
-
   </div>
   </body>
 </ww:i18n>

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?rev=433355&r1=433354&r2=433355&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp
Mon Aug 21 13:55:47 2006
@@ -11,7 +11,10 @@
       <div id="h3">
         <div>
           <p style="border-top: 1px solid transparent; border-bottom: 1px solid #DFDEDE;">
-            <ww:url id="projectGroupViewUrl" action="projectGroupView">
+           <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">
@@ -21,7 +24,8 @@
               <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="%{projectGroupViewUrl}">Info</ww:a>
+            <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>
@@ -32,6 +36,8 @@
         <div class="axial">
           <table border="1" cellspacing="2" cellpadding="3" width="100%">
             <c1:data label="%{getText('projectView.project.name')}" name="projectGroup.name"/>
+            <c1:data label="Group Id" name="projectGroup.groupId"/>
+            <c1:data label="Description" name="projectGroup.description"/>
            </table>         
         </div>
 

Copied: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupMembers.jsp (from
r432677, maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupView.jsp)
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupMembers.jsp?p2=maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupMembers.jsp&p1=maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupView.jsp&r1=432677&r2=433355&rev=433355&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupView.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupMembers.jsp Mon Aug
21 13:55:47 2006
@@ -1,62 +1,112 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
 <%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
-<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
 <%@ taglib uri="continuum" prefix="c1" %>
 <html>
-  <ww:i18n name="localization.Continuum">
-    <head>
-        <title><ww:text name="projectView.page.title"/></title>
-    </head>
-    <body>
-      <div id="h3">
-        <div>
-          <p style="border-top: 1px solid transparent; border-bottom: 1px solid #DFDEDE;">
-            <ww:url id="projectGroupViewUrl" action="projectGroupView">
-              <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;">Info</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>
-        <h3>Project Group Information</h3>
-            
-        <div class="axial">
-          <table border="1" cellspacing="2" cellpadding="3" width="100%">
-            <c1:data label="%{getText('projectView.project.name')}" name="projectGroup.name"/>
-            <c1:data label="Group Id" name="projectGroup.groupId"/>
-            <c1:data label="Description" name="projectGroup.description"/>
-           </table>
-        </div>
-
-        <h3>Project Group Actions</h3>
-
-        <div class="functnbar3">
-          <!-- switch these to action urls -->
-          <ww:form action="buildProjectGroup" method="post">
-            <input type="hidden" name="projectGroupId" value="<ww:property value="projectGroupId"/>"/>
-            <ww:submit value="Build"/>
-          </ww:form>
-          <ww:form action="removeProjectGroup" method="post">
-            <input type="hidden" name="projectGroupId" value="<ww:property value="projectGroupId"/>"/>
-            <ww:submit value="Remove"/>
-          </ww:form>
-        </div>
-
-        <h3>Member Projects</h3>
-
-        <ww:action name="projectSummary" executeResult="true" namespace="component">
-          <ww:param name="projectGroupId" value="%{projectGroupId}"/>
-        </ww:action>
-
-      </div>
-    </body>
-  </ww:i18n>
+<ww:i18n name="localization.Continuum">
+  <head>
+    <title><ww:text name="projectView.page.title"/></title>
+  </head>
+
+  <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>
+
+    <h3>Project Group Information</h3>
+
+    <div class="axial">
+      <table border="1" cellspacing="2" cellpadding="3" width="100%">
+        <c1:data label="%{getText('projectView.project.name')}" name="projectGroup.name"/>
+        <c1:data label="Group Id" name="projectGroup.groupId"/>
+        <c1:data label="Description" name="projectGroup.description"/>
+      </table>
+    </div>
+
+    <h3>Membership Actions</h3>
+
+    <div class="axial">
+      Scan for new Projects? 
+    </div>
+
+    <h3>Member Projects</h3>
+
+    <ec:table items="projectGroup.projects"
+              var="project"
+              showExports="false"
+              showPagination="false"
+              showStatusBar="false"
+              filterable="false">
+      <ec:row highlightRow="true">
+        <ec:column property="name" title="summary.projectTable.name" width="48%">
+          <ww:url id="projectViewUrl" action="projectView">
+            <ww:param name="projectId" value="projectId"/>
+          </ww:url>
+          <ww:a href="%{projectViewUrl}">${pageScope.project.name}</ww:a>
+        </ec:column>
+        <ec:column property="editAction" title="Edit" width="1%" sortable="false">
+          <center>
+            <c:choose>
+              <c:when
+                  test="${pageScope.project.state == 1 || pageScope.project.state == 10 ||
pageScope.project.state == 2 || pageScope.project.state == 3 || pageScope.project.state ==
4}">
+                <ww:url id="editProjectUrl" action="projectEdit">
+                  <ww:param name="projectId" value="${pageScope.project.id}"/>
+                  <ww:param name="projectName" value="${project.name}"/>
+                </ww:url>
+                <ww:a href="%{editProjectUrl}">
+                  <img src="<ww:url value='/images/edit.gif'/>" alt="Edit" title="Edit"
border="0">
+                </ww:a>
+              </c:when>
+              <c:otherwise>
+                <img src="<ww:url value='/images/edit_disabled.gif'/>" alt="Edit"
title="Edit" border="0">
+              </c:otherwise>
+            </c:choose>
+          </center>
+        </ec:column>
+        <ec:column property="deleteAction" title="Remove" width="1%" sortable="false">
+          <center>
+            <c:choose>
+              <c:when
+                  test="${pageScope.project.state == 1 || pageScope.project.state == 10 ||
pageScope.project.state == 2 || pageScope.project.state == 3 || pageScope.project.state ==
4}">
+                <ww:url id="removeProjectUrl" action="deleteProject">
+                  <ww:param name="projectId" value="${pageScope.project.id}"/>
+                  <ww:param name="projectName" value="${pageScope.project.name}"/>
+                </ww:url>
+                <ww:a href="%{removeProjectUrl">
+                  <img src="<ww:url value='/images/delete.gif'/>" alt="Delete" title="Delete"
border="0">
+                </ww:a>
+              </c:when>
+              <c:otherwise>
+                <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="Delete"
title="Delete" border="0">
+              </c:otherwise>
+            </c:choose>
+          </center>
+        </ec:column>
+      </ec:row>
+    </ec:table>
+  </div>
+  </body>
+</ww:i18n>
 </html>

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupMembers.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

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?rev=433355&r1=433354&r2=433355&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupNotifier.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupNotifier.jsp Mon Aug
21 13:55:47 2006
@@ -1,45 +1,52 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
 <%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
-<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
 <%@ taglib uri="continuum" prefix="c1" %>
 <html>
-  <ww:i18n name="localization.Continuum">
-    <head>
-        <title><ww:text name="projectView.page.title"/></title>
-    </head>
-    <body>
-      <div id="h3">
-        <div>
-          <p style="border-top: 1px solid transparent; border-bottom: 1px solid #DFDEDE;">
-            <ww:url id="projectGroupViewUrl" action="projectGroupView">
-              <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:i18n name="localization.Continuum">
+  <head>
+    <title><ww:text name="projectView.page.title"/></title>
+  </head>
 
-            <ww:a cssStyle="border: 1px solid #DFDEDE; padding-left: 1em; padding-right:
1em; text-decoration: none;" href="%{projectGroupViewUrl}">Info</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>
+  <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>
+      </p>
+    </div>
 
-        <h3>PROJECT GROUP Notifiers<ww:text name="projectView.section.title"/></h3>
-            
-        <div class="axial">
-          <table border="1" cellspacing="2" cellpadding="3" width="100%">
-            <c1:data label="%{getText('projectView.project.name')}" name="projectGroup.name"/>
-           </table>         
-        </div>
+    <h3>PROJECT GROUP Notifiers<ww:text name="projectView.section.title"/></h3>
 
-        <div class="axial">
-          UNDER CONSTRUCTION
-        </div>
-      </div>
-    </body>
-  </ww:i18n>
+    <div class="axial">
+      <table border="1" cellspacing="2" cellpadding="3" width="100%">
+        <c1:data label="%{getText('projectView.project.name')}" name="projectGroup.name"/>
+      </table>
+    </div>
+
+    <div class="axial">
+      UNDER CONSTRUCTION
+    </div>
+  </div>
+  </body>
+</ww:i18n>
 </html>

Added: 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?rev=433355&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupSummary.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupSummary.jsp Mon Aug
21 13:55:47 2006
@@ -0,0 +1,65 @@
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
+<%@ taglib uri="continuum" prefix="c1" %>
+<html>
+  <ww:i18n name="localization.Continuum">
+    <head>
+        <title><ww:text name="projectView.page.title"/></title>
+    </head>
+    <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>
+        <h3>Project Group Information</h3>
+            
+        <div class="axial">
+          <table border="1" cellspacing="2" cellpadding="3" width="100%">
+            <c1:data label="%{getText('projectView.project.name')}" name="projectGroup.name"/>
+            <c1:data label="Group Id" name="projectGroup.groupId"/>
+            <c1:data label="Description" name="projectGroup.description"/>
+           </table>
+        </div>
+
+        <h3>Project Group Actions</h3>
+
+        <div class="functnbar3">
+          <ww:url id="buildProjectGroupUrl" action="buildProjectGroup">
+            <ww:param name="projectGroupId" value="projectGroupId"/>
+          </ww:url>
+          <ww:url id="removeProjectGroupUrl" action="removeProjectGroup">
+            <ww:param name="projectGroupId" value="projectGroupId"/>
+            <ww:param name="confirmed" value="false"/>
+          </ww:url>
+          <ww:a href="%{buildProjectGroupUrl}">Build</ww:a>&nbsp;<ww:a
href="%{removeProjectGroupUrl}">Remove</ww:a>
+        </div>
+
+        <h3>Projects</h3>
+
+        <ww:action name="projectSummary" executeResult="true" namespace="component">
+          <ww:param name="projectGroupId" value="%{projectGroupId}"/>
+        </ww:action>
+
+      </div>
+    </body>
+  </ww:i18n>
+</html>

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupSummary.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp?rev=433355&r1=433354&r2=433355&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp Mon Aug 21 13:55:47
2006
@@ -25,7 +25,6 @@
             </ec:column>
             <ec:column property="version" title="summary.projectTable.version" width="13%"/>
             <ec:column property="buildNumber" title="summary.projectTable.build" width="5%"
cell="org.apache.maven.continuum.web.view.BuildCell"/>
-            <ec:column property="projectGroupName" title="summary.projectTable.group"
width="13%"/>
             <ec:column property="buildNowAction" title="&nbsp;" width="1%" cell="org.apache.maven.continuum.web.view.BuildNowCell"
sortable="false"/>
             <ec:column property="buildHistoryAction" title="&nbsp;" width="1%" sortable="false">
               <c:choose>
@@ -48,21 +47,6 @@
                 </c:when>
                 <c:otherwise>
                   <img src="<ww:url value='/images/workingcopy_disabled.gif'/>"
alt="Working Copy" title="Working Copy" border="0">
-                </c:otherwise>
-              </c:choose>
-            </ec:column>
-            <ec:column property="deleteAction" title="&nbsp;" width="1%" sortable="false">
-              <c:choose>
-                <c:when test="${pageScope.project.state == 1 || pageScope.project.state
== 10 || pageScope.project.state == 2 || pageScope.project.state == 3 || pageScope.project.state
== 4}">
-                  <a href='<ww:url value="/deleteProject!default.action">
-                    <ww:param name="projectId" value="${project.id}"/>
-                    <ww:param name="projectName" value="${project.name}"/>
-                  </ww:url>'>
-                    <img src="<ww:url value='/images/delete.gif'/>" alt="Delete"
title="Delete" border="0">
-                  </a>
-                </c:when>
-                <c:otherwise>
-                  <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="Delete"
title="Delete" border="0">
                 </c:otherwise>
               </c:choose>
             </ec:column>



Mime
View raw message