ajout ébauche 3615/
authorJulien Moutinho <julm@cyclocoop.org>
Thu, 27 Mar 2014 11:37:38 +0000 (12:37 +0100)
committerJulien Moutinho <julm@cyclocoop.org>
Thu, 27 Mar 2014 11:37:38 +0000 (12:37 +0100)
19 files changed:
.ikiwiki/lib/IkiWiki/Plugin/calendar
.ikiwiki/lib/IkiWiki/Plugin/newevent
3615.mdwn [new file with mode: 0644]
3615/Agenda.mdwn [new file with mode: 0644]
3615/Agenda/2014.mdwn [new file with mode: 0644]
3615/Agenda/2014/03/04.mdwn [deleted file]
3615/Agenda/2014/03/04/Newnew.mdwn [deleted file]
3615/Agenda/2014/05.mdwn [deleted file]
3615/Agenda/2014/05/03.mdwn [deleted file]
3615/Agenda/2014/05/03/New_event.mdwn [deleted file]
3615/recentchanges.mdwn [new file with mode: 0644]
3615/templates/newevent.tmpl [new file with mode: 0644]
3615/templates/neweventcontent.tmpl [new file with mode: 0644]
3615/templates/neweventday.tmpl [new file with mode: 0644]
3615/templates/neweventmonth.tmpl [new file with mode: 0644]
3615/templates/neweventpage.tmpl [new file with mode: 0644]
local.css
recentchanges.mdwn
templates/neweventmonth.tmpl

