You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mu...@apache.org on 2007/03/10 23:56:59 UTC
svn commit: r516804 - in /struts/struts2/trunk:
core/src/main/java/org/apache/struts2/components/
core/src/main/java/org/apache/struts2/views/jsp/ui/
core/src/main/resources/template/simple/ core/src/site/resources/tags/
core/src/site/resources/tags/aj...
Author: musachy
Date: Sat Mar 10 14:56:58 2007
New Revision: 516804
URL: http://svn.apache.org/viewvc?view=rev&rev=516804
Log:
WW-1607
* Copy head tag to Dojo plugin
* Remove calendar-related attributes and tests from head tag
* Fix tabbedpanel examples in showcase to use the head tag from the Dojo plugin
WW-1757 Rename tabbed panel tag to "tabbedpanel" (from "tabbedPanel")
Added:
struts/struts2/trunk/core/src/site/resources/tags/ajax/form.html
struts/struts2/trunk/core/src/site/resources/tags/ajax/head.html
struts/struts2/trunk/core/src/site/resources/tags/ajax/tabbedpanel.html
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head.java
- copied, changed from r515829, struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Head.java
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/HeadModel.java
- copied, changed from r515829, struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/HeadModel.java
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/HeadTag.java
- copied, changed from r515829, struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/HeadDirective.java
- copied, changed from r515829, struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/tabbedpanel-close.ftl
- copied unchanged from r515829, struts/struts2/trunk/core/src/main/resources/template/simple/tabbedpanel-close.ftl
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/tabbedpanel.ftl
- copied unchanged from r515829, struts/struts2/trunk/core/src/main/resources/template/simple/tabbedpanel.ftl
struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest.java
- copied, changed from r515829, struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt
- copied, changed from r515829, struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-1.txt
Removed:
struts/struts2/trunk/core/src/main/resources/template/simple/dojoRequire.js
struts/struts2/trunk/core/src/main/resources/template/simple/tabbedpanel-close.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/tabbedpanel.ftl
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-2.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-3.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-4.txt
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Head.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java
struts/struts2/trunk/core/src/main/resources/template/simple/head.ftl
struts/struts2/trunk/core/src/site/resources/tags/head.html
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-1.txt
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/DojoTagLibrary.java
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Head.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Head.java?view=diff&rev=516804&r1=516803&r2=516804
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Head.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Head.java Sat Mar 10 14:56:58 2007
@@ -33,18 +33,7 @@
/**
* <!-- START SNIPPET: javadoc -->
*
- * Renders parts of the HEAD section for an HTML file. This is useful as some themes require certain CSS and JavaScript
- * includes.<p/>
- *
- * If, for example, your page has ajax components integrated, without having the default theme set to ajax, you might
- * want to use the head tag with <b>theme="ajax"</b> so that the typical ajax header setup will be included in the
- * page.<p/>
- *
- * The tag also includes the option to set a custom datepicker theme if needed. See calendarcss parameter for
- * description for details.<p/>
- *
- * If you use the ajax theme you can turn a debug flag on by setting the debug parameter to <tt>true</tt>.
- *
+ * Renders parts of the HEAD section for an HTML file. Encoding can be set using this tag.
* <!-- END SNIPPET: javadoc -->
*
* <p/> <b>Examples</b>
@@ -58,32 +47,12 @@
* <!-- END SNIPPET: example1 -->
* </pre>
*
- * <pre>
- * <!-- START SNIPPET: example2 -->
- * <head>
- * <title>My page</title>
- * <s:head theme="ajax" calendarcss="calendar-green"/>
- * </head>
- * <!-- END SNIPPET: example2 -->
- * </pre>
- *
- * <pre>
- * <!-- START SNIPPET: example3 -->
- * <head>
- * <title>My page</title>
- * <s:head theme="ajax" debug="true"/>
- * </head>
- * <!-- END SNIPPET: example3 -->
- * </pre>
- *
*/
@StrutsTag(name="head", tldBodyContent="empty", tldTagClass="org.apache.struts2.views.jsp.ui.HeadTag",
description="Render a chunk of HEAD for your HTML file")
public class Head extends UIBean {
public static final String TEMPLATE = "head";
- private String calendarcss = "calendar-blue.css";
- private boolean debug;
private String encoding;
public Head(ValueStack stack, HttpServletRequest request, HttpServletResponse response) {
@@ -102,39 +71,6 @@
public void evaluateParams() {
super.evaluateParams();
- if (calendarcss != null) {
- String css = findString(calendarcss);
- if (css != null && css.trim().length() > 0) {
- if (css.lastIndexOf(".css") < 0) {
- addParameter("calendarcss", css + ".css");
- } else {
- addParameter("calendarcss", css);
- }
- }
- }
-
addParameter("encoding", encoding);
- addParameter("debug", Boolean.valueOf(debug).toString());
- }
-
- public String getCalendarcss() {
- return calendarcss;
- }
-
- @StrutsTagAttribute(description="The jscalendar css theme to use", defaultValue="calendar-blue.css")
- public void setCalendarcss(String calendarcss) {
- //TODO remove this one
- this.calendarcss = calendarcss;
}
-
- public boolean isDebug() {
- return debug;
- }
-
- @StrutsTagAttribute(description="Set to true to enable debugging mode for AJAX themes")
- public void setDebug(boolean debug) {
- this.debug = debug;
- }
-
-
}
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java?view=diff&rev=516804&r1=516803&r2=516804
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java Sat Mar 10 14:56:58 2007
@@ -35,32 +35,7 @@
private static final long serialVersionUID = 6876765769175246030L;
- private String calendarcss;
- private String debug;
-
public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Head(stack, req, res);
- }
-
- protected void populateParams() {
- super.populateParams();
- if (calendarcss != null) {
- ((Head) component).setCalendarcss(calendarcss);
- }
- if (debug != null) {
- ((Head) component).setDebug(Boolean.valueOf(debug).booleanValue());
- }
- }
-
- public String getCalendarcss() {
- return calendarcss;
- }
-
- public void setCalendarcss(String calendarcss) {
- this.calendarcss = calendarcss;
- }
-
- public void setDebug(String debug) {
- this.debug = debug;
}
}
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/head.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/head.ftl?view=diff&rev=516804&r1=516803&r2=516804
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/head.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/head.ftl Sat Mar 10 14:56:58 2007
@@ -1,13 +0,0 @@
-<script type="text/javascript">
- // Dojo configuration
- djConfig = {
- baseRelativePath: "<@s.url includeParams='none' value='/struts/dojo' includeParams="none" encode='false'/>",
- isDebug: ${parameters.debug?default(false)},
- bindEncoding: "${parameters.encoding}",
- debugAtAllCosts: true // not needed, but allows the Venkman debugger to work with the includes
- };
-</script>
-<script type="text/javascript"
- src="<@s.url includeParams='none' value='/struts/dojo/dojo.js' includeParams="none" encode='false'/>"></script>
-<script type="text/javascript"
- src="<@s.url includeParams='none' value='/struts/simple/dojoRequire.js' includeParams="none" encode='false'/>"></script>
Added: struts/struts2/trunk/core/src/site/resources/tags/ajax/form.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/ajax/form.html?view=auto&rev=516804
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/ajax/form.html (added)
+++ struts/struts2/trunk/core/src/site/resources/tags/ajax/form.html Sat Mar 10 14:56:58 2007
@@ -0,0 +1,378 @@
+<!--
+This file is generated during the build by processing Component class annotations.
+Please do not edit it directly.
+-->
+<html>
+ <head>
+ <title>form</title>
+ </head>
+
+ <body>
+ <h1>Tag Name: form</h1>
+ <h2>Description</h2>
+ <p>
+ <!-- START SNIPPET: tagdescription -->
+ Renders an input form
+ <!-- END SNIPPET: tagdescription -->
+ </p>
+
+ <h2>Attributes</h2>
+ <!-- START SNIPPET: tagattributes -->
+ <table width="100%">
+ <tr>
+ <th align="left" valign="top"><h4>Name</h4></th>
+ <th align="left" valign="top"><h4>Required</h4></th>
+ <th align="left" valign="top"><h4>Default</h4></th>
+ <th align="left" valign="top"><h4>Evaluated</h4></th>
+ <th align="left" valign="top"><h4>Type</h4></th>
+ <th align="left" valign="top"><h4>Description</h4></th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">acceptcharset</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">The accepted charsets for this form. The values may be comma or blank delimited.</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">accesskey</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html accesskey attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">action</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top">current action</td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set action nane to submit to, without .action suffix</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">cssClass</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">The css class to use for element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">cssStyle</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">The css style definitions for element ro use</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">disabled</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html disabled attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">enctype</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">HTML form enctype attribute</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">id</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">key</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the key (name, value, label) for this particular component</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">label</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Label expression used for rendering a element specific label</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">labelposition</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Define label position of form element (top/left)</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">method</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">HTML form method attribute</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">name</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">The name to set for element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">namespace</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top">current namespace</td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Namespace for action to submit to</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onblur</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top"> Set the html onblur attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onchange</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onchange attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onclick</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onclick attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">ondblclick</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html ondblclick attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onfocus</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onfocus attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onkeydown</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onkeydown attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onkeypress</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onkeypress attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onkeyup</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onkeyup attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onmousedown</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onmousedown attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onmousemove</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onmousemove attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onmouseout</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onmouseout attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onmouseover</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onmouseover attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onmouseup</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onmouseup attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onselect</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onselect attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onsubmit</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">HTML onsubmit attribute</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">openTemplate</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set template to use for opening the rendered html.</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">portletMode</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">he portlet mode to display after the form submit</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">required</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">Boolean</td>
+ <td align="left" valign="top">If set to true, the rendered element will indicate that input is required</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">requiredposition</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Define required position of required form element (left|right)</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">tabindex</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html tabindex attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">target</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">HTML form target attribute</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">template</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">The template (other than default) to use for rendering the element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">templateDir</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">The template directory.</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">title</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html title attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">tooltip</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the tooltip of this particular component</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">tooltipConfig</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the tooltip configuration</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">validate</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">Boolean</td>
+ <td align="left" valign="top">Whether client side/remote validation should be performed. Only useful with theme xhtml/ajax</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">value</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Preset the value of input element.</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">windowState</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">The window state to display after the form submit</td>
+ </tr>
+ </table>
+ <!-- END SNIPPET: tagattributes -->
+ </body>
+</html>
+
Added: struts/struts2/trunk/core/src/site/resources/tags/ajax/head.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/ajax/head.html?view=auto&rev=516804
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/ajax/head.html (added)
+++ struts/struts2/trunk/core/src/site/resources/tags/ajax/head.html Sat Mar 10 14:56:58 2007
@@ -0,0 +1,298 @@
+<!--
+This file is generated during the build by processing Component class annotations.
+Please do not edit it directly.
+-->
+<html>
+ <head>
+ <title>head</title>
+ </head>
+
+ <body>
+ <h1>Tag Name: head</h1>
+ <h2>Description</h2>
+ <p>
+ <!-- START SNIPPET: tagdescription -->
+ Render a chunk of HEAD for your HTML file
+ <!-- END SNIPPET: tagdescription -->
+ </p>
+
+ <h2>Attributes</h2>
+ <!-- START SNIPPET: tagattributes -->
+ <table width="100%">
+ <tr>
+ <th align="left" valign="top"><h4>Name</h4></th>
+ <th align="left" valign="top"><h4>Required</h4></th>
+ <th align="left" valign="top"><h4>Default</h4></th>
+ <th align="left" valign="top"><h4>Evaluated</h4></th>
+ <th align="left" valign="top"><h4>Type</h4></th>
+ <th align="left" valign="top"><h4>Description</h4></th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">accesskey</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html accesskey attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">cssClass</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">The css class to use for element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">cssStyle</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">The css style definitions for element ro use</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">debug</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set to true to enable Dojo debug messages</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">disabled</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html disabled attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">id</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">key</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the key (name, value, label) for this particular component</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">label</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Label expression used for rendering a element specific label</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">labelposition</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Define label position of form element (top/left)</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">name</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">The name to set for element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onblur</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top"> Set the html onblur attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onchange</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onchange attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onclick</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onclick attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">ondblclick</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html ondblclick attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onfocus</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onfocus attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onkeydown</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onkeydown attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onkeypress</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onkeypress attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onkeyup</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onkeyup attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onmousedown</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onmousedown attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onmousemove</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onmousemove attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onmouseout</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onmouseout attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onmouseover</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onmouseover attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onmouseup</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onmouseup attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onselect</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onselect attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">required</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">Boolean</td>
+ <td align="left" valign="top">If set to true, the rendered element will indicate that input is required</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">requiredposition</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Define required position of required form element (left|right)</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">tabindex</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html tabindex attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">template</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">The template (other than default) to use for rendering the element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">templateDir</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">The template directory.</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">title</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html title attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">tooltip</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the tooltip of this particular component</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">tooltipConfig</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the tooltip configuration</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">value</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Preset the value of input element.</td>
+ </tr>
+ </table>
+ <!-- END SNIPPET: tagattributes -->
+ </body>
+</html>
+
Added: struts/struts2/trunk/core/src/site/resources/tags/ajax/tabbedpanel.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/ajax/tabbedpanel.html?view=auto&rev=516804
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/ajax/tabbedpanel.html (added)
+++ struts/struts2/trunk/core/src/site/resources/tags/ajax/tabbedpanel.html Sat Mar 10 14:56:58 2007
@@ -0,0 +1,330 @@
+<!--
+This file is generated during the build by processing Component class annotations.
+Please do not edit it directly.
+-->
+<html>
+ <head>
+ <title>tabbedpanel</title>
+ </head>
+
+ <body>
+ <h1>Tag Name: tabbedpanel</h1>
+ <h2>Description</h2>
+ <p>
+ <!-- START SNIPPET: tagdescription -->
+ Render a tabbedPanel widget.
+ <!-- END SNIPPET: tagdescription -->
+ </p>
+
+ <h2>Attributes</h2>
+ <!-- START SNIPPET: tagattributes -->
+ <table width="100%">
+ <tr>
+ <th align="left" valign="top"><h4>Name</h4></th>
+ <th align="left" valign="top"><h4>Required</h4></th>
+ <th align="left" valign="top"><h4>Default</h4></th>
+ <th align="left" valign="top"><h4>Evaluated</h4></th>
+ <th align="left" valign="top"><h4>Type</h4></th>
+ <th align="left" valign="top"><h4>Description</h4></th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">accesskey</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html accesskey attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">closeButton</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Where the close button will be placed, possible values are 'tab' and 'pane'</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">cssClass</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">The css class to use for element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">cssStyle</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">The css style definitions for element ro use</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">disabled</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html disabled attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">doLayout</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">Boolean</td>
+ <td align="left" valign="top">If doLayout is false, the tab container's height equals the height of the currently selected tab</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">id</td>
+ <td align="left" valign="top"><strong>true</strong></td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">The id to assign to the component.</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">key</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the key (name, value, label) for this particular component</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">label</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Label expression used for rendering a element specific label</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">labelposition</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Define label position of form element (top/left)</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">name</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">The name to set for element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onblur</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top"> Set the html onblur attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onchange</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onchange attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onclick</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onclick attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">ondblclick</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html ondblclick attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onfocus</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onfocus attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onkeydown</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onkeydown attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onkeypress</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onkeypress attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onkeyup</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onkeyup attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onmousedown</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onmousedown attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onmousemove</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onmousemove attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onmouseout</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onmouseout attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onmouseover</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onmouseover attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onmouseup</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onmouseup attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">onselect</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html onselect attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">openTemplate</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set template to use for opening the rendered html.</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">required</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">Boolean</td>
+ <td align="left" valign="top">If set to true, the rendered element will indicate that input is required</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">requiredposition</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Define required position of required form element (left|right)</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">selectedTab</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top"> The id of the tab that will be selected by default</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">tabindex</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html tabindex attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">template</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">The template (other than default) to use for rendering the element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">templateCssPath</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Template css path</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">templateDir</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">The template directory.</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">title</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the html title attribute on rendered html element</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">tooltip</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the tooltip of this particular component</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">tooltipConfig</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Set the tooltip configuration</td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">value</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">true</td>
+ <td align="left" valign="top">String</td>
+ <td align="left" valign="top">Preset the value of input element.</td>
+ </tr>
+ </table>
+ <!-- END SNIPPET: tagattributes -->
+ </body>
+</html>
+
Modified: struts/struts2/trunk/core/src/site/resources/tags/head.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/head.html?view=diff&rev=516804&r1=516803&r2=516804
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/head.html (original)
+++ struts/struts2/trunk/core/src/site/resources/tags/head.html Sat Mar 10 14:56:58 2007
@@ -36,14 +36,6 @@
<td align="left" valign="top">Set the html accesskey attribute on rendered html element</td>
</tr>
<tr>
- <td align="left" valign="top">calendarcss</td>
- <td align="left" valign="top">false</td>
- <td align="left" valign="top">calendar-blue.css</td>
- <td align="left" valign="top">true</td>
- <td align="left" valign="top">String</td>
- <td align="left" valign="top">The jscalendar css theme to use</td>
- </tr>
- <tr>
<td align="left" valign="top">cssClass</td>
<td align="left" valign="top">false</td>
<td align="left" valign="top"></td>
@@ -58,14 +50,6 @@
<td align="left" valign="top">true</td>
<td align="left" valign="top">String</td>
<td align="left" valign="top">The css style definitions for element ro use</td>
- </tr>
- <tr>
- <td align="left" valign="top">debug</td>
- <td align="left" valign="top">false</td>
- <td align="left" valign="top"></td>
- <td align="left" valign="top">true</td>
- <td align="left" valign="top">String</td>
- <td align="left" valign="top">Set to true to enable debugging mode for AJAX themes</td>
</tr>
<tr>
<td align="left" valign="top">disabled</td>
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java?view=diff&rev=516804&r1=516803&r2=516804
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java Sat Mar 10 14:56:58 2007
@@ -20,7 +20,6 @@
*/
package org.apache.struts2.views.jsp.ui;
-import org.apache.struts2.components.Head;
import org.apache.struts2.views.jsp.AbstractUITagTest;
/**
@@ -32,51 +31,13 @@
*/
public class HeadTagTest extends AbstractUITagTest {
- private HeadTag tag;
-
public void testHead1() throws Exception {
+ HeadTag tag = new HeadTag();
+ tag.setPageContext(pageContext);
+
tag.doStartTag();
tag.doEndTag();
verify(HeadTagTest.class.getResource("HeadTagTest-1.txt"));
}
-
- public void testHead1NoCalender() throws Exception {
- tag.doStartTag();
- tag.doEndTag();
- tag.setCalendarcss(null); // null = should use calendar-blue.css
-
- verify(HeadTagTest.class.getResource("HeadTagTest-1.txt"));
- }
-
- public void testHead4() throws Exception {
- tag.setCalendarcss("my-calendar");
- tag.doStartTag();
- tag.doEndTag();
-
- verify(HeadTagTest.class.getResource("HeadTagTest-4.txt"));
- assertEquals("my-calendar", tag.getCalendarcss());
- }
-
- public void testHead4b() throws Exception {
- tag.setCalendarcss("my-calendar.css");
- tag.doStartTag();
- Head component = (Head) tag.getComponent(); // must be done between start and end
- assertEquals("my-calendar.css", component.getCalendarcss());
- tag.doEndTag();
-
- verify(HeadTagTest.class.getResource("HeadTagTest-4.txt"));
- assertEquals("my-calendar.css", tag.getCalendarcss());
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- tag = new HeadTag();
- tag.setPageContext(pageContext);
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
}
Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-1.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-1.txt?view=diff&rev=516804&r1=516803&r2=516804
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-1.txt (original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-1.txt Sat Mar 10 14:56:58 2007
@@ -1,17 +1 @@
-<link rel="stylesheet" href="/struts/xhtml/styles.css" type="text/css"/>
-
-<script type="text/javascript">
- // Dojo configuration
- djConfig={
- baseRelativePath: "/struts/dojo",
- isDebug: false,
- bindEncoding: "ISO-8859-1",
- debugAtAllCosts:true
- //not needed, but allows the Venkman debugger to work with the includes};
-</script>
-
-<script type="text/javascript" src="/struts/dojo/dojo.js">
-</script>
-
-<script type="text/javascript" src="/struts/simple/dojoRequire.js">
-</script>
+<link rel="stylesheet" href="/struts/xhtml/styles.css" type="text/css"/>
\ No newline at end of file
Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java?view=diff&rev=516804&r1=516803&r2=516804
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java Sat Mar 10 14:56:58 2007
@@ -129,7 +129,7 @@
this.stopTimerListenTopics = stopTimerListenTopic;
}
- @StrutsTagAttribute(description="Content will be loaded when div becomes visible, used only inside tabbedPanel", type="Boolean", defaultValue="false")
+ @StrutsTagAttribute(description="Content will be loaded when div becomes visible, used only inside the tabbedpanel tag", type="Boolean", defaultValue="false")
public void setRefreshOnShow(String refreshOnShow) {
this.refreshOnShow = refreshOnShow;
}
Copied: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head.java (from r515829, struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Head.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head.java?view=diff&rev=516804&p1=struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Head.java&r1=515829&p2=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head.java&r2=516804
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Head.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Head.java Sat Mar 10 14:56:58 2007
@@ -18,16 +18,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.components;
+package org.apache.struts2.dojo.components;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
-import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -40,9 +39,6 @@
* want to use the head tag with <b>theme="ajax"</b> so that the typical ajax header setup will be included in the
* page.<p/>
*
- * The tag also includes the option to set a custom datepicker theme if needed. See calendarcss parameter for
- * description for details.<p/>
- *
* If you use the ajax theme you can turn a debug flag on by setting the debug parameter to <tt>true</tt>.
*
* <!-- END SNIPPET: javadoc -->
@@ -59,32 +55,21 @@
* </pre>
*
* <pre>
- * <!-- START SNIPPET: example2 -->
- * <head>
- * <title>My page</title>
- * <s:head theme="ajax" calendarcss="calendar-green"/>
- * </head>
- * <!-- END SNIPPET: example2 -->
- * </pre>
- *
- * <pre>
* <!-- START SNIPPET: example3 -->
* <head>
* <title>My page</title>
- * <s:head theme="ajax" debug="true"/>
+ * <s:head debug="true"/>
* </head>
* <!-- END SNIPPET: example3 -->
* </pre>
*
*/
-@StrutsTag(name="head", tldBodyContent="empty", tldTagClass="org.apache.struts2.views.jsp.ui.HeadTag",
+@StrutsTag(name="head", tldBodyContent="empty", tldTagClass="org.apache.struts2.dojo.views.jsp.ui.HeadTag",
description="Render a chunk of HEAD for your HTML file")
-public class Head extends UIBean {
+public class Head extends org.apache.struts2.components.Head {
public static final String TEMPLATE = "head";
- private String calendarcss = "calendar-blue.css";
private boolean debug;
- private String encoding;
public Head(ValueStack stack, HttpServletRequest request, HttpServletResponse response) {
super(stack, request, response);
@@ -94,47 +79,29 @@
return TEMPLATE;
}
- @Inject(StrutsConstants.STRUTS_I18N_ENCODING)
- public void setEncoding(String encoding) {
- this.encoding = encoding;
- }
-
public void evaluateParams() {
super.evaluateParams();
- if (calendarcss != null) {
- String css = findString(calendarcss);
- if (css != null && css.trim().length() > 0) {
- if (css.lastIndexOf(".css") < 0) {
- addParameter("calendarcss", css + ".css");
- } else {
- addParameter("calendarcss", css);
- }
- }
- }
-
- addParameter("encoding", encoding);
addParameter("debug", Boolean.valueOf(debug).toString());
}
- public String getCalendarcss() {
- return calendarcss;
- }
-
- @StrutsTagAttribute(description="The jscalendar css theme to use", defaultValue="calendar-blue.css")
- public void setCalendarcss(String calendarcss) {
- //TODO remove this one
- this.calendarcss = calendarcss;
+ @Override
+ @StrutsTagSkipInheritance
+ public void setTheme(String theme) {
+ super.setTheme(theme);
+ }
+
+ @Override
+ public String getTheme() {
+ return "ajax";
}
-
+
public boolean isDebug() {
return debug;
}
- @StrutsTagAttribute(description="Set to true to enable debugging mode for AJAX themes")
+ @StrutsTagAttribute(description="Set to true to enable Dojo debug messages", defaultValue="false")
public void setDebug(boolean debug) {
this.debug = debug;
}
-
-
}
Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java?view=diff&rev=516804&r1=516803&r2=516804
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java Sat Mar 10 14:56:58 2007
@@ -43,7 +43,7 @@
* <!-- END SNIPPET: exdesc -->
* <pre>
* <!-- START SNIPPET: example -->
- * <s:tabbedPanel id="test" >
+ * <s:tabbedpanel id="test" >
* <s:div id="one" label="one" theme="ajax" labelposition="top" >
* This is the first pane<br/>
* <s:form>
@@ -54,12 +54,12 @@
* <s:div id="three" label="remote" theme="ajax" href="/AjaxTest.action" >
* This is the remote tab
* </s:div>
- * </s:tabbedPanel>
+ * </s:tabbedpanel>
* <!-- END SNIPPET: example -->
* </pre>
*
*/
-@StrutsTag(name="tabbedPanel", tldTagClass="org.apache.struts2.dojo.views.jsp.ui.TabbedPanelTag", description="Render a tabbedPanel widget.")
+@StrutsTag(name="tabbedpanel", tldTagClass="org.apache.struts2.dojo.views.jsp.ui.TabbedPanelTag", description="Render a tabbedPanel widget.")
public class TabbedPanel extends ClosingUIBean {
public static final String TEMPLATE = "tabbedpanel";
public static final String TEMPLATE_CLOSE = "tabbedpanel-close";
Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/DojoTagLibrary.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/DojoTagLibrary.java?view=diff&rev=516804&r1=516803&r2=516804
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/DojoTagLibrary.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/DojoTagLibrary.java Sat Mar 10 14:56:58 2007
@@ -6,6 +6,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts2.components.Head;
+import org.apache.struts2.dojo.views.freemarker.tags.DojoModels;
import org.apache.struts2.dojo.views.velocity.components.AnchorDirective;
import org.apache.struts2.dojo.views.velocity.components.AutocompleterDirective;
import org.apache.struts2.dojo.views.velocity.components.DateTimePickerDirective;
@@ -16,7 +18,6 @@
import org.apache.struts2.dojo.views.velocity.components.TreeDirective;
import org.apache.struts2.dojo.views.velocity.components.TreeNodeDirective;
import org.apache.struts2.views.TagLibrary;
-import org.apache.struts2.views.freemarker.tags.StrutsModels;
import com.opensymphony.xwork2.util.ValueStack;
@@ -25,7 +26,7 @@
public Object getFreemarkerModels(ValueStack stack, HttpServletRequest req,
HttpServletResponse res) {
- return new StrutsModels(stack, req, res);
+ return new DojoModels(stack, req, res);
}
public List<Class> getVelocityDirectiveClasses() {
@@ -38,7 +39,8 @@
TabbedPanelDirective.class,
TreeDirective.class,
TreeNodeDirective.class,
- FormDirective.class
+ FormDirective.class,
+ Head.class
};
return Arrays.asList(directives);
}
Copied: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/HeadModel.java (from r515829, struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/HeadModel.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/HeadModel.java?view=diff&rev=516804&p1=struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/HeadModel.java&r1=515829&p2=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/HeadModel.java&r2=516804
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/HeadModel.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/freemarker/tags/HeadModel.java Sat Mar 10 14:56:58 2007
@@ -18,13 +18,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.views.freemarker.tags;
+package org.apache.struts2.dojo.views.freemarker.tags;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Head;
+import org.apache.struts2.dojo.components.Head;
+import org.apache.struts2.views.freemarker.tags.TagModel;
import com.opensymphony.xwork2.util.ValueStack;
Copied: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/HeadTag.java (from r515829, struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/HeadTag.java?view=diff&rev=516804&p1=struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java&r1=515829&p2=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/HeadTag.java&r2=516804
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/HeadTag.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/HeadTag.java Sat Mar 10 14:56:58 2007
@@ -18,13 +18,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Head;
+import org.apache.struts2.dojo.components.Head;
+import org.apache.struts2.views.jsp.ui.AbstractUITag;
import com.opensymphony.xwork2.util.ValueStack;
@@ -35,7 +36,6 @@
private static final long serialVersionUID = 6876765769175246030L;
- private String calendarcss;
private String debug;
public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
@@ -44,20 +44,9 @@
protected void populateParams() {
super.populateParams();
- if (calendarcss != null) {
- ((Head) component).setCalendarcss(calendarcss);
- }
if (debug != null) {
((Head) component).setDebug(Boolean.valueOf(debug).booleanValue());
}
- }
-
- public String getCalendarcss() {
- return calendarcss;
- }
-
- public void setCalendarcss(String calendarcss) {
- this.calendarcss = calendarcss;
}
public void setDebug(String debug) {
Copied: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/HeadDirective.java (from r515829, struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/HeadDirective.java?view=diff&rev=516804&p1=struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java&r1=515829&p2=struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/HeadDirective.java&r2=516804
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/HeadDirective.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/velocity/components/HeadDirective.java Sat Mar 10 14:56:58 2007
@@ -18,13 +18,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.views.velocity.components;
+package org.apache.struts2.dojo.views.velocity.components;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.components.Component;
-import org.apache.struts2.components.Head;
+import org.apache.struts2.dojo.components.Head;
+import org.apache.struts2.views.velocity.components.AbstractDirective;
import com.opensymphony.xwork2.util.ValueStack;
Modified: struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl?view=diff&rev=516804&r1=516803&r2=516804
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl Sat Mar 10 14:56:58 2007
@@ -1,4 +1,15 @@
-<script type="text/javascript"
+<script language="JavaScript" type="text/javascript">
+ // Dojo configuration
+ djConfig = {
+ baseRelativePath: "<@s.url includeParams='none' value='/struts/dojo' includeParams="none" encode='false'/>",
+ isDebug: ${parameters.debug?default(false)},
+ bindEncoding: "${parameters.encoding}",
+ debugAtAllCosts: true // not needed, but allows the Venkman debugger to work with the includes
+ };
+</script>
+<script language="JavaScript" type="text/javascript"
+ src="<@s.url value='/struts/dojo/dojo.js' includeParams='none' encode='false' />"></script>
+<script language="JavaScript" type="text/javascript"
src="<@s.url value='/struts/ajax/dojoRequire.js' includeParams='none' encode='false' />"></script>
-<script type="text/javascript"
+<script language="JavaScript" type="text/javascript"
src="<@s.url value='/struts/CommonFunctions.js' includeParams='none' encode='false'/>"></script>
Copied: struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest.java (from r515829, struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest.java?view=diff&rev=516804&p1=struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java&r1=515829&p2=struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest.java&r2=516804
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest.java Sat Mar 10 14:56:58 2007
@@ -18,10 +18,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.views.jsp.ui;
+package org.apache.struts2.dojo.views.jsp.ui;
-import org.apache.struts2.components.Head;
-import org.apache.struts2.views.jsp.AbstractUITagTest;
/**
* Unit test for {@link HeadTag}.
@@ -32,51 +30,13 @@
*/
public class HeadTagTest extends AbstractUITagTest {
- private HeadTag tag;
-
public void testHead1() throws Exception {
+ HeadTag tag = new HeadTag();
+ tag.setPageContext(pageContext);
+
tag.doStartTag();
tag.doEndTag();
verify(HeadTagTest.class.getResource("HeadTagTest-1.txt"));
}
-
- public void testHead1NoCalender() throws Exception {
- tag.doStartTag();
- tag.doEndTag();
- tag.setCalendarcss(null); // null = should use calendar-blue.css
-
- verify(HeadTagTest.class.getResource("HeadTagTest-1.txt"));
- }
-
- public void testHead4() throws Exception {
- tag.setCalendarcss("my-calendar");
- tag.doStartTag();
- tag.doEndTag();
-
- verify(HeadTagTest.class.getResource("HeadTagTest-4.txt"));
- assertEquals("my-calendar", tag.getCalendarcss());
- }
-
- public void testHead4b() throws Exception {
- tag.setCalendarcss("my-calendar.css");
- tag.doStartTag();
- Head component = (Head) tag.getComponent(); // must be done between start and end
- assertEquals("my-calendar.css", component.getCalendarcss());
- tag.doEndTag();
-
- verify(HeadTagTest.class.getResource("HeadTagTest-4.txt"));
- assertEquals("my-calendar.css", tag.getCalendarcss());
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- tag = new HeadTag();
- tag.setPageContext(pageContext);
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
}
Copied: struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt (from r515829, struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-1.txt)
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt?view=diff&rev=516804&p1=struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-1.txt&r1=515829&p2=struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt&r2=516804
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-1.txt (original)
+++ struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt Sat Mar 10 14:56:58 2007
@@ -1,17 +1,18 @@
-<link rel="stylesheet" href="/struts/xhtml/styles.css" type="text/css"/>
-
<script language="JavaScript" type="text/javascript">
// Dojo configuration
djConfig={
baseRelativePath: "/struts/dojo",
isDebug: false,
- bindEncoding: "ISO-8859-1",
- debugAtAllCosts:true
- //not needed, but allows the Venkman debugger to work with the includes};
+ bindEncoding: "UTF-8",
+ debugAtAllCosts: true // not needed, but allows the Venkman debugger to work with the includes
+ };
</script>
<script language="JavaScript" type="text/javascript" src="/struts/dojo/dojo.js">
</script>
-<script language="JavaScript" type="text/javascript" src="/struts/simple/dojoRequire.js">
+<script language="JavaScript" type="text/javascript" src="/struts/ajax/dojoRequire.js">
</script>
+
+<script language="JavaScript" type="text/javascript" src="/struts/CommonFunctions.js">
+</script>
\ No newline at end of file