roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r543318 - in /roller/trunk/apps/weblogger: src/java/org/apache/roller/weblogger/ui/struts2/admin/ src/java/org/apache/roller/weblogger/ui/struts2/core/ src/java/org/apache/roller/weblogger/ui/struts2/editor/ web/WEB-INF/jsps/admin/ web/WEB-...
Date Thu, 31 May 2007 23:53:58 GMT
Author: agilliland
Date: Thu May 31 16:53:57 2007
New Revision: 543318

URL: http://svn.apache.org/viewvc?view=rev&rev=543318
Log:
cleaning up the way cancel buttons work.


Modified:
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
    roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/ModifyUser.jsp
    roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/CreateWeblog.jsp
    roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Profile.jsp
    roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Register.jsp
    roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/TemplateEdit.jsp

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java?view=diff&rev=543318&r1=543317&r2=543318
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
(original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
Thu May 31 16:53:57 2007
@@ -121,13 +121,8 @@
     }
     
     
-    public String cancel() {
-        return "cancel";
-    }
-    
-    
     // TODO: replace with struts2 validation
-    protected void myValidate() {
+    private void myValidate() {
         
         String allowed = RollerConfig.getProperty("username.allowedChars");
         if(allowed == null || allowed.trim().length() == 0) {

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java?view=diff&rev=543318&r1=543317&r2=543318
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
(original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
Thu May 31 16:53:57 2007
@@ -157,11 +157,6 @@
     }
     
     
-    public String cancel() {
-        return "cancel";
-    }
-    
-    
     // TODO: replace with struts2 validation
     private void myValidate() {
         

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java?view=diff&rev=543318&r1=543317&r2=543318
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
(original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
Thu May 31 16:53:57 2007
@@ -87,12 +87,6 @@
     }
     
     
-    @SkipValidation
-    public String cancel() {
-        return "cancel";
-    }
-    
-    
     public String save() {
         
         User user = getAuthenticatedUser();

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java?view=diff&rev=543318&r1=543317&r2=543318
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
(original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
Thu May 31 16:53:57 2007
@@ -67,12 +67,6 @@
     }
     
     
-    @SkipValidation
-    public String cancel() {
-        return "cancel";
-    }
-    
-    
     public String save() {
         
         myValidate();

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java?view=diff&rev=543318&r1=543317&r2=543318
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
(original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
Thu May 31 16:53:57 2007
@@ -106,12 +106,6 @@
     }
     
     
-    @SkipValidation
-    public String cancel() {
-        return "cancel";
-    }
-    
-    
     public String save() {
         
         if(!RollerRuntimeConfig.getBooleanProperty("users.registration.enabled")) {

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java?view=diff&rev=543318&r1=543317&r2=543318
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
(original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
Thu May 31 16:53:57 2007
@@ -149,11 +149,6 @@
     }
     
     
-    public String cancel() {
-        return "cancel";
-    }
-    
-    
     private void myValidate() {
         
         // if name changed make sure there isn't a conflict

Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/ModifyUser.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/ModifyUser.jsp?view=diff&rev=543318&r1=543317&r2=543318
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/ModifyUser.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/ModifyUser.jsp Thu May 31 16:53:57
2007
@@ -135,7 +135,7 @@
     
     <div class="control">
         <s:submit key="userAdmin.save" />
-        <s:submit key="application.cancel" action="modifyUser!cancel" />
+        <input type="button" value="<s:text name="application.cancel"/>" onclick="window.location='<s:url
action="userAdmin"/>'" />
     </div>
     
 </s:form>

Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/CreateWeblog.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/CreateWeblog.jsp?view=diff&rev=543318&r1=543317&r2=543318
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/CreateWeblog.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/CreateWeblog.jsp Thu May 31 16:53:57
2007
@@ -113,7 +113,7 @@
 <br />
    
 <s:submit key="createWebsite.button.save" />
-<s:submit key="createWebsite.button.cancel" action="createWeblog!cancel" />
+<input type="button" value="<s:text name="createWebsite.button.cancel"/>" onclick="window.location='<s:url
action="menu"/>'" />
     
 </s:form>
 

Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Profile.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Profile.jsp?view=diff&rev=543318&r1=543317&r2=543318
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Profile.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Profile.jsp Thu May 31 16:53:57 2007
@@ -83,6 +83,6 @@
 <br />
 
 <s:submit key="userSettings.button.save" />
-<s:submit key="userSettings.button.cancel" action="profile!cancel" />
+<input type="button" value="<s:text name="userSettings.button.cancel"/>" onclick="window.location='<s:url
action="menu"/>'" />
 
 </s:form>

Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Register.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Register.jsp?view=diff&rev=543318&r1=543317&r2=543318
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Register.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Register.jsp Thu May 31 16:53:57 2007
@@ -94,6 +94,6 @@
 <br />
 
 <s:submit key="userRegister.button.save" />
-<s:submit key="userSettings.button.cancel" action="register!cancel" />
+<input type="button" value="<s:text name="userSettings.button.cancel"/>" onclick="window.location='<s:url
value="/"/>'" />
     
 </s:form>

Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/TemplateEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/TemplateEdit.jsp?view=diff&rev=543318&r1=543317&r2=543318
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/TemplateEdit.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/TemplateEdit.jsp Thu May 31 16:53:57
2007
@@ -143,8 +143,8 @@
     <table style="width:100%">
         <tr>
             <td>
-                <s:submit key="pageForm.save" /></input>
-                <s:submit key="application.done" action="templates" /></input>
+                <s:submit key="pageForm.save" />
+                <input type="button" value="<s:text name="application.done"/>" onclick="window.location='<s:url
action="templates"><s:param name="weblog" value="%{weblog}"/></s:url>'" />
             </td>
             <td align="right">
                 <!-- Add buttons to make this textarea taller or shorter -->



Mime
View raw message