Correction : events.
authorJulien Moutinho <julm@cyclocoop.org>
Mon, 7 Apr 2014 19:57:45 +0000 (21:57 +0200)
committerJulien Moutinho <julm@cyclocoop.org>
Mon, 7 Apr 2014 19:57:45 +0000 (21:57 +0200)
23 files changed:
.ikiwiki/lib/IkiWiki/Plugin/events
3615/Agenda/templates/newevent.tmpl [new file with mode: 0644]
3615/Agenda/templates/neweventcontent.tmpl [new file with mode: 0644]
3615/Agenda/templates/neweventday.tmpl [new file with mode: 0644]
3615/Agenda/templates/neweventmonth.tmpl [new file with mode: 0644]
3615/Agenda/templates/neweventpage.tmpl [new file with mode: 0644]
3615/templates/newevent.tmpl [deleted file]
3615/templates/neweventcontent.tmpl [deleted file]
3615/templates/neweventday.tmpl [deleted file]
3615/templates/neweventmonth.tmpl [deleted file]
3615/templates/neweventpage.tmpl [deleted file]
Lieu/Pantin.mdwn [new file with mode: 0644]
Presse.mdwn
Presse/2014/02.mdwn
Presse/2014/02/18.mdwn
Presse/2014/03.mdwn
Presse/2014/03/03.mdwn
Presse/2014/03/06.mdwn
Presse/2014/03/13.mdwn
Presse/2014/04.mdwn [new file with mode: 0644]
Presse/2014/04/04.mdwn [new file with mode: 0644]
Presse/2014/04/04/Cyclofficine_:_bourse_aux_vélos_à_Pantin_ce_dimanche_6_avril.mdwn [new file with mode: 0644]
Presse/templates/neweventcontent.tmpl [new file with mode: 0644]

index e9ee26d..f88de8e 160000 (submodule)
@@ -1 +1 @@
-Subproject commit e9ee26dee80eb138db20ec0274ac1a1f90082a71
+Subproject commit f88de8ec79469efd7603bf328e23e59d03fb9c61
diff --git a/3615/Agenda/templates/newevent.tmpl b/3615/Agenda/templates/newevent.tmpl
new file mode 100644 (file)
index 0000000..a6cd754
--- /dev/null
@@ -0,0 +1,161 @@
+<TMPL_VAR JS-HEAD>
+<TMPL_VAR FORM-START>
+<TMPL_VAR FIELD-DO>
+<TMPL_VAR FIELD-BASE>
+<table class="newevent">
+<tbody>
+<tr>
+<td>Du :<TMPL_IF NAME="ERROR-FROM_DATE"><span class='error'><TMPL_VAR ERROR-FROM_DATE></span></TMPL_IF></td>
+<td class='from_day'><TMPL_VAR FIELD-FROM_DAY
+><TMPL_IF NAME="COMMENT-FROM_DAY"><span class='comment'><TMPL_VAR COMMENT-FROM_DAY></span></TMPL_IF
+><TMPL_IF NAME="ERROR-FROM_DAY"><span class='error'><TMPL_VAR ERROR-FROM_DAY></span></TMPL_IF
+></td>
+<td class='from_month'><TMPL_VAR FIELD-FROM_MONTH
+><TMPL_IF NAME="COMMENT-FROM_MONTH"><span class='comment'><TMPL_VAR COMMENT-FROM_MONTH></span></TMPL_IF
+><TMPL_IF NAME="ERROR-FROM_MONTH"><span class='error'><TMPL_VAR ERROR-FROM_MONTH></span></TMPL_IF
+></td>
+<td class='from_year'><TMPL_VAR FIELD-FROM_YEAR
+><TMPL_IF NAME="COMMENT-FROM_YEAR"><span class='comment'><TMPL_VAR COMMENT-FROM_YEAR></span></TMPL_IF
+><TMPL_IF NAME="ERROR-FROM_YEAR"><span class='error'><TMPL_VAR ERROR-FROM_YEAR></span></TMPL_IF
+></td>
+<td class='from_hour'>à <TMPL_VAR FIELD-FROM_HOUR
+>h<TMPL_IF NAME="COMMENT-FROM_HOUR"><span class='comment'><TMPL_VAR COMMENT-FROM_HOUR></span></TMPL_IF
+><TMPL_IF NAME="ERROR-FROM_HOUR"><span class='error'><TMPL_VAR ERROR-FROM_HOUR></span></TMPL_IF
+></td>
+<td class='from_minute'><TMPL_VAR FIELD-FROM_MINUTE
+>min<TMPL_IF NAME="COMMENT-FROM_MINUTE"><span class='comment'><TMPL_VAR COMMENT-FROM_MINUTE></span></TMPL_IF
+><TMPL_IF NAME="ERROR-FROM_MINUTE"><span class='error'><TMPL_VAR ERROR-FROM_MINUTE></span></TMPL_IF
+></td>
+<td></td>
+<td>jours du mois</td>
+</tr>
+<tr>
+<td>Au :<TMPL_IF NAME="ERROR-TO_DATE"><span class='error'><TMPL_VAR ERROR-TO_DATE></span></TMPL_IF></td>
+<td class='to_day'><TMPL_VAR FIELD-TO_DAY
+><TMPL_IF NAME="COMMENT-TO_DAY"><span class='comment'><TMPL_VAR COMMENT-TO_DAY></span></TMPL_IF
+><TMPL_IF NAME="ERROR-TO_DAY"><span class='error'><TMPL_VAR ERROR-TO_DAY></span></TMPL_IF
+></td>
+<td class='to_month'><TMPL_VAR FIELD-TO_MONTH
+><TMPL_IF NAME="COMMENT-TO_MONTH"><span class='comment'><TMPL_VAR COMMENT-TO_MONTH></span></TMPL_IF
+><TMPL_IF NAME="ERROR-TO_MONTH"><span class='error'><TMPL_VAR ERROR-TO_MONTH></span></TMPL_IF
+></td>
+<td class='to_year'><TMPL_VAR FIELD-TO_YEAR
+><TMPL_IF NAME="COMMENT-TO_YEAR"><span class='comment'><TMPL_VAR COMMENT-TO_YEAR></span></TMPL_IF
+><TMPL_IF NAME="ERROR-TO_YEAR"><span class='error'><TMPL_VAR ERROR-TO_YEAR></span></TMPL_IF
+></td>
+<td class='to_hour'>à <TMPL_VAR FIELD-TO_HOUR
+>h<TMPL_IF NAME="COMMENT-TO_HOUR"><span class='comment'><TMPL_VAR COMMENT-TO_HOUR></span></TMPL_IF
+><TMPL_IF NAME="ERROR-TO_HOUR"><span class='error'><TMPL_VAR ERROR-TO_HOUR></span></TMPL_IF
+></td>
+<td class='to_minute'><TMPL_VAR FIELD-TO_MINUTE
+>min<TMPL_IF NAME="COMMENT-TO_MINUTE"><span class='comment'><TMPL_VAR COMMENT-TO_MINUTE></span></TMPL_IF
+><TMPL_IF NAME="ERROR-TO_MINUTE"><span class='error'><TMPL_VAR ERROR-TO_MINUTE></span></TMPL_IF
+></td>
+<td></td>
+<td class='dom' rowspan='7'><TMPL_VAR FIELD-DOM></td>
+</tr>
+<tr>
+<td>Incrément :<TMPL_IF NAME="ERROR-INC_DUR"><span class='error'><TMPL_VAR ERROR-INC_DUR></span></TMPL_IF></td>
+<td class='inc_year'><TMPL_VAR FIELD-INC_YEAR
+>année(s)<TMPL_IF NAME="COMMENT-INC_YEAR"><span class='comment'><TMPL_VAR COMMENT-INC_YEAR></span></TMPL_IF
+><TMPL_IF NAME="ERROR-INC_YEAR"><span class='error'><TMPL_VAR ERROR-INC_YEAR></span></TMPL_IF
+></td>
+<td class='inc_month'><TMPL_VAR FIELD-INC_MONTH
+>mois<TMPL_IF NAME="COMMENT-INC_MONTH"><span class='comment'><TMPL_VAR COMMENT-INC_MONTH></span></TMPL_IF
+><TMPL_IF NAME="ERROR-INC_MONTH"><span class='error'><TMPL_VAR ERROR-INC_MONTH></span></TMPL_IF
+></td>
+<td class='inc_week'><TMPL_VAR FIELD-INC_WEEK
+>semaine(s)<TMPL_IF NAME="COMMENT-INC_WEEK"><span class='comment'><TMPL_VAR COMMENT-INC_WEEK></span></TMPL_IF
+><TMPL_IF NAME="ERROR-INC_WEEK"><span class='error'><TMPL_VAR ERROR-INC_WEEK></span></TMPL_IF
+></td>
+<td class='inc_day'><TMPL_VAR FIELD-INC_DAY
+>jour(s)<TMPL_IF NAME="COMMENT-INC_DAY"><span class='comment'><TMPL_VAR COMMENT-INC_DAY></span></TMPL_IF
+><TMPL_IF NAME="ERROR-INC_DAY"><span class='error'><TMPL_VAR ERROR-INC_DAY></span></TMPL_IF
+></td>
+<td><TMPL_VAR FIELD-INC_HOUR
+>heure(s)<TMPL_IF NAME="COMMENT-INC_HOUR"><span class='comment'><TMPL_VAR COMMENT-INC_HOUR></span></TMPL_IF
+><TMPL_IF NAME="ERROR-INC_HOUR"><span class='error'><TMPL_VAR ERROR-INC_HOUR></span></TMPL_IF
+></td>
+<td class='inc_minute'><TMPL_VAR FIELD-INC_MINUTE
+>minute(s)<TMPL_IF NAME="COMMENT-INC_MINUTE"><span class='comment'><TMPL_VAR COMMENT-INC_MINUTE></span></TMPL_IF
+><TMPL_IF NAME="ERROR-INC_MINUTE"><span class='error'><TMPL_VAR ERROR-INC_MINUTE></span></TMPL_IF
+></td>
+</tr>
+<tr>
+<td class='end'>Fin :<TMPL_IF NAME="ERROR-END_DATE"><span class='error'><TMPL_VAR ERROR-END_DATE></span></TMPL_IF
+><span class='times'><TMPL_VAR FIELD-END_TIMES
+>fois<TMPL_IF NAME="COMMENT-END_TIMES"><span class='comment'><TMPL_VAR COMMENT-END_TIMES></span></TMPL_IF
+><TMPL_IF NAME="ERROR-END_TIMES"><span class='error'><TMPL_VAR ERROR-END_TIMES></span></TMPL_IF
+></span></td>
+<td class='end_day'><TMPL_VAR FIELD-END_DAY
+><TMPL_IF NAME="COMMENT-END_DAY"><span class='comment'><TMPL_VAR COMMENT-END_DAY></span></TMPL_IF
+><TMPL_IF NAME="ERROR-END_DAY"><span class='error'><TMPL_VAR ERROR-END_DAY></span></TMPL_IF
+></td>
+<td class='end_month'><TMPL_VAR FIELD-END_MONTH
+><TMPL_IF NAME="COMMENT-END_MONTH"><span class='comment'><TMPL_VAR COMMENT-END_MONTH></span></TMPL_IF
+><TMPL_IF NAME="ERROR-END_MONTH"><span class='error'><TMPL_VAR ERROR-END_MONTH></span></TMPL_IF
+></td>
+<td class='end_year'><TMPL_VAR FIELD-END_YEAR
+><TMPL_IF NAME="COMMENT-END_YEAR"><span class='comment'><TMPL_VAR COMMENT-END_YEAR></span></TMPL_IF
+><TMPL_IF NAME="ERROR-END_YEAR"><span class='error'><TMPL_VAR ERROR-END_YEAR></span></TMPL_IF
+></td>
+<td class='end_hour'>à <TMPL_VAR FIELD-END_HOUR
+>h<TMPL_IF NAME="COMMENT-END_HOUR"><span class='comment'><TMPL_VAR COMMENT-END_HOUR></span></TMPL_IF
+><TMPL_IF NAME="ERROR-END_HOUR"><span class='error'><TMPL_VAR ERROR-END_HOUR></span></TMPL_IF
+></td>
+<td class='end_minute'><TMPL_VAR FIELD-END_MINUTE
+>min<TMPL_IF NAME="COMMENT-END_MINUTE"><span class='comment'><TMPL_VAR COMMENT-END_MINUTE></span></TMPL_IF
+><TMPL_IF NAME="ERROR-END_MINUTE"><span class='error'><TMPL_VAR ERROR-END_MINUTE></span></TMPL_IF
+></td>
+</tr>
+<tr>
+<td class='name'>Nom :</td>
+<td class='name-value' colspan='6'><TMPL_VAR FIELD-NAME
+><TMPL_IF NAME="COMMENT-NAME"><span class='comment'><TMPL_VAR COMMENT-NAME></span></TMPL_IF
+><TMPL_IF NAME="ERROR-NAME"><span class='error'><TMPL_VAR ERROR-NAME></span></TMPL_IF
+></td>
+</tr>
+<tr>
+<td class='content' colspan='7' rowspan='3'><TMPL_VAR FIELD-CONTENT></td>
+</tr>
+<tr>
+</tr>
+<tr>
+</tr>
+</tbody>
+</table>
+<TMPL_VAR FORM-RESET>
+<TMPL_VAR FORM-SUBMIT>
+<TMPL_VAR HELPONFORMATTINGLINK>
+<TMPL_VAR FORM-END>
+
+<TMPL_IF NAME="PREVIEW">
+<hr class="preview"/>
+<div id="preview"><TMPL_VAR PREVIEW></div>
+</TMPL_IF>
+
+<TMPL_IF NAME="EVENTS">
+<hr class="events"/>
+<table id="events">
+<thead>
+<tr>
+<th><TMPL_VAR YEAR></th>
+<th><TMPL_VAR MONTH></th>
+<th><TMPL_VAR DAY></th>
+<th><TMPL_VAR HOUR></th>
+<th><TMPL_VAR PAGE></th>
+</tr>
+</thead>
+<tbody>
+<TMPL_LOOP NAME="EVENTS">
+<tr>
+<td><TMPL_VAR FROM_YEAR></td>
+<td><TMPL_VAR FROM_MONTH>(<TMPL_VAR FROM_MONTHNAME>)</td>
+<td><TMPL_VAR FROM_DAY>(<TMPL_VAR FROM_DOWNAME>)</td>
+<td><TMPL_VAR FROM_HOUR>:<TMPL_VAR FROM_MINUTE></td>
+<td><TMPL_VAR PAGE></td>
+</tr>
+</TMPL_LOOP>
+</tbody>
+</table>
+</TMPL_IF>
diff --git a/3615/Agenda/templates/neweventcontent.tmpl b/3615/Agenda/templates/neweventcontent.tmpl
new file mode 100644 (file)
index 0000000..8afb956
--- /dev/null
@@ -0,0 +1,3 @@
+[[!tag<TMPL_LOOP NAME="TAGS"> "<TMPL_VAR NAME>"</TMPL_LOOP>]]
+
+Blah
diff --git a/3615/Agenda/templates/neweventday.tmpl b/3615/Agenda/templates/neweventday.tmpl
new file mode 100644 (file)
index 0000000..8e1a824
--- /dev/null
@@ -0,0 +1,6 @@
+[[!meta title="<TMPL_VAR DAY> - <TMPL_VAR DAYNAME>"]]
+
+[[!events type="day" day="<TMPL_VAR DAY>"
+ base="<TMPL_VAR BASE>"
+ pages="(page(Agenda/%Y/%m/%d/*) or page(./%d/*)) and !*/Discussion"
+ ]]
diff --git a/3615/Agenda/templates/neweventmonth.tmpl b/3615/Agenda/templates/neweventmonth.tmpl
new file mode 100644 (file)
index 0000000..f6cdb83
--- /dev/null
@@ -0,0 +1,8 @@
+[[!meta title="<TMPL_VAR MONTH> - <TMPL_VAR MONTHNAME>"]]
+
+[[!events type="month" month="<TMPL_VAR MONTH>"
+ base="<TMPL_VAR BASE>"
+ pages="(  page(Agenda/%Y/%m/*/*)
+        or page(./%m/*/*)
+        ) and !*/Discussion"
+ ]]
diff --git a/3615/Agenda/templates/neweventpage.tmpl b/3615/Agenda/templates/neweventpage.tmpl
new file mode 100644 (file)
index 0000000..ceb0a33
--- /dev/null
@@ -0,0 +1,4 @@
+[[!meta date="<TMPL_VAR FROM_DATE>"]]
+<TMPL_VAR CONTENT><TMPL_IF NAME="EVENT_FIRST"><TMPL_IF NAME="EVENT_LAST"><TMPL_ELSE>
+<TMPL_LOOP NAME="EVENTS">
+[[!trailitem "<TMPL_VAR PAGE>"]]</TMPL_LOOP></TMPL_IF></TMPL_IF>
diff --git a/3615/templates/newevent.tmpl b/3615/templates/newevent.tmpl
deleted file mode 100644 (file)
index a6cd754..0000000
+++ /dev/null
@@ -1,161 +0,0 @@
-<TMPL_VAR JS-HEAD>
-<TMPL_VAR FORM-START>
-<TMPL_VAR FIELD-DO>
-<TMPL_VAR FIELD-BASE>
-<table class="newevent">
-<tbody>
-<tr>
-<td>Du :<TMPL_IF NAME="ERROR-FROM_DATE"><span class='error'><TMPL_VAR ERROR-FROM_DATE></span></TMPL_IF></td>
-<td class='from_day'><TMPL_VAR FIELD-FROM_DAY
-><TMPL_IF NAME="COMMENT-FROM_DAY"><span class='comment'><TMPL_VAR COMMENT-FROM_DAY></span></TMPL_IF
-><TMPL_IF NAME="ERROR-FROM_DAY"><span class='error'><TMPL_VAR ERROR-FROM_DAY></span></TMPL_IF
-></td>
-<td class='from_month'><TMPL_VAR FIELD-FROM_MONTH
-><TMPL_IF NAME="COMMENT-FROM_MONTH"><span class='comment'><TMPL_VAR COMMENT-FROM_MONTH></span></TMPL_IF
-><TMPL_IF NAME="ERROR-FROM_MONTH"><span class='error'><TMPL_VAR ERROR-FROM_MONTH></span></TMPL_IF
-></td>
-<td class='from_year'><TMPL_VAR FIELD-FROM_YEAR
-><TMPL_IF NAME="COMMENT-FROM_YEAR"><span class='comment'><TMPL_VAR COMMENT-FROM_YEAR></span></TMPL_IF
-><TMPL_IF NAME="ERROR-FROM_YEAR"><span class='error'><TMPL_VAR ERROR-FROM_YEAR></span></TMPL_IF
-></td>
-<td class='from_hour'>à <TMPL_VAR FIELD-FROM_HOUR
->h<TMPL_IF NAME="COMMENT-FROM_HOUR"><span class='comment'><TMPL_VAR COMMENT-FROM_HOUR></span></TMPL_IF
-><TMPL_IF NAME="ERROR-FROM_HOUR"><span class='error'><TMPL_VAR ERROR-FROM_HOUR></span></TMPL_IF
-></td>
-<td class='from_minute'><TMPL_VAR FIELD-FROM_MINUTE
->min<TMPL_IF NAME="COMMENT-FROM_MINUTE"><span class='comment'><TMPL_VAR COMMENT-FROM_MINUTE></span></TMPL_IF
-><TMPL_IF NAME="ERROR-FROM_MINUTE"><span class='error'><TMPL_VAR ERROR-FROM_MINUTE></span></TMPL_IF
-></td>
-<td></td>
-<td>jours du mois</td>
-</tr>
-<tr>
-<td>Au :<TMPL_IF NAME="ERROR-TO_DATE"><span class='error'><TMPL_VAR ERROR-TO_DATE></span></TMPL_IF></td>
-<td class='to_day'><TMPL_VAR FIELD-TO_DAY
-><TMPL_IF NAME="COMMENT-TO_DAY"><span class='comment'><TMPL_VAR COMMENT-TO_DAY></span></TMPL_IF
-><TMPL_IF NAME="ERROR-TO_DAY"><span class='error'><TMPL_VAR ERROR-TO_DAY></span></TMPL_IF
-></td>
-<td class='to_month'><TMPL_VAR FIELD-TO_MONTH
-><TMPL_IF NAME="COMMENT-TO_MONTH"><span class='comment'><TMPL_VAR COMMENT-TO_MONTH></span></TMPL_IF
-><TMPL_IF NAME="ERROR-TO_MONTH"><span class='error'><TMPL_VAR ERROR-TO_MONTH></span></TMPL_IF
-></td>
-<td class='to_year'><TMPL_VAR FIELD-TO_YEAR
-><TMPL_IF NAME="COMMENT-TO_YEAR"><span class='comment'><TMPL_VAR COMMENT-TO_YEAR></span></TMPL_IF
-><TMPL_IF NAME="ERROR-TO_YEAR"><span class='error'><TMPL_VAR ERROR-TO_YEAR></span></TMPL_IF
-></td>
-<td class='to_hour'>à <TMPL_VAR FIELD-TO_HOUR
->h<TMPL_IF NAME="COMMENT-TO_HOUR"><span class='comment'><TMPL_VAR COMMENT-TO_HOUR></span></TMPL_IF
-><TMPL_IF NAME="ERROR-TO_HOUR"><span class='error'><TMPL_VAR ERROR-TO_HOUR></span></TMPL_IF
-></td>
-<td class='to_minute'><TMPL_VAR FIELD-TO_MINUTE
->min<TMPL_IF NAME="COMMENT-TO_MINUTE"><span class='comment'><TMPL_VAR COMMENT-TO_MINUTE></span></TMPL_IF
-><TMPL_IF NAME="ERROR-TO_MINUTE"><span class='error'><TMPL_VAR ERROR-TO_MINUTE></span></TMPL_IF
-></td>
-<td></td>
-<td class='dom' rowspan='7'><TMPL_VAR FIELD-DOM></td>
-</tr>
-<tr>
-<td>Incrément :<TMPL_IF NAME="ERROR-INC_DUR"><span class='error'><TMPL_VAR ERROR-INC_DUR></span></TMPL_IF></td>
-<td class='inc_year'><TMPL_VAR FIELD-INC_YEAR
->année(s)<TMPL_IF NAME="COMMENT-INC_YEAR"><span class='comment'><TMPL_VAR COMMENT-INC_YEAR></span></TMPL_IF
-><TMPL_IF NAME="ERROR-INC_YEAR"><span class='error'><TMPL_VAR ERROR-INC_YEAR></span></TMPL_IF
-></td>
-<td class='inc_month'><TMPL_VAR FIELD-INC_MONTH
->mois<TMPL_IF NAME="COMMENT-INC_MONTH"><span class='comment'><TMPL_VAR COMMENT-INC_MONTH></span></TMPL_IF
-><TMPL_IF NAME="ERROR-INC_MONTH"><span class='error'><TMPL_VAR ERROR-INC_MONTH></span></TMPL_IF
-></td>
-<td class='inc_week'><TMPL_VAR FIELD-INC_WEEK
->semaine(s)<TMPL_IF NAME="COMMENT-INC_WEEK"><span class='comment'><TMPL_VAR COMMENT-INC_WEEK></span></TMPL_IF
-><TMPL_IF NAME="ERROR-INC_WEEK"><span class='error'><TMPL_VAR ERROR-INC_WEEK></span></TMPL_IF
-></td>
-<td class='inc_day'><TMPL_VAR FIELD-INC_DAY
->jour(s)<TMPL_IF NAME="COMMENT-INC_DAY"><span class='comment'><TMPL_VAR COMMENT-INC_DAY></span></TMPL_IF
-><TMPL_IF NAME="ERROR-INC_DAY"><span class='error'><TMPL_VAR ERROR-INC_DAY></span></TMPL_IF
-></td>
-<td><TMPL_VAR FIELD-INC_HOUR
->heure(s)<TMPL_IF NAME="COMMENT-INC_HOUR"><span class='comment'><TMPL_VAR COMMENT-INC_HOUR></span></TMPL_IF
-><TMPL_IF NAME="ERROR-INC_HOUR"><span class='error'><TMPL_VAR ERROR-INC_HOUR></span></TMPL_IF
-></td>
-<td class='inc_minute'><TMPL_VAR FIELD-INC_MINUTE
->minute(s)<TMPL_IF NAME="COMMENT-INC_MINUTE"><span class='comment'><TMPL_VAR COMMENT-INC_MINUTE></span></TMPL_IF
-><TMPL_IF NAME="ERROR-INC_MINUTE"><span class='error'><TMPL_VAR ERROR-INC_MINUTE></span></TMPL_IF
-></td>
-</tr>
-<tr>
-<td class='end'>Fin :<TMPL_IF NAME="ERROR-END_DATE"><span class='error'><TMPL_VAR ERROR-END_DATE></span></TMPL_IF
-><span class='times'><TMPL_VAR FIELD-END_TIMES
->fois<TMPL_IF NAME="COMMENT-END_TIMES"><span class='comment'><TMPL_VAR COMMENT-END_TIMES></span></TMPL_IF
-><TMPL_IF NAME="ERROR-END_TIMES"><span class='error'><TMPL_VAR ERROR-END_TIMES></span></TMPL_IF
-></span></td>
-<td class='end_day'><TMPL_VAR FIELD-END_DAY
-><TMPL_IF NAME="COMMENT-END_DAY"><span class='comment'><TMPL_VAR COMMENT-END_DAY></span></TMPL_IF
-><TMPL_IF NAME="ERROR-END_DAY"><span class='error'><TMPL_VAR ERROR-END_DAY></span></TMPL_IF
-></td>
-<td class='end_month'><TMPL_VAR FIELD-END_MONTH
-><TMPL_IF NAME="COMMENT-END_MONTH"><span class='comment'><TMPL_VAR COMMENT-END_MONTH></span></TMPL_IF
-><TMPL_IF NAME="ERROR-END_MONTH"><span class='error'><TMPL_VAR ERROR-END_MONTH></span></TMPL_IF
-></td>
-<td class='end_year'><TMPL_VAR FIELD-END_YEAR
-><TMPL_IF NAME="COMMENT-END_YEAR"><span class='comment'><TMPL_VAR COMMENT-END_YEAR></span></TMPL_IF
-><TMPL_IF NAME="ERROR-END_YEAR"><span class='error'><TMPL_VAR ERROR-END_YEAR></span></TMPL_IF
-></td>
-<td class='end_hour'>à <TMPL_VAR FIELD-END_HOUR
->h<TMPL_IF NAME="COMMENT-END_HOUR"><span class='comment'><TMPL_VAR COMMENT-END_HOUR></span></TMPL_IF
-><TMPL_IF NAME="ERROR-END_HOUR"><span class='error'><TMPL_VAR ERROR-END_HOUR></span></TMPL_IF
-></td>
-<td class='end_minute'><TMPL_VAR FIELD-END_MINUTE
->min<TMPL_IF NAME="COMMENT-END_MINUTE"><span class='comment'><TMPL_VAR COMMENT-END_MINUTE></span></TMPL_IF
-><TMPL_IF NAME="ERROR-END_MINUTE"><span class='error'><TMPL_VAR ERROR-END_MINUTE></span></TMPL_IF
-></td>
-</tr>
-<tr>
-<td class='name'>Nom :</td>
-<td class='name-value' colspan='6'><TMPL_VAR FIELD-NAME
-><TMPL_IF NAME="COMMENT-NAME"><span class='comment'><TMPL_VAR COMMENT-NAME></span></TMPL_IF
-><TMPL_IF NAME="ERROR-NAME"><span class='error'><TMPL_VAR ERROR-NAME></span></TMPL_IF
-></td>
-</tr>
-<tr>
-<td class='content' colspan='7' rowspan='3'><TMPL_VAR FIELD-CONTENT></td>
-</tr>
-<tr>
-</tr>
-<tr>
-</tr>
-</tbody>
-</table>
-<TMPL_VAR FORM-RESET>
-<TMPL_VAR FORM-SUBMIT>
-<TMPL_VAR HELPONFORMATTINGLINK>
-<TMPL_VAR FORM-END>
-
-<TMPL_IF NAME="PREVIEW">
-<hr class="preview"/>
-<div id="preview"><TMPL_VAR PREVIEW></div>
-</TMPL_IF>
-
-<TMPL_IF NAME="EVENTS">
-<hr class="events"/>
-<table id="events">
-<thead>
-<tr>
-<th><TMPL_VAR YEAR></th>
-<th><TMPL_VAR MONTH></th>
-<th><TMPL_VAR DAY></th>
-<th><TMPL_VAR HOUR></th>
-<th><TMPL_VAR PAGE></th>
-</tr>
-</thead>
-<tbody>
-<TMPL_LOOP NAME="EVENTS">
-<tr>
-<td><TMPL_VAR FROM_YEAR></td>
-<td><TMPL_VAR FROM_MONTH>(<TMPL_VAR FROM_MONTHNAME>)</td>
-<td><TMPL_VAR FROM_DAY>(<TMPL_VAR FROM_DOWNAME>)</td>
-<td><TMPL_VAR FROM_HOUR>:<TMPL_VAR FROM_MINUTE></td>
-<td><TMPL_VAR PAGE></td>
-</tr>
-</TMPL_LOOP>
-</tbody>
-</table>
-</TMPL_IF>
diff --git a/3615/templates/neweventcontent.tmpl b/3615/templates/neweventcontent.tmpl
deleted file mode 100644 (file)
index 8afb956..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!tag<TMPL_LOOP NAME="TAGS"> "<TMPL_VAR NAME>"</TMPL_LOOP>]]
-
-Blah
diff --git a/3615/templates/neweventday.tmpl b/3615/templates/neweventday.tmpl
deleted file mode 100644 (file)
index 8e1a824..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-[[!meta title="<TMPL_VAR DAY> - <TMPL_VAR DAYNAME>"]]
-
-[[!events type="day" day="<TMPL_VAR DAY>"
- base="<TMPL_VAR BASE>"
- pages="(page(Agenda/%Y/%m/%d/*) or page(./%d/*)) and !*/Discussion"
- ]]
diff --git a/3615/templates/neweventmonth.tmpl b/3615/templates/neweventmonth.tmpl
deleted file mode 100644 (file)
index f6cdb83..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!meta title="<TMPL_VAR MONTH> - <TMPL_VAR MONTHNAME>"]]
-
-[[!events type="month" month="<TMPL_VAR MONTH>"
- base="<TMPL_VAR BASE>"
- pages="(  page(Agenda/%Y/%m/*/*)
-        or page(./%m/*/*)
-        ) and !*/Discussion"
- ]]
diff --git a/3615/templates/neweventpage.tmpl b/3615/templates/neweventpage.tmpl
deleted file mode 100644 (file)
index ceb0a33..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-[[!meta date="<TMPL_VAR FROM_DATE>"]]
-<TMPL_VAR CONTENT><TMPL_IF NAME="EVENT_FIRST"><TMPL_IF NAME="EVENT_LAST"><TMPL_ELSE>
-<TMPL_LOOP NAME="EVENTS">
-[[!trailitem "<TMPL_VAR PAGE>"]]</TMPL_LOOP></TMPL_IF></TMPL_IF>
diff --git a/Lieu/Pantin.mdwn b/Lieu/Pantin.mdwn
new file mode 100644 (file)
index 0000000..e69de29
index d947ee0..d2ba426 100644 (file)
@@ -6,8 +6,14 @@
  pages="page(Presse/%Y/%m/*/*)
         and !*/Discussion"
  ]]
