Changeset 7045

Timestamp:

04/01/10 21:49:44 (23 months ago)

Author:

RaulFRodriguez

Message:

Item8677: implementing the changes in the Release branch version of JSCalendarContrib

Note: changes implemented from scratch, and not by pushing the changes from Trunk here,
since according to Tasks.Item2111, Tasks.Item8235 (and Support.Question252) the versions
of JSCalendarContrib existing in Trunk and in Release branch are incompatible

• fixing foswiki.js of JSCalendarContrib not to hardcode showsTime

Setting showsTime=false or showsTime=true depending on whether or not the format string contains time specifiers
Using the following time specifers as triggers: %H|%I|%k|%l|%M|%p|%P
Do so preserving the original formatting of the Javascript code

• fixing foswiki_src.js in the same manner

• in JSCalendarContrib.txt: adding a short section "Using the Calendar for picking dates only or picking times and dates" to the documentation

• adding a reference in EditTablePlugin documentation

to the place in JSCalendarContrib documentation where the time and date DHTML format is described
the link is to an anchor #FormatSpecifiers in the relevant JSCalendarContrib section so that
the user lands directly where needed

• updating Change History and Release date

Location:

branches/Release01x00

Files:

• EditTablePlugin/data/System/EditTablePlugin.txt (modified) (1 diff)
• JSCalendarContrib/data/System/JSCalendarContrib.txt (modified) (2 diffs)
• JSCalendarContrib/lib/Foswiki/Contrib/JSCalendarContrib.pm (modified) (2 diffs)
• JSCalendarContrib/pub/System/JSCalendarContrib/foswiki.js (modified) (1 diff)
• JSCalendarContrib/pub/System/JSCalendarContrib/foswiki_src.js (modified) (1 diff)

branches/Release01x00/EditTablePlugin/data/System/EditTablePlugin.txt

@@ -41 +41 @@
 The =date= field type allows one to choose a date with a popup calendar. Popup calendar works with all modern browsers. The date picker button is inactive if the browser cannot support the popup calendar or if javascript is disabled. 
 
+The optional DHTML date format specifiers are described in the [[System.JSCalendarContrib#FormatSpecifiers][JSCalendarContrib]] documentation. When time spec
+ifiers are used, the calendar allows one to choose a date and a time.
 
 ---++ Per Cell Settings

branches/Release01x00/JSCalendarContrib/data/System/JSCalendarContrib.txt

@@ -22 +22 @@
 ---++ Detailed Documentation
 %$POD%
+
+---+++ Using the Calendar for picking dates only or picking times and dates
+The calendar is able to display a time-picker, in addition to the default date-picker, depending on the optional date format passed.
+
+   * the calendar displays the built-in time picker when the passed format descriptions includes hours, minutes or am or pm specifiers (i.e.: =%H, %I, %k, %l, %M, %p, %P=),
+
+   * otherwise the calendar is displayed normally with only dates if anything else or no format description is passed.
 
 ---+++ Using the Calendar in user forms
@@ -57 +64 @@
 |  Release: | %$RELEASE% |
 | Change History: | |
+|  01 Apr 2010 | Calendar displays the built-in Time-Picker if the optional format string contains time format specifiers (Foswiki:Main.RaulFRodriguez) |
 |  09 Jan 2010 | Adding the Config.spec file with the 3 settings so that people do not have to manually create the file. |
 |  20 Sep 2009 | Small documentation update in connection with release of Foswiki 1.0.7 |

branches/Release01x00/JSCalendarContrib/lib/Foswiki/Contrib/JSCalendarContrib.pm

@@ -19 +19 @@
 
 $VERSION = '$Rev$';
-$RELEASE = '09 Jan 2010';
+$RELEASE = '01 Apr 2010';
 $SHORTDESCRIPTION = "[[http://dynarch.com/mishoo/calendar.epl][Mishoo JSCalendar]], packaged for use by plugins, skins and add-ons";
 
@@ -148 +148 @@
 The first parameter to =showCalendar= is the id of the textfield, and the second parameter is the date format. Default format is '%e %B %Y'.
 
+#FormatSpecifiers
 All available date specifiers:
 <verbatim>

branches/Release01x00/JSCalendarContrib/pub/System/JSCalendarContrib/foswiki.js

@@ -1 +1 @@
 function showCalendar(id,format){var el=document.getElementById(id);if(_dynarch_popupCalendar!=null){_dynarch_popupCalendar.hide();}else{var cal=new Calendar(1,null,function(cal,date){cal.sel.value=date;if(cal.sel.onchange!=null)
 cal.sel.onchange();if(cal.dateClicked)
-cal.callCloseHandler();},function(cal){cal.hide();_dynarch_popupCalendar=null;});cal.showsTime=false;cal.showsOtherMonths=true;_dynarch_popupCalendar=cal;cal.setRange(1900,2070);cal.create();}
+cal.callCloseHandler();},function(cal){cal.hide();_dynarch_popupCalendar=null;});if(format.search(/%H|%I|%k|%l|%M|%p|%P/)!=-1){cal.showsTime=true;}else{cal.showsTime=false;}cal.showsOtherMonths=true;_dynarch_popupCalendar=cal;cal.setRange(1900,2070);cal.create();}
 _dynarch_popupCalendar.setDateFormat(format);_dynarch_popupCalendar.parseDate(el.value);_dynarch_popupCalendar.sel=el;_dynarch_popupCalendar.showAtElement(el,"Br");return false;}

branches/Release01x00/JSCalendarContrib/pub/System/JSCalendarContrib/foswiki_src.js

@@ -18 +18 @@
                 _dynarch_popupCalendar = null;
             });
-        cal.showsTime = false;
+        if (format.search(/%H|%I|%k|%l|%M|%p|%P/)!=-1) {
+            cal.showsTime=true;
+        } else {
+            cal.showsTime=false;
+        }
         cal.showsOtherMonths = true;
         _dynarch_popupCalendar = cal;