Author: musachy
Date: Fri Mar 16 18:35:42 2007
New Revision: 519204
URL: http://svn.apache.org/viewvc?view=rev&rev=519204
Log:
WW-1607
* Restore javascript files to core that were moved to the dojo plugin but were
not related to dojo
* Render a tr with cells for the ajaxtags if a "label" is specified
* Fix wrong reference to dojo tooltip
Added:
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/inputtransferselect.js
- copied unchanged from r519200,
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/inputtransferselect.js
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/optiontransferselect.js
- copied unchanged from r519200,
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/optiontransferselect.js
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/validationClient.js
- copied unchanged from r519200,
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/validationClient.js
Removed:
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/inputtransferselect.js
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/optiontransferselect.js
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/validationClient.js
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/controlheader.ftl
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/form-close.ftl
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl?view=diff&rev=519204&r1=519203&r2=519204
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
Fri Mar 16 18:35:42 2007
@@ -1,3 +1,4 @@
+<#include "/${parameters.templateDir}/ajax/controlheader.ftl" />
<#if parameters.href?exists>
<input dojoType="struts:ComboBox"<#rt/>
dataUrl="${parameters.href}"<#rt/>
@@ -122,6 +123,8 @@
</@s.iterator>
</select>
</#if>
-
+<#if parameters.label?if_exists != "">
+ <#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
+</#if>
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/controlheader.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/controlheader.ftl?view=diff&rev=519204&r1=519203&r2=519204
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/controlheader.ftl
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/controlheader.ftl
Fri Mar 16 18:35:42 2007
@@ -1,4 +1,6 @@
-<#--include "/${parameters.templateDir}/xhtml/controlheader-core.ftl" /-->
+<#if parameters.label?if_exists != "">
+ <#include "/${parameters.templateDir}/xhtml/controlheader.ftl" />
+</#if>
<#if parameters.form?exists && parameters.form.validate?default(false) == true>
<#-- can't mutate the data model in freemarker -->
<#if parameters.onblur?exists>
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl?view=diff&rev=519204&r1=519203&r2=519204
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl
Fri Mar 16 18:35:42 2007
@@ -1,6 +1,7 @@
<script type="text/javascript">
dojo.require("dojo.widget.DatePicker");
-</script>
+</script>
+<#include "/${parameters.templateDir}/ajax/controlheader.ftl" />
<div
<#if parameters.type?if_exists == "date">
dojoType="dropdowndatepicker"<#rt/>
@@ -71,3 +72,6 @@
saveFormat="rfc"<#rt/>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
></div>
+<#if parameters.label?if_exists != "">
+ <#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
+</#if>
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/form-close.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/form-close.ftl?view=diff&rev=519204&r1=519203&r2=519204
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/form-close.ftl
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/form-close.ftl
Fri Mar 16 18:35:42 2007
@@ -83,7 +83,7 @@
Code that will add javascript needed for tooltips
--><#t/>
<#lt/><!-- javascript that is needed for tooltips -->
- <#lt/><script
type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script>
+ <#lt/><script
type="text/javascript">dojo.require("dojo.widget.Tooltip");dojo.require("dojo.fx.html");</script>
</table>
</form>
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=519204&r1=519203&r2=519204
==============================================================================
--- 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
Fri Mar 16 18:35:42 2007
@@ -2,7 +2,7 @@
// Dojo configuration
djConfig = {
baseRelativePath: "<@s.url includeParams='none' value='/struts/dojo'
includeParams="none" encode='false'/>",
- isDebug: ${parameters.debug?default(false)},
+ isDebug: ${parameters.debug?default(false)?string},
bindEncoding: "${parameters.encoding}",
debugAtAllCosts: true // not needed, but allows the Venkman debugger
to work with the includes
};
