You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ca...@apache.org on 2006/09/18 19:41:53 UTC
svn commit: r447482 - in
/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main:
resources/xwork.xml webapp/configurationEdit.jsp
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>