Author: husted
Date: Sun Dec 24 18:32:18 2006
New Revision: 490096
URL: http://svn.apache.org/viewvc?view=rev&rev=490096
Log:
WW-1538 Organize home page. Add Sandbox section.
Modified:
struts/struts2/trunk/apps/blank/src/main/webapp/example/HelloWorld.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp
Modified: struts/struts2/trunk/apps/blank/src/main/webapp/example/HelloWorld.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/webapp/example/HelloWorld.jsp?view=diff&rev=490096&r1=490095&r2=490096
==============================================================================
--- struts/struts2/trunk/apps/blank/src/main/webapp/example/HelloWorld.jsp
(original)
+++ struts/struts2/trunk/apps/blank/src/main/webapp/example/HelloWorld.jsp Sun
Dec 24 18:32:18 2006
@@ -11,13 +11,13 @@
<h3>Languages</h3>
<ul>
<li>
- <s:url id="url" action="HelloWorld" includeContext="false">
+ <s:url id="url" action="HelloWorld">
<s:param name="request_locale">en</s:param>
</s:url>
<s:a href="%{url}">English</s:a>
</li>
<li>
- <s:url id="url" action="HelloWorld" includeContext="false">
+ <s:url id="url" action="HelloWorld">
<s:param name="request_locale">es</s:param>
</s:url>
<s:a href="%{url}">Espanol</s:a>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp?view=diff&rev=490096&r1=490095&r2=490096
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
Sun Dec 24 18:32:18 2006
@@ -77,25 +77,23 @@
<div class="wrapper">
<h2 class="accessibility">Navigation</h2>
<ul class="clearfix">
- <li><strong><a href="<s:url action="showcase"
namespace="/" includeParams="none" />">Home</a></strong></li>
+ <li><a href="<s:url
value="/showcase.jsp"/>"><strong>Home</strong></a></li>
<li><a href="<s:url action="index"
namespace="/config-browser" includeParams="none" />">Config Browser</a></li>
- <li><a href="<s:url action="guess"
namespace="/continuations" />">Continuations</a></li>
- <li><a href="<s:url
value="/tags/index.jsp"/>">Tags</a></li>
- <li><a href="<s:url
value="/empmanager/index.jsp"/>">CRUD</a></li>
- <li><a href="<s:url value="/person/index.jsp"/>">Person
Manager</a></li>
- <li><a href="<s:url
value="/validation/index.jsp"/>">Validation</a></li>
<li><a href="<s:url
value="/ajax/index.jsp"/>">AJAX</a></li>
<li><a href="<s:url action="actionChain1!input"
namespace="/actionchaining" includeParams="none" />">Action Chaining</a></li>
+ <li><a href="<s:url
value="/conversion/index.jsp"/>">Conversion</a></li>
+ <li><a href="<s:url
value="/empmanager/index.jsp"/>">CRUD</a></li>
<li><a href="<s:url value="/wait/index.jsp"/>">Execute &
Wait</a></li>
- <li><a href="<s:url
value="/token/index.jsp"/>">Token</a></li>
<li><a href="<s:url
value="/filedownload/index.jsp"/>">File Download</a></li>
- <li><a href="<s:url
value="/conversion/index.jsp"/>">Conversion</a></li>
- <li><a href="<s:url value="/jsf/index.jsp"/>">JSF</a></li>
+ <li><a href="<s:url value="/fileupload" />">File
Upload</a></li>
<li><a href="<s:url
value="/freemarker/index.jsp"/>">Freemarker</a>
- <li><a href="<s:url value="/chat/index.jsp"/>">Chat
(AJAX)</a>
<li><a href="<s:url action="hangmanMenu"
namespace="/hangman"/>">Hangman</a></li>
- <li><a href="<s:url value="/fileupload"
/>">Fileupload</a></li>
+ <li><a href="<s:url value="/jsf/index.jsp"/>">JavaServer
Faces</a></li>
+ <li><a href="<s:url value="/person/index.jsp"/>">Person
Manager</a></li>
+ <li><a href="<s:url
value="/tags/index.jsp"/>">Tags</a></li>
<li><a href="<s:url value="/tiles/index.action"
/>">Tiles</a></li>
+ <li><a href="<s:url
value="/token/index.jsp"/>">Token</a></li>
+ <li><a href="<s:url
value="/validation/index.jsp"/>">Validation</a></li>
<li class="last"><a href="<s:url
value="/help.jsp"/>">Help</a></li>
</ul>
</div>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp?view=diff&rev=490096&r1=490095&r2=490096
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/showcase.jsp Sun Dec 24
18:32:18 2006
@@ -12,35 +12,53 @@
</head>
<body>
-<p>The Struts Showcase demonstrates the usages of all Struts tags as well as
validations, and so forth</p>
+<p>The Struts Showcase demonstrates using Struts tags as well as validations,
and so forth</p>
<p>
<%-- THIS LIST IS MAINTAINED IN MAIN.JSP TO CREATE THE MENU BAR -- EDIT
THERE AND COPY HERE --%>
<ul>
- <li><a href="<s:url action="index" namespace="/config-browser"
includeParams="none" />">Config Browser</a></li>
- <li><a href="<s:url action="guess" namespace="/continuations"
/>">Continuations</a></li>
- <li><a href="<s:url value="/tags/index.jsp"/>">Tags</a></li>
- <li><a href="<s:url value="/empmanager/index.jsp"/>">CRUD</a></li>
- <li><a href="<s:url value="/person/index.jsp"/>">Person Manager</a></li>
- <li><a href="<s:url value="/validation/index.jsp"/>">Validation</a></li>
- <li><a href="<s:url value="/ajax/index.jsp"/>">AJAX</a></li>
- <li><a href="<s:url action="actionChain1!input"
namespace="/actionchaining" includeParams="none" />">Action Chaining</a></li>
- <li><a href="<s:url value="/wait/index.jsp"/>">Execute & Wait</a></li>
- <li><a href="<s:url value="/token/index.jsp"/>">Token</a></li>
- <li><a href="<s:url value="/filedownload/index.jsp"/>">File
Download</a></li>
- <li><a href="<s:url value="/conversion/index.jsp"/>">Conversion</a></li>
- <li><a href="<s:url value="/jsf/index.jsp"/>">JSF</a></li>
- <li><a href="<s:url value="/freemarker/index.jsp"/>">Freemarker</a>
- <li><a href="<s:url value="/chat/index.jsp"/>">Chat (AJAX)</a>
- <li><a href="<s:url action="hangmanMenu"
namespace="/hangman"/>">Hangman</a></li>
- <li><a href="<s:url value="/fileupload" />">Fileupload</a></li>
- <li><a href="<s:url value="/tiles/index.action" />">Tiles</a></li>
- <li class="last"><a href="<s:url value="/help.jsp"/>">Help</a></li>
- <ul>
+ <li><a href="<s:url value="/showcase.jsp"/>">Home</a></li>
+ <li><a href="<s:url action="index" namespace="/config-browser"
includeParams="none" />">Config Browser</a></li>
+ <li><a href="<s:url value="/ajax/index.jsp"/>">AJAX</a></li>
+ <li><a href="<s:url action="actionChain1!input"
namespace="/actionchaining" includeParams="none" />">Action Chaining</a></li>
+ <li><a href="<s:url
value="/conversion/index.jsp"/>">Conversion</a></li>
+ <li><a href="<s:url value="/empmanager/index.jsp"/>">CRUD</a></li>
+ <li><a href="<s:url value="/wait/index.jsp"/>">Execute & Wait</a></li>
+ <li><a href="<s:url value="/filedownload/index.jsp"/>">File
Download</a></li>
+ <li><a href="<s:url value="/fileupload" />">File Upload</a></li>
+ <li><a href="<s:url value="/freemarker/index.jsp"/>">Freemarker</a>
+ <li><a href="<s:url action="hangmanMenu"
namespace="/hangman"/>">Hangman</a></li>
+ <li><a href="<s:url value="/jsf/index.jsp"/>">JavaServer Faces</a></li>
+ <li><a href="<s:url value="/person/index.jsp"/>">Person
Manager</a></li>
+ <li><a href="<s:url value="/tags/index.jsp"/>">Tags</a></li>
+ <li><a href="<s:url value="/tiles/index.action" />">Tiles</a></li>
+ <li><a href="<s:url value="/token/index.jsp"/>">Token</a></li>
+ <li><a href="<s:url
value="/validation/index.jsp"/>">Validation</a></li>
+ <li class="last"><a href="<s:url value="/help.jsp"/>">Help</a></li>
+ </ul>
+ <h2>Sandbox</h2>
+ <p>
+ These examples are under development.
+ </p>
+ <ul>
+ <li>AJAX / Remote Forms</li>
+ <li><a href="<s:url value="/chat/index.jsp"/>">Chat (AJAX)</a>
+ <li><a href="<s:url action="guess" namespace="/continuations"
/>">Continuations</a></li>
+ <li>Conversion<ul>
+ <li>Address</li>
+ <li>Java 5 Enum</li>
+ </ul>
+ </li>
+ <li>Tags / UI Tags<ul>
+ <li>UI Example</li>
+ <li>UI Example (Velocity)</li>
+ </ul>
+ </li>
</ul>
+
</p>
</body>
