Author: musachy
Date: Tue Mar 10 15:23:08 2009
New Revision: 752138
URL: http://svn.apache.org/viewvc?rev=752138&view=rev
Log:
Add image tolltip and url parameters to datepicker
Modified:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/views/jsp/ui/JQueryDatepickerTag.java
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery-simple/datepicker.ftl
struts/sandbox/trunk/struts2-jquery-plugin/src/site/docs/datepicker.html
Modified:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java?rev=752138&r1=752137&r2=752138&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java
(original)
+++
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/components/JQueryDatepicker.java
Tue Mar 10 15:23:08 2009
@@ -52,6 +52,8 @@
//see http://docs.jquery.com/UI/Datepicker/%24.datepicker.formatDate
private String displayFormat;
+ private String imageUrl;
+ private String imageTooltip;
public JQueryDatepicker(ValueStack stack, HttpServletRequest request,
HttpServletResponse response) {
super(stack, request, response);
@@ -66,6 +68,14 @@
else
addParameter("displayFormat", "yy-mm-dd");
+ if (imageUrl != null)
+ addParameter("imageUrl", findString(imageUrl));
+
+ if (imageTooltip != null)
+ addParameter("imageTooltip", findString(imageTooltip));
+ else
+ addParameter("imageTooltip", "Pick a date");
+
Object currentValue = null;
if (parameters.containsKey("value")) {
addParameter("displayValue", parameters.get("value"));
@@ -154,4 +164,15 @@
public void setDisplayFormat(String displayFormat) {
this.displayFormat = displayFormat;
}
+
+ @StrutsTagAttribute(description = "Tooltip for the calendar image",
defaultValue = "Pick a date")
+ public void setImageTooltip(String imageTooltip) {
+ this.imageTooltip = imageTooltip;
+ }
+
+ @StrutsTagAttribute(description = "Image used for the calendar button")
+ public void setImageUrl(String imageUrl) {
+ this.imageUrl = imageUrl;
+ }
+
}
Modified:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/views/jsp/ui/JQueryDatepickerTag.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/views/jsp/ui/JQueryDatepickerTag.java?rev=752138&r1=752137&r2=752138&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/views/jsp/ui/JQueryDatepickerTag.java
(original)
+++
struts/sandbox/trunk/struts2-jquery-plugin/src/main/java/org/apache/struts2/jquery/views/jsp/ui/JQueryDatepickerTag.java
Tue Mar 10 15:23:08 2009
@@ -30,6 +30,8 @@
public class JQueryDatepickerTag extends JQueryTextFieldTag {
private String displayFormat;
+ private String imageUrl;
+ private String imageTooltip;
public Component getBean(ValueStack stack, HttpServletRequest req,
HttpServletResponse res) {
return new JQueryDatepicker(stack, req, res);
@@ -39,9 +41,19 @@
super.populateParams();
JQueryDatepicker picker = ((JQueryDatepicker) component);
picker.setDisplayFormat(displayFormat);
+ picker.setImageTooltip(imageTooltip);
+ picker.setImageUrl(imageUrl);
}
public void setDisplayFormat(String displayFormat) {
this.displayFormat = displayFormat;
}
+
+ public void setImageTooltip(String imageTooltip) {
+ this.imageTooltip = imageTooltip;
+ }
+
+ public void setImageUrl(String imageUrl) {
+ this.imageUrl = imageUrl;
+ }
}
Modified:
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery-simple/datepicker.ftl
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery-simple/datepicker.ftl?rev=752138&r1=752137&r2=752138&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery-simple/datepicker.ftl
(original)
+++
struts/sandbox/trunk/struts2-jquery-plugin/src/main/resources/template/jquery-simple/datepicker.ftl
Tue Mar 10 15:23:08 2009
@@ -64,8 +64,14 @@
altField: "#${parameters.id?html}_hidden",
altFormat: "yy-mm-dd'T'00:00:00",
dateFormat : "${parameters.displayFormat?html}",
- buttonImage: '${base}/struts/images/dateIcon.gif',
- buttonImageOnly: true
+ <#if parameters.imageUrl??>
+ buttonImage: "${parameters.imageUrl}",
+ <#else>
+ buttonImage: "${base}/struts/images/dateIcon.gif",
+ </#if>
+ buttonImageOnly: true,
+ showOn: "both",
+ buttonText: "${parameters.imageTooltip}"
});
<#if parameters.year?? && parameters.month?? && parameters.day??>
$("#${parameters.id?html}").val($.datepicker.formatDate("${parameters.displayFormat?html}",
new Date(${parameters.year?c}, ${parameters.month}, ${parameters.day})));
Modified:
struts/sandbox/trunk/struts2-jquery-plugin/src/site/docs/datepicker.html
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jquery-plugin/src/site/docs/datepicker.html?rev=752138&r1=752137&r2=752138&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-jquery-plugin/src/site/docs/datepicker.html
(original)
+++ struts/sandbox/trunk/struts2-jquery-plugin/src/site/docs/datepicker.html
Tue Mar 10 15:23:08 2009
@@ -98,6 +98,22 @@
<td align="left" valign="top">HTML id
attribute</td>
</tr>
<tr>
+ <td align="left"
valign="top">imageTooltip</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top">Pick a
date</td>
+ <td align="left" valign="top">false</td>
+ <td align="left"
valign="top">String</td>
+ <td align="left" valign="top">Tooltip
for the calendar image</td>
+ </tr>
+ <tr>
+ <td align="left"
valign="top">imageUrl</td>
+ <td align="left" valign="top">false</td>
+ <td align="left" valign="top"></td>
+ <td align="left" valign="top">false</td>
+ <td align="left"
valign="top">String</td>
+ <td align="left" valign="top">Image
used for the calendar button</td>
+ </tr>
+ <tr>
<td align="left"
valign="top">javascriptTooltip</td>
<td align="left" valign="top">false</td>
<td align="left" valign="top">false</td>
