Changeset 54002 in spip-zone

Timestamp:

Nov 3, 2011, 5:16:04 PM (9 years ago)

Author:

cedric@…

Message:

rangement
retablir la page des evenements en squelette
lien vers l'article depuis la boite info d'un evenement,
retablir le fonctionnement de la liste des evenements
bouton action pour supprimer un evenement

Location:

_plugins_/agenda/trunk

Files:

• agenda_pipelines.php (modified) (1 diff)
• exec/agenda_evenements.php (deleted)
• prive/objets/contenu/article-evenements.html (moved) (moved from _plugins_/agenda/trunk/prive/contenu/evenements_article.html) (1 diff)
• prive/objets/infos/evenement.html (added)
• prive/objets/liste/evenements-post.html (moved) (moved from _plugins_/agenda/trunk/prive/contenu/liste-evenements-post.html) (2 diffs)
• prive/squelettes/contenu/evenements.html (moved) (moved from _plugins_/agenda/trunk/prive/contenu/agenda_evenements.html) (1 diff)
• prive/squelettes/navigation/evenements.html (moved) (moved from _plugins_/agenda/trunk/prive/navigation/agenda_evenements.html)
• prive/style_prive_plugin_agenda.html (modified) (2 diffs)

_plugins_/agenda/trunk/agenda_pipelines.php

@@ -67 +67 @@
                         foreach($_GET as $key=>$val)
                                 $contexte[$key] = $val;
-                         $evenements = recuperer_fond('prive/contenu/evenements_article',$contexte);
+                         $evenements = recuperer_fond('prive/objets/contenu/article-evenements',$contexte);
                          $out .= $evenements;
                 }

_plugins_/agenda/trunk/prive/objets/contenu/article-evenements.html

@@ -1 +1 @@
 [(#REM) afficher les evenements de cet article]
 <div id="agenda">
-<INCLURE{fond=prive/contenu/agenda_evenements}{env}{pagine=5}>
+<INCLURE{fond=prive/squelettes/contenu/evenements}{env}{pagine=5}>
 </div>

_plugins_/agenda/trunk/prive/objets/liste/evenements-post.html

@@ -9 +9 @@
 </div>
 <ul class='liste_items liste-items evenements'>
-        <BOUCLE_agenda(EVENEMENTS){par date_debut}{pagination #ENV{pagine,20}}{age_relatif_debut<=0}{id_evenement?}{id_article?}{id_rubrique?}{id_mot?}{id_evenement_source?}>
+        <BOUCLE_agenda(EVENEMENTS){par date_debut}{pagination #ENV{pagine,20}}{age_relatif_debut<=0}{id_evenement?}{id_article?}{id_rubrique?}{id_mot?}{id_evenement_source?}{statut?}>
         <li class='item[ (#EXPOSE)][ (#ID_EVENEMENT_SOURCE|oui)repetition]'><div class='jour'>[(#DATE_DEBUT|affdate_jourcourt|unique)]</div>
                 [(#MODELE{evenement_vevent}|trim|sinon{'?'})]
@@ -22 +22 @@
                 </div>
                 </B_repetitions>
-                <p class='actions'>
-                        <span class='lien_article'>[<a href='[(#URL_ECRIRE{articles,id_article=#ID_ARTICLE})]'>Article</a>]</span>
+                <div class='actions'>
+                        <span class='lien_article'>[<a href='[(#URL_ECRIRE{article,id_article=#ID_ARTICLE})]'>Article</a>]</span>
                         [(#SESSION{statut}|=={'0minirezo'}|?{#INSCRIPTION|?{' ',''},''})<span class='lien_inscrits'>&#91;<a href='[(#URL_ECRIRE{agenda_inscriptions,id_evenement=#ID_EVENEMENT})]'><:agenda:liste_inscrits:></a>&#93;</span>]
-                        [<span class='lien_modifier'>&#91;<a(#ID_EVENEMENT_SOURCE|non) href='[(#URL_ECRIRE{evenement_edit,id_evenement=#ID_EVENEMENT}|parametre_url{retour,#SELF})]'><:bouton_modifier:></a>&#93;</span>]
+                        [<span class='lien_modifier'>&#91;<a(#ID_EVENEMENT_SOURCE|non) href='[(#URL_ECRIRE{evenement_edit,id_evenement=#ID_EVENEMENT}|parametre_url{redirect,#SELF})]'><:bouton_modifier:></a>&#93;</span>]
                         [<span class='lien_source'>&#91;<a class='ajax' (#ID_EVENEMENT_SOURCE|oui) href='[(#GET{self}|parametre_url{id_evenement,#ID_EVENEMENT_SOURCE}|parametre_url{date_debut,1900-01-01})]'>source</a>&#93;</span>]
-                        <span class='lien_supprimer'>[<a class='ajax' href='#URL_ACTION_AUTEUR{supprimer_evenement,#ID_EVENEMENT;#ID_ARTICLE,#SELF}'><:agenda:bouton_supprimer:></a>]</span>
-                </p>
+                        <span class='lien_supprimer'>[(#BOUTON_ACTION{<:agenda:bouton_supprimer:>,#URL_ACTION_AUTEUR{supprimer_evenement,#ID_EVENEMENT;#ID_ARTICLE,#SELF},ajax})]</span>
+                </div>
         </li>
         </BOUCLE_agenda>

_plugins_/agenda/trunk/prive/squelettes/contenu/evenements.html

@@ -8 +8 @@
         #SET{date_debut,#ENV{date_debut,#GET{date_debut}}}
 <//B_un>
-[(#INCLURE{fond=prive/contenu/liste-evenements-post}{date_debut=#GET{date_debut}}{env}{ajax})
+[(#INCLURE{fond=prive/objets/liste/evenements-post}{date_debut=#GET{date_debut}}{env}{ajax})
 <script type='text/javascript'>
 function set_vevent(){

_plugins_/agenda/trunk/prive/style_prive_plugin_agenda.html

@@ -21 +21 @@
 li.item div.vevent p {margin:2px 0 0;}
 li.item div.vevent p.date {font-size: 0.98em; }
-ul.evenements li.item.court p { display: none; }
+ul.evenements li.item.court p,ul.evenements li.item.court .actions { display: none; }
 li.item div.vevent p.category {font-size:0.9em;color:#999;}
 
@@ -35 +35 @@
 li.item .repetitions li {display:inline;margin:0;padding:0;}
 
-.evenements p.actions {text-align:right;font-size:0.9em;margin:5px 0 0;}
+.evenements .actions {text-align:right;font-size:0.9em;margin:5px 0 0;}
 
 /* sur la fiche rubriques */