Author: hermanns
Date: Wed Nov 15 11:21:42 2006
New Revision: 475372
URL: http://svn.apache.org/viewvc?view=rev&rev=475372
Log:
upgrade struts2 dojo widget due to upgrading dojo to 0.4
o fixing tabbedpanel example4
Issue Number: WW-1484
Added:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp
(contents, props changed)
- copied, changed from r474938,
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.ftl
Removed:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.ftl
Copied:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp
(from r474938,
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.ftl)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp?view=diff&rev=475372&p1=struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.ftl&r1=474938&p2=struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp&r2=475372
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.ftl
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp
Wed Nov 15 11:21:42 2006
@@ -1,18 +1,20 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title>Example 4</title>
- <@s.head theme="ajax" debug="false" />
- <link rel="stylesheet" type="text/css" href="<@s.url
value="/struts/tabs.css"/>" />
+ <jsp:include page="/ajax/commonInclude.jsp"/>
+ <link rel="stylesheet" type="text/css" href="<s:url
value="/struts/tabs.css"/>" />
</head>
<body>
- <@s.url id="panel1url" action="panel1" namespace="/nodecorate"
includeContext="false" />
- <@s.url id="panel2url" action="panel2" namespace="/nodecorate"
includeContext="false"/>
- <@s.url id="panel3url" action="panel3" namespace="/nodecorate"
includeContext="false"/>
- <@s.tabbedPanel id="tabbedpanel" >
- <@s.panel id="panel1" tabName="Panel1" remote="true"
href="%{#panel1url}" theme="ajax" />
- <@s.panel id="panel2" tabName="Panel2" remote="true"
href="%{#panel2url}" theme="ajax" />
- <@s.panel id="panel3" tabName="Panel3" remote="true"
href="%{#panel3url}" theme="ajax" />
- </@s.tabbedPanel>
+ <s:url id="panel1url" action="panel1" namespace="/nodecorate"
includeContext="false" />
+ <s:url id="panel2url" action="panel2" namespace="/nodecorate"
includeContext="false"/>
+ <s:url id="panel3url" action="panel3" namespace="/nodecorate"
includeContext="false"/>
+ <s:tabbedPanel id="tabbedpanel" >
+ <s:div id="panel1" label="Panel1" href="%{#panel1url}"
theme="ajax" />
+ <s:div id="panel2" label="Panel2" href="%{#panel2url}"
theme="ajax" />
+ <s:div id="panel3" label="Panel3" href="%{#panel3url}"
theme="ajax" />
+ </s:tabbedPanel>
</body>
</html>
Propchange:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp
------------------------------------------------------------------------------
svn:eol-style = native
