Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-1596 Fixing DatePicker and TimePicker. Thanks Musachy

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@492987 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
David H. DeWolf
2007-01-05 11:27:27 +00:00
parent 3fcfcad103
commit aec83eae92
6 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/showcase/src/main/webapp/ajax/datepicker/index.jsp
+1 -1
View File
@@ -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;"/>
core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js
+2 -1
View File
@@ -2,6 +2,7 @@ dojo.kwCompoundRequire({
common: ["struts.widget.Bind",
"struts.widget.BindDiv",
"struts.widget.BindAnchor",
"struts.widget.ComboBox"]
"struts.widget.ComboBox",
"struts.widget.DatePicker"]
});
dojo.provide("struts.widget.*");
core/src/main/resources/template/ajax/dojoRequire.js
+2
View File
@@ -9,5 +9,7 @@ dojo.require("struts.widget.Bind");
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
core/src/main/resources/template/simple/datepicker.ftl
+18 -13
View File
@@ -1,19 +1,24 @@
<script type="text/javascript">
dojo.require("dojo.widget.DatePicker");
</script>
<div dojoType="datepicker"
<#if parameters.id?if_exists != "">
id="${parameters.id?html}"<#rt/>
</#if>
<#if parameters.value?if_exists != "">
value="${parameters.value?html}"<#rt/>
</#if>
<#if parameters.language?if_exists != "">
lang="${parameters.language?html}"<#rt/>
<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.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.displayWeeks?if_exists != "">
displayWeeks="${parameters.displayWeeks?html}"<#rt/>
core/src/main/resources/template/simple/timepicker.ftl
+15 -7
View File
@@ -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/>
core/src/main/resources/template/xhtml/timepicker.ftl
+2
View File
@@ -1,2 +1,4 @@
<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
<#include "/${parameters.templateDir}/simple/timepicker.ftl" />
<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />