continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r488635 - in /maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp: components/buildDefinitionGroupSummaryComponent.jsp components/buildDefinitionSummaryComponent.jsp projectView.jsp
Date Tue, 19 Dec 2006 11:18:31 GMT
Author: evenisse
Date: Tue Dec 19 03:18:25 2006
New Revision: 488635

URL: http://svn.apache.org/viewvc?view=rev&rev=488635
Log:
Fix some columns length

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp?view=diff&rev=488635&r1=488634&r2=488635
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
Tue Dec 19 03:18:25 2006
@@ -23,7 +23,7 @@
       <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="editActions" title="&nbsp;">
+      <ec:column property="editActions" title="&nbsp;" width="1%">
         <center>
         <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
           <ww:url id="editUrl" action="buildDefinition" method="input" namespace="/">
@@ -39,7 +39,7 @@
         </pss:elseAuthorized>
         </center>
       </ec:column>    
-      <ec:column property="deleteActions" title="&nbsp;">
+      <ec:column property="deleteActions" title="&nbsp;" width="1%">
         <center>
         <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
           <ww:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">
@@ -47,9 +47,9 @@
             <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
             <ww:param name="confirmed" value="false"/>
           </ww:url>
-        <ww:a href="%{removeUrl}">
+          <ww:a href="%{removeUrl}">
             <img src="<ww:url value='/images/delete.gif'/>" alt="Delete" title="Delete"
border="0">
-        </ww:a>
+          </ww:a>
         </pss:ifAuthorized>
         <pss:elseAuthorized>
           <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="Delete"
title="Delete" border="0">
@@ -95,7 +95,7 @@
           <img src="<c:url value='/images/buildnow.gif'/>" alt="Build Now" title="Build
Now" border="0">
         </ww:a>
       </ec:column>
-      <ec:column property="editAction" title="&nbsp;">
+      <ec:column property="editAction" title="&nbsp;" width="1%">
         <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
           <ww:url id="editUrl" action="buildDefinition" method="input" namespace="/">
             <ww:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</ww:param>
@@ -109,7 +109,7 @@
           <img src="<ww:url value='/images/edit_disabled.gif'/>" alt="Edit" title="Edit"
border="0">
         </pss:elseAuthorized>
       </ec:column>
-      <ec:column property="removeAction" title="&nbsp;">
+      <ec:column property="removeAction" title="&nbsp;" width="1%">
         <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
           <ww:url id="removeUrl" action="removeProjectBuildDefinition" namespace="/">
             <ww:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</ww:param>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp?view=diff&rev=488635&r1=488634&r2=488635
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
Tue Dec 19 03:18:25 2006
@@ -20,7 +20,7 @@
       <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="&nbsp;">
+      <ec:column property="editAction" title="&nbsp;" width="1%">
         <%-- if the from is PROJECT then render the links differently --%>
         <ww:if test="${pageScope.buildDefinitionSummary.from == 'PROJECT'}">
           <pss:ifAuthorized permission="continuum-modify-project-build-definition" resource="${projectGroupName}">
@@ -30,14 +30,9 @@
             </ww:url>
             <ww:a href="%{editUrl}"><img src="<ww:url value='/images/edit.gif'/>"
alt="<ww:text name='edit'/>" title="<ww:text name='edit'/>" border="0"></ww:a>
           </pss:ifAuthorized>
-          <pss:ifAuthorized permission="continuum-remove-project-build-definition" resource="${projectGroupName}">
-            <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="%{removeUrl}"><img src="<ww:url value='/images/delete.gif'/>"
alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0"></ww:a>
-          </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" />
+          </pss:elseAuthorized>
         </ww:if>
         <ww:else>
           <pss:ifAuthorized permission="continuum-modify-group-build-definition" resource="${projectGroupName}">
@@ -48,6 +43,27 @@
             </ww:url>
             <ww:a href="%{editUrl}"><img src="<ww:url value='/images/edit.gif'/>"
alt="<ww:text name='edit'/>" title="<ww:text name='edit'/>" border="0"></ww:a>
           </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" />
+          </pss:elseAuthorized>
+        </ww:else>
+      </ec:column>
+      <ec:column property="deleteAction" title="&nbsp;" width="1%">
+        <%-- if the from is PROJECT then render the links differently --%>
+        <ww:if test="${pageScope.buildDefinitionSummary.from == 'PROJECT'}">
+          <pss:ifAuthorized permission="continuum-remove-project-build-definition" resource="${projectGroupName}">
+            <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="%{removeUrl}"><img src="<ww:url value='/images/delete.gif'/>"
alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0"></ww:a>
+          </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" />
+          </pss:elseAuthorized>
+        </ww:if>
+        <ww:else>
           <pss:ifAuthorized permission="continuum-remove-group-build-definition" resource="${projectGroupName}">
             <ww:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">
               <ww:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
@@ -57,6 +73,9 @@
             </ww:url>
             <ww:a href="%{removeUrl}"><img src="<ww:url value='/images/delete.gif'/>"
alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0"></ww:a>
           </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" />
+          </pss:elseAuthorized>
         </ww:else>
       </ec:column>
     </ec:row>

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=488635&r1=488634&r2=488635
==============================================================================
--- 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 Tue
Dec 19 03:18:25 2006
@@ -85,7 +85,7 @@
               <ec:column property="recipient" title="projectView.notifier.recipient" cell="org.apache.maven.continuum.web.view.projectview.NotifierRecipientCell"/>
               <ec:column property="events" title="projectView.notifier.events" cell="org.apache.maven.continuum.web.view.projectview.NotifierEventCell"/>
               <ec:column property="from" title="projectView.notifier.from" cell="org.apache.maven.continuum.web.view.projectview.NotifierFromCell"/>
-              <ec:column property="actions" title="&nbsp;">
+              <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!default.action">
@@ -95,7 +95,15 @@
                       <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>
-                    &nbsp;
+                  </c:if>
+                </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" />
+                </pss:elseAuthorized>
+              </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}"/>
@@ -105,6 +113,9 @@
                       <img src="<ww:url value='/images/delete.gif'/>" alt="<ww:text
name='delete'/>" title="<ww:text name='delete'/>" border="0"></a>
                   </c:if>
                 </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" />
+                </pss:elseAuthorized>
               </ec:column>
             </ec:row>
           </ec:table>



Mime
View raw message