continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r510084 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/view/projectview/ webapp/WEB-INF/jsp/ webapp/WEB-INF/jsp/components/
Date Wed, 21 Feb 2007 16:19:38 GMT
Author: evenisse
Date: Wed Feb 21 08:19:38 2007
New Revision: 510084

URL: http://svn.apache.org/viewvc?view=rev&rev=510084
Log:
o Add disabled icons for notifiers instead of empty columns
o Add missing slashes in project view for notifiers

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierEventCell.java
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierEventCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierEventCell.java?view=diff&rev=510084&r1=510083&r2=510084
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierEventCell.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierEventCell.java
Wed Feb 21 08:19:38 2007
@@ -23,6 +23,7 @@
 import org.extremecomponents.table.bean.Column;
 import org.extremecomponents.table.cell.DisplayCell;
 import org.extremecomponents.table.core.TableModel;
+import org.codehaus.plexus.util.StringUtils;
 
 /**
  * Used in Project view
@@ -61,6 +62,8 @@
         {
             event += "Errors";
         }
+
+        event = StringUtils.replace( event, " ", "/" );
 
         return event;
     }

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp?view=diff&rev=510084&r1=510083&r2=510084
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
Wed Feb 21 08:19:38 2007
@@ -105,18 +105,23 @@
         <!-- ec:column property="sender" title="projectView.notifier.sender"/ -->
         <ec:column property="editActions" title="&nbsp;" width="1%">
           <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
-            <c:if test="${!pageScope.projectNotifierSummary.fromProject}">
-              <ww:url id="editUrl" action="editProjectNotifier" namespace="/"  includeContext="false"
includeParams="none">
-                <ww:param name="projectGroupId">${pageScope.projectNotifierSummary.projectGroupId}</ww:param>
-                <ww:param name="projectId">${pageScope.projectNotifierSummary.projectId}</ww:param>
-                <ww:param name="notifierId">${pageScope.projectNotifierSummary.id}</ww:param>
-                <ww:param name="notifierType">${pageScope.projectNotifierSummary.type}</ww:param>
-                <ww:param name="fromGroupPage" value="true"/>
-              </ww:url>
-              <ww:a href="%{editUrl}">
-                <img src="<ww:url value='/images/edit.gif'/>" alt="Edit" title="Edit"
border="0">
-              </ww:a>
-            </c:if>
+            <c:choose>
+              <c:when test="${!pageScope.projectNotifierSummary.fromProject}">
+                <ww:url id="editUrl" action="editProjectNotifier" namespace="/" includeParams="none">
+                  <ww:param name="projectGroupId">${pageScope.projectNotifierSummary.projectGroupId}</ww:param>
+                  <ww:param name="projectId">${pageScope.projectNotifierSummary.projectId}</ww:param>
+                  <ww:param name="notifierId">${pageScope.projectNotifierSummary.id}</ww:param>
+                  <ww:param name="notifierType">${pageScope.projectNotifierSummary.type}</ww:param>
+                  <ww:param name="fromGroupPage" value="true"/>
+                </ww:url>
+                <ww:a href="%{editUrl}">
+                  <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>
           </pss:ifAuthorized>
           <pss:elseAuthorized>
             <img src="<ww:url value='/images/edit_disabled.gif'/>" alt="Edit" title="Edit"
border="0">
@@ -124,18 +129,23 @@
         </ec:column>
         <ec:column property="deleteActions" title="&nbsp;" width="1%">
           <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
-            <c:if test="${!pageScope.projectNotifierSummary.fromProject}">
-              <ww:url id="removeUrl" action="deleteProjectNotifier" namespace="/">
-                <ww:param name="projectGroupId">${pageScope.projectNotifierSummary.projectGroupId}</ww:param>
-                <ww:param name="projectId">${pageScope.projectNotifierSummary.projectId}</ww:param>
-                <ww:param name="notifierId">${pageScope.projectNotifierSummary.id}</ww:param>
-                <ww:param name="confirmed" value="false"/>
-                <ww:param name="fromGroupPage" value="true"/>
-              </ww:url>
-              <ww:a href="%{removeUrl}">
-                <img src="<ww:url value='/images/delete.gif'/>" alt="Delete" title="Delete"
border="0">
-              </ww:a>
-            </c:if>
+            <c:choose>
+              <c:when test="${!pageScope.projectNotifierSummary.fromProject}">
+                <ww:url id="removeUrl" action="deleteProjectNotifier" namespace="/">
+                  <ww:param name="projectGroupId">${pageScope.projectNotifierSummary.projectGroupId}</ww:param>
+                  <ww:param name="projectId">${pageScope.projectNotifierSummary.projectId}</ww:param>
+                  <ww:param name="notifierId">${pageScope.projectNotifierSummary.id}</ww:param>
+                  <ww:param name="confirmed" value="false"/>
+                  <ww:param name="fromGroupPage" value="true"/>
+                </ww:url>
+                <ww:a href="%{removeUrl}">
+                  <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>
           </pss:ifAuthorized>
           <pss:elseAuthorized>
             <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="Delete"
title="Delete" border="0">

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp?view=diff&rev=510084&r1=510083&r2=510084
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp Wed
Feb 21 08:19:38 2007
@@ -107,15 +107,20 @@
               <ec:column property="from" title="projectView.notifier.from" cell="org.apache.maven.continuum.web.view.projectview.NotifierFromCell"/>
               <ec:column property="editAction" title="&nbsp;" width="1%">
                 <pss:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
-                  <c:if test="${!pageScope.notifier.fromProject}">
-                    <a href='<ww:url value="${notifier.type}ProjectNotifierEdit.action">
-                      <ww:param name="notifierId" value="${notifier.id}"/>
-                      <ww:param name="projectId" value="project.id"/>
-                      <ww:param name="projectGroupId" value="${project.projectGroup.id}"/>
-                      <ww:param name="notifierType">${notifier.type}</ww:param>
-                      </ww:url>'>
-                      <img src="<ww:url value='/images/edit.gif'/>" alt="<ww:text
name='edit'/>" title="<ww:text name='edit'/>" border="0" /></a>
-                  </c:if>
+                  <c:choose>
+                    <c:when test="${!pageScope.notifier.fromProject}">
+                      <a href='<ww:url value="${notifier.type}ProjectNotifierEdit.action">
+                        <ww:param name="notifierId" value="${notifier.id}"/>
+                        <ww:param name="projectId" value="project.id"/>
+                        <ww:param name="projectGroupId" value="${project.projectGroup.id}"/>
+                        <ww:param name="notifierType">${notifier.type}</ww:param>
+                        </ww:url>'>
+                        <img src="<ww:url value='/images/edit.gif'/>" alt="<ww:text
name='edit'/>" title="<ww:text name='edit'/>" border="0" /></a>
+                    </c:when>
+                    <c:otherwise>
+                      <img src="<ww:url value='/images/edit_disabled.gif'/>" alt="<ww:text
name='edit'/>" title="<ww:text name='edit'/>" border="0" />
+                    </c:otherwise>
+                </c:choose>
                 </pss:ifAuthorized>
                 <pss:elseAuthorized>
                   <img src="<ww:url value='/images/edit_disabled.gif'/>" alt="<ww:text
name='edit'/>" title="<ww:text name='edit'/>" border="0" />
@@ -123,15 +128,20 @@
               </ec:column>
               <ec:column property="deleteAction" title="&nbsp;" width="1%">
                 <pss:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
-                  <c:if test="${!pageScope.notifier.fromProject}">
-                    <a href='<ww:url value="/deleteProjectNotifier!default.action">
-                      <ww:param name="projectId" value="project.id"/>
-                      <ww:param name="projectGroupId" value="${project.projectGroup.id}"/>
-                      <ww:param name="notifierType">${notifier.type}</ww:param>
-                      <ww:param name="notifierId" value="${notifier.id}"/>
-                      </ww:url>'>
-                      <img src="<ww:url value='/images/delete.gif'/>" alt="<ww:text
name='delete'/>" title="<ww:text name='delete'/>" border="0"></a>
-                  </c:if>
+                  <c:choose>
+                    <c:when test="${!pageScope.notifier.fromProject}">
+                      <a href='<ww:url value="/deleteProjectNotifier!default.action">
+                        <ww:param name="projectId" value="project.id"/>
+                        <ww:param name="projectGroupId" value="${project.projectGroup.id}"/>
+                        <ww:param name="notifierType">${notifier.type}</ww:param>
+                        <ww:param name="notifierId" value="${notifier.id}"/>
+                        </ww:url>'>
+                        <img src="<ww:url value='/images/delete.gif'/>" alt="<ww:text
name='delete'/>" title="<ww:text name='delete'/>" border="0"></a>
+                    </c:when>
+                    <c:otherwise>
+                      <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="<ww:text
name='edit'/>" title="<ww:text name='edit'/>" border="0" />
+                    </c:otherwise>
+                  </c:choose>
                 </pss:ifAuthorized>
                 <pss:elseAuthorized>
                   <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="<ww:text
name='edit'/>" title="<ww:text name='edit'/>" border="0" />



Mime
View raw message