You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by oc...@apache.org on 2009/01/16 08:26:29 UTC
svn commit: r734933 -
/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp
Author: oching
Date: Thu Jan 15 23:26:29 2009
New Revision: 734933
URL: http://svn.apache.org/viewvc?rev=734933&view=rev
Log:
cleanup commented parts in buildQueueView.jsp
Modified:
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp?rev=734933&r1=734932&r2=734933&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp Thu Jan 15 23:26:29 2009
@@ -135,67 +135,7 @@
</table>
</div>
</c:if>
-
- <%--
- <div id="h3">
- <h3>
- <s:text name="buildQueue.section.title"/>
- </h3>
- <c:if test="${not empty buildsInQueue}">
- <ec:table items="buildsInQueue.values"
- var="buildProjectTask"
- showExports="false"
- showPagination="false"
- showStatusBar="false"
- sortable="false"
- filterable="false">
- <ec:row highlightRow="true">
- <redback:ifAuthorized permission="continuum-manage-queues">
- <ec:column alias="selectedBuildTaskHashCodes" title=" " style="width:5px" filterable="false" sortable="false" width="1%" headerCell="selectAll">
- <input type="checkbox" name="selectedBuildTaskHashCodes" value="${buildProjectTask.hashCode}" />
- </ec:column>
- </redback:ifAuthorized>
- <ec:column property="projectName" title="buildQueue.currentTask.projectName" style="white-space: nowrap" width="49%"/>
- <ec:column property="buildDefinitionLabel" title="buildQueue.currentTask.buildDefinition" style="white-space: nowrap" width="49%"/>
- <ec:column property="cancelEntry" title=" " width="1%">
- <redback:ifAuthorized permission="continuum-manage-queues">
- <s:url id="cancelUrl" action="removeBuildQueueEntry" method="remove" namespace="/">
- <s:param name="projectId">${pageScope.buildProjectTask.projectId}</s:param>
- <s:param name="buildDefinitionId">${pageScope.buildProjectTask.buildDefinitionId}</s:param>
- <s:param name="trigger">${pageScope.buildProjectTask.trigger}</s:param>
- <s:param name="projectName">${pageScope.buildProjectTask.projectName}</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>
- <c:if test="${empty buildsInQueue}">
- <s:text name="buildQueue.empty"/>
- </c:if>
- </div>
- <c:if test="${not empty buildsInQueue}">
- <div class="functnbar3">
- <table>
- <tbody>
- <tr>
- <td>
- <input type="submit" value="<s:text name="buildQueue.removeEntries"/>"
- onclick="$('removeForm').action='removeBuildQueueEntries!removeBuildEntries.action';$('removeForm').submit();" />
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- </c:if>
-
- --%>
-
-
+
<!-- checkout queue -->
<div id="h3">
<h3>
@@ -296,70 +236,7 @@
</table>
</div>
</c:if>
-
- <%--
- <div id="h3">
- <h3>
- <s:text name="checkoutQueue.section.title"/>
- </h3>
-
-
- <c:forEach var="element" items="${checkoutsInQueue}">
- <h4>
- Build Queue: ${element.key}
- </h4>
- <c:if test="${!empty checkoutsInQueue}">
- <ec:table items="checkoutsInQueue.values.value"
- var="currentCheckOutTask"
- showExports="false"
- showPagination="false"
- showStatusBar="false"
- sortable="false"
- filterable="false">
- <ec:row highlightRow="true">
- <redback:ifAuthorized permission="continuum-manage-queues">
- <ec:column alias="selectedCheckOutTaskHashCodes" title=" " style="width:5px" filterable="false" sortable="false" width="1%" headerCell="selectAll">
- <input type="checkbox" name="selectedCheckOutTaskHashCodes" value="${currentCheckOutTask.hashCode}" />
- </ec:column>
- </redback:ifAuthorized>
- <ec:column property="projectName" title="Project Name" style="white-space: nowrap" width="98%"/>
- <ec:column property="cancelEntry" title=" " width="1%">
- <redback:ifAuthorized permission="continuum-manage-queues">
- <s:url id="cancelUrl" action="removeCheckoutQueueEntry" method="removeCheckout">
- <s:param name="projectId">${pageScope.currentCheckOutTask.projectId}</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>
- <c:if test="${empty checkoutsInQueue}">
- <s:text name="checkoutQueue.empty"/>
- </c:if>
- </c:forEach>
- </div>
- <c:if test="${not empty checkoutsInQueue}">
- <div class="functnbar3">
- <table>
- <tbody>
- <tr>
- <td>
- <redback:ifAuthorized permission="continuum-manage-queues">
- <input type="submit" value="<s:text name="checkoutQueue.removeEntries"/>"
- onclick="$('removeForm').action='removeCheckoutQueueEntries!removeCheckoutEntries.action';$('removeForm').submit();" />
- </redback:ifAuthorized>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- </c:if>
- --%>
-
+
</s:form>
</body>
</s:i18n>