Return-Path: 
 <continuum-commits-return-2321-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org>
Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org
Received: (qmail 20758 invoked from network); 18 Sep 2006 17:42:14 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 18 Sep 2006 17:42:14 -0000
Received: (qmail 68718 invoked by uid 500); 18 Sep 2006 17:42:14 -0000
Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org
Received: (qmail 68682 invoked by uid 500); 18 Sep 2006 17:42:14 -0000
Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:continuum-commits-help@maven.apache.org>
List-Unsubscribe: <mailto:continuum-commits-unsubscribe@maven.apache.org>
List-Post: <mailto:continuum-commits@maven.apache.org>
List-Id: <continuum-commits.maven.apache.org>
Reply-To: continuum-dev@maven.apache.org
Delivered-To: mailing list continuum-commits@maven.apache.org
Received: (qmail 68669 invoked by uid 99); 18 Sep 2006 17:42:14 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Sep 2006 10:42:14 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Sep 2006 10:42:13 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 8E3031A981A; Mon, 18 Sep 2006 10:41:53 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r447482 - in
 /maven/continuum/branches/continuum-acegi/continuum-webapp/src/main:
 resources/xwork.xml webapp/configurationEdit.jsp
Date: Mon, 18 Sep 2006 17:41:53 -0000
To: continuum-commits@maven.apache.org
From: carlos@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20060918174153.8E3031A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: carlos
Date: Mon Sep 18 10:41:52 2006
New Revision: 447482

URL: http://svn.apache.org/viewvc?view=rev&rev=447482
Log:
Add cancel button to configuration

Modified:
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/configurationEdit.jsp

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml?view=diff&rev=447482&r1=447481&r2=447482
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml Mon Sep 18 10:41:52 2006
@@ -32,7 +32,7 @@
 
     <global-results>
       <result name="error-internal">/error/error.jsp?id=500</result>
-      <result name="continuumInitialization" type="redirect">/configuration!input.action</result>
+      <result name="continuumInitialization" type="redirect">/configuration!input.action?isNew=true</result>
     </global-results>
 
     <global-exception-mappings>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/configurationEdit.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/configurationEdit.jsp?view=diff&rev=447482&r1=447481&r2=447482
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/configurationEdit.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/configurationEdit.jsp Mon Sep 18 10:41:52 2006
@@ -1,5 +1,6 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
 <%@ taglib uri="continuum" prefix="c1" %>
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <html>
   <ww:i18n name="localization.Continuum">
     <head>
@@ -22,7 +23,15 @@
               </tbody>
             </table>
             <div class="functnbar3">
-              <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+              <c:choose>
+                <c:when test="${param.isNew == true}">
+                  <ww:submit value="%{getText('save')}"/>
+                  <input type="button" value="<ww:text name="cancel"/>" onclick="location.href='/configuration!default.action'">
+                </c:when>
+                <c:otherwise>
+                  <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+                </c:otherwise>
+              </c:choose>
             </div>
           </ww:form>
         </div>