struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmitch...@apache.org
Subject svn commit: r522730 - in /struts/struts2/trunk/apps/mailreader/src/main/webapp: Footer.jsp Registration.jsp Subscription.jsp WEB-INF/web.xml Welcome.jsp
Date Tue, 27 Mar 2007 03:52:48 GMT
Author: jmitchell
Date: Mon Mar 26 20:52:47 2007
New Revision: 522730

URL: http://svn.apache.org/viewvc?view=rev&rev=522730
Log:
Patch trunk from original 2.0.x changes as follows...

WW-1840 -- Mailreader -- either show passwords as *** or show them as readonly (text) or remove
them
WW-1841 -- Mailreader -- msg text showing in place of logo image (struts.logo.alt)
WW-1842 -- Mailreader -- Remove walking tour

 * 1841 is not resolved, due to an issue with the i18n tag not finding the alternate bundle
 * also remove extra extra params from css href and back links



Modified:
    struts/struts2/trunk/apps/mailreader/src/main/webapp/Footer.jsp
    struts/struts2/trunk/apps/mailreader/src/main/webapp/Registration.jsp
    struts/struts2/trunk/apps/mailreader/src/main/webapp/Subscription.jsp
    struts/struts2/trunk/apps/mailreader/src/main/webapp/WEB-INF/web.xml
    struts/struts2/trunk/apps/mailreader/src/main/webapp/Welcome.jsp

Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/Footer.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/Footer.jsp?view=diff&rev=522730&r1=522729&r2=522730
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/Footer.jsp (original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/Footer.jsp Mon Mar 26 20:52:47 2007
@@ -2,5 +2,5 @@
 <hr/>
 
 <p>
-    <a href="<s:url action="Welcome" />"><s:text name="index.title"/></a>
+    <a href="<s:url action="Welcome"  includeParams="none"/>"><s:text name="index.title"/></a>
 </p>

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=522730&r1=522729&r2=522730
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/Registration.jsp (original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/Registration.jsp Mon Mar 26 20:52:47
2007
@@ -28,7 +28,7 @@
         <s:hidden name="username"/>
     </s:else>
 
-    <s:password key="password"/>
+    <s:password key="password" showPassword="true"/>
     <s:password key="password2"/>
     <s:textfield key="user.fullName"/>
     <s:textfield key="user.fromAddress"/>

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=522730&r1=522729&r2=522730
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/Subscription.jsp (original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/Subscription.jsp Mon Mar 26 20:52:47
2007
@@ -13,7 +13,7 @@
     <s:if test="task=='Delete'">
         <title><s:text name="subscription.title.delete"/></title>
     </s:if>
-    <link href="<s:url value="/css/mailreader.css"/>" rel="stylesheet"
+    <link href="<s:url value="/css/mailreader.css" includeParams="none"/>" rel="stylesheet"
           type="text/css"/>
 </head>
 

Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/WEB-INF/web.xml?view=diff&rev=522730&r1=522729&r2=522730
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/WEB-INF/web.xml (original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/WEB-INF/web.xml Mon Mar 26 20:52:47
2007
@@ -13,7 +13,7 @@
 
     <filter-mapping>
         <filter-name>Struts2</filter-name>
-        <url-pattern>/*</url-pattern>
+        <url-pattern>*.do</url-pattern>
     </filter-mapping>
 
     <!-- Application Listener for Mailreader database -->

Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/Welcome.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/Welcome.jsp?view=diff&rev=522730&r1=522729&r2=522730
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/Welcome.jsp (original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/Welcome.jsp Mon Mar 26 20:52:47 2007
@@ -44,12 +44,11 @@
 
 <hr/>
 
-<p><s:i18n name="alternate">
+<p><s:i18n name="alternate"><a href="http://struts.apache.org/">
     <img src="<s:text name="struts.logo.path"/>"
-         alt="<s:text name="struts.logo.alt"/>"/>
+         alt="<s:text name="struts.logo.alt"/>" border="0px"/>
+</a>
 </s:i18n></p>
-
-<p><a href="<s:url action="Tour" />"><s:text name="index.tour"/></a></p>
 
 </body>
 </html>



Mime
View raw message