You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hu...@apache.org on 2006/03/11 18:34:31 UTC

svn commit: r385112 - in /struts/sandbox/trunk/action2/apps/cookbook/src/webapp: Home.jsp pages/Hello/Result.jsp pages/Hello/index.jsp pages/Select/Result.jsp pages/Select/index.jsp pages/Simple/index.jsp

Author: husted
Date: Sat Mar 11 09:34:30 2006
New Revision: 385112

URL: http://svn.apache.org/viewcvs?rev=385112&view=rev
Log:
Action2 Apps 
* Add includes to displace redundant markup. 

Modified:
    struts/sandbox/trunk/action2/apps/cookbook/src/webapp/Home.jsp
    struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Hello/Result.jsp
    struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Hello/index.jsp
    struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/Result.jsp
    struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/index.jsp
    struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Simple/index.jsp

Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/Home.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/Home.jsp?rev=385112&r1=385111&r2=385112&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/Home.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/Home.jsp Sat Mar 11 09:34:30 2006
@@ -14,18 +14,18 @@
   is assumed. </p>
 <p>To navigate your way through the examples, the following icons will help: </p>
 <table border="0" cellspacing="5" width="85%" >
-  <tr valign="top">
-    <td width="30"><img alt="Home" src="<ww:url value="/images/return.gif"/>" height="24" width="24" /></td>
-    <td>Return to this screen</td>
-  </tr>
     <tr valign="top">
-      <td width="30"><img alt="Open" src="<ww:url value="/images/execute.gif"/>"></td>
+      <td width="30"><ww:include value="/icon-open.jsp" /></td>
       <td>Execute the example</td>
     </tr>
   <tr valign="top">
-    <td><img alt="View" src="<ww:url value="/images/code.gif"/>" height="24" width="24" /></td>
+    <td><ww:include value="/icon-view.jsp" /></td>
     <td>View the source code for the example</td>
   </tr>
+  <tr valign="top">
+    <td width="30"><ww:include value="/icon-home.jsp" /></td>
+    <td>Return to this screen</td>
+  </tr>
 </table>
 <br />
 <table width="85%" border="0" cellpadding="2" cellspacing="5">
@@ -36,7 +36,7 @@
 
           <ww:url id="Hello_Open" action="Open" namespace="/Hello" />
           <ww:a href="%{Hello_Open}">
-              <img src="<ww:url value="/images/execute.gif"/>" alt="" hspace="4" border="0"  align="top" class="inline" />
+              <ww:include value="/icon-open.jsp" />
           </ww:a>
           <ww:a href="%{Hello_Open}">Execute</ww:a>
 
@@ -45,7 +45,7 @@
 
           <ww:url id="Hello_View" action="View" namespace="/Hello" />
           <ww:a href="%{Hello_View}">
-              <img src="<ww:url value="/images/code.gif"/>" alt="" hspace="4" border="0"  align="top" class="inline" />
+              <ww:include value="/icon-view.jsp" />
           </ww:a>
           <ww:a href="%{Hello_View}">
               View Source
@@ -61,7 +61,7 @@
 
         <ww:url id="Simple_Open" action="Open!input" namespace="/Simple" />
         <ww:a href="%{Simple_Open}">
-            <img src="<ww:url value="/images/execute.gif"/>" alt="" hspace="4" border="0"  align="top" class="inline" />
+            <ww:include value="/icon-open.jsp" />
         </ww:a>
         <ww:a href="%{Simple_Open}">Execute</ww:a>
 
@@ -70,7 +70,7 @@
 
         <ww:url id="Simple_View" action="View" namespace="/Simple" />
         <ww:a href="%{Simple_View}">
-            <img src="<ww:url value="/images/code.gif"/>" alt="" hspace="4" border="0"  align="top" class="inline" />
+            <ww:include value="/icon-view.jsp" />
         </ww:a>
         <ww:a href="%{Simple_View}">
             View Source
@@ -96,7 +96,7 @@
 
           <ww:url id="Select_Open" action="Open!input" namespace="/Select" />
           <ww:a href="%{Select_Open}">
-              <img src="<ww:url value="/images/execute.gif"/>" alt="" hspace="4" border="0"  align="top" class="inline" />
+              <ww:include value="/icon-open.jsp" />
           </ww:a>
           <ww:a href="%{Select_Open}">Execute</ww:a>
 
@@ -105,7 +105,7 @@
 
           <ww:url id="Select_View" action="View" namespace="/Select" />
           <ww:a href="%{Select_View}">
