continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r776901 - /continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp
Date Thu, 21 May 2009 00:40:22 GMT
Author: ctan
Date: Thu May 21 00:40:22 2009
New Revision: 776901

URL: http://svn.apache.org/viewvc?rev=776901&view=rev
Log:
[CONTINUUM-2231] reorder queues in Queues page and fixed typo

Modified:
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp?rev=776901&r1=776900&r2=776901&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp
(original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp
Thu May 21 00:40:22 2009
@@ -30,86 +30,6 @@
       <meta http-equiv="refresh" content="60"/>
     </head>
     <body>
-      <s:form id="prepareBuildForm" action="none" method="post">
-      	<div id="h3">
-          <h3><s:text name="prepareBuildQueue.currentTask.section.title"/></h3>
-          <c:if test="${not empty currentPrepareBuilds}">
-            <s:set name="currentPrepareBuilds" value="currentPrepareBuilds" scope="request"/>
-            <ec:table items="currentPrepareBuilds"
-                      var="currentPrepareBuild"
-                      showExports="false"
-                      showPagination="false"
-                      showStatusBar="false"
-                      sortable="false"
-                      filterable="false">
-              <ec:row>
-                <ec:column property="projectGroupName" title="prepareBuildQueue.table.projectGroupName"/>
-                <ec:column property="scmRootAddress" title="prepareBuildQueue.table.scmRootAddress"/>
-              </ec:row>
-            </ec:table>
-          </c:if>
-          <c:if test="${empty currentPrepareBuilds}">
-            <s:text name="prepareBuildQueue.no.currentTasks"/>
-          </c:if>
-        </div>
-      </s:form>
-       
-      <s:form id="removePrepareBuildForm" action="removePrepareBuildEntries.action" method="post">
-        <div id="h3">
-          <h3>
-            <s:text name="prepareBuildQueue.section.title"/>
-          </h3>
-          <c:if test="${not empty prepareBuildQueues}">
-            <s:set name="prepareBuildQueues" value="prepareBuildQueues" scope="request"/>
-            <ec:table items="prepareBuildQueues"
-                      var="prepareBuildQueue"
-                      showExports="false"
-                      showPagination="false"
-                      showStatusBar="false"
-                      sortable="false"
-                      filterable="false">
-              <ec:row>
-                <redback:ifAuthorized permission="continuum-manage-queues">
-                  <ec:column alias="selectedPrepareBuildTaskHashCodes" title="&nbsp;"
style="width:5px" filterable="false" sortable="false" width="1%" headerCell="selectAll">
-                    <input type="checkbox" name="selectedPrepareBuildTaskHashCodes" value="${pageScope.prepareBuildQueue.hashCode}"
/>
-                  </ec:column>             
-                </redback:ifAuthorized>
-                <ec:column property="projectGroupName" title="prepareBuildQueue.table.projectGroupName"/>
-                <ec:column property="scmRootAddress" title="prepareBuildQueue.table.scmRootAddress"/>
-                <ec:column property="cancelEntry" title="&nbsp;" width="1%">
-                  <redback:ifAuthorized permission="continuum-manage-queues">
-                    <s:url id="cancelUrl" action="removePrepareBuildEntry" method="removePrepareBuildEntry"
namespace="/">
-                      <s:param name="projectGroupId">${pageScope.prepareBuildQueue.projectGroupId}</s:param>
-                      <s:param name="scmRootId">${pageScope.prepareBuildQueue.scmRootId}</s:param>
-                    </s:url>
-                    <s:a href="%{cancelUrl}"><img src="<s:url value='/images/cancelbuild.gif'
includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>"
border="0"></s:a>
-                  </redback:ifAuthorized>
-                  <redback:elseAuthorized>
-                    <img src="<s:url value='/images/cancelbuild_disabled.gif' includeParams="none"/>"
alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0">
-                  </redback:elseAuthorized>
-                </ec:column>
-              </ec:row>
-            </ec:table>
-          </c:if>
-        </div>
-        <c:if test="${not empty prepareBuildQueues}">
-          <div class="functnbar3">
-            <table>
-              <tbody>
-                <tr>
-                  <td>
-                    <input type="button" name="remove-prepare-build-queues" value="<s:text
name="prepareBuildQueue.removeEntries"/>" onclick="document.forms.removePrepareBuildForm.submit();"
/> 
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </c:if>
-        <c:if test="${empty prepaerBuildQueues}">
-          <s:text name="prepareBuildQueue.empty"/>
-        </c:if>
-      </s:form>
-      
       <s:form id="buildQueueForm" action="none" method="post">
         <div id="h3">
           <h3>
@@ -320,8 +240,87 @@
               </tbody>
             </table>
           </div>
+        </c:if>          
+      </s:form>
+
+      <s:form id="prepareBuildForm" action="none" method="post">
+      	<div id="h3">
+          <h3><s:text name="prepareBuildQueue.currentTask.section.title"/></h3>
+          <c:if test="${not empty currentPrepareBuilds}">
+            <s:set name="currentPrepareBuilds" value="currentPrepareBuilds" scope="request"/>
+            <ec:table items="currentPrepareBuilds"
+                      var="currentPrepareBuild"
+                      showExports="false"
+                      showPagination="false"
+                      showStatusBar="false"
+                      sortable="false"
+                      filterable="false">
+              <ec:row>
+                <ec:column property="projectGroupName" title="prepareBuildQueue.table.projectGroupName"/>
+                <ec:column property="scmRootAddress" title="prepareBuildQueue.table.scmRootAddress"/>
+              </ec:row>
+            </ec:table>
+          </c:if>
+          <c:if test="${empty currentPrepareBuilds}">
+            <s:text name="prepareBuildQueue.no.currentTasks"/>
+          </c:if>
+        </div>
+      </s:form>
+       
+      <s:form id="removePrepareBuildForm" action="removePrepareBuildEntries.action" method="post">
+        <div id="h3">
+          <h3>
+            <s:text name="prepareBuildQueue.section.title"/>
+          </h3>
+          <c:if test="${not empty prepareBuildQueues}">
+            <s:set name="prepareBuildQueues" value="prepareBuildQueues" scope="request"/>
+            <ec:table items="prepareBuildQueues"
+                      var="prepareBuildQueue"
+                      showExports="false"
+                      showPagination="false"
+                      showStatusBar="false"
+                      sortable="false"
+                      filterable="false">
+              <ec:row>
+                <redback:ifAuthorized permission="continuum-manage-queues">
+                  <ec:column alias="selectedPrepareBuildTaskHashCodes" title="&nbsp;"
style="width:5px" filterable="false" sortable="false" width="1%" headerCell="selectAll">
+                    <input type="checkbox" name="selectedPrepareBuildTaskHashCodes" value="${pageScope.prepareBuildQueue.hashCode}"
/>
+                  </ec:column>             
+                </redback:ifAuthorized>
+                <ec:column property="projectGroupName" title="prepareBuildQueue.table.projectGroupName"/>
+                <ec:column property="scmRootAddress" title="prepareBuildQueue.table.scmRootAddress"/>
+                <ec:column property="cancelEntry" title="&nbsp;" width="1%">
+                  <redback:ifAuthorized permission="continuum-manage-queues">
+                    <s:url id="cancelUrl" action="removePrepareBuildEntry" method="removePrepareBuildEntry"
namespace="/">
+                      <s:param name="projectGroupId">${pageScope.prepareBuildQueue.projectGroupId}</s:param>
+                      <s:param name="scmRootId">${pageScope.prepareBuildQueue.scmRootId}</s:param>
+                    </s:url>
+                    <s:a href="%{cancelUrl}"><img src="<s:url value='/images/cancelbuild.gif'
includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>"
border="0"></s:a>
+                  </redback:ifAuthorized>
+                  <redback:elseAuthorized>
+                    <img src="<s:url value='/images/cancelbuild_disabled.gif' includeParams="none"/>"
alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0">
+                  </redback:elseAuthorized>
+                </ec:column>
+              </ec:row>
+            </ec:table>
+          </c:if>
+        </div>
+        <c:if test="${not empty prepareBuildQueues}">
+          <div class="functnbar3">
+            <table>
+              <tbody>
+                <tr>
+                  <td>
+                    <input type="button" name="remove-prepare-build-queues" value="<s:text
name="prepareBuildQueue.removeEntries"/>" onclick="document.forms.removePrepareBuildForm.submit();"
/> 
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </c:if>
+        <c:if test="${empty prepareBuildQueues}">
+          <s:text name="prepareBuildQueue.empty"/>
         </c:if>
-                
       </s:form>
     </body>
   </s:i18n>



Mime
View raw message