-## Le mois prochain
-[[!events type="month" month="+1"
+## Le mois précédent
+[[!events type="month" month="-1"
+ base="Presse"
+ pages="page(Presse/%Y/%m/*/*)
+        and !*/Discussion"
+ ]]
+## Le précédent mois précédent
+[[!events type="month" month="-2"
  base="Presse"
  pages="page(Presse/%Y/%m/*/*)
         and !*/Discussion"
index 5f13378..324dedc 100644 (file)
@@ -1,5 +1,6 @@
 [[!meta title="02 - février"]]
 
 [[!events type="month" month="02"
+ base="Presse"
  pages="page(./%m/*/*) and !*/Discussion"
  ]]
index 7992c7c..8978a18 100644 (file)
@@ -1,8 +1,6 @@
 [[!meta title="18 - mardi"]]
-[[!meta date="2014-02-18T00:00:00"]]
 
-# Évènements du jour
-[[!map
- pages="page(./18/*) and !*/Discussion"
- show="title"
+[[!events type="day" day="18"
+ base="Presse"
+ pages="page(./%d/*) and !*/Discussion"
  ]]
index 84182b0..2c5004e 100644 (file)
@@ -1,5 +1,6 @@
 [[!meta title="03 - mars"]]
 
 [[!events type="month" month="03"
+ base="Presse"
  pages="page(./%m/*/*) and !*/Discussion"
  ]]
index 2562dd9..01bf655 100644 (file)
@@ -1,8 +1,6 @@
 [[!meta title="03 - lundi"]]
-[[!meta date="2014-03-03T00:00:00"]]
 
-# Évènements du jour
-[[!map
- pages="page(./03/*) and !*/Discussion"
- show="title"
+[[!events type="day" day="03"
+ base="Presse"
+ pages="page(./%d/*) and !*/Discussion"
  ]]
index 17e9e0d..8f0fcd8 100644 (file)
@@ -1,8 +1,6 @@
 [[!meta title="06 - jeudi"]]
-[[!meta date="2014-03-06T00:00:00"]]
 
-# Évènements du jour
-[[!map
- pages="page(./06/*) and !*/Discussion"
- show="title"
+[[!events type="day" day="06"
+ base="Presse"
+ pages="page(./%d/*) and !*/Discussion"
  ]]
index d59e2fb..182d8ab 100644 (file)
@@ -1,8 +1,6 @@
 [[!meta title="13 - jeudi"]]
-[[!meta date="2014-03-13T00:00:00"]]
 
-# Évènements du jour
-[[!map
- pages="page(./13/*) and !*/Discussion"
- show="title"
+[[!events type="day" day="13"
+ base="Presse"
+ pages="page(./%d/*) and !*/Discussion"
  ]]
diff --git a/Presse/2014/04.mdwn b/Presse/2014/04.mdwn
new file mode 100644 (file)
index 0000000..3836669
--- /dev/null
@@ -0,0 +1,6 @@
+[[!meta title="04 - avril"]]
+
+[[!events type="month" month="04"
+ base="Presse"
+ pages="page(./%m/*/*) and !*/Discussion"
+ ]]
diff --git a/Presse/2014/04/04.mdwn b/Presse/2014/04/04.mdwn
new file mode 100644 (file)
index 0000000..35a8ba9
--- /dev/null
@@ -0,0 +1,6 @@
+[[!meta title="04 - vendredi"]]
+
+[[!events type="day" day="04"
+ base="Presse"
+ pages="page(./%d/*) and !*/Discussion"
+ ]]
diff --git a/Presse/2014/04/04/Cyclofficine_:_bourse_aux_vélos_à_Pantin_ce_dimanche_6_avril.mdwn b/Presse/2014/04/04/Cyclofficine_:_bourse_aux_vélos_à_Pantin_ce_dimanche_6_avril.mdwn
new file mode 100644 (file)
index 0000000..adbe603
--- /dev/null
@@ -0,0 +1,11 @@
+[[!meta date="2014-04-04T00:00:00"]]
+[[!tag
+       Agenda/2014/04/06/09h00-19h00/Bourse_aux_vélos_à_Pantin
+       Cyclofficine/Pantin
+       Organisme/Bagnolet_en_Vert
+ ]]
+* [Cyclofficine : bourse aux vélos à Pantin ce dimanche 6 avril](http://www.bagnoletenvert.com/article-cyclofficine-bourse-aux-velos-a-pantin-ce-dimanche-6-avril-123218868.html)
+<div class="website">
+<iframe frameborder="1" scrolling="yes" marginwidth="5" marginheight="5"
+ src="http://www.bagnoletenvert.com/article-cyclofficine-bourse-aux-velos-a-pantin-ce-dimanche-6-avril-123218868.html"></iframe>
+</div>
diff --git a/Presse/templates/neweventcontent.tmpl b/Presse/templates/neweventcontent.tmpl
new file mode 100644 (file)
index 0000000..4d27929
--- /dev/null
@@ -0,0 +1,7 @@
+[[!tag
+ ]]
+* [Titre de l’article](http://lien-vers-article)
+<div class="website">
+<iframe frameborder="1" scrolling="yes" marginwidth="5" marginheight="5"
+ src="http://lien-vers-article"></iframe>
+</div>