X-Git-Url: http://olivier.miskin.fr/git/?a=blobdiff_plain;f=prive%2Fobjets%2Fliste%2Fsouscriptions.html;h=7f72867f11b7fa18325d741275942ffbc59ada10;hb=1a8acfa96559fbd8e9f6081d652c69bc8c694581;hp=edb2f8455b08b0a28127fe973727cf9378f13513;hpb=e4e52b6560b0230c44668bdab9460434a2427df1;p=spip_souscriptions.git

diff --git a/prive/objets/liste/souscriptions.html b/prive/objets/liste/souscriptions.html
index edb2f84..7f72867 100644
--- a/prive/objets/liste/souscriptions.html
+++ b/prive/objets/liste/souscriptions.html
@@ -12,22 +12,22 @@
 	<thead>
 		<tr class="first_row">
 			<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:>,ajax})]</th>
-			<th class="prenom" scope="col">[(#TRI{prenom,<:souscription:label_prenom:>,ajax})]</th>
 			<th class="nom" scope="col">[(#TRI{nom,<:souscription:label_nom:>,ajax})]</th>
 			<th class="date" scope="col">[(#TRI{date_souscription,<:date:>,ajax})]</th> 
-			<th class="statut" scope="col">[(#TRI{souscription_statut,<:statut:>,ajax})]</th> 
+			<th class="statut" scope="col">[(#TRI{statut,<:statut:>,ajax})]</th> 
 			<th class="id_souscription_campagne" scope="col">[(#TRI{id_souscription_campagne,<:souscription:label_campagne:>,ajax})]</th>
 			<th class="id" scope="col">[(#TRI{id_souscription,<:info_numero_abbreviation:>,ajax})]</th>
 		</tr>
 	</thead>
 	<tbody>
-	<BOUCLE_liste_souscriptions(SOUSCRIPTIONS transactions){id_transaction?}{id_mot?}{id_auteur?}{where?}{recherche?}{tri #ENV{par,num nom},#GET{defaut_tri}}{par nom}{pagination #ENV{nb,10}}>
+	<BOUCLE_liste_souscriptions(SOUSCRIPTIONS transactions){id_transaction?}{id_mot?}{id_auteur?}{where?}{recherche?}{type_souscription==#ENV{type_souscription,'.'}}{tri #ENV{par,num nom},#GET{defaut_tri}}{par nom}{pagination #ENV{nb,10}}>
 		<tr class="[(#COMPTEUR_BOUCLE|alterner{row_odd,row_even})]">
 			<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="prenom secondaire">[(#PRENOM)]</td> 
-			<td class="nom secondaire">[(#NOM)]</td> 
+			<td class="nom secondaire">#NOM #PRENOM</td> 
 			<td class="date secondaire">[(#DATE_SOUSCRIPTION|affdate_jourcourt)]</td> 
 			<td class="statut secondaire">[(#STATUT)]</td> 
 			<td class="id_souscription_campagne" scope="col">[(#ID_SOUSCRIPTION_CAMPAGNE)]</td>