From: Julien Moutinho <julm+ikiwiki+newevent@autogeree.net>
Date: Sat, 15 Mar 2014 06:24:17 +0000 (+0100)
Subject: fix templates/*.tmpl
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/%22%24mplink/%40%20%27info_date_publication_anterieure%27%20=%3E%20%27Previously%20published%20on:%27%2C%20%27info_date_referencement%27%20=%3E%20%27THIS%20SITE%20REFERENCED%20ON:%27%2C%20%27info_derniere_etape%27%20=%3E%20%27Done%21%27%2C-%27info_derniers_articles_publies%27%20=%3E%20%27Your%20most%20recently%20published%20articles%27%2C-%27info_desactiver_messagerie_personnelle%27%20=%3E%20%27You%20can%20enable%20or%20disable%20your%20personal%20messaging%20on%20this%20site.%27%2C%20%27info_descriptif%27%20=%3E%20%27Description:%27%2C%20%27info_desinstaller_plugin%27%20=%3E%20%27%20deactivates%20the%20plugin%20and%20deletes%20the%20data%27%2C%20%27info_discussion_cours%27%20=%3E%20%27Current%20discussions%27%2C%40%40%20-332%2C7%20%20284%2C6%20%40%40%20Do%20not%20submit%20this%20import%20request.%3Cp%3EFor%20more%20information%2C%20please%20see%20%3Ca%20href=?a=commitdiff_plain;h=2e54e9ef6272daa366ce74747b7f9112d0e3f3fa;p=ikiwiki%2Fevents.git

fix templates/*.tmpl
---

diff --git a/templates/newevent.tmpl b/templates/newevent.tmpl
index cd47150..a6cd754 100644
--- a/templates/newevent.tmpl
+++ b/templates/newevent.tmpl
@@ -1,6 +1,7 @@
 <TMPL_VAR JS-HEAD>
 <TMPL_VAR FORM-START>
 <TMPL_VAR FIELD-DO>
+<TMPL_VAR FIELD-BASE>
 <table class="newevent">
 <tbody>
 <tr>
diff --git a/templates/neweventday.tmpl b/templates/neweventday.tmpl
index 354f43a..6b137dd 100644
--- a/templates/neweventday.tmpl
+++ b/templates/neweventday.tmpl
@@ -1,7 +1,8 @@
 [[!meta title="<TMPL_VAR DAY> - <TMPL_VAR DAYNAME>"]]
 [[!meta date="<TMPL_VAR YEAR>-<TMPL_VAR MONTH>-<TMPL_VAR DAY>T00:00:00"]]
+
 # Évènements du jour
 [[!map
- pages="page(Agenda/<TMPL_VAR YEAR>/<TMPL_VAR MONTH>/<TMPL_VAR DAY>/*) and !*/Discussion"
+ pages="page(<TMPL_VAR BASE>/<TMPL_VAR YEAR>/<TMPL_VAR MONTH>/<TMPL_VAR DAY>/*) and !*/Discussion"
  show="title"
  ]]
diff --git a/templates/neweventmonth.tmpl b/templates/neweventmonth.tmpl
index 6a0c027..aa9e6ea 100644
--- a/templates/neweventmonth.tmpl
+++ b/templates/neweventmonth.tmpl
@@ -1,15 +1,11 @@
 [[!meta title="<TMPL_VAR MONTH> - <TMPL_VAR MONTHNAME>"]]
 [[!meta date="<TMPL_VAR YEAR>-<TMPL_VAR MONTH>-01T00:00:00"]]
-# Aperçu du mois
+
 [[!calendar
  month="<TMPL_VAR MONTH>"
- pages="page(Agenda/<TMPL_VAR YEAR>/<TMPL_VAR MONTH>/*/*) and !*/Discussion"
+ pages="page(<TMPL_VAR BASE>/<TMPL_VAR YEAR>/<TMPL_VAR MONTH>/*/*) and !*/Discussion"
+ popup="no"
  type="month"
  year="<TMPL_VAR YEAR>"
  week_start_day="1"
  ]]
-# Évènements du mois
-[[!map
- pages="page(Agenda/<TMPL_VAR YEAR>/*) and !*/Discussion"
- show="title"
- ]]