# HG changeset patch # User Paul Boddie # Date 1360017661 -3600 # Node ID 61a688f08a7044b12841508c1ecf58f09a8531a9 # Parent 2f8738a3b04cacd98ae7d8313ea557049171f61b Changed the event template to use an event region. Updated the installation instructions and release notes. Added some tests. diff -r 2f8738a3b04c -r 61a688f08a70 README.txt --- a/README.txt Mon Feb 04 23:35:50 2013 +0100 +++ b/README.txt Mon Feb 04 23:41:01 2013 +0100 @@ -81,6 +81,7 @@ python moinsetup.py -f moinsetup.cfg -m install_extension_package $EADIR python moinsetup.py -f moinsetup.cfg -m install_actions $EADIR/actions python moinsetup.py -f moinsetup.cfg -m install_macros $EADIR/macros + python moinsetup.py -f moinsetup.cfg -m install_parsers $EADIR/parsers python moinsetup.py -f moinsetup.cfg -m install_theme_resources $EADIR python moinsetup.py -f moinsetup.cfg -m edit_theme_stylesheet screen.css event-aggregator.css python moinsetup.py -f moinsetup.cfg -m edit_theme_stylesheet print.css event-aggregator.css @@ -90,9 +91,10 @@ python setup.py install --prefix=path-to-moin-prefix -The second and third commands install the actions and macros respectively. +The second, third and fourth commands install the actions, macros and parsers +respectively. -The fourth command installs the theme resources in the available theme +The fifth command installs the theme resources in the available theme directories. The remaining commands activate the styles provided by EventAggregator by @@ -286,7 +288,7 @@ It may be necessary to manually remove locks. This can be done as follows: -find path-to-wiki/data/cache/xapian -depth -name "*-lock" -type d -exec rmdir '{}' \; +find path-to-wiki/data/cache/xapian -depth -name "*lock" -type d -exec rmdir '{}' \; Troubleshooting: Plain Text Formatting -------------------------------------- @@ -359,6 +361,8 @@ categories. * Encoded map location pop-up headings as plain text in order to handle locations specified using Wiki formatting. + * Permitted events with map references but without location details to be + positioned in maps. * Improved navigation between months and days, and between view modes for both levels of calendar view. diff -r 2f8738a3b04c -r 61a688f08a70 pages/EventTemplate --- a/pages/EventTemplate Mon Feb 04 23:35:50 2013 +0100 +++ b/pages/EventTemplate Mon Feb 04 23:41:01 2013 +0100 @@ -1,3 +1,4 @@ +{{{#!event Start:: YYYY-MM-DD End:: YYYY-MM-DD Topics:: topics @@ -10,7 +11,7 @@ ## provide a specific form of the page name, uncomment the above entry ## and write the appropriate title or summary, employing simple Wiki ## syntax. For example: <> +}}} -Description of event. ---- CategoryEvents diff -r 2f8738a3b04c -r 61a688f08a70 tests/EventRegionsTest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/EventRegionsTest Mon Feb 04 23:41:01 2013 +0100 @@ -0,0 +1,30 @@ +{{{#!event + Start:: 2013-02-04 + End:: 2013-02-04 + Topics:: test,testing + Description:: An event region + Link:: http://moinmo.in/MacroMarket/EventAggregator + Location:: Oslo, Norway + Summary:: First region +}}} + +{{{#!event + Start:: 2013-02-04 21:59:50 + End:: 2013-02-04 22:00 + Topics:: test,time + Description:: Another event region with time information + Location:: Helsinki, Finland + Summary:: Second region with time +}}} + +{{{#!event + Start:: 2013-02-04 23:55 + End:: 2013-02-05 00:05 + Topics:: test,time,midnight + Description:: Another event region with times either side of midnight and explicit latitude and longitude + Geo:: 62:0:42 -6:46:3 + Summary:: Third region with geo field +}}} + +---- +CategoryEvents diff -r 2f8738a3b04c -r 61a688f08a70 tests/MapCalendarTest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/MapCalendarTest Mon Feb 04 23:41:01 2013 +0100 @@ -0,0 +1,3 @@ +A test of events in CategoryEvents on a map of Europe for February 2013: + +<>