Author: ddewolf
Date: Fri Jan 5 03:27:27 2007
New Revision: 492987
URL: http://svn.apache.org/viewvc?view=rev&rev=492987
Log:
WW-1596 Fixing DatePicker and TimePicker. Thanks Musachy
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js
struts/struts2/trunk/core/src/main/resources/template/ajax/dojoRequire.js
struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/timepicker.ftl
struts/struts2/trunk/core/src/main/resources/template/xhtml/timepicker.ftl
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp?view=diff&rev=492987&r1=492986&r2=492987
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp
Fri Jan 5 03:27:27 2007
@@ -12,7 +12,7 @@
<body>
This should have the month label all on one line (problem in IE) appears fine
in FF though.
-<s:paneldatepicker id="foo" language="en-us" displayWeeks="1"
staticDisplay="true"/>
+<s:datepicker id="foo" language="en-us" displayWeeks="1"
staticDisplay="true"/>
<p>A calendar in your locale, or the closest thing to it we currently
provide</p>
<s:datepicker id="test" cssStyle="border:1px solid red;padding:1px;"/>
Modified:
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js?view=diff&rev=492987&r1=492986&r2=492987
==============================================================================
---
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js
(original)
+++
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js
Fri Jan 5 03:27:27 2007
@@ -2,6 +2,7 @@
common: ["struts.widget.Bind",
"struts.widget.BindDiv",
"struts.widget.BindAnchor",
- "struts.widget.ComboBox"]
+ "struts.widget.ComboBox",
+ "struts.widget.DatePicker"]
});
dojo.provide("struts.widget.*");
Modified:
struts/struts2/trunk/core/src/main/resources/template/ajax/dojoRequire.js
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/ajax/dojoRequire.js?view=diff&rev=492987&r1=492986&r2=492987
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/ajax/dojoRequire.js
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/ajax/dojoRequire.js
Fri Jan 5 03:27:27 2007
@@ -9,5 +9,7 @@
dojo.require("struts.widget.BindDiv");
dojo.require("struts.widget.BindAnchor");
dojo.require("struts.widget.ComboBox");
+dojo.require("struts.widget.DatePicker");
+dojo.require("struts.widget.TimePicker");
dojo.require("dojo.widget.Editor");
dojo.hostenv.writeIncludes(); // not needed, but allows the Venkman debugger
to work with the includes
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl?view=diff&rev=492987&r1=492986&r2=492987
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl
Fri Jan 5 03:27:27 2007
@@ -1,19 +1,24 @@
-<script type="text/javascript">
- dojo.require("dojo.widget.DatePicker");
-</script>
-
-<div dojoType="datepicker"
+<input type="hidden"
+ <#if parameters.nameValue?if_exists != "">
+ value="${parameters.nameValue?html}"<#rt/>
+ </#if>
+ <#if parameters.name?if_exists != "">
+ name="${parameters.name?html}"<#rt/>
+ id="struts_${parameters.name?html}"<#rt/>
+ </#if>
+>
+<div dojoType="struts:DatePicker"
<#if parameters.id?if_exists != "">
id="${parameters.id?html}"<#rt/>
</#if>
- <#if parameters.value?if_exists != "">
- value="${parameters.value?html}"<#rt/>
+ <#if parameters.name?if_exists != "">
+ inputId="struts_${parameters.name?html}"<#rt/>
+ </#if>
+ <#if parameters.nameValue?if_exists != "">
+ value="${parameters.nameValue?html}"<#rt/>
</#if>
<#if parameters.language?if_exists != "">
lang="${parameters.language?html}"<#rt/>
- </#if>
- <#if parameters.name?if_exists != "">
- name="${parameters.name?html}"<#rt/>
</#if>
<#if parameters.displayWeeks?if_exists != "">
displayWeeks="${parameters.displayWeeks?html}"<#rt/>
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/timepicker.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/timepicker.ftl?view=diff&rev=492987&r1=492986&r2=492987
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/timepicker.ftl
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/timepicker.ftl
Fri Jan 5 03:27:27 2007
@@ -1,13 +1,21 @@
-<script type="text/javascript">
- dojo.require("dojo.widget.TimePicker");
-</script>
-
-<div dojoType="timepicker"
+<input type="hidden"
+ <#if parameters.nameValue?if_exists != "">
+ value="${parameters.nameValue?html}"<#rt/>
+ </#if>
+ <#if parameters.name?if_exists != "">
+ name="${parameters.name?html}"<#rt/>
+ id="struts_${parameters.name?html}"<#rt/>
+ </#if>
+>
+<div dojoType="struts:TimePicker"
<#if parameters.id?if_exists != "">
id="${parameters.id?html}"<#rt/>
</#if>
- <#if parameters.value?if_exists != "">
- storedTime="todayT${parameters.value?html}"<#rt/>
+ <#if parameters.name?if_exists != "">
+ inputId="struts_${parameters.name?html}"<#rt/>
+ </#if>
+ <#if parameters.nameValue?if_exists != "">
+ storedTime="${parameters.nameValue?html}"<#rt/>
</#if>
<#if parameters.language?if_exists != "">
lang="${parameters.language?html}"<#rt/>
Modified:
struts/struts2/trunk/core/src/main/resources/template/xhtml/timepicker.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/timepicker.ftl?view=diff&rev=492987&r1=492986&r2=492987
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/xhtml/timepicker.ftl
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/xhtml/timepicker.ftl
Fri Jan 5 03:27:27 2007
@@ -1,2 +1,4 @@
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
<#include "/${parameters.templateDir}/simple/timepicker.ftl" />
+<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
