continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r709091 - in /continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp: ./ admin/
Date Thu, 30 Oct 2008 05:50:47 GMT
Author: evenisse
Date: Wed Oct 29 22:50:47 2008
New Revision: 709091

URL: http://svn.apache.org/viewvc?rev=709091&view=rev
Log:
more fix

Modified:
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp?rev=709091&r1=709090&r2=709091&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp
(original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp
Wed Oct 29 22:50:47 2008
@@ -34,7 +34,7 @@
                         <c:if test="${!empty actionErrors}">
                           <div class="errormessage">
                             <s:iterator value="actionErrors">
-                              <p><s:text name="<s:property/>" /></p>
+                              <p><s:property/></p>
                             </s:iterator>
                           </div>
                         </c:if>
@@ -67,14 +67,16 @@
                             <s:file label="%{getText('add.m1.project.m1PomFile.label')}"
name="m1PomFile">
                                 <s:param name="desc"><p><s:text name="add.m1.project.m1PomFile.message"/></p></s:param>
                             </s:file>
-                            <s:if test="disableGroupSelection == true">
+                            <c:choose>
+                            <c:when test="${disableGroupSelection == true}">
                               <s:hidden name="selectedProjectGroup"/>
                               <s:hidden name="disableGroupSelection"/>
                               <s:textfield label="%{getText('add.m1.project.projectGroup')}"
name="projectGroupName" disabled="true"/>
-                            </s:if>
-                            <s:else>
+                            </c:when>
+                            <c:otherwise>
                               <s:select label="%{getText('add.m1.project.projectGroup')}"
name="selectedProjectGroup" list="projectGroups" listKey="id" listValue="name"/>
-                            </s:else>
+                            </c:otherwise>
+                            </c:choose>
                             <s:select label="%{getText('add.m1.project.buildDefinitionTemplate')}"
name="buildDefinitionTemplateId"
                                        list="buildDefinitionTemplates" listKey="id" listValue="name"
headerKey="-1" 
                                        headerValue="%{getText('add.m1.project.defaultBuildDefinition')}"/>
                           

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp?rev=709091&r1=709090&r2=709091&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp
(original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp
Wed Oct 29 22:50:47 2008
@@ -34,7 +34,7 @@
                         <c:if test="${!empty actionErrors || !empty errorMessages}">
                           <div class="errormessage">
                             <s:iterator value="actionErrors">
-                              <p><s:text name="<s:property/>">${actionError}</s:text></p>
+                              <p><s:property/></p>
                             </s:iterator>
                             <c:forEach items="${errorMessages}" var="errorMessage">
                               <p>${errorMessage}</p>
@@ -70,15 +70,17 @@
                             <s:file label="%{getText('add.m2.project.m2PomFile.label')}"
name="m2PomFile">
                                 <s:param name="desc"><p><s:text name="add.m2.project.m2PomFile.message"/></p></s:param>
                             </s:file>
-                            <s:if test="disableGroupSelection == true">
+                            <c:choose>
+                            <c:when test="${disableGroupSelection == true}">
                               <s:hidden name="selectedProjectGroup"/>
                               <s:hidden name="disableGroupSelection"/>
                               <s:textfield label="%{getText('add.m2.project.projectGroup')}"
name="projectGroupName" disabled="true"/>
-                            </s:if>
-                            <s:else>
+                            </c:when>
+                            <c:otherwise>
                               <s:select label="%{getText('add.m2.project.projectGroup')}"
name="selectedProjectGroup"
                                          list="projectGroups" listKey="id" listValue="name"/>
-                            </s:else>
+                            </c:otherwise>
+                            </c:choose>
                             <s:checkbox label="%{getText('add.m2.project.nonRecursiveProject')}"
name="nonRecursiveProject" />
                             <s:select label="%{getText('add.m2.project.buildDefinitionTemplate')}"
name="buildDefinitionTemplateId"
                                        list="buildDefinitionTemplates" listKey="id" listValue="name"
headerKey="-1" 

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp?rev=709091&r1=709090&r2=709091&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp
(original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp
Wed Oct 29 22:50:47 2008
@@ -48,7 +48,7 @@
                         <c:if test="${!empty actionErrors}">
                           <div class="errormessage">
                             <s:iterator value="actionErrors">
-                              <p><s:text name="<s:property/>" /></p>
+                              <p><s:property/></p>
                             </s:iterator>
                           </div>
                         </c:if>
@@ -73,14 +73,16 @@
                                 <s:param name="desc"><p><s:text name="projectScmTag.message"/></p></s:param>
                             </s:textfield>
                             <s:checkbox label="%{getText('projectScmUseCache.label')}"
name="projectScmUseCache"/>
-                            <s:if test="disableGroupSelection == true">
+                            <c:choose>
+                            <c:when test="${disableGroupSelection == true}">
                               <s:hidden name="selectedProjectGroup"/>
                               <s:hidden name="disableGroupSelection"/>
                               <s:textfield label="%{getText('projectGroup.name.label')}"
name="projectGroupName" disabled="true"/>
-                            </s:if>
-                            <s:else>
+                            </c:when>
+                            <c:otherwise>
                               <s:select label="%{getText('projectGroup.name.label')}"
name="selectedProjectGroup" list="projectGroups" listKey="id" listValue="name"/>
-                            </s:else>
+                            </c:otherwise>
+                            </c:choose>
                             <s:select label="%{getText('add.project.buildDefinitionTemplate')}"
name="buildDefinitionTemplateId"
                                        list="buildDefinitionTemplates" listKey="id" listValue="name"
headerKey="-1" 
                                        headerValue="%{getText('add.project.defaultBuildDefinition')}"/>
                            

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp?rev=709091&r1=709090&r2=709091&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp
(original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp
Wed Oct 29 22:50:47 2008
@@ -51,15 +51,17 @@
           </ec:column>  
           <!-- TODO list attached buildDefs -->
           <ec:column property="deleteAction" title="&nbsp;" width="1%">
-            <s:if test="template.continuumDefault == true">
+            <c:choose>
+            <c:when test="${template.continuumDefault == true}">
               <img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>"
alt="<s:text name='disabled'/>" title="<s:text name='disabled'/>" border="0" />
-            </s:if>
-            <s:else>
+            </c:when>
+            <c:otherwise>${template.continuumDefault}
               <s:url id="deleteUrl" action="deleteDefinitionTemplate" method="delete"
namespace="/">
                 <s:param name="buildDefinitionTemplate.id">${pageScope.template.id}</s:param>
               </s:url>
               <s:a href="%{deleteUrl}"><img src="<s:url value='/images/delete.gif'
includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>"
border="0"></s:a>
-            </s:else>
+            </c:otherwise>
+            </c:choose>
           </ec:column>                     
         </ec:row>  
       </ec:table> 
@@ -96,15 +98,17 @@
             <s:a href="%{editUrl}"><img src="<s:url value='/images/edit.gif'
includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>"
border="0"></s:a>
           </ec:column>          
           <ec:column property="deleteAction" title="&nbsp;" width="1%">
-            <s:if test="buildDefinitionSummary.isDefault == true">
+            <c:choose>
+            <c:when test="${buildDefinitionSummary.isDefault == true}">
               <img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>"
alt="<s:text name='disabled'/>" title="<s:text name='disabled'/>" border="0" />
-            </s:if>
-            <s:else>
+            </c:when>
+            <c:otherwise>
               <s:url id="deleteUrl" action="deleteBuildDefinitionAsTemplate" method="deleteBuildDefinition"
namespace="/">
                 <s:param name="buildDefinition.id">${pageScope.buildDefinitionSummary.id}</s:param>
               </s:url>
               <s:a href="%{deleteUrl}"><img src="<s:url value='/images/delete.gif'
includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>"
border="0"></s:a>
-            </s:else>
+            </c:otherwise>
+            </c:choose>
           </ec:column>
         </ec:row>  
       </ec:table>      

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp?rev=709091&r1=709090&r2=709091&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp
(original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp
Wed Oct 29 22:50:47 2008
@@ -64,7 +64,7 @@
             </s:textfield>
 
             <s:textfield label="%{getText('configuration.releaseOutputDirectory.label')}"
name="releaseOutputDirectory"
-            			  required="%{#requireReleaseOutput}">
+            			  required="%{requireReleaseOutput}">
               <s:param name="desc"><p>
                 <s:text name="configuration.releaseOutputDirectory.message"/>
               </s:param>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp?rev=709091&r1=709090&r2=709091&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp
(original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp
Wed Oct 29 22:50:47 2008
@@ -55,7 +55,7 @@
             </s:if>
             <s:if test="varNameUpdatable">
               <s:if test="varNameDisplayable">
-                <s:textfield label="%{getText('installation.varName.label')}" name="installation.varName"
required="%{#varNameUpdatable}" />
+                <s:textfield label="%{getText('installation.varName.label')}" name="installation.varName"
required="true" />
               </s:if>
             </s:if>
             <s:else>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp?rev=709091&r1=709090&r2=709091&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp
(original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp
Wed Oct 29 22:50:47 2008
@@ -67,12 +67,14 @@
                     <s:textfield label="%{getText('buildDefinition.arguments.label')}"
name="arguments"/>
                     <s:checkbox label="%{getText('buildDefinition.buildFresh.label')}"
name="buildFresh" value="buildFresh" fieldValue="true"/>
                     <s:checkbox label="%{getText('buildDefinition.alwaysBuild.label')}"
name="alwaysBuild" />
-                    <s:if test="defaultBuildDefinition == true">
+                    <c:choose>
+                    <c:when test="${defaultBuildDefinition == true}">
                       <s:label label="%{getText('buildDefinition.defaultForProject.label')}"
value="true"/>
-                    </s:if>
-                    <s:else>
+                    </c:when>
+                    <c:otherwise>
                       <s:checkbox label="%{getText('buildDefinition.defaultForProject.label')}"
 name="defaultBuildDefinition" value="defaultBuildDefinition" fieldValue="true"/>
-                    </s:else>
+                    </c:otherwise>
+                    </c:choose>
                     <s:select label="%{getText('buildDefinition.schedule.label')}" name="scheduleId"
list="schedules"/>
                     <s:select label="%{getText('buildDefinition.profile.label')}" name="profileId"
list="profiles" listValue="name"
                                listKey="id" headerKey="-1" headerValue=""/>
@@ -88,9 +90,11 @@
                 <s:hidden name="projectId"/>
                 <s:hidden name="projectGroupId"/>
                 <s:hidden name="groupBuildDefinition"/>
-                <s:if test="defaultBuildDefinition == true">
+                <c:choose>
+                <c:when test="${defaultBuildDefinition == true}">
                   <s:hidden name="defaultBuildDefinition" value="true"/>
-                </s:if>
+                </c:when>
+                </c:choose>
               </c:when>
             
             </c:choose>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp?rev=709091&r1=709090&r2=709091&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
(original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
Wed Oct 29 22:50:47 2008
@@ -90,7 +90,7 @@
         <c1:data label="%{getText('projectGroup.description.label')}" name="projectGroup.description"/>
         <c1:data label="%{getText('projectGroup.repository.label')}" name="projectGroup.localRepository.name"/>
         <s:if test="url != null">
-            <s:url id="projectHomepageUrl" value="%{#url}" includeContext="false" includeParams="none"/>
+            <s:url id="projectHomepageUrl" value="%{url}" includeContext="false" includeParams="none"/>
         	<c1:data label="%{getText('projectGroup.url.label')}" name="url" valueLink="%{'${projectHomepageUrl}'}"/>
 
         </s:if>
       </table>
@@ -142,8 +142,8 @@
               <redback:ifAnyAuthorized permissions="continuum-add-project-to-group" resource="${projectGroup.name}">
                 <s:form name="addNewProject">
                   <s:hidden name="disableGroupSelection" value="true"/>
-                  <s:hidden name="selectedProjectGroup">${projectGroup.id}</s:hidden>
-                  <s:hidden name="projectGroupName">${projectGroup.name}</s:hidden>
+                  <s:hidden name="selectedProjectGroup" value="%{projectGroup.id}"/>
+                  <s:hidden name="projectGroupName" value="%{projectGroup.name}"/>
                   <s:hidden name="projectType" value=""/>
                 </s:form>
 



Mime
View raw message