struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hus...@apache.org
Subject svn commit: r388862 - in /struts/sandbox/trunk/action2: ./ apps/mailreader/src/webapp/pages/
Date Sun, 26 Mar 2006 00:18:29 GMT
Author: husted
Date: Sat Mar 25 16:18:26 2006
New Revision: 388862

URL: http://svn.apache.org/viewcvs?rev=388862&view=rev
Log:
Action2 Apps
* Mailreader - Work in progress
** Standardize on "saf" for now. 


Modified:
    struts/sandbox/trunk/action2/README.txt
    struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/ChangePassword.jsp
    struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Footer.jsp
    struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Logon.jsp
    struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp
    struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp
    struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Welcome.jsp

Modified: struts/sandbox/trunk/action2/README.txt
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/README.txt?rev=388862&r1=388861&r2=388862&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/README.txt (original)
+++ struts/sandbox/trunk/action2/README.txt Sat Mar 25 16:18:26 2006
@@ -117,25 +117,24 @@
 Subscription Edit
 
 Nominal
-+ Cancel (*)
++ Cancel
 + Save (no changes)
 + Save (changes)
 
-Issues
-* Cancel
-** Goes to MainMenu rather than (back to) Registration
-
 ----
 
 Subscription Delete
 
 Norminal
-  Cancel
-  Confirm
++ Cancel
++ Confirm
 
 ----
 
 Subscription Add
++ Cancel 
++ Submit 
+  Submit (bad data)
 
 ----
 

