Actually, the button markup is "right", it's the code is broken. We
implemented the key attributes for link tags but not the buttons. I
meant to try and fix this before committing it back, but it got mixed
in with the site changes. In the meantime, I reopened WW-1458.

-T.


On 11/20/06, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote:
Author: mrdon
Date: Mon Nov 20 12:26:44 2006
New Revision: 477318

URL: http://svn.apache.org/viewvc?view=rev&rev=477318
Log:
Fixed submit button values, updated jetty plugin
WW-1483


Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/Login.jsp
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/Login.jsp?view=diff&rev=477318&r1=477317&r2=477318
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/Login.jsp (original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/Login.jsp Mon Nov 20 
12:26:44 2006
@@ -17,11 +17,11 @@

     <s:password key="password" showPassword="true"/>

-    <s:submit key="button.save"/>
+    <s:submit value="%{getText('button.save')}"/>

-    <s:reset key="button.reset"/>
+    <s:reset value="%{getText('button.reset')}"/>

-    <s:submit action="Login_cancel" key="button.cancel}"
+    <s:submit action="Login_cancel" value="%{getText('button.cancel')}"
                 onclick="form.onsubmit=null"/>
 </s:form>


Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/Registration.jsp
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/Registration.jsp?view=diff&rev=477318&r1=477317&r2=477318
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/Registration.jsp 
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/Registration.jsp Mon 
Nov 20 12:26:44 2006
@@ -42,19 +42,19 @@
                    name="user.replyToAddress"/>

     <s:if test="task == 'Create'">
-        <s:submit key="button.save" action="Registration_save"/>
+        <s:submit value="%{getText('button.save')}" 
action="Registration_save"/>

-        <s:reset key="button.reset"/>
+        <s:reset value="%{getText('button.reset')}"/>

-        <s:submit action="Welcome" key="button.cancel"
+        <s:submit action="Welcome" value="%{getText('button.cancel')}"
                     onclick="form.onsubmit=null"/>
     </s:if>
     <s:else>
-        <s:submit key="button.save" action="Registration"/>
+        <s:submit value="%{getText('button.save')}" action="Registration"/>

-        <s:reset key="button.reset"/>
+        <s:reset value="%{getText('button.reset')}"/>

-        <s:submit action="MainMenu" key="button.cancel"
+        <s:submit action="MainMenu" value="%{getText('button.cancel')}"
                     onclick="form.onsubmit=null"/>
     </s:else>


Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/Subscription.jsp
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/Subscription.jsp?view=diff&rev=477318&r1=477317&r2=477318
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/Subscription.jsp 
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/Subscription.jsp Mon 
Nov 20 12:26:44 2006
@@ -42,7 +42,7 @@
                    name="subscription.type"/>
         <s:label key="autoConnect"
                    name="subscription.autoConnect"/>
-        <s:submit key="button.confirm"/>
+        <s:submit value="%{getText('button.confirm')}"/>
     </s:if>
     <s:else>
         <s:textfield key="mailUsername"
@@ -53,12 +53,12 @@
                     name="subscription.type" list="types"/>
         <s:checkbox key="autoConnect"
                       name="subscription.autoConnect"/>
-        <s:submit key="button.save"/>
-        <s:reset key="button.reset"/>
+        <s:submit value="%{getText('button.save')}"/>
+        <s:reset value="%{getText('button.reset')}"/>
     </s:else>

     <s:submit action="Registration_input"
-                key="button.cancel"
+                value="%{getText('button.cancel')}"
                 onclick="form.onsubmit=null"/>
 </s:form>






--
HTH, Ted.
* http://www.husted.com/struts/

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to