Changeset 8059

Timestamp:

07/07/10 15:00:20 (23 months ago)

Author:

CrawfordCurrie

Message:

Item8548: doc tidy up prior to release

Location:

trunk/HolidaylistPlugin

Files:

• data/System/HolidaylistPlugin.txt (modified) (4 diffs)
• lib/Foswiki/Plugins/HolidaylistPlugin.pm (modified) (1 diff)

trunk/HolidaylistPlugin/data/System/HolidaylistPlugin.txt

@@ -15 +15 @@
 %SHORTDESCRIPTION%
 
-The !%TOPIC% handles the %<nop>HOLIDAYLIST</nop>% macro to inserts a vacation list on the current page. Smilies are used to indicate if a person is in work or on holiday. 
+The !%TOPIC% handles the %<nop>HOLIDAYLIST</nop>% macro to insert a vacation list on the current page. Smilies are used to indicate if a person is in work or on holiday. 
 
 The plugin creates a table filled with Smilies where today's date will be the first column. There is a row in the table for each person and each day is flagged as either: :mad: (in work), :ok: (a day off) or 8-) (absent for some time), :-I (not at work; used if you type a location). You can also use other smilies (like :skull:).
@@ -94 +94 @@
 *Notes and hints:*
         * At least one space character have to stay before and after a seperator ('-'). This allows you to use a '-' in names, locations or icons, e.g. if you have a composite name like Eva-Maria.
-        * If you enable the compatmode (see [[#AttriButes][Attributes]]) you can use all event types of the Foswiki:Extensions.CalendarPlugin
+        * If you enable the =compatmode= (see [[#AttriButes][Attributes]]) you can use all event types of the Foswiki:Extensions.CalendarPlugin
         * If you change the default language ('lang' attribute; see [[#AttriButes][Attributes]]) you can use your language specific month and day names or the abbreviations for any entry type (including Foswiki:Extensions.CalendarPlugin event types).
         * If you change the month names or day names ('monthnames' and 'daynames' attributes; see [[#AttriButes][Attributes]]) you can use it for your entries (including Foswiki:Extensions.CalendarPlugin event types).
@@ -114 +114 @@
 </verbatim>
 
-You can also use the Foswiki:Extensions.CalDAVPlugin to recover calendars from
-a !CalDAV server.
+You can also use the Foswiki:Extensions.CalDAVPlugin to recover holiday
+calendars from a !CalDAV server.
 
 #AttriButes
@@ -311 +311 @@
 *Note:* Every attribute of %<nop>HOLIDAYLIST% can also be used as plugin setting. You only have to use capital letters.
 
----++ Plugin Installation Instructions
+---++ Installation Instructions
 
 %$INSTALL_INSTRUCTIONS%

trunk/HolidaylistPlugin/lib/Foswiki/Plugins/HolidaylistPlugin.pm

@@ -7 +7 @@
 # See plugin topic for complete release history
 our $VERSION = '$Rev: 18212 $';
-our $RELEASE = '1.1.0';
+our $RELEASE = '1.031';
 our $SHORTDESCRIPTION = 'Create a table with a list of people on holidays';
 our $NO_PREFS_IN_TOPIC = 1;
 
 sub initPlugin {
-    Foswiki::Func::registerTagHandler(
-        'HOLIDAYLIST', sub {
-            require Foswiki::Plugins::HolidaylistPlugin::Core;
-            return Foswiki::Plugins::HolidaylistPlugin::Core::HOLIDAYLIST(@_);
-        });
+    # my ( $topic, $web, $user, $installWeb ) = @_;
+    Foswiki::Func::registerTagHandler( 'HOLIDAYLIST', \&_HOLIDAYLIST );
     return 1;
+}
+
+sub _HOLIDAYLIST {
+    # my($session, $params, $topic, $web) = @_;
+    require Foswiki::Plugins::HolidaylistPlugin::Core;
+#    *_HOLIDAYLIST = \&Foswiki::Plugins::HolidaylistPlugin::Core::HOLIDAYLIST;
+    return Foswiki::Plugins::HolidaylistPlugin::Core::HOLIDAYLIST(@_);
 }