continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From batkin...@apache.org
Subject svn commit: r1662889 - in /continuum/trunk: continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ continuum-webapp/src/main/webapp/WEB-INF/jsp/ continuum-webapp/src/main/webapp/css/
Date Sat, 28 Feb 2015 02:27:15 GMT
Author: batkinson
Date: Sat Feb 28 02:27:14 2015
New Revision: 1662889

URL: http://svn.apache.org/r1662889
Log:
Fixed release pages with broken layouts.

Modified:
    continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AbstractReleaseTest.java
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseFinished.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInProgress.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/css/continuum.css

Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AbstractReleaseTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AbstractReleaseTest.java?rev=1662889&r1=1662888&r2=1662889&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AbstractReleaseTest.java
(original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AbstractReleaseTest.java
Sat Feb 28 02:27:14 2015
@@ -89,7 +89,6 @@ public abstract class AbstractReleaseTes
     {
         assertPage( "Continuum - Release Project" );
         assertTextPresent( "Prepare Project for Release" );
-        assertTextPresent( "Release Prepare Parameters" );
         assertTextPresent( "SCM Username" );
         assertTextPresent( "SCM Password" );
         assertTextPresent( "SCM Tag" );
@@ -107,7 +106,6 @@ public abstract class AbstractReleaseTes
     {
         assertPage( "Continuum - Perform Project Release" );
         assertTextPresent( "Perform Project Release" );
-        assertTextPresent( "Release Perform Parameters" );
         assertTextPresent( "SCM Connection URL" );
         assertTextPresent( "SCM Username" );
         assertTextPresent( "SCM Password" );

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseFinished.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseFinished.jsp?rev=1662889&r1=1662888&r2=1662889&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseFinished.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseFinished.jsp Sat Feb
28 02:27:14 2015
@@ -24,10 +24,9 @@
         <title><s:text name="releaseProject.page.title"/></title>
     </head>
     <body>
-      <h2><s:text name="releaseInProgress.section.title"/></h2>
-      <h3><s:property value="name"/></h3>
+      <h3><s:text name="releaseInProgress.section.title"/> - <s:property value="projectName"/></h3>
       <div class="axial">
-        <table width="100%">
+        <table class="releasePhases">
           <tr>
             <th><s:text name="releaseInProgress.status"/></th>
             <th width="100%"><s:text name="releaseInProgress.phase"/></th>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInProgress.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInProgress.jsp?rev=1662889&r1=1662888&r2=1662889&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInProgress.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInProgress.jsp Sat
Feb 28 02:27:14 2015
@@ -25,13 +25,12 @@
         <meta http-equiv="refresh" content="10;url=<s:url includeParams="all" />"/>
     </head>
     <body>
-      <h2><s:text name="releaseInProgress.section.title"/></h2>
-      <h3><s:property value="name"/></h3>
+      <h3><s:text name="releaseInProgress.section.title"/> - <s:property value="projectName"/></h3>
       <div class="axial">
-        <table width="100%">
+        <table class="releasePhases">
           <tr>
             <th><s:text name="releaseInProgress.status"/></th>
-            <th width="100%"><s:text name="releaseInProgress.phase"/></th>
+            <th><s:text name="releaseInProgress.phase"/></th>
           </tr>
           <s:iterator value="listenerSummary.phases">
             <tr>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp?rev=1662889&r1=1662888&r2=1662889&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp
(original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp
Sat Feb 28 02:27:14 2015
@@ -25,10 +25,12 @@
         <title><s:text name="releasePerformFromScm.page.title"/></title>
     </head>
     <body>
-      <h2><s:text name="releasePerformFromScm.section.title"/></h2>
-      <s:form action="releasePerformFromScm" method="post" validate="true">
-        <h3><s:text name="releasePerformFromScm.parameters.section.title"/></h3>
+      <h3><s:text name="releasePerformFromScm.section.title"/></h3>
+      <s:form action="releasePerformFromScm" validate="true">
+        <tr><td>
         <s:hidden name="projectId"/>
+        </td></tr>
+        <tr><td>
         <div class="axial">
           <table border="1" cellspacing="2" cellpadding="3" width="100%">
             <s:textfield label="%{getText('releasePerformFromScm.scmUrl.label')}" name="scmUrl"
size="100"/>
@@ -46,6 +48,7 @@
           </table>
         </div>
         <s:submit value="%{getText('submit')}"/>
+        </tr></td>
       </s:form>
     </body>
   </s:i18n>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp?rev=1662889&r1=1662888&r2=1662889&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp Sat Feb
28 02:27:14 2015
@@ -25,11 +25,17 @@
       <title><s:text name="releaseProject.page.title"/></title>
     </head>
     <body>
-      <h2><s:text name="releasePrepare.section.title"/></h2>
-      <s:form action="releasePrepare" method="post">
-        <h3><s:text name="releasePrepare.parameters"/></h3>
-        <input type="hidden" name="projectId" value="<s:property value="projectId"/>"/>
-        <input type="hidden" name="autoVersionSubmodules" value="<s:property value="autoVersionSubmodules"/>"/>
+
+      <h3><s:text name="releasePrepare.section.title"/></h3>
+
+      <s:form action="releasePrepare">
+
+        <tr><td>
+          <s:hidden name="projectId" />
+          <s:hidden name="autoVersionSubmodules" />
+        </td></tr>
+
+        <tr><td>
         <div class="axial">
           <table border="1" cellspacing="2" cellpadding="3" width="100%">
             <s:textfield label="%{getText('releasePrepare.scmUsername.label')}" name="scmUsername"
size="100"/>
@@ -50,8 +56,10 @@
             </c:if>
           </table>
         </div>
+        </td></tr>
 
         <s:iterator value="projects">
+          <tr><td>
           <h3><s:property value="name"/></h3>
           <input type="hidden" name="projectKeys" value="<s:property value="key"/>">
           <div class="axial">
@@ -72,6 +80,7 @@
               </tr>
              </table>
            </div>
+          </td></tr>
         </s:iterator>
 
         <s:submit value="%{getText('submit')}"/>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/css/continuum.css
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/css/continuum.css?rev=1662889&r1=1662888&r2=1662889&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/css/continuum.css (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/css/continuum.css Sat Feb 28 02:27:14
2015
@@ -52,4 +52,17 @@ td.tdLabel {
   white-space: -pre-wrap;
   white-space: -o-pre-wrap;
   word-wrap: break-word;
+}
+
+table.releasePhases {
+  width: 100%;
+}
+table.releasePhases th {
+  text-align: left;
+}
+table.releasePhases td:nth-child(1) {
+  text-align: center;
+}
+table.releasePhases td:nth-child(2) {
+  width: 100%;
 }
\ No newline at end of file



Mime
View raw message