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 2013/11/16 13:53:44 UTC
svn commit: r1542501 - in
/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp:
addMavenOneProject.jsp addMavenTwoProject.jsp addProject.jsp
admin/configurationEdit.jsp editSchedule.jsp
Author: brett
Date: Sat Nov 16 12:53:44 2013
New Revision: 1542501
URL: http://svn.apache.org/r1542501
Log:
[CONTINUUM-2713] replace desc with after to use default theme
Modified:
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp
continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp?rev=1542501&r1=1542500&r2=1542501&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp Sat Nov 16 12:53:44 2013
@@ -43,7 +43,7 @@
<table>
<tbody>
<s:textfield label="%{getText('add.m1.project.m1PomUrl.label')}" name="m1PomUrl" size="100">
- <s:param name="desc">
+ <s:param name="after">
<table cellspacing="0" cellpadding="0">
<tbody>
<tr>
@@ -67,7 +67,7 @@
<s:param name="after"><strong><s:text name="or"/></strong></s:param>
</s:label>
<s:file label="%{getText('add.m1.project.m1PomFile.label')}" name="m1PomFile" size="100">
- <s:param name="desc"><p><s:text name="add.m1.project.m1PomFile.message"/></p></s:param>
+ <s:param name="after"><p><s:text name="add.m1.project.m1PomFile.message"/></p></s:param>
</s:file>
<c:choose>
<c:when test="${disableGroupSelection == true}">
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp?rev=1542501&r1=1542500&r2=1542501&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp Sat Nov 16 12:53:44 2013
@@ -43,7 +43,7 @@
<table>
<tbody>
<s:textfield label="%{getText('add.m2.project.m2PomUrl.label')}" requiredLabel="true" name="m2PomUrl" size="100">
- <s:param name="desc">
+ <s:param name="after">
<table cellspacing="0" cellpadding="0">
<tbody>
<tr>
@@ -67,7 +67,7 @@
<s:param name="after"><strong><s:text name="or"/></strong></s:param>
</s:label>
<s:file label="%{getText('add.m2.project.m2PomFile.label')}" name="m2PomFile" size="100">
- <s:param name="desc"><p><s:text name="add.m2.project.m2PomFile.message"/></p></s:param>
+ <s:param name="after"><p><s:text name="add.m2.project.m2PomFile.message"/></p></s:param>
</s:file>
<c:choose>
<c:when test="${disableGroupSelection == true}">
@@ -82,7 +82,7 @@
</c:choose>
<s:label>
- <s:param name="desc">
+ <s:param name="after">
<table cellspacing="0" cellpadding="0">
<tbody>
<tr>
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp?rev=1542501&r1=1542500&r2=1542501&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp Sat Nov 16 12:53:44 2013
@@ -54,25 +54,25 @@
<table>
<tbody>
<s:textfield label="%{getText('projectName.label')}" name="projectName" requiredLabel="true" size="100">
- <s:param name="desc"><p><s:text name="projectName.message"/></p></s:param>
+ <s:param name="after"><p><s:text name="projectName.message"/></p></s:param>
</s:textfield>
<s:textfield label="%{getText('projectDescription.label')}" name="projectDescription" size="100">
- <s:param name="desc"><p><s:text name="projectDescription.message"/></p></s:param>
+ <s:param name="after"><p><s:text name="projectDescription.message"/></p></s:param>
</s:textfield>
<s:textfield label="%{getText('projectVersion.label')}" name="projectVersion" requiredLabel="true" size="100">
- <s:param name="desc"><p><s:text name="projectVersion.message"/></p></s:param>
+ <s:param name="after"><p><s:text name="projectVersion.message"/></p></s:param>
</s:textfield>
<s:textfield label="%{getText('projectScmUrl.label')}" name="projectScmUrl" requiredLabel="true" size="100">
- <s:param name="desc"><p><s:text name="projectScmUrl.message"/></p></s:param>
+ <s:param name="after"><p><s:text name="projectScmUrl.message"/></p></s:param>
</s:textfield>
<s:textfield label="%{getText('projectScmUsername.label')}" name="projectScmUsername" size="100">
- <s:param name="desc"><p><s:text name="projectScmUsername.message"/></p></s:param>
+ <s:param name="after"><p><s:text name="projectScmUsername.message"/></p></s:param>
</s:textfield>
<s:password label="%{getText('projectScmPassword.label')}" name="projectScmPassword" size="100">
- <s:param name="desc"><p><s:text name="projectScmPassword.message"/></p></s:param>
+ <s:param name="after"><p><s:text name="projectScmPassword.message"/></p></s:param>
</s:password>
<s:textfield label="%{getText('projectScmTag.label')}" name="projectScmTag" size="100">
- <s:param name="desc"><p><s:text name="projectScmTag.message"/></p></s:param>
+ <s:param name="after"><p><s:text name="projectScmTag.message"/></p></s:param>
</s:textfield>
<s:checkbox label="%{getText('projectScmUseCache.label')}" name="projectScmUseCache"/>
<c:choose>
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp?rev=1542501&r1=1542500&r2=1542501&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp Sat Nov 16 12:53:44 2013
@@ -65,40 +65,40 @@
<s:textfield label="%{getText('configuration.workingDirectory.label')}" name="workingDirectory"
requiredLabel="true" size="100">
- <s:param name="desc"><p>
+ <s:param name="after"><p>
<s:text name="configuration.workingDirectory.message"/>
</p></s:param>
</s:textfield>
<s:textfield label="%{getText('configuration.buildOutputDirectory.label')}" name="buildOutputDirectory"
requiredLabel="true" size="100">
- <s:param name="desc"><p>
+ <s:param name="after"><p>
<s:text name="configuration.buildOutputDirectory.message"/>
</p></s:param>
</s:textfield>
<s:textfield label="%{getText('configuration.releaseOutputDirectory.label')}" name="releaseOutputDirectory"
requiredLabel="%{requireReleaseOutput}" size="100">
- <s:param name="desc"><p>
+ <s:param name="after"><p>
<s:text name="configuration.releaseOutputDirectory.message"/>
</s:param>
</s:textfield>
<s:textfield label="%{getText('configuration.deploymentRepositoryDirectory.label')}"
name="deploymentRepositoryDirectory" size="100">
- <s:param name="desc"><p>
+ <s:param name="after"><p>
<s:text name="configuration.deploymentRepositoryDirectory.message"/>
</p></s:param>
</s:textfield>
<s:textfield label="%{getText('configuration.baseUrl.label')}" name="baseUrl" requiredLabel="true" size="100">
- <s:param name="desc"><p>
+ <s:param name="after"><p>
<s:text name="configuration.baseUrl.message"/>
</p></s:param>
</s:textfield>
<s:textfield label="%{getText('configuration.allowed.build.parallel')}" name="numberOfAllowedBuildsinParallel" size="10">
- <s:param name="desc"><p>
+ <s:param name="after"><p>
<s:text name="configuration.allowed.build.paralle.message"/>
</p></s:param>
</s:textfield>
@@ -110,7 +110,7 @@
<s:checkbox label="%{getText('configuration.distributedBuildEnabled.label')}" name="distributedBuildEnabled" onclick="setSecretPassword();"/>
<s:password label="%{getText('configuration.sharedSecretPassword.label')}" name="sharedSecretPassword" disabled="%{!distributedBuildEnabled}" showPassword="true" size="100">
- <s:param name="desc">
+ <s:param name="after">
<p>
<s:text name="configuration.sharedSecretPassword.message"/>
</p>
Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp?rev=1542501&r1=1542500&r2=1542501&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp Sat Nov 16 12:53:44 2013
@@ -43,10 +43,10 @@
<table>
<s:textfield label="%{getText('schedule.name.label')}" name="name" requiredLabel="true" size="100">
- <s:param name="desc"><p><s:text name="schedule.name.message"/></p></s:param>
+ <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" size="100">
- <s:param name="desc"><p><s:text name="schedule.description.message"/></p></s:param>
+ <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" size="100">
- <s:param name="desc"><p><s:text name="schedule.maxJobExecutionTime.message"/></p></s:param>
+ <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" size="100">
- <s:param name="desc"><p><s:text name="schedule.quietPeriod.message"/></p></s:param>
+ <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,7 +103,7 @@
</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>