X-Git-Url: http://olivier.miskin.fr/git/?a=blobdiff_plain;f=prive%2Fobjets%2Fliste%2Fsouscriptions.html;h=f1bd69efde94f2f300c55115926649cd26259f51;hb=5e9621b1173fe9af2289ed8c5da133c3786d222d;hp=f11dfceefefbeb85f81bb2a2e1106c479d4a9a8e;hpb=05b71fe10af9c1d866b1bf8f8cec0c42557a58b0;p=spip_souscriptions.git

diff --git a/prive/objets/liste/souscriptions.html b/prive/objets/liste/souscriptions.html
index f11dfce..f1bd69e 100644
--- a/prive/objets/liste/souscriptions.html
+++ b/prive/objets/liste/souscriptions.html
@@ -15,29 +15,29 @@
 	<thead>
 		<tr class="first_row">
 			<th class="id" scope="col">[(#TRI{id_souscription,<:info_numero_abbreviation:>,ajax})]</th>
+			<th class="type_souscription" scope="col">[(#TRI{type_souscription,Type,ajax})]</th>
 			<th class="courriel" scope="col">[(#TRI{courriel,<:souscription:label_courriel:>,ajax})]</th>
-			<th class="type_souscription" scope="col">[(#TRI{type_souscription,<:souscription:label_type_souscription:>,ajax})]</th>
-			<th class="montant" scope="col">[(#TRI{montant,<:souscription:label_montant_liste:>,ajax})]</th>
 			<th class="nom" scope="col">[(#TRI{nom,<:souscription:label_nom:>,ajax})]</th>
+			<th class="montant" scope="col">[(#TRI{montant,<:souscription:label_montant_liste:>,ajax})]</th>
 			<th class="date" scope="col">[(#TRI{date_souscription,<:date:>,ajax})]</th>
 			<th class="statut" scope="col">[(#TRI{statut,<:souscription:label_statut:>,ajax})]</th>
-			<th class="id_souscription_campagne" scope="col">[(#TRI{id_souscription_campagne,<:souscription:label_campagne:>,ajax})]</th>
+			<th class="id_souscription_campagne" scope="col">[(#TRI{id_souscription_campagne,C,ajax})]</th>
 		</tr>
 	</thead>
 	<tbody>
 	<BOUCLE_liste_souscriptions(SOUSCRIPTIONS transactions){id_transaction?}{id_mot?}{id_auteur?}{where?}{recherche?}{type_souscription==#ENV{type_souscription,'.'}}{statut==#ENV{statut_transaction,'.'}}{tri #ENV{par,id_souscription},#GET{defaut_tri}}{pagination #ENV{nb,10}}>
 		<tr class="[(#COMPTEUR_BOUCLE|alterner{row_odd,row_even})]">
-			<td class="id">[(#AUTORISER{modifier,souscription,#ID_SOUSCRIPTION}|?{
-				<a href="[(#URL_ECRIRE{souscription_edit,id_souscription=#ID_SOUSCRIPTION})]">#ID_SOUSCRIPTION</a>,
-				#ID_SOUSCRIPTION
-			})]</td>
-			<td class="courriel principale"><a href="[(#ID_SOUSCRIPTION|generer_url_entite{souscription})]" title="<:info_numero_abbreviation|attribut_html:> #ID_SOUSCRIPTION">[(#RANG). ]#COURRIEL</a></td>
-			<td class="type_souscription secondaire">[(#TYPE_SOUSCRIPTION)]</td>
-			<td class="montant secondaire">[(#MONTANT) €]</td>
+			<td class="id"><a href="[(#ID_SOUSCRIPTION|generer_url_entite{souscription})]"
+			                  title="<:info_numero_abbreviation|attribut_html:> #ID_SOUSCRIPTION">#ID_SOUSCRIPTION</a></td>
+			<td class="type_souscription"><a href="[(#ID_SOUSCRIPTION|generer_url_entite{souscription})]"
+			                  title="<:info_numero_abbreviation|attribut_html:> #ID_SOUSCRIPTION">[(#TYPE_SOUSCRIPTION)]</a></td>
+			<td class="courriel">#COURRIEL</td>
 			<td class="nom secondaire">#NOM #PRENOM</td>
-			<td class="date secondaire">[(#DATE_SOUSCRIPTION|affdate_jourcourt)]</td>
+			<td class="montant secondaire">[(#MONTANT) €]</td>
+			<td class="date secondaire">[(#DATE_SOUSCRIPTION|affdate{Y-m-d H:i:s})]</td>
 			<td class="statut secondaire">[(#STATUT)]</td>
-			<td class="id_souscription_campagne" scope="col">[(#ID_SOUSCRIPTION_CAMPAGNE)]</td>
+			<td class="id_souscription_campagne" scope="col"><a href="[(#ID_SOUSCRIPTION_CAMPAGNE|generer_url_entite{souscription_campagne})]"
+						                  title="<:info_numero_abbreviation|attribut_html:> #ID_SOUSCRIPTION_CAMPAGNE">#ID_SOUSCRIPTION_CAMPAGNE</a></td>
 		</tr>
 	</BOUCLE_liste_souscriptions>
 	</tbody>