You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2014/05/20 16:02:06 UTC
svn commit: r1596252 [3/4] - in /continuum/trunk: ./
continuum-buildagent/continuum-buildagent-webapp/src/appserver-base/conf/
continuum-jetty/ continuum-jetty/src/main/assembly/ continuum-webapp-test/
continuum-webapp-test/src/appserver-base/conf/ con...
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp Tue May 20 14:02:03 2014
@@ -19,7 +19,6 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -45,7 +44,7 @@
<c:when test="${empty actionErrors}">
<table>
<tbody>
- <s:textfield label="%{getText('buildDefinitionTemplate.name')}" name="buildDefinitionTemplate.name" requiredLabel="true"/>
+ <s:textfield label="%{getText('buildDefinitionTemplate.name')}" name="buildDefinitionTemplate.name" requiredLabel="true" size="100"/>
<s:optiontransferselect
label="%{getText('buildDefinitionTemplate.builddefinitions.define')}"
name="buildDefinitionIds"
@@ -73,7 +72,8 @@
</tbody>
</table>
<div class="functnbar3">
- <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('save')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</div>
<s:hidden name="buildDefinitionTemplate.id"/>
<s:hidden name="buildDefinitionTemplate.continuumDefault"/>
@@ -85,10 +85,5 @@
</div>
</body>
</s:i18n>
- <script type="text/javascript">
- customOnsubmit = function(){
- // no op
- }
- </script>
</html>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editDistributedPurgeConfiguration.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editDistributedPurgeConfiguration.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editDistributedPurgeConfiguration.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editDistributedPurgeConfiguration.jsp Tue May 20 14:02:03 2014
@@ -19,7 +19,6 @@
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -41,8 +40,8 @@
</c:if>
<table>
<s:select label="%{getText('purgeConfig.directoryType.label')}" name="directoryType" list="directoryTypes"/>
- <s:textfield label="%{getText('purgeConfig.daysOlder.label')}" name="daysOlder"/>
- <s:textfield label="%{getText('purgeConfig.retentionCount.label')}" name="retentionCount"/>
+ <s:textfield label="%{getText('purgeConfig.daysOlder.label')}" name="daysOlder" size="100"/>
+ <s:textfield label="%{getText('purgeConfig.retentionCount.label')}" name="retentionCount" size="100"/>
<s:checkbox label="%{getText('purgeConfig.deleteAll.label')}" name="deleteAll"/>
<s:if test="purgeType == 'repository'">
<s:checkbox label="%{getText('purgeConfig.deleteReleasedSnapshots.label')}" name="deleteReleasedSnapshots"/>
@@ -50,13 +49,14 @@
<s:select label="%{getText('purgeConfig.buildAgent.label')}" name="buildAgentUrl" list="buildAgentUrls"/>
<s:select label="%{getText('purgeConfig.schedule.label')}" name="scheduleId" list="schedules"
headerKey="-1" headerValue=""/>
- <s:textfield label="%{getText('purgeConfig.description.label')}" name="description"/>
+ <s:textfield label="%{getText('purgeConfig.description.label')}" name="description" size="100"/>
<s:checkbox label="%{getText('purgeConfig.enabled.label')}" name="enabled"/>
</table>
<s:hidden name="purgeConfigId"/>
<s:hidden name="purgeType"/>
<div class="functnbar3">
- <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('save')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</div>
</s:form>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
--%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -33,7 +32,7 @@
<s:text name="installation.section.title"/>
</h3>
- <s:form action="saveInstallation!save" method="post">
+ <s:form action="saveInstallation" method="post">
<s:if test="hasActionErrors()">
<h3>Action Error</h3>
@@ -52,29 +51,30 @@
<s:hidden name="varNameUpdatable" />
<s:hidden name="varNameDisplayable" />
<s:textfield label="%{getText('installation.name.label')}" name="installation.name"
- requiredLabel="true"/>
+ requiredLabel="true" size="100"/>
<s:if test="displayTypes">
<s:select label="%{getText('installation.type.label')}" name="installation.type" list="typesLabels" />
</s:if>
<s:if test="varNameUpdatable">
<s:if test="varNameDisplayable">
- <s:textfield label="%{getText('installation.varName.label')}" name="installation.varName" requiredLabel="true" />
+ <s:textfield label="%{getText('installation.varName.label')}" name="installation.varName" requiredLabel="true" size="100" />
</s:if>
</s:if>
<s:else>
<s:if test="varNameDisplayable">
- <s:textfield label="%{getText('installation.varName.label')}" name="installation.varName" requiredLabel="true" readonly="true"/>
+ <s:textfield label="%{getText('installation.varName.label')}" name="installation.varName" requiredLabel="true" readonly="true" size="100"/>
</s:if>
</s:else>
<s:textfield label="%{getText('installation.value.label')}" name="installation.varValue"
- requiredLabel="true"/>
+ requiredLabel="true" size="100"/>
<s:if test="%{(automaticProfileDisplayable && installation == null) || (installation.installationId == 0)}">
<s:checkbox label="%{getText('installation.automaticProfile.label')}" name="automaticProfile" />
</s:if>
</tbody>
</table>
<div class="functnbar3">
- <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('save')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</div>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp Tue May 20 14:02:03 2014
@@ -19,7 +19,6 @@
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -41,8 +40,8 @@
</c:if>
<table>
- <s:textfield label="%{getText('repository.name.label')}" name="repository.name" requiredLabel="true" disabled="%{defaultRepo}"/>
- <s:textfield label="%{getText('repository.location.label')}" name="repository.location" requiredLabel="true" disabled="%{defaultRepo}"/>
+ <s:textfield label="%{getText('repository.name.label')}" name="repository.name" requiredLabel="true" disabled="%{defaultRepo}" size="100"/>
+ <s:textfield label="%{getText('repository.location.label')}" name="repository.location" requiredLabel="true" disabled="%{defaultRepo}" size="100"/>
<s:select label="%{getText('repository.layout.label')}" name="repository.layout" list="layouts" disabled="%{defaultRepo}"/>
</table>
<s:hidden name="repository.id"/>
@@ -52,7 +51,8 @@
<s:hidden name="repository.layout"/>
</s:if>
<div class="functnbar3">
- <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('save')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</div>
</s:form>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editParallelBuilds.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editParallelBuilds.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editParallelBuilds.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editParallelBuilds.jsp Tue May 20 14:02:03 2014
@@ -19,7 +19,6 @@
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
@@ -43,10 +42,11 @@
<div class="axial">
<s:form action="saveBuildQueue" method="post" validate="true">
<table>
- <s:textfield label="%{getText('parallel.build.queue.name')}" name="name" requiredLabel="true" />
+ <s:textfield label="%{getText('parallel.build.queue.name')}" name="name" requiredLabel="true" size="100" />
</table>
<div class="functnbar3">
- <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('save')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</div>
</s:form>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp Tue May 20 14:02:03 2014
@@ -28,7 +28,7 @@
<h1><s:text name="companyPom.section.title"/></h1>
<s:actionmessage/>
-<s:form method="post" action="saveCompanyPom" namespace="/admin" validate="true" theme="xhtml">
+<s:form method="post" action="saveCompanyPom" namespace="/admin" validate="true">
<s:token/>
<s:label name="companyModel.groupId" label="%{getText('appearance.companyPom.groupId')}"/>
<s:label name="companyModel.artifactId" label="%{getText('appearance.companyPom.artifactId')}"/>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp Tue May 20 14:02:03 2014
@@ -38,118 +38,85 @@
<div class="axial">
<s:if test="hasActionErrors()">
<h3><s:text name="profile.actionError"/></h3>
- <p>
- <s:actionerror/>
- </p>
+ <p>
+ <s:actionerror/>
+ </p>
</s:if>
</div>
- <table>
- <tr>
- <td>
- <s:form action="saveBuildEnv!save" method="post">
-
- <div class="axial">
- <!-- if other fields are added ProfileAction#save must be changed -->
- <table>
- <tbody>
- <tr>
- <td>
- <s:hidden name="profile.id" />
- <s:textfield label="%{getText('profile.name.label')}" name="profile.name"
- requiredLabel="true" />
- </td>
- </tr>
-
- <c1:ifBuildTypeEnabled buildType="distributed">
- <tr>
- <td>
- <s:if test ="profile != null">
- <s:if test="profile.buildAgentGroup == null">
- <s:select label="%{getText('profile.build.agent.group')}" name="profile.buildAgentGroup" list="buildAgentGroups" listValue="name"
- value="-1" listKey="name" headerKey="" headerValue=""/>
- </s:if>
- <s:else>
- <s:select label="%{getText('profile.build.agent.group')}" name="profile.buildAgentGroup" list="buildAgentGroups" listValue="name"
- listKey="name" headerKey="" headerValue=""/>
- </s:else>
- </s:if>
- </td>
- </tr>
- </c1:ifBuildTypeEnabled>
-
- </tbody>
- </table>
+ <div class="axial">
+ <s:form action="saveBuildEnv" method="post">
+ <!-- if other fields are added ProfileAction#save must be changed -->
+ <s:hidden name="profile.id" />
+ <s:textfield label="%{getText('profile.name.label')}" name="profile.name"
+ requiredLabel="true" size="100" />
+ <c1:ifBuildTypeEnabled buildType="distributed">
+ <s:if test ="profile != null">
+ <s:if test="profile.buildAgentGroup == null">
+ <s:select label="%{getText('profile.build.agent.group')}" name="profile.buildAgentGroup" list="buildAgentGroups" listValue="name"
+ value="-1" listKey="name" headerKey="" headerValue=""/>
+ </s:if>
+ <s:else>
+ <s:select label="%{getText('profile.build.agent.group')}" name="profile.buildAgentGroup" list="buildAgentGroups" listValue="name"
+ listKey="name" headerKey="" headerValue=""/>
+ </s:else>
+ </s:if>
+ </c1:ifBuildTypeEnabled>
+ <tr>
+ <td colspan="2">
<div class="functnbar3">
- <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('save')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</div>
-
- </div>
- </s:form>
- </td>
- </tr>
- <s:if test="profile.id != 0">
- <tr>
- <td>
- <div class="axial">
- <table width="100%">
- <tbody>
- <tr>
- <td>
- <ec:table items="profileInstallations"
- var="profileInstallation"
- showExports="false"
- showPagination="false"
- showStatusBar="false"
- sortable="false"
- filterable="false"
- width="100%"
- autoIncludeParameters="false">
- <ec:row highlightRow="true">
- <ec:column property="nameEdit" title="profile.installation.name.label" style="white-space: nowrap" width="50%">
- <a href="editInstallation!edit.action?installation.installationId=<c:out value="${profileInstallation.installationId}"/>">
- <c:out value="${profileInstallation.name}"/>
- </a>
- (<c:out value="${profileInstallation.varValue}"/>)
- </ec:column>
- <ec:column property="type" title="installation.type.label" style="white-space: nowrap" width="49%"/>
- <ec:column property="id" title=" " width="1%">
- <a href="removeBuildEnvInstallation!removeInstallation.action?profile.id=<c:out value="${profile.id}"/>&installationId=<c:out value="${profileInstallation.installationId}"/>">
- <img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0" />
- </a>
- </ec:column>
- </ec:row>
- </ec:table>
- </td>
- </tr>
- </tbody>
- </table>
- <s:if test="allInstallations.size > 0">
- <s:form action="addInstallationBuildEnv!addInstallation.action" method="get">
- <s:hidden name="profile.id" />
- <div class="functnbar3">
- <!-- can't use default profile to display this select -->
- <s:select theme="profile" name="installationId" list="allInstallations" listKey="installationId" listValue="name" />
- <s:submit value="%{getText('add')}"/>
- </div>
- </s:form>
- </s:if>
- <s:else>
- <div class="warningmessage" style="color: red"><s:text name="profile.no.installations" /></div>
- </s:else>
- </div>
</td>
</tr>
- </s:if>
- <s:else>
- <tr>
- <td>
- <c:if test="allInstallations.size < 1">
- <div class="warningmessage" style="color: red"><s:text name="profile.no.installations" /></div>
- </c:if>
- </td>
- </tr>
- </s:else>
- </table>
+ </s:form>
+ </div>
+ <s:if test="profile.id != 0">
+ <div class="axial">
+ <ec:table items="profileInstallations"
+ var="profileInstallation"
+ showExports="false"
+ showPagination="false"
+ showStatusBar="false"
+ sortable="false"
+ filterable="false"
+ width="100%"
+ autoIncludeParameters="false">
+ <ec:row highlightRow="true">
+ <ec:column property="nameEdit" title="profile.installation.name.label" style="white-space: nowrap" width="50%">
+ <a href="editInstallation.action?installation.installationId=<c:out value="${profileInstallation.installationId}"/>">
+ <c:out value="${profileInstallation.name}"/>
+ </a>
+ (<c:out value="${profileInstallation.varValue}"/>)
+ </ec:column>
+ <ec:column property="type" title="installation.type.label" style="white-space: nowrap" width="49%"/>
+ <ec:column property="id" title=" " width="1%">
+ <a href="removeBuildEnvInstallation.action?profile.id=<c:out value="${profile.id}"/>&installationId=<c:out value="${profileInstallation.installationId}"/>">
+ <img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0" />
+ </a>
+ </ec:column>
+ </ec:row>
+ </ec:table>
+ <s:if test="allInstallations.size > 0">
+ <s:form action="addInstallationBuildEnv.action" method="get">
+ <s:hidden name="profile.id" />
+ <div class="functnbar3">
+ <!-- can't use default profile to display this select -->
+ <s:select theme="simple" name="installationId" list="allInstallations" listKey="installationId" listValue="name" />
+ <s:submit value="%{getText('add')}" theme="simple"/>
+ </div>
+ </s:form>
+ </s:if>
+ <s:else>
+ <div class="warningmessage" style="color: red"><s:text name="profile.no.installations" /></div>
+ </s:else>
+ </div>
+ </s:if>
+ <s:else>
+ <c:if test="allInstallations.size < 1">
+ <div class="warningmessage" style="color: red"><s:text name="profile.no.installations" /></div>
+ </c:if>
+ </s:else>
</div>
</body>
</s:i18n>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp Tue May 20 14:02:03 2014
@@ -19,7 +19,6 @@
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -50,8 +49,8 @@
<s:select label="%{getText('purgeConfig.directoryType.label')}" name="directoryType" list="directoryTypes"/>
</c:otherwise>
</c:choose>
- <s:textfield label="%{getText('purgeConfig.daysOlder.label')}" name="daysOlder"/>
- <s:textfield label="%{getText('purgeConfig.retentionCount.label')}" name="retentionCount"/>
+ <s:textfield label="%{getText('purgeConfig.daysOlder.label')}" name="daysOlder" size="100"/>
+ <s:textfield label="%{getText('purgeConfig.retentionCount.label')}" name="retentionCount" size="100"/>
<s:checkbox label="%{getText('purgeConfig.deleteAll.label')}" name="deleteAll"/>
<s:if test="purgeType == 'repository'">
<s:checkbox label="%{getText('purgeConfig.deleteReleasedSnapshots.label')}" name="deleteReleasedSnapshots"/>
@@ -67,13 +66,14 @@
</c:choose>
<s:select label="%{getText('purgeConfig.schedule.label')}" name="scheduleId" list="schedules"
headerKey="-1" headerValue=""/>
- <s:textfield label="%{getText('purgeConfig.description.label')}" name="description"/>
+ <s:textfield label="%{getText('purgeConfig.description.label')}" name="description" size="100"/>
<s:checkbox label="%{getText('purgeConfig.enabled.label')}" name="enabled"/>
</table>
<s:hidden name="purgeConfigId"/>
<s:hidden name="purgeType"/>
<div class="functnbar3">
- <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('save')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</div>
</c:when>
<c:otherwise>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp Tue May 20 14:02:03 2014
@@ -19,7 +19,6 @@
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<html>
@@ -49,12 +48,12 @@
<ec:column property="varValue" title="installation.value.label" style="white-space: nowrap" />
<ec:column property="id" title=" " width="1%">
- <a href="editInstallation!edit.action?installation.installationId=<c:out value="${installation.installationId}"/>">
+ <a href="editInstallation.action?installation.installationId=<c:out value="${installation.installationId}"/>">
<img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0" />
</a>
</ec:column>
<ec:column property="id" title=" " width="1%">
- <a href="deleteInstallation!delete.action?installation.installationId=<c:out value="${installation.installationId}"/>&installation.name=<c:out value="${installation.name}"/>">
+ <a href="deleteInstallation.action?installation.installationId=<c:out value="${installation.installationId}"/>&installation.name=<c:out value="${installation.name}"/>">
<img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0" />
</a>
</ec:column>
@@ -62,7 +61,7 @@
</ec:table>
</c:if>
<div class="functnbar3">
- <s:form action="installationsTypeChoice!listTypes.action" method="post">
+ <s:form action="installationsTypeChoice.action" method="post">
<s:submit value="%{getText('add')}"/>
</s:form>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsTypeChoice.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsTypeChoice.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsTypeChoice.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsTypeChoice.jsp Tue May 20 14:02:03 2014
@@ -19,7 +19,6 @@
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<html>
@@ -32,7 +31,7 @@
<h3>
<s:text name="installationTypeChoice.section.title"/>
</h3>
- <form action="editInstallation!input.action">
+ <form action="editInstallation_input.action">
<div class="axial">
<table>
@@ -42,7 +41,8 @@
</tbody>
</table>
<div class="functnbar3">
- <c1:submitcancel value="%{getText('add')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('add')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</div>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp Tue May 20 14:02:03 2014
@@ -19,7 +19,6 @@
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
@@ -68,7 +67,7 @@
</c:if>
<div class="functnbar3">
- <s:form action="addBuildQueue!input.action" method="post">
+ <s:form action="addBuildQueue.action" method="post">
<s:submit value="%{getText('add')}"/>
</s:form>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp Tue May 20 14:02:03 2014
@@ -71,12 +71,12 @@
<ec:column property="buildAgentGroup" title="profilesList.buildAgentGroup.label" style="white-space: nowrap" />
</c1:ifBuildTypeEnabled>
<ec:column property="id" title=" " width="1%">
- <a href="editBuildEnv!edit.action?profile.id=<c:out value="${pageScope.profile.id}"/>">
+ <a href="editBuildEnv.action?profile.id=<c:out value="${pageScope.profile.id}"/>">
<img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0" />
</a>
</ec:column>
<ec:column property="id" title=" " width="1%">
- <a href="confirmDeleteBuildEnv!confirmDelete.action?profile.id=<c:out value="${pageScope.profile.id}"/>">
+ <a href="confirmDeleteBuildEnv.action?profile.id=<c:out value="${pageScope.profile.id}"/>">
<img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0" />
</a>
</ec:column>
@@ -84,7 +84,7 @@
</ec:table>
</c:if>
<div class="functnbar3">
- <s:form action="addBuildEnv!input.action" method="post">
+ <s:form action="addBuildEnv.action" method="post">
<s:submit value="%{getText('add')}"/>
</s:form>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp Tue May 20 14:02:03 2014
@@ -20,7 +20,6 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
<html>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewBuildAgent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewBuildAgent.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewBuildAgent.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewBuildAgent.jsp Tue May 20 14:02:03 2014
@@ -20,7 +20,6 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<s:i18n name="localization.Continuum">
@@ -32,9 +31,18 @@
<h3><s:text name="viewBuildAgent.section.title"/></h3>
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
- <c1:data label="%{getText('buildAgent.url.label')}" name="buildAgent.url"/>
- <c1:data label="%{getText('buildAgent.description.label')}" name="buildAgent.description"/>
- <c1:data label="%{getText('buildAgent.enabled.label')}" name="buildAgent.enabled"/>
+ <tr class="b">
+ <th><label class="label"><s:text name='buildAgent.url.label'/>:</label></th>
+ <td><s:property value="buildAgent.url"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='buildAgent.description.label'/>:</label></th>
+ <td><s:property value="buildAgent.description"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='buildAgent.enabled.label'/>:</label></th>
+ <td><s:property value="buildAgent.enabled"/></td>
+ </tr>
</table>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp Tue May 20 14:02:03 2014
@@ -61,7 +61,7 @@
<ec:column property="projectGroupName" title="distributedBuild.table.projectGroupName"/>
<ec:column property="buildAgentUrl" title="distributedBuild.table.buildAgentUrl"/>
<ec:column property="cancelEntry" title=" " width="1%">
- <s:url id="cancelUrl" action="cancelDistributedBuild" method="cancelDistributedBuild" namespace="/">
+ <s:url id="cancelUrl" action="cancelDistributedBuild" namespace="/">
<s:param name="buildAgentUrl"><c:out value="${pageScope.currentBuild.buildAgentUrl}"/></s:param>
</s:url>
<redback:ifAuthorized permission="continuum-manage-queues">
@@ -79,7 +79,7 @@
</c:if>
</div>
- <s:form id="removeBuildForm" action="removeDistributedBuildEntries!removeDistributedBuildEntries.action" method="post">
+ <s:form id="removeBuildForm" action="removeDistributedBuildEntries.action" method="post">
<div id="h3">
<h3>
<s:text name="distributedBuilds.buildQueue.section.title"/>
@@ -111,7 +111,7 @@
<ec:column property="buildAgentUrl" title="distributedBuild.table.buildAgentUrl"/>
<ec:column property="cancelEntry" title=" " width="1%">
<redback:ifAuthorized permission="continuum-manage-queues">
- <s:url id="cancelUrl" action="removeDistributedBuildEntry" method="removeDistributedBuildEntry" namespace="/">
+ <s:url id="cancelUrl" action="removeDistributedBuildEntry" namespace="/">
<s:param name="projectId"><c:out value="${pageScope.buildQueue.projectId}"/></s:param>
<s:param name="buildDefinitionId"><c:out value="${pageScope.buildQueue.buildDefinitionId}"/></s:param>
<s:param name="buildAgentUrl"><c:out value="${pageScope.buildQueue.buildAgentUrl}"/></s:param>
@@ -174,7 +174,7 @@
</div>
- <s:form id="removePrepareBuildForm" action="removeDistributedPrepareBuildEntries!removeDistributedPrepareBuildEntries.action" method="post">
+ <s:form id="removePrepareBuildForm" action="removeDistributedPrepareBuildEntries.action" method="post">
<div id="h3">
<h3>
<s:text name="distributedBuilds.prepareBuildQueue.section.title"/>
@@ -205,7 +205,7 @@
<ec:column property="buildAgentUrl" title="distributedPrepareBuild.table.buildAgentUrl"/>
<ec:column property="cancelEntry" title=" " width="1%">
<redback:ifAuthorized permission="continuum-manage-queues">
- <s:url id="cancelUrl" action="removeDistributedPrepareBuildEntry" method="removeDistributedPrepareBuildEntry" namespace="/">
+ <s:url id="cancelUrl" action="removeDistributedPrepareBuildEntry" namespace="/">
<s:param name="projectGroupId"><c:out value="${pageScope.prepareBuildQueue.projectGroupId}"/></s:param>
<s:param name="scmRootId"><c:out value="${pageScope.prepareBuildQueue.scmRootId}"/></s:param>
<s:param name="buildAgentUrl"><c:out value="${pageScope.prepareBuildQueue.buildAgentUrl}"/></s:param>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp Tue May 20 14:02:03 2014
@@ -19,7 +19,6 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -46,25 +45,25 @@
<table>
<tbody>
<s:if test="executor == 'ant' or buildDefinitionType == 'ant'">
- <s:textfield label="%{getText('buildDefinition.buildFile.ant.label')}" name="buildFile" requiredLabel="true"/>
+ <s:textfield label="%{getText('buildDefinition.buildFile.ant.label')}" name="buildFile" requiredLabel="true" size="100"/>
</s:if>
<s:elseif test="executor == 'shell' or buildDefinitionType == 'shell'">
- <s:textfield label="%{getText('buildDefinition.buildFile.shell.label')}" name="buildFile" requiredLabel="true"/>
+ <s:textfield label="%{getText('buildDefinition.buildFile.shell.label')}" name="buildFile" requiredLabel="true" size="100"/>
</s:elseif>
<s:else>
- <s:textfield label="%{getText('buildDefinition.buildFile.maven.label')}" name="buildFile" requiredLabel="true"/>
+ <s:textfield label="%{getText('buildDefinition.buildFile.maven.label')}" name="buildFile" requiredLabel="true" size="100"/>
</s:else>
<s:if test="executor == 'ant' or buildDefinitionType == 'ant'">
- <s:textfield label="%{getText('buildDefinition.goals.ant.label')}" name="goals"/>
+ <s:textfield label="%{getText('buildDefinition.goals.ant.label')}" name="goals" size="100"/>
</s:if>
<s:elseif test="executor == 'shell' or buildDefinitionType == 'shell'">
</s:elseif>
<s:else>
- <s:textfield label="%{getText('buildDefinition.goals.maven.label')}" name="goals" requiredLabel="true"/>
+ <s:textfield label="%{getText('buildDefinition.goals.maven.label')}" name="goals" requiredLabel="true" size="100"/>
</s:else>
- <s:textfield label="%{getText('buildDefinition.arguments.label')}" name="arguments"/>
+ <s:textfield label="%{getText('buildDefinition.arguments.label')}" name="arguments" size="100"/>
<s:checkbox label="%{getText('buildDefinition.buildFresh.label')}" id="buildFresh" name="buildFresh" value="buildFresh" fieldValue="true"/>
<s:checkbox label="%{getText('buildDefinition.alwaysBuild.label')}" id="alwaysBuild" name="alwaysBuild" value="alwaysBuild" fieldValue="true"/>
<c:choose>
@@ -82,11 +81,12 @@
<s:if test="executor != 'ant' && executor != 'shell'">
<s:select label="%{getText('buildDefinition.updatePolicy.label')}" name="updatePolicy" list="buildDefinitionUpdatePolicies"/>
</s:if>
- <s:textfield label="%{getText('buildDefinition.description.label')}" name="description" />
+ <s:textfield label="%{getText('buildDefinition.description.label')}" name="description" size="100" />
</tbody>
</table>
<div class="functnbar3">
- <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('save')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</div>
<s:hidden name="buildDefinitionId"/>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp Tue May 20 14:02:03 2014
@@ -41,39 +41,46 @@
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
- <c1:data label="%{getText('buildResult.startTime')}">
- <s:param name="after"><c1:date name="buildResult.startTime"/></s:param>
- </c1:data>
- <c1:data label="%{getText('buildResult.endTime')}">
- <s:param name="after"><c1:date name="buildResult.endTime"/></s:param>
- </c1:data>
- <c1:data label="%{getText('buildResult.duration')}">
- <s:param name="after">
- <s:if test="buildResult.endTime == 0"><s:text name="buildResult.startedSince"/></s:if> <s:property value="buildResult.durationTime"/></s:param>
- </c1:data>
- <c1:data label="%{getText('buildResult.trigger')}">
- <s:param name="after"><s:text name="buildResult.trigger.%{buildResult.trigger}"/></s:param>
- </c1:data>
- <c1:data label="%{getText('buildResult.state')}">
- <s:param name="after" value="state"/>
- </c1:data>
- <c1:data label="%{getText('buildResult.buildNumber')}">
- <s:param name="after">
- <s:if test="buildResult.buildNumber != 0">
- <s:property value="buildResult.buildNumber"/>
- </s:if>
- <s:else>
-
- </s:else>
- </s:param>
- </c1:data>
- <c1:data label="%{getText('buildResult.username')}">
- <s:param name="after"><s:property value="buildResult.username"/></s:param>
- </c1:data>
+ <tr class="b">
+ <th><label class="label"><s:text name='buildResult.startTime'/>:</label></th>
+ <td><c1:date name="buildResult.startTime"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='buildResult.endTime'/>:</label></th>
+ <td><c1:date name="buildResult.endTime"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='buildResult.duration'/>:</label></th>
+ <td><s:if test="buildResult.endTime == 0"><s:text name="buildResult.startedSince"/></s:if> <s:property value="buildResult.durationTime"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='buildResult.trigger'/>:</label></th>
+ <td><s:text name="buildResult.trigger.%{buildResult.trigger}"/></td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='buildResult.state'/>:</label></th>
+ <td>${state}</td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='buildResult.buildNumber'/>:</label></th>
+ <td>
+ <s:if test="buildResult.buildNumber != 0">
+ <s:property value="buildResult.buildNumber"/>
+ </s:if>
+ <s:else>
+
+ </s:else>
+ </td>
+ </tr>
+ <tr class="b">
+ <th><label class="label"><s:text name='buildResult.username'/>:</label></th>
+ <td><s:property value="buildResult.username"/></td>
+ </tr>
<c:if test="${!empty buildResult.buildUrl}">
- <c1:data label="%{getText('buildResult.buildUrl')}">
- <s:param name="after"><s:property value="buildResult.buildUrl"/></s:param>
- </c1:data>
+ <tr class="b">
+ <th><label class="label"><s:text name='buildResult.buildUrl'/>:</label></th>
+ <td><s:property value="buildResult.buildUrl"/></td>
+ </tr>
</c:if>
</table>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp Tue May 20 14:02:03 2014
@@ -20,7 +20,6 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
<s:i18n name="localization.Continuum">
@@ -51,7 +50,7 @@
</redback:elseAuthorized>
</ec:column>
<ec:column property="profileName" title="projectView.buildDefinition.profile">
- <s:url id="profileUrl" action="editBuildEnv!edit.action" namespace="/" includeParams="none">
+ <s:url id="profileUrl" action="editBuildEnv.action" namespace="/" includeParams="none">
<s:param name="profile.id"><c:out value="${pageScope.buildDefinitionSummary.profileId}"/></s:param>
</s:url>
<s:a href="%{profileUrl}"><c:out value="${pageScope.buildDefinitionSummary.profileName}"/></s:a>
@@ -78,7 +77,7 @@
<ec:column property="editActions" title=" " width="1%">
<center>
<redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
- <s:url id="editUrl" action="buildDefinition" method="input" namespace="/" includeParams="none">
+ <s:url id="editUrl" action="buildDefinition" namespace="/" includeParams="none">
<s:param name="projectGroupId"><c:out value="${pageScope.buildDefinitionSummary.projectGroupId}"/></s:param>
<s:param name="buildDefinitionId"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
</s:url>
@@ -163,7 +162,7 @@
</redback:elseAuthorized>
</ec:column>
<ec:column property="profileName" title="projectView.buildDefinition.profile">
- <s:url id="profileUrl" action="editBuildEnv!edit.action" namespace="/" includeParams="none">
+ <s:url id="profileUrl" action="editBuildEnv.action" namespace="/" includeParams="none">
<s:param name="profile.id"><c:out value="${pageScope.buildDefinitionSummary.profileId}"/></s:param>
</s:url>
<s:a href="%{profileUrl}"><c:out value="${pageScope.buildDefinitionSummary.profileName}"/></s:a>
@@ -190,7 +189,7 @@
</ec:column>
<ec:column property="editAction" title=" " width="1%">
<redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
- <s:url id="editUrl" action="buildDefinition" method="input" namespace="/">
+ <s:url id="editUrl" action="buildDefinition" namespace="/">
<s:param name="projectId"><c:out value="${pageScope.buildDefinitionSummary.projectId}"/></s:param>
<s:param name="buildDefinitionId"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
<s:param name="groupBuildView" value="true"/>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp Tue May 20 14:02:03 2014
@@ -20,7 +20,6 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
<s:i18n name="localization.Continuum">
@@ -71,7 +70,7 @@
<c:choose>
<c:when test="${pageScope.buildDefinitionSummary.from=='PROJECT'}">
<redback:ifAuthorized permission="continuum-modify-project-build-definition" resource="${projectGroupName}">
- <s:url id="editUrl" action="buildDefinition" method="input" namespace="/">
+ <s:url id="editUrl" action="buildDefinition" namespace="/">
<s:param name="projectId"><c:out value="${projectId}"/></s:param>
<s:param name="buildDefinitionId"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
</s:url>
@@ -83,7 +82,7 @@
</c:when>
<c:otherwise>
<redback:ifAuthorized permission="continuum-modify-group-build-definition" resource="${projectGroupName}">
- <s:url id="editUrl" action="buildDefinition" method="input" namespace="/">
+ <s:url id="editUrl" action="buildDefinition" namespace="/">
<s:param name="projectGroupId"><c:out value="${pageScope.buildDefinitionSummary.projectGroupId}"/></s:param>
<s:param name="buildDefinitionId"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
<s:param name="groupBuildDefinition">true</s:param>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/failureComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/failureComponent.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/failureComponent.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/failureComponent.jsp Tue May 20 14:02:03 2014
@@ -20,7 +20,6 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
<s:i18n name="localization.Continuum">
<div class="axial">
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp Tue May 20 14:02:03 2014
@@ -20,7 +20,6 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
<s:i18n name="localization.Continuum">
@@ -56,7 +55,7 @@
</ec:column>
<ec:column property="deleteActions" title=" " width="1%">
<redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
- <s:url id="removeUrl" action="deleteProjectGroupNotifier!default.action" namespace="/">
+ <s:url id="removeUrl" action="deleteProjectGroupNotifier_default.action" namespace="/">
<s:param name="projectGroupId"><c:out value="${pageScope.projectGroupNotifierSummary.projectGroupId}"/></s:param>
<s:param name="notifierId"><c:out value="${pageScope.projectGroupNotifierSummary.id}"/></s:param>
<s:param name="notifierType"><c:out value="${pageScope.projectGroupNotifierSummary.type}"/></s:param>
@@ -132,7 +131,7 @@
<redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
<c:choose>
<c:when test="${!pageScope.projectNotifierSummary.fromProject}">
- <s:url id="removeUrl" action="deleteProjectNotifier!default.action" namespace="/">
+ <s:url id="removeUrl" action="deleteProjectNotifier_default.action" namespace="/">
<s:param name="projectGroupId"><c:out value="${pageScope.projectNotifierSummary.projectGroupId}"/></s:param>
<s:param name="projectId"><c:out value="${pageScope.projectNotifierSummary.projectId}"/></s:param>
<s:param name="notifierId"><c:out value="${pageScope.projectNotifierSummary.id}"/></s:param>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupTabComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupTabComponent.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupTabComponent.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupTabComponent.jsp Tue May 20 14:02:03 2014
@@ -20,7 +20,6 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
<s:i18n name="localization.Continuum">
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectNotifierSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectNotifierSummaryComponent.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectNotifierSummaryComponent.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectNotifierSummaryComponent.jsp Tue May 20 14:02:03 2014
@@ -20,7 +20,6 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
<s:i18n name="localization.Continuum">
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp Tue May 20 14:02:03 2014
@@ -20,7 +20,6 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
-<%@ taglib uri="continuum" prefix="c1" %>
<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
<s:i18n name="localization.Continuum">
@@ -212,7 +211,7 @@
<c:when
test="${projectIdle}">
<s:token/>
- <s:url id="deleteProjectUrl" value="deleteProject!default.action" namespace="/">
+ <s:url id="deleteProjectUrl" value="deleteProject_default.action" namespace="/">
<s:param name="projectId"><c:out value="${project.id}"/></s:param>
<s:param name="struts.token.name">token</s:param>
<s:param name="token"><s:property value="token"/></s:param>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildDefinitionRemoval.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildDefinitionRemoval.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildDefinitionRemoval.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildDefinitionRemoval.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
--%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -46,7 +45,8 @@
<s:hidden name="projectGroupId"/>
<s:hidden name="projectId"/>
<s:hidden name="confirmed" value="true"/>
- <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('delete')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</s:form>
</div>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildResultsRemoval.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildResultsRemoval.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildResultsRemoval.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildResultsRemoval.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
--%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<html>
<s:i18n name="localization.Continuum">
@@ -72,14 +71,12 @@
<div class="functnbar3">
<s:if test="buildId > 0">
- <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('delete')}" theme="simple"/>
</s:if>
<s:elseif test="selectedBuildResults.size > 0">
- <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('delete')}" theme="simple"/>
</s:elseif>
- <s:else>
- <input type="submit" value="<s:text name="cancel"/>" onClick="history.back()"/>
- </s:else>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</div>
</form>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmDeleteProjects.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmDeleteProjects.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmDeleteProjects.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmDeleteProjects.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
--%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -44,7 +43,8 @@
</s:iterator>
<input type="hidden" name="projectGroupId" value="${projectGroupId}" />
<input type="hidden" name="methodToCall" value="remove" />
- <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('delete')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</s:form>
</div>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
--%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -44,7 +43,8 @@
</div>
<div class="functnbar3">
- <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('delete')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</div>
</s:form>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmReleaseResultsRemoval.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmReleaseResultsRemoval.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmReleaseResultsRemoval.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmReleaseResultsRemoval.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
--%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<html>
<s:i18n name="localization.Continuum">
@@ -47,7 +46,8 @@
</s:iterator>
<input type="hidden" name="projectGroupId" value="${projectGroupId}" />
<s:hidden name="confirmed" value="true"/>
- <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('delete')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</s:form>
</div>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmScheduleRemoval.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmScheduleRemoval.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmScheduleRemoval.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmScheduleRemoval.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
--%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -45,7 +44,8 @@
</div>
<div class="functnbar3">
- <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('delete')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</div>
</s:form>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteBuildDefinition.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteBuildDefinition.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteBuildDefinition.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteBuildDefinition.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
--%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -44,7 +43,8 @@
<s:hidden name="projectId"/>
<s:hidden name="buildDefinitionId"/>
<s:hidden name="confirmed" value="true"/>
- <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('delete')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</s:form>
</div>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteProject.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteProject.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteProject.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteProject.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
--%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -42,7 +41,8 @@
<s:token/>
<s:hidden name="projectId"/>
<s:hidden name="projectGroupId"/>
- <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('delete')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</s:form>
</div>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp Tue May 20 14:02:03 2014
@@ -42,11 +42,11 @@
</c:if>
<table>
- <s:textfield label="%{getText('schedule.name.label')}" name="name" requiredLabel="true">
- <s:param name="desc"><p><s:text name="schedule.name.message"/></p></s:param>
+ <s:textfield label="%{getText('schedule.name.label')}" name="name" requiredLabel="true" size="100">
+ <s:param name="after"><p><s:text name="schedule.name.message"/></p></s:param>
</s:textfield>
- <s:textfield label="%{getText('schedule.description.label')}" name="description" requiredLabel="true">
- <s:param name="desc"><p><s:text name="schedule.description.message"/></p></s:param>
+ <s:textfield label="%{getText('schedule.description.label')}" name="description" requiredLabel="true" size="100">
+ <s:param name="after"><p><s:text name="schedule.description.message"/></p></s:param>
</s:textfield>
<tr>
@@ -60,19 +60,19 @@
<s:textfield label="%{getText('schedule.month.label')}" name="month" size="10"/>
<s:textfield label="%{getText('schedule.dayOfWeek.label')}" name="dayOfWeek" size="10"/>
<s:textfield label="%{getText('schedule.year.label')}" name="year" size="4">
- <s:param name="desc"><p><s:text name="schedule.cronExpression.message"/></p></s:param>
+ <s:param name="after"><p><s:text name="schedule.cronExpression.message"/></p></s:param>
</s:textfield>
</table>
</td>
</tr>
- <s:textfield label="%{getText('schedule.maxJobExecutionTime.label')}" name="maxJobExecutionTime" requiredLabel="true">
- <s:param name="desc"><p><s:text name="schedule.maxJobExecutionTime.message"/></p></s:param>
+ <s:textfield label="%{getText('schedule.maxJobExecutionTime.label')}" name="maxJobExecutionTime" requiredLabel="true" size="100">
+ <s:param name="after"><p><s:text name="schedule.maxJobExecutionTime.message"/></p></s:param>
</s:textfield>
- <s:textfield label="%{getText('schedule.quietPeriod.label')}" name="delay">
- <s:param name="desc"><p><s:text name="schedule.quietPeriod.message"/></p></s:param>
+ <s:textfield label="%{getText('schedule.quietPeriod.label')}" name="delay" size="100">
+ <s:param name="after"><p><s:text name="schedule.quietPeriod.message"/></p></s:param>
</s:textfield>
-
+
<c1:ifBuildTypeEnabled buildType="parallel">
<s:optiontransferselect
label="%{getText('schedule.buildqueues.label')}"
@@ -103,14 +103,15 @@
</c1:ifBuildTypeEnabled>
<s:checkbox label="%{getText('schedule.enabled.label')}" name="active" value="active" fieldValue="true">
- <s:param name="desc"><p><s:text name="schedule.enabled.message"/></p></s:param>
+ <s:param name="after"><p><s:text name="schedule.enabled.message"/></p></s:param>
</s:checkbox>
</table>
<s:hidden name="id"/>
- <div class="functnbar3">
- <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
- </div>
+ <div class="functnbar3">
+ <s:submit value="%{getText('save')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
+ </div>
</s:form>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp Tue May 20 14:02:03 2014
@@ -125,7 +125,7 @@
<table>
<tr>
<td>
- <form action="<s:url action='addProjectGroup' method='input' namespace='/' />" method="post">
+ <form action="<s:url action='addProjectGroup_input' namespace='/' />" method="post">
<input type="submit" name="addProjectGroup" value="<s:text name="projectGroup.add.section.title"/>"/>
</form>
</td>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp Tue May 20 14:02:03 2014
@@ -49,14 +49,14 @@
</div>
<div>
<div class="body">
- <s:url id="addMavenTwoProjectUrl" action="addMavenTwoProjectInput" method="input" namespace="/"
+ <s:url id="addMavenTwoProjectUrl" action="addMavenTwoProjectInput" namespace="/"
includeParams="none"/>
<s:a href="%{addMavenTwoProjectUrl}">
<s:text name="menu.add.m2Project"/>
</s:a>
</div>
<div class="body">
- <s:url id="addMavenOneProjectUrl" action="addMavenOneProjectInput" method="input" namespace="/"
+ <s:url id="addMavenOneProjectUrl" action="addMavenOneProjectInput" namespace="/"
includeParams="none"/>
<s:a href="%{addMavenOneProjectUrl}">
<s:text name="menu.add.m1Project"/>
@@ -114,7 +114,7 @@
</div>
</redback:ifAuthorized>
<redback:ifAuthorized permission="continuum-manage-installations">
- <s:url id="configurationUrl" action="installationsList" namespace="/admin" method="list" includeParams="none"/>
+ <s:url id="configurationUrl" action="installationsList" namespace="/admin" includeParams="none"/>
<div class="body">
<s:a href="%{configurationUrl}">
<s:text name="menu.administration.installations"/>
@@ -122,7 +122,7 @@
</div>
</redback:ifAuthorized>
<redback:ifAuthorized permission="continuum-manage-profiles">
- <s:url id="configurationUrl" action="buildEnvList" namespace="/admin" method="list" includeParams="none"/>
+ <s:url id="configurationUrl" action="buildEnvList" namespace="/admin" includeParams="none"/>
<div class="body">
<s:a href="%{configurationUrl}">
<s:text name="menu.administration.profile"/>
@@ -130,7 +130,7 @@
</div>
</redback:ifAuthorized>
<redback:ifAuthorized permission="continuum-view-queues">
- <s:url id="queueUrls" action="displayQueues" namespace="/admin" method="display" includeParams="none"/>
+ <s:url id="queueUrls" action="displayQueues" namespace="/admin" includeParams="none"/>
<div class="body">
<s:a href="%{queueUrls}">
<s:text name="menu.administration.queues"/>
@@ -146,7 +146,7 @@
</div>
</redback:ifAuthorized>
<redback:ifAuthorized permission="continuum-manage-configuration">
- <s:url id="configurationUrl" action="configuration" namespace="/admin" method="input" includeParams="none"/>
+ <s:url id="configurationUrl" action="configuration" namespace="/admin" includeParams="none"/>
<div class="body">
<s:a href="%{configurationUrl}">
<s:text name="menu.administration.configuration"/>
@@ -184,7 +184,7 @@
</div>
<div>
<div class="body">
- <s:url id="viewProjectBuildsReportUrl" action="viewProjectBuildsReport" method="init" namespace="/" includeParams="none"/>
+ <s:url id="viewProjectBuildsReportUrl" action="viewProjectBuildsReport" namespace="/" includeParams="none"/>
<s:a href="%{viewProjectBuildsReportUrl}">
<s:text name="menu.reports.projectBuilds"/>
</s:a>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/ProjectMenu.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/ProjectMenu.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/ProjectMenu.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/ProjectMenu.jsp Tue May 20 14:02:03 2014
@@ -19,7 +19,6 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
--%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -44,7 +43,8 @@
<s:token/>
<s:hidden name="notifierId"/>
<s:hidden name="projectGroupId" />
- <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('delete')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</s:form>
</s:if>
<s:else>
@@ -54,7 +54,8 @@
<s:hidden name="projectId"/>
<s:hidden name="projectGroupId" />
<s:hidden name="fromGroupPage" />
- <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('delete')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</s:form>
</s:else>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
--%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -51,14 +50,14 @@
<s:hidden name="fromGroupPage"/>
<table>
<tbody>
- <s:textfield label="%{getText('notifier.irc.host.label')}" name="host" requiredLabel="true"/>
- <s:textfield label="%{getText('notifier.irc.port.label')}" name="port"/>
- <s:textfield label="%{getText('notifier.irc.channel.label')}" name="channel" requiredLabel="true"/>
- <s:textfield label="%{getText('notifier.irc.nick.label')}" name="nick"/>
- <s:textfield label="%{getText('notifier.irc.alternateNick.label')}" name="alternateNick"/>
- <s:textfield label="%{getText('notifier.irc.username.label')}" name="username"/>
- <s:textfield label="%{getText('notifier.irc.fullName.label')}" name="fullName"/>
- <s:password label="%{getText('notifier.irc.password.label')}" name="password"/>
+ <s:textfield label="%{getText('notifier.irc.host.label')}" name="host" requiredLabel="true" size="100"/>
+ <s:textfield label="%{getText('notifier.irc.port.label')}" name="port" size="100"/>
+ <s:textfield label="%{getText('notifier.irc.channel.label')}" name="channel" requiredLabel="true" size="100"/>
+ <s:textfield label="%{getText('notifier.irc.nick.label')}" name="nick" size="100"/>
+ <s:textfield label="%{getText('notifier.irc.alternateNick.label')}" name="alternateNick" size="100"/>
+ <s:textfield label="%{getText('notifier.irc.username.label')}" name="username" size="100"/>
+ <s:textfield label="%{getText('notifier.irc.fullName.label')}" name="fullName" size="100"/>
+ <s:password label="%{getText('notifier.irc.password.label')}" name="password" size="100"/>
<s:checkbox label="%{getText('notifier.irc.isSSL.label')}" name="ssl" value="ssl" fieldValue="true"/>
<s:checkbox label="%{getText('notifier.event.sendOnSuccess')}" name="sendOnSuccess" value="sendOnSuccess" fieldValue="true"/>
<s:checkbox label="%{getText('notifier.event.sendOnFailure')}" name="sendOnFailure" value="sendOnFailure" fieldValue="true"/>
@@ -68,7 +67,8 @@
</tbody>
</table>
<div class="functnbar3">
- <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('save')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</div>
</s:form>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp?rev=1596252&r1=1596251&r2=1596252&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp Tue May 20 14:02:03 2014
@@ -18,7 +18,6 @@
--%>
<%@ taglib uri="/struts-tags" prefix="s" %>
-<%@ taglib uri="continuum" prefix="c1" %>
<html>
<s:i18n name="localization.Continuum">
<head>
@@ -51,12 +50,12 @@
<s:hidden name="fromGroupPage"/>
<table>
<tbody>
- <s:textfield label="%{getText('notifier.jabber.host.label')}" name="host" requiredLabel="true"/>
- <s:textfield label="%{getText('notifier.jabber.port.label')}" name="port"/>
- <s:textfield label="%{getText('notifier.jabber.login.label')}" name="login" requiredLabel="true"/>
- <s:password label="%{getText('notifier.jabber.password.label')}" name="password" requiredLabel="true"/>
- <s:textfield label="%{getText('notifier.jabber.domainName.label')}" name="domainName"/>
- <s:textfield label="%{getText('notifier.jabber.address.label')}" name="address" requiredLabel="true"/>
+ <s:textfield label="%{getText('notifier.jabber.host.label')}" name="host" requiredLabel="true" size="100"/>
+ <s:textfield label="%{getText('notifier.jabber.port.label')}" name="port" size="100"/>
+ <s:textfield label="%{getText('notifier.jabber.login.label')}" name="login" requiredLabel="true" size="100"/>
+ <s:password label="%{getText('notifier.jabber.password.label')}" name="password" requiredLabel="true" size="100"/>
+ <s:textfield label="%{getText('notifier.jabber.domainName.label')}" name="domainName" size="100"/>
+ <s:textfield label="%{getText('notifier.jabber.address.label')}" name="address" requiredLabel="true" size="100"/>
<s:checkbox label="%{getText('notifier.jabber.isSslConnection.label')}" name="sslConnection" value="sslConnection" fieldValue="true"/>
<s:checkbox label="%{getText('notifier.jabber.isGroup.label')}" name="group" value="group" fieldValue="true"/>
<s:checkbox label="%{getText('notifier.event.sendOnSuccess')}" name="sendOnSuccess" value="sendOnSuccess" fieldValue="true"/>
@@ -67,7 +66,8 @@
</tbody>
</table>
<div class="functnbar3">
- <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+ <s:submit value="%{getText('save')}" theme="simple"/>
+ <input type="button" name="Cancel" value="<s:text name='cancel'/>" onclick="history.back();"/>
</div>
</s:form>
</div>