index 83cd152..806f6f0 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 83cd152475e5d97f4d3fe6d2fff76b0156e7b927
+Subproject commit 806f6f0b2ff51bf3cf9fdb4f9ac2c77dbeafc453
index 29d2861..a6478d7 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 29d286116ff9b7ca25e8ac52ccb43d3268bfcfad
+Subproject commit a6478d7f2e1f28bb2324a2fa6e030f73c412ed4b
diff --git a/3615.mdwn b/3615.mdwn
new file mode 100644 (file)
index 0000000..e5afc96
--- /dev/null
+++ b/3615.mdwn
@@ -0,0 +1,7 @@
+[[!meta title="3615 CYCLO"]]
+[[!action html="<a href='Agenda'><span>Agenda</span></a>"]]
+
+Perdu sur l’Internet ?  
+Pas de panique, ici vous êtes : sur le CycloTél !
+
+[[!map pages="page(./3615/*) and !./3615/Agenda/* and !*/Discussion" show="title"]]
diff --git a/3615/Agenda.mdwn b/3615/Agenda.mdwn
new file mode 100644 (file)
index 0000000..00a3852
--- /dev/null
@@ -0,0 +1,33 @@
+**Sommaire**
+[[!toc startlevel=0 levels=3]]
+
+# Ce mois-ci
+[[!calendar month="+0"
+ neweventbase="3615/Agenda"
+ pages="(  page(Agenda/*/*/*/*)
+        or page(./Agenda/*/*/*/*)
+        ) and !*/Discussion"
+ popup="no"
+ type="month"
+ week_start_day="1"
+ ]]
+# Le mois prochain
+[[!calendar month="+1"
+ neweventbase="3615/Agenda"
+ pages="(  page(Agenda/*/*/*/*)
+        or page(./Agenda/*/*/*/*)
+        ) and !*/Discussion"
+ popup="no"
+ type="month"
+ week_start_day="1"
+ ]]
+# Le prochain mois prochain
+[[!calendar month="+2"
+ neweventbase="3615/Agenda"
+ pages="(  page(Agenda/*/*/*/*)
+        or page(./Agenda/*/*/*/*)
+        ) and !*/Discussion"
+ popup="no"
+ type="month"
+ week_start_day="1"
+ ]]
diff --git a/3615/Agenda/2014.mdwn b/3615/Agenda/2014.mdwn
new file mode 100644 (file)
index 0000000..c0f6b9e
--- /dev/null
@@ -0,0 +1 @@
+[[!map pages="page(./2014/*) and !./*/*/* and !*/Discussion" show="title"]]
diff --git a/3615/Agenda/2014/03/04.mdwn b/3615/Agenda/2014/03/04.mdwn
deleted file mode 100644 (file)
index befd8fc..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-[[!meta title="04 - mardi"]]
-[[!meta date="2014-03-04T00:00:00"]]
-
-# Évènements privés du jour
-[[!map
- pages="( page(./04/*)
-        ) and !*/Discussion"
- show="title"
- ]]
-# Évènements publics du jour
-[[!map
- pages="(  page(Agenda/2014/03/04/*)
-        ) and !*/Discussion"
- show="title"
- ]]
diff --git a/3615/Agenda/2014/03/04/Newnew.mdwn b/3615/Agenda/2014/03/04/Newnew.mdwn
deleted file mode 100644 (file)
index 7414f32..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!meta date="2014-03-04T00:00:00"]]
-[[!tag
-Activité/Réunion
-Activité/Whatever
-Cyclofficine/Paris
- ]]
-
-Blah
diff --git a/3615/Agenda/2014/05.mdwn b/3615/Agenda/2014/05.mdwn
deleted file mode 100644 (file)
index 512a9ac..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[[!meta title="05 - mai"]]
-[[!meta date="2014-05-01T00:00:00"]]
-
-[[!calendar
- month="05"
- neweventbase="3615/Agenda"
- pages="page(./05/*/*) and !*/Discussion"
- popup="no"
- type="month"
- year="2014"
- week_start_day="1"
- ]]
diff --git a/3615/Agenda/2014/05/03.mdwn b/3615/Agenda/2014/05/03.mdwn
deleted file mode 100644 (file)
index 6fe4b46..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!meta title="03 - samedi"]]
-[[!meta date="2014-05-03T00:00:00"]]
-
-# Évènements du jour
-[[!map
- pages="page(./03/*) and !*/Discussion"
- show="title"
- ]]
diff --git a/3615/Agenda/2014/05/03/New_event.mdwn b/3615/Agenda/2014/05/03/New_event.mdwn
deleted file mode 100644 (file)
index 099fadc..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-[[!meta date="2014-05-03T00:00:00"]]
-[[!tag]]
-
-Blah
diff --git a/3615/recentchanges.mdwn b/3615/recentchanges.mdwn
new file mode 100644 (file)
index 0000000..d33abc4
--- /dev/null
@@ -0,0 +1,8 @@
+[[!if test="enabled(meta)" then="""
+[[!meta title="Dernières modifications"]]
+"""]]
+
+[[!inline
+ pages="internal(recentchanges/change_*) and !*/Discussion and /3615/*"
+ show=0
+ template=recentchanges]]
diff --git a/3615/templates/newevent.tmpl b/3615/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/templates/neweventcontent.tmpl b/3615/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/templates/neweventday.tmpl b/3615/templates/neweventday.tmpl
new file mode 100644 (file)
index 0000000..95b501c
--- /dev/null
@@ -0,0 +1,15 @@
+[[!meta title="<TMPL_VAR DAY> - <TMPL_VAR DAYNAME>"]]
+[[!meta date="<TMPL_VAR YEAR>-<TMPL_VAR MONTH>-<TMPL_VAR DAY>T00:00:00"]]
+
+# Évènements privés du jour
+[[!map
+ pages="(page(./<TMPL_VAR DAY>/*)
+        ) and !*/Discussion"
+ show="title"
+ ]]
+# Évènements publics du jour
+[[!map
+ pages="(page(Agenda/<TMPL_VAR YEAR>/<TMPL_VAR MONTH>/<TMPL_VAR DAY>/*)
+        ) and !*/Discussion"
+ show="title"
+ ]]
diff --git a/3615/templates/neweventmonth.tmpl b/3615/templates/neweventmonth.tmpl
new file mode 100644 (file)
index 0000000..25b5184
--- /dev/null
@@ -0,0 +1,14 @@
+[[!meta title="<TMPL_VAR MONTH> - <TMPL_VAR MONTHNAME>"]]
+[[!meta date="<TMPL_VAR YEAR>-<TMPL_VAR MONTH>-01T00:00:00"]]
+
+[[!calendar
+ month="<TMPL_VAR MONTH>"
+ neweventbase="<TMPL_VAR BASE>"
+ pages="(  page(Agenda/<TMPL_VAR YEAR>/<TMPL_VAR MONTH>/*/*)
+        or page(./<TMPL_VAR MONTH>/*/*)
+        ) and !*/Discussion"
+ popup="no"
+ type="month"
+ year="<TMPL_VAR YEAR>"
+ week_start_day="1"
+ ]]
diff --git a/3615/templates/neweventpage.tmpl b/3615/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>
index d6a46bc..1ccbba1 100644 (file)
--- a/local.css
+++ b/local.css
@@ -641,6 +641,14 @@ img.big {
        height:auto;
  }
 
+.calendar .no-popup .balloon > ul > li[class^='event-3615_'] {
+       border:1px solid black !important;
+       background-color:#DCC5A5;
+ }
+.calendar .no-popup .balloon > ul > li[class^='event-3615_'] > ul > li {
+       border:1px solid black !important;
+ }
+
 .tag-Atelier_de_quartier_Ivry-sur-Seine_Brandebourg {
        background-color:#FF4E50 !important;
  }
index cb3579b..c4326f3 100644 (file)
@@ -3,6 +3,6 @@
 """]]
 
 [[!inline
- pages="internal(recentchanges/change_*) and !*/Discussion"
+ pages="internal(recentchanges/change_*) and !*/Discussion and !/3615/*"
  show=0
  template=recentchanges]]
index 2823afc..2b8f3d4 100644 (file)
@@ -3,6 +3,7 @@
 
 [[!calendar
  month="<TMPL_VAR MONTH>"
+ neweventbase="<TMPL_VAR BASE>"
  pages="page(./<TMPL_VAR MONTH>/*/*) and !*/Discussion"
  popup="no"
  type="month"