Modified: struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/ChangePassword.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/ChangePassword.jsp?rev=388862&r1=388861&r2=388862&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/ChangePassword.jsp (original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/ChangePassword.jsp Sat Mar
25 16:18:26 2006
@@ -1,21 +1,21 @@
-<%@ taglib uri="/webwork" prefix="af" %>
+<%@ taglib uri="/webwork" prefix="saf" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-    <title><af:text name="change.title"/></title>
-    <link href="<af:url value="/css/mailreader.css"/>" rel="stylesheet" type="text/css"/>
+    <title><saf:text name="change.title"/></title>
+    <link href="<saf:url value="/css/mailreader.css"/>" rel="stylesheet" type="text/css"/>
 </head>
 
 <body>
 
 <p>
-    <af:text name="change.message"/>
+    <saf:text name="change.message"/>
 </p>
 
 <p>
-    <a href="<af:url action="Logon!input"/>">
-        <af:text name="change.try"/>
+    <a href="<saf:url action="Logon!input"/>">
+        <saf:text name="change.try"/>
     </a>
 </p>
 

Modified: struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Footer.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Footer.jsp?rev=388862&r1=388861&r2=388862&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Footer.jsp (original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Footer.jsp Sat Mar 25 16:18:26
2006
@@ -1,6 +1,6 @@
-<%@ taglib uri="/webwork" prefix="a2" %>
+<%@ taglib uri="/webwork" prefix="saf" %>
 <hr/>
 
 <p>
-    <a href="<a2:url action="Welcome" />"><a2:text name="index.title"/></a>
+    <a href="<saf:url action="Welcome" />"><saf:text name="index.title"/></a>
 </p>

Modified: struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Logon.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Logon.jsp?rev=388862&r1=388861&r2=388862&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Logon.jsp (original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Logon.jsp Sat Mar 25 16:18:26
2006
@@ -1,10 +1,10 @@
-<%@ taglib uri="/webwork" prefix="a2" %>
+<%@ taglib uri="/webwork" prefix="saf" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-    <title><a2:text name="logon.title"/></title>
-    <link href="<a2:url value="/css/mailreader.css"/>" rel="stylesheet" type="text/css"/>
+    <title><saf:text name="logon.title"/></title>
+    <link href="<saf:url value="/css/mailreader.css"/>" rel="stylesheet" type="text/css"/>
 </head>
 
 <body>

Modified: struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp?rev=388862&r1=388861&r2=388862&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp (original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp Sat Mar
25 16:18:26 2006
@@ -1,110 +1,110 @@
-<%@ taglib uri="/webwork" prefix="a2" %>
+<%@ taglib uri="/webwork" prefix="saf" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-    <a2:if test="task=='Create'">
-        <title><a2:text name="registration.title.create"/></title>
-    </a2:if>
-    <a2:if test="task=='Edit'">
-        <title><a2:text name="registration.title.edit"/></title>
-    </a2:if>
-    <link href="<a2:url value="/css/mailreader.css"/>" rel="stylesheet" type="text/css"/>
+    <saf:if test="task=='Create'">
+        <title><saf:text name="registration.title.create"/></title>
+    </saf:if>
+    <saf:if test="task=='Edit'">
+        <title><saf:text name="registration.title.edit"/></title>
+    </saf:if>
+    <link href="<saf:url value="/css/mailreader.css"/>" rel="stylesheet" type="text/css"/>
 </head>
 
 <body>
 
-<a2:form method="POST" validate="false">
-    <a2:hidden name="task"/>
-    <a2:if test="task == 'Create'">
-        <a2:textfield label="%{getText('prompt.username')}" name="username"/>
-    </a2:if>
-    <a2:else>
-        <a2:label label="%{getText('prompt.username')}" name="username"/>
-        <a2:hidden name="username"/>
-    </a2:else>
+<saf:form method="POST" validate="false">
+    <saf:hidden name="task"/>
+    <saf:if test="task == 'Create'">
+        <saf:textfield label="%{getText('prompt.username')}" name="username"/>
+    </saf:if>
+    <saf:else>
+        <saf:label label="%{getText('prompt.username')}" name="username"/>
+        <saf:hidden name="username"/>
+    </saf:else>
 
-    <a2:textfield label="%{getText('prompt.password')}" name="password"/>
+    <saf:textfield label="%{getText('prompt.password')}" name="password"/>
 
-    <a2:textfield label="%{getText('prompt.password2')}" name="password2"/>
+    <saf:textfield label="%{getText('prompt.password2')}" name="password2"/>
 
-    <a2:textfield label="%{getText('prompt.fullName')}" name="user.fullName"/>
+    <saf:textfield label="%{getText('prompt.fullName')}" name="user.fullName"/>
 
-    <a2:textfield label="%{getText('prompt.fromAddress')}" name="user.fromAddress"/>
+    <saf:textfield label="%{getText('prompt.fromAddress')}" name="user.fromAddress"/>
 
-    <a2:textfield label="%{getText('prompt.replyToAddress')}" name="user.replyToAddress"/>
+    <saf:textfield label="%{getText('prompt.replyToAddress')}" name="user.replyToAddress"/>
 
-    <a2:submit/>
+    <saf:submit/>
 
-    <a2:reset/>
+    <saf:reset/>
 
-    <a2:if test="task == 'Create'">
-        <a2:submit action="Welcome" value="%{getText('button.cancel')}" onclick="form.onsubmit=null"/>
-    </a2:if>
-    <a2:else>
-        <a2:submit action="MainMenu" value="%{getText('button.cancel')}" onclick="form.onsubmit=null"/>
-    </a2:else>
+    <saf:if test="task == 'Create'">
+        <saf:submit action="Welcome" value="%{getText('button.cancel')}" onclick="form.onsubmit=null"/>
+    </saf:if>
+    <saf:else>
+        <saf:submit action="MainMenu" value="%{getText('button.cancel')}" onclick="form.onsubmit=null"/>
+    </saf:else>
 
-</a2:form>
+</saf:form>
 
-<a2:if test="task == 'Edit'">
+<saf:if test="task == 'Edit'">
     <div align="center">
-        <h3><a2:text name="heading.subscriptions"/></h3>
+        <h3><saf:text name="heading.subscriptions"/></h3>
     </div>
 
     <table border="1" width="100%">
 
         <tr>
             <th align="center" width="30%">
-                <a2:text name="heading.host"/>
+                <saf:text name="heading.host"/>
             </th>
             <th align="center" width="25%">
-                <a2:text name="heading.user"/>
+                <saf:text name="heading.user"/>
             </th>
             <th align="center" width="10%">
-                <a2:text name="heading.type"/>
+                <saf:text name="heading.type"/>
             </th>
             <th align="center" width="10%">
-                <a2:text name="heading.autoConnect"/>
+                <saf:text name="heading.autoConnect"/>
             </th>
             <th align="center" width="15%">
-                <a2:text name="heading.action"/>
+                <saf:text name="heading.action"/>
             </th>
         </tr>
 
-        <a2:iterator value="user.subscriptions">
+        <saf:iterator value="user.subscriptions">
             <tr>
                 <td align="left">
-                    <a2:property value="host"/>
+                    <saf:property value="host"/>
                 </td>
                 <td align="left">
-                    <a2:property value="username"/>
+                    <saf:property value="username"/>
                 </td>
                 <td align="center">
-                    <a2:property value="type"/>
+                    <saf:property value="type"/>
                 </td>
                 <td align="center">
-                    <a2:property value="autoConnect"/>
+                    <saf:property value="autoConnect"/>
                 </td>
                 <td align="center">
 
-                    <a href="<a2:url action="Subscription!delete"><a2:param name="host"
value="host"/></a2:url>">
-                        <a2:text name="registration.deleteSubscription"/>
+                    <a href="<saf:url action="Subscription!delete"><saf:param
name="host" value="host"/></saf:url>">
+                        <saf:text name="registration.deleteSubscription"/>
                     </a>
                     &nbsp;
-                    <a href="<a2:url action="Subscription!edit"><a2:param name="host"
value="host"/></a2:url>">
-                        <a2:text name="registration.editSubscription"/>
+                    <a href="<saf:url action="Subscription!edit"><saf:param name="host"
value="host"/></saf:url>">
+                        <saf:text name="registration.editSubscription"/>
                     </a>
 
                 </td>
             </tr>
-        </a2:iterator>
+        </saf:iterator>
 
     </table>
 
-    <a href="<a2:url action="Subscription!input"/>"><a2:text name="registration.addSubscription"/></a>
+    <a href="<saf:url action="Subscription!input"/>"><saf:text name="registration.addSubscription"/></a>
 
-</a2:if>
+</saf:if>
 
 <jsp:include page="Footer.jsp"/>
 

Modified: struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp?rev=388862&r1=388861&r2=388862&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp (original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp Sat Mar
25 16:18:26 2006
@@ -1,51 +1,51 @@
-<%@ taglib uri="/webwork" prefix="ui" %>
+<%@ taglib uri="/webwork" prefix="saf" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-    <ui:if test="task=='Create'">
-        <title><ui:text name="subscription.title.create"/></title>
-    </ui:if>
-    <ui:if test="task=='Edit'">
-        <title><ui:text name="subscription.title.edit"/></title>
-    </ui:if>
-    <ui:if test="task=='Delete'">
-        <title><ui:text name="subscription.title.delete"/></title>
-    </ui:if>
-    <link href="<ui:url value="/css/mailreader.css"/>" rel="stylesheet" type="text/css"/>
+    <saf:if test="task=='Create'">
+        <title><saf:text name="subscription.title.create"/></title>
+    </saf:if>
+    <saf:if test="task=='Edit'">
+        <title><saf:text name="subscription.title.edit"/></title>
+    </saf:if>
+    <saf:if test="task=='Delete'">
+        <title><saf:text name="subscription.title.delete"/></title>
+    </saf:if>
+    <link href="<saf:url value="/css/mailreader.css"/>" rel="stylesheet" type="text/css"/>
 </head>
 
 <body>
-<ui:form method="POST" action="Subscription" validate="true">
-    <ui:hidden name="task"/>
-    <ui:label label="%{getText('prompt.username')}" name="user.username"/>
+<saf:form method="POST" action="Subscription" validate="true">
+    <saf:hidden name="task"/>
+    <saf:label label="%{getText('prompt.username')}" name="user.username"/>
 
-    <ui:if test="task == 'Create'">
-        <ui:textfield label="%{getText('prompt.mailHostname')}" name="host"/>
-    </ui:if>
-    <ui:else>
-        <ui:label label="%{getText('prompt.mailHostname')}" name="host"/>
-        <ui:hidden name="host"/>
-    </ui:else>
+    <saf:if test="task == 'Create'">
+        <saf:textfield label="%{getText('prompt.mailHostname')}" name="host"/>
+    </saf:if>
+    <saf:else>
+        <saf:label label="%{getText('prompt.mailHostname')}" name="host"/>
+        <saf:hidden name="host"/>
+    </saf:else>
 
-    <ui:if test="task == 'Delete'">
-        <ui:label label="%{getText('prompt.mailUsername')}" name="subscription.username"/>
-        <ui:label label="%{getText('prompt.mailPassword')}" name="subscription.password"/>
-        <ui:label label="%{getText('prompt.mailServerType')}" name="subscription.type"/>
-        <ui:label label="%{getText('prompt.autoConnect')}" name="subscription.autoConnect"/>
-        <ui:submit value="%{getText('button.confirm')}"/>
-    </ui:if>
-    <ui:else>
-        <ui:textfield label="%{getText('prompt.mailUsername')}" name="subscription.username"/>
-        <ui:textfield label="%{getText('prompt.mailPassword')}" name="subscription.password"/>
-        <ui:select label="%{getText('prompt.mailServerType')}" name="subscription.type"
list="types"/>
-        <ui:checkbox label="%{getText('prompt.autoConnect')}" name="subscription.autoConnect"/>
-        <ui:submit value="%{getText('button.save')}"/>
-        <ui:reset value="%{getText('button.reset')}"/>
-    </ui:else>
+    <saf:if test="task == 'Delete'">
+        <saf:label label="%{getText('prompt.mailUsername')}" name="subscription.username"/>
+        <saf:label label="%{getText('prompt.mailPassword')}" name="subscription.password"/>
+        <saf:label label="%{getText('prompt.mailServerType')}" name="subscription.type"/>
+        <saf:label label="%{getText('prompt.autoConnect')}" name="subscription.autoConnect"/>
+        <saf:submit value="%{getText('button.confirm')}"/>
+    </saf:if>
+    <saf:else>
+        <saf:textfield label="%{getText('prompt.mailUsername')}" name="subscription.username"/>
+        <saf:textfield label="%{getText('prompt.mailPassword')}" name="subscription.password"/>
+        <saf:select label="%{getText('prompt.mailServerType')}" name="subscription.type"
list="types"/>
+        <saf:checkbox label="%{getText('prompt.autoConnect')}" name="subscription.autoConnect"/>
+        <saf:submit value="%{getText('button.save')}"/>
+        <saf:reset value="%{getText('button.reset')}"/>
+    </saf:else>
 
-    <ui:submit action="Registration!input" value="%{getText('button.cancel')}" onclick="form.onsubmit=null"/>
-</ui:form>
+    <saf:submit action="Registration!input" value="%{getText('button.cancel')}" onclick="form.onsubmit=null"/>
+</saf:form>
 
 <jsp:include page="Footer.jsp"/>
 

Modified: struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Welcome.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Welcome.jsp?rev=388862&r1=388861&r2=388862&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Welcome.jsp (original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Welcome.jsp Sat Mar 25 16:18:26
2006
@@ -1,19 +1,19 @@
-<%@ taglib uri="/webwork" prefix="t" %>
+<%@ taglib uri="/webwork" prefix="saf" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title><t:text name="index.title"/></title>
-    <link href="<t:url value="/css/mailreader.css"/>" rel="stylesheet" type="text/css"/>
+    <title><saf:text name="index.title"/></title>
+    <link href="<saf:url value="/css/mailreader.css"/>" rel="stylesheet" type="text/css"/>
 </head>
 
 <body>
-<h3><t:text name="index.heading"/></h3>
+<h3><saf:text name="index.heading"/></h3>
 
 <ul>
-    <li><a href="<t:url action="Registration!input"/>"><t:text name="index.registration"/></a></li>
-    <li><a href="<t:url action="Logon!input"/>"><t:text name="index.logon"/></a></li>
+    <li><a href="<saf:url action="Registration!input"/>"><saf:text name="index.registration"/></a></li>
+    <li><a href="<saf:url action="Logon!input"/>"><saf:text name="index.logon"/></a></li>
 </ul>
 
 <h3>Language Options</h3>
@@ -21,16 +21,16 @@
 <hr/>
 
 <ul>
-    <li><a href="<t:url action="Locale?language=en"/>">English</a></li>
-    <li><a href="<t:url action="Locale?language=ja"/>">Japanese</a></li>
-    <li><a href="<t:url action="Locale?language=ru"/>">Russian</a></li>
+    <li><a href="<saf:url action="Locale?language=en"/>">English</a></li>
+    <li><a href="<saf:url action="Locale?language=ja"/>">Japanese</a></li>
+    <li><a href="<saf:url action="Locale?language=ru"/>">Russian</a></li>
 </ul>
 
-<p><t:i18n name="alternate">
-    <img src="<t:url><t:text name="struts.logo.path"/></t:url>" alt="<t:text
name="struts.logo.alt"/>"/>
-</t:i18n></p>
+<p><saf:i18n name="alternate">
+    <img src="<saf:url><saf:text name="struts.logo.path"/></saf:url>"
alt="<saf:text name="struts.logo.alt"/>"/>
+</saf:i18n></p>
 
-<p><a href="<t:url action="Tour" />"><t:text name="index.tour"/></a></p>
+<p><a href="<saf:url action="Tour" />"><saf:text name="index.tour"/></a></p>
 
 </body>
 </html>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org


Mime
View raw message