Author: musachy
Date: Sat Apr 28 11:15:39 2007
New Revision: 533404
URL: http://svn.apache.org/viewvc?view=rev&rev=533404
Log:
* Fix "view source" (was using old tabbedPanel from core)
* Remove references to niftycorners
* Fix "view source" link on ajax tag pages
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/viewSource.jsp
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=533404&r1=533403&r2=533404
==============================================================================
---
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
Sat Apr 28 11:15:39 2007
@@ -30,23 +30,6 @@
<head>
<title><decorator:title default="Struts Showcase"/></title>
<link href="<s:url value='/styles/main.css' encode='false'
includeParams='none'/>" rel="stylesheet" type="text/css" media="all"/>
- <link href="<s:url value='/struts/niftycorners/niftyCorners.css'
encode='false' includeParams='none'/>" rel="stylesheet" type="text/css"/>
- <link href="<s:url value='/struts/niftycorners/niftyPrint.css'
encode='false' includeParams='none'/>" rel="stylesheet" type="text/css"
media="print"/>
-
- <script language="JavaScript" type="text/javascript" src="<s:url
value='/struts/niftycorners/nifty.js' encode='false'
includeParams='none'/>"></script>
-
- <script language="JavaScript" type="text/javascript">
-
- window.onload=function(){
- if(!NiftyCheck())
- return;
- Rounded("blockquote","tr bl","#ECF1F9","#CDFFAA","smooth border
#88D84F");
- Rounded("div#outer-header", "all", "white", "#818EBD", "smooth
border #434F7C");
- Rounded("div#footer", "all", "white", "#818EBD", "smooth border
#434F7C");
- }
-
- </script>
-
<decorator:head/>
</head>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp?view=diff&rev=533404&r1=533403&r2=533404
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/index.jsp Sat Apr
28 11:15:39 2007
@@ -10,14 +10,14 @@
</p>
<ul>
- <li><a href="bind">Bind tag</a></li>
- <li><a href="autocompleter">Autocompleter combobox tag</a></li>
- <li><a href="remotebutton">Remote button tag</a></li>
- <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="remoteforms">Remote forms</a></li>
- <li><a href="widgets">Widgets </a> (may not work in all browsers!)
+ <li><a href="bind/index.jsp">Bind tag</a></li>
+ <li><a href="autocompleter/index.jsp">Autocompleter combobox tag</a></li>
+ <li><a href="remotebutton/index.jsp">Remote button tag</a></li>
+ <li><a href="remotediv/index.jsp">Remote div tag</a></li>
+ <li><a href="remotelink/index.jsp">Remote link tag</a></li>
+ <li><a href="tabbedpanel/index.jsp">Tabbed panel</a></li>
+ <li><a href="remoteforms/index.jsp">Remote forms</a></li>
+ <li><a href="widgets/index.jsp">Widgets </a> (may not work in all
browsers!)
see the <a href="http://www.dojotoolkit.org";>dojo website</a> for more
information</li>
</ul>
</body>
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp?view=diff&rev=533404&r1=533403&r2=533404
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp
Sat Apr 28 11:15:39 2007
@@ -7,20 +7,6 @@
<title>Ajax examples - tabbled panel</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
- <link rel="stylesheet" type="text/css" href="<s:url
value="/struts/tabs.css"/>">
- <link rel="stylesheet" type="text/css" href="<s:url
value="/struts/niftycorners/niftyCorners.css"/>">
- <link rel="stylesheet" type="text/css" href="<s:url
value="/struts/niftycorners/niftyPrint.css"/>" media="print">
- <script type="text/javascript" src="<s:url
value="/struts/niftycorners/nifty.js"/>"></script>
- <script type="text/javascript">
- dojo.event.connect(window, "onload", function() {
- if (!NiftyCheck())
- return;
- Rounded("li.tab_selected", "top", "white", "transparent", "border
#ffffffS");
- Rounded("li.tab_unselected", "top", "white", "transparent",
"border #ffffffS");
- // Rounded("div#tab_header_main
li","top","white","transparent","border #ffffffS");
- // "white" needs to be replaced with the background color
- });
- </script>
</head>
<s:url id="ajaxTest" value="/AjaxTest.action" />
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/viewSource.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/viewSource.jsp?view=diff&rev=533404&r1=533403&r2=533404
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/viewSource.jsp (original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/viewSource.jsp Sat Apr
28 11:15:39 2007
@@ -1,28 +1,15 @@
<%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="sx" uri="/struts-dojo-tags" %>
<html>
<head>
<title>View Sources</title>
<jsp:include page="/ajax/commonInclude.jsp"/>
- <link rel="stylesheet" type="text/css" href="<s:url
value="/struts/tabs.css"/>">
- <link rel="stylesheet" type="text/css" href="<s:url
value="/struts/niftycorners/niftyCorners.css"/>">
- <link rel="stylesheet" type="text/css" href="<s:url
value="/struts/niftycorners/niftyPrint.css"/>" media="print">
- <script type="text/javascript" src="<s:url
value="/struts/niftycorners/nifty.js"/>"></script>
- <script type="text/javascript">
- window.onload = function() {
- if (!NiftyCheck())
- return;
- Rounded("li.tab_selected", "top", "white", "transparent", "border
#ffffffS");
- Rounded("li.tab_unselected", "top", "white", "transparent",
"border #ffffffS");
- // Rounded("div#tab_header_main
li","top","white","transparent","border #ffffffS");
- // "white" needs to be replaced with the background color
- }
- </script>
</head>
<body>
<h1>View Sources</h1>
-<s:tabbedPanel id="test" theme="ajax">
+<sx:tabbedpanel id="test">
<s:div id="one" label="Page" theme="ajax">
<h3>${empty page ? "Unknown page" : page}</h3>
<pre>
@@ -47,7 +34,7 @@
</pre>
</s:div>
-</s:tabbedPanel>
+</sx:tabbedpanel>
</body>
</html>
