Author: husted
Date: Sun Feb 18 16:03:37 2007
New Revision: 509034
URL: http://svn.apache.org/viewvc?view=rev&rev=509034
Log:
WW-1685 Playtest Showcase and adjust status of verious examples.
Modified:
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/ajax/index.jsp
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/hangman/hangmanMenu.ftl
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/showcase.jsp
Modified:
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp?view=diff&rev=509034&r1=509033&r2=509034
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
Sun Feb 18 16:03:37 2007
@@ -5,7 +5,7 @@
response.setHeader("Pragma", "no-cache");
response.setHeader("Cache-Control", "no-cache");
response.setDateHeader("Expires", 0);
-
+
// Calculate the view sources url
String sourceUrl = request.getContextPath()+"/viewSource.action";
com.opensymphony.xwork2.ActionInvocation inv =
com.opensymphony.xwork2.ActionContext.getContext().getActionInvocation();
@@ -14,9 +14,9 @@
com.opensymphony.xwork2.util.location.Location loc =
inv.getProxy().getConfig().getLocation();
sourceUrl += "?config="+(loc != null ?
loc.getURI()+":"+loc.getLineNumber() : "");
sourceUrl += "&className="+inv.getProxy().getConfig().getClassName();
-
+
if (inv.getResult() != null && inv.getResult() instanceof
org.apache.struts2.dispatcher.StrutsResultSupport) {
- sourceUrl +=
"&page="+mapping.getNamespace()+"/"+((org.apache.struts2.dispatcher.StrutsResultSupport)inv.getResult()).getLastFinalLocation();
+ sourceUrl +=
"&page="+mapping.getNamespace()+"/"+((org.apache.struts2.dispatcher.StrutsResultSupport)inv.getResult()).getLastFinalLocation();
}
} else {
sourceUrl += "?page="+request.getServletPath();
@@ -92,7 +92,6 @@
<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>
@@ -104,11 +103,11 @@
</div><!-- end content -->
- <div>
- <p>
- <a href="<%=sourceUrl %>">View Sources</a>
- </p>
- </div>
+ <div>
+ <p>
+ <a href="<%=sourceUrl %>">View Sources</a>
+ </p>
+ </div>
<div id="footer" class="clearfix">
<p>Copyright © 2003-<s:property value="#dateAction.now.year +
1900" /> The Apache Software Foundation.</p>
</div><!-- end footer -->
Modified:
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/ajax/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/ajax/index.jsp?view=diff&rev=509034&r1=509033&r2=509034
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/ajax/index.jsp
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/ajax/index.jsp
Sun Feb 18 16:03:37 2007
@@ -15,9 +15,9 @@
<li><a href="remotediv">Remote div tag</a></li>
<li><a href="remotelink">Remote link tag</a></li>
<li><a href="tabbedpanel">Tabbed panel</a></li>
- <li><a href="widgets">Widgets </a> (may not work in all browsers!)
+ <li><a href="widgets">Widgets </a> (may not work in all browsers!)
see the <a href="http://www.dojotoolkit.org";>dojo website</a> for more
information</li>
- <li>(broken) <a href="remoteforms">Remote forms</a></li>
+ <li><a href="remoteforms">Remote forms</a></li>
</ul>
</body>
</html>
Modified:
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/hangman/hangmanMenu.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/hangman/hangmanMenu.ftl?view=diff&rev=509034&r1=509033&r2=509034
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/hangman/hangmanMenu.ftl
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/hangman/hangmanMenu.ftl
Sun Feb 18 16:03:37 2007
@@ -11,7 +11,7 @@
</li>
<li>
<@s.url id="url" action="hangmanAjax" namespace="/hangman" />
- <@s.a href="%{#url}">Hangman (Ajax - Experimental)</@s.a>
+ (broken) <@s.a href="%{#url}">Hangman (Ajax - Experimental)</@s.a>
</li>
</ul>
</body>
Modified:
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/showcase.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/showcase.jsp?view=diff&rev=509034&r1=509033&r2=509034
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/showcase.jsp
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/showcase.jsp
Sun Feb 18 16:03:37 2007
@@ -47,10 +47,15 @@
<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>
+
+ <p>Sandbox - Experimenta</p>
+
+ <ul>
+ <li><a href="<s:url value="/tiles/index.action" />">Tiles</a></li>
</ul>
</p>
