continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r482205 - in /maven/continuum/trunk: continuum-webapp-test/src/test/it/org/apache/continuum/web/test/ continuum-webapp/src/main/resources/localization/ continuum-webapp/src/main/webapp/WEB-INF/jsp/
Date Mon, 04 Dec 2006 15:05:13 GMT
Author: evenisse
Date: Mon Dec  4 07:05:09 2006
New Revision: 482205

URL: http://svn.apache.org/viewvc?view=rev&rev=482205
Log:
o Remove 'Continuum' in 'Continuum Project Group' texts
o Replace links by buttons for consistency

Modified:
    maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AbstractContinuumTestCase.java
    maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp

Modified: maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AbstractContinuumTestCase.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AbstractContinuumTestCase.java?view=diff&rev=482205&r1=482204&r2=482205
==============================================================================
--- maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AbstractContinuumTestCase.java
(original)
+++ maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AbstractContinuumTestCase.java
Mon Dec  4 07:05:09 2006
@@ -335,9 +335,9 @@
 
     public void assertAddProjectGroupPage()
     {
-        assertPage( "Continuum - Add Continuum Project Group" );
+        assertPage( "Continuum - Add Project Group" );
 
-        assertTextPresent( "Add Continuum Project Group" );
+        assertTextPresent( "Add Project Group" );
         assertTextPresent( "Project Group Name" );
         assertElementPresent( "name" );
         assertTextPresent( "Project Group Id" );

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?view=diff&rev=482205&r1=482204&r2=482205
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
Mon Dec  4 07:05:09 2006
@@ -99,7 +99,7 @@
 # ----------------------------------------------------------------------
 # Page: Project Group
 # ----------------------------------------------------------------------
-projectGroup.page.title = Continuum - Continuum Project Group
+projectGroup.page.title = Continuum - Project Group
 projectGroup.name.label = Project Group Name
 projectGroup.groupId.label = Project Group Id
 projectGroup.description.label = Description
@@ -112,8 +112,8 @@
 # ----------------------------------------------------------------------
 # Page: Add Project Group
 # ----------------------------------------------------------------------
-projectGroup.add.page.title = Continuum - Add Continuum Project Group
-projectGroup.add.section.title = Add Continuum Project Group
+projectGroup.add.page.title = Continuum - Add Project Group
+projectGroup.add.section.title = Add Project Group
 projectGroup.error.name.required = Project Group Name required.
 projectGroup.error.name.already.exists = Project Group Name already exists.
 projectGroup.error.groupId.required = Project Group ID required.
@@ -121,8 +121,8 @@
 # ----------------------------------------------------------------------
 # Page: Edit Project Group
 # ----------------------------------------------------------------------
-projectGroup.edit.page.title = Continuum - Update Continuum Project Group
-projectGroup.edit.section.title = Update Continuum Project Group
+projectGroup.edit.page.title = Continuum - Update Project Group
+projectGroup.edit.section.title = Update Project Group
 projectGroup.edit.project.name = Project Name
 projectGroup.edit.move.to.group = Move to Group
 project.in.checkout.queue.error = Cannot edit this project group. Projects that are members
of this project group are still being checked out from scm.

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp?view=diff&rev=482205&r1=482204&r2=482205
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp Mon
Dec  4 07:05:09 2006
@@ -39,6 +39,17 @@
       </ec:row>
     </ec:table>
     <pss:ifAuthorized permission="continuum-add-group">
+      <div class="functnbar3">
+        <table>
+          <tr>
+            <td>
+              <form action="<ww:url  action='addProjectGroup' method='input' namespace='/'
/>" method="post">
+                <input type="submit" name="addProjectGroup" value="<ww:text name="projectGroup.add.section.title"/>"/>
+              </form>
+            </td>
+          </tr>
+        </table>
+      </div>
       <a href="<ww:url  action='addProjectGroup' method='input' namespace='/' />">Add
a Project Group</a>
     </pss:ifAuthorized>
     </div>        

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp?view=diff&rev=482205&r1=482204&r2=482205
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
Mon Dec  4 07:05:09 2006
@@ -66,14 +66,30 @@
       <ww:param name="projectGroupName" value="%{projectGroup.name}"/>
     </ww:action>
     
-    <div class="functnbar3">
-      <pss:ifAnyAuthorized permissions="continuum-add-project-to-group" resource="${projectGroup.name}">
-          <c:url var="addM2ProjectUrl" value="/addMavenTwoProject!default.action">
-            <c:param name="disableGroupSelection" value="true"/>
-          </c:url>
-          <a href="<c:out value='${addM2ProjectUrl}'/>"><ww:text name="add.m2.project.section.title"/></a>
-      </pss:ifAnyAuthorized>
-    </div>
+    <pss:ifAnyAuthorized permissions="continuum-add-project-to-group" resource="${projectGroup.name}">
+      <div class="functnbar3">
+        <c:url var="addM2ProjectUrl" value="/addMavenTwoProject!default.action">
+          <c:param name="disableGroupSelection" value="true"/>
+        </c:url>
+        <c:url var="addM1ProjectUrl" value="/addMavenOneProject!default.action">
+          <c:param name="disableGroupSelection" value="true"/>
+        </c:url>
+        <table>
+          <tr>
+            <td>
+              <form action="${addM2ProjectUrl}" method="post">
+                <input type="submit" name="addM2Project" value="<ww:text name="add.m2.project.section.title"/>"/>
+              </form>
+            </td>
+            <td>
+              <form action="${addM1ProjectUrl}" method="post">
+                <input type="submit" name="addM1Project" value="<ww:text name="add.m1.project.section.title"/>"/>
+              </form>
+            </td>
+          </tr>
+        </table>
+      </div>
+    </pss:ifAnyAuthorized>
 
   </div>
   </body>



Mime
View raw message