-              <img src="<ww:url value="/images/code.gif"/>" alt="" hspace="4" border="0"  align="top" class="inline" />
+              <ww:include value="/icon-view.jsp" />
           </ww:a>
           <ww:a href="%{Select_View}">
               View Source

Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Hello/Result.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Hello/Result.jsp?rev=385112&r1=385111&r2=385112&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Hello/Result.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Hello/Result.jsp Sat Mar 11 09:34:30 2006
@@ -2,12 +2,10 @@
 <html>
     <head>
         <title>Cookbook - Hello World</title>
+        <link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css" />" >
     </head>
     <body>
-        <p>
-            <a href="<ww:url action="Home" />"><img src="<ww:url value="/images/return.gif"/>" alt="Home"  border="0"  hspace="4"align="top" class="inline" /></a>
-            <a href="<ww:url action="View"/>"><img src="<ww:url value="/images/code.gif"/>" alt="View" border="0" height="24" width="24"  class="icon" /></a>
-        </p>
+        <ww:include value="/header-result.jsp"/>
 
         <h1>Don't panic! Struts is mostly harmless ...</h1>
 

Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Hello/index.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Hello/index.jsp?rev=385112&r1=385111&r2=385112&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Hello/index.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Hello/index.jsp Sat Mar 11 09:34:30 2006
@@ -2,20 +2,12 @@
 <!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>Source Code for Hello World</title>
 <link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css" />" >
 </head>
 <body>
 
-<a href="<ww:url action="Home" />">
-    <img src="<ww:url value="/images/return.gif"/>" alt="Home" hspace="4" border="0"  align="top" class="inline" />
-</a>
-
-<ww:url id="Open" action="Open" namespace="/Hello" />
-<ww:a href="%{Open}">
-    <img src="<ww:url value="/images/execute.gif"/>" alt="Open" hspace="4" border="0"  align="top" class="inline" />
-</ww:a>
+<ww:include value="/header-index.jsp"/>
 
 <h1>Source Code for Hello World</h1>
 <hr noshade="noshade"/>

Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/Result.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/Result.jsp?rev=385112&r1=385111&r2=385112&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/Result.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/Result.jsp Sat Mar 11 09:34:30 2006
@@ -2,12 +2,10 @@
 <html>
     <head>
         <title>Cookbook - Complex Input Form using Select Controls</title>
-        </head>
+        <link rel="stylesheet" type="text/css" href="<ww:url value="/css/cookbook.css" />" >    
+    </head>
     <body>
-        <p>
-            <a href="<ww:url action="Home" />"><img src="<ww:url value="/images/return.gif"/>" alt="Home"  border="0"  hspace="4"align="top" class="inline" /></a>
-            <a href="<ww:url action="View"/>"><img src="<ww:url value="/images/code.gif"/>" alt="View" border="0" height="24" width="24"  class="icon" /></a>
-        </p>
+        <ww:include value="/header-result.jsp"/>
 
         <h1>Input Result</h1>
         <table>

Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/index.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/index.jsp?rev=385112&r1=385111&r2=385112&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/index.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Select/index.jsp Sat Mar 11 09:34:30 2006
@@ -8,14 +8,7 @@
 </head>
 <body>
 
-<a href="<ww:url action="Home" />">
-    <img src="<ww:url value="/images/return.gif"/>" alt="Home" hspace="4" border="0"  align="top" class="inline" />
-</a>
-
-<ww:url id="Open" action="Open" namespace="/Select" />
-<ww:a href="%{Open}">
-    <img src="<ww:url value="/images/execute.gif"/>" alt="Open" hspace="4" border="0"  align="top" class="inline" />
-</ww:a>
+<ww:include value="/header-index.jsp"/>
 
 <h1>Source Code for Complex Input Form using Select Controls</h1>
 <hr noshade="noshade"/>

Modified: struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Simple/index.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Simple/index.jsp?rev=385112&r1=385111&r2=385112&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Simple/index.jsp (original)
+++ struts/sandbox/trunk/action2/apps/cookbook/src/webapp/pages/Simple/index.jsp Sat Mar 11 09:34:30 2006
@@ -8,14 +8,7 @@
 </head>
 <body>
 
-<a href="<ww:url action="Home" />">
-    <img src="<ww:url value="/images/return.gif"/>" alt="Home" hspace="4" border="0"  align="top" class="inline" />
-</a>
-
-<ww:url id="Open" action="Open!input" namespace="/Simple" />
-<ww:a href="%{Open}">
-    <img src="<ww:url value="/images/execute.gif"/>" alt="Open" hspace="4" border="0"  align="top" class="inline" />
-</ww:a>
+<ww:include value="/header-index.jsp"/>
 
 <h1>Source Code for Simple Input Form using Action Properties</h1>
 <hr noshade="noshade"/>



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