X-Git-Url: http://olivier.miskin.fr/git/?a=blobdiff_plain;f=formulaires%2Fsouscription.html;h=776109dccdca56486d8e8965aa67dddd76354289;hb=a481dd24e143ea258da99cf600d69f7d5ad96862;hp=4e3160b70446336040a3d1751a4cbe8adb897725;hpb=48fca8889301bfc7550924432854fa3791240d83;p=spip_souscriptions.git

diff --git a/formulaires/souscription.html b/formulaires/souscription.html
index 4e3160b..776109d 100644
--- a/formulaires/souscription.html
+++ b/formulaires/souscription.html
@@ -21,7 +21,7 @@
         <li class="editer editer_[(#GET{name})][ (#GET{obli})][ (#GET{erreurs}|oui)erreur]">
           <label for="#GET{name}">#ENV{montant_label}</label>[
           <span class='erreur_message'>(#GET{erreurs})</span>
-          ][<span class="input">(#INCLURE{fond=formulaires/inc-souscription-#ENV{montant_type},name=#GET{name},valeur=#ENV*{#GET{name},#GET{defaut}},obli=#GET{obli},montants=#ENV{_montant_datas}})</span>]
+          ][<span class="input">(#INCLURE{fond=formulaires/inc-souscription-#ENV{montant_type},name=#GET{name},valeur=#ENV*{#GET{name},#GET{defaut}},obli=#GET{obli},montants=#ENV{_montant_datas},montant_libre})</span>]
 	        [<p class="explication">(#ENV{montant_explication})</p>]
         </li>
 	      #SET{name,courriel}#SET{obli,'obligatoire'}#SET{defaut,''}#SET{erreurs,#ENV**{erreurs}|table_valeur{#GET{name}}}
@@ -45,7 +45,7 @@
 	      <li class="fieldset suite souscription_bloc_fiscal[(#ENV{#GET{name},#GET{defaut}}|=={#GET{val}}|non)none]">
 		      <fieldset>
 			      <legend><:souscription:label_legende_bloc_fiscal:></legend>
-			      [(#INCLURE{fond=inclure/souscription_bloc_fiscal_intro,type_souscription=#ENV{type_souscription}})]
+			      [(#INCLURE{fond=inclure/souscription/bloc_fiscal_intro,type_souscription=#ENV{type_souscription}})]
 			      <ul>
 				      #SET{name1,prenom}#SET{obli1,'obligatoire'}#SET{defaut1,''}#SET{erreurs1,#ENV**{erreurs}|table_valeur{#GET{name1}}}
 				      #SET{name2,nom}#SET{obli2,'obligatoire'}#SET{defaut2,''}#SET{erreurs2,#ENV**{erreurs}|table_valeur{#GET{name2}}}
@@ -109,10 +109,19 @@
 				</li>
 				]
 
-				[(#ENV{type_souscription}|=={adhesion}|oui)
-		      [(#CONFIG{souscription/proposer_informer_comite_local,off}|=={on}|oui)
-						[(#SAISIE{oui_non, informer_comite_local, label=<:souscription:label_informer_comite_local:> })]
-		      ]
+	      [(#ENV{type_souscription}|=={adhesion}|et{#CONFIG{souscription/proposer_informer_comite_local,off}|=={on}}|oui)
+	      #SET{name,informer_comite_local}#SET{obli,''}#SET{defaut,'non'}#SET{erreurs,#ENV**{erreurs}|table_valeur{#GET{name}}}
+	      <li class="editer editer_[(#GET{name})][ (#GET{obli})][ (#GET{erreurs}|oui)erreur]">[
+					<span class='erreur_message'>(#GET{erreurs})</span>
+					]
+					#SET{val,off}
+					<input type="hidden" name="#GET{name}" value="#GET{val}" />
+					#SET{val,on}
+					<div class="choix">
+						<input type="checkbox" name="#GET{name}" class="checkbox" id="#GET{name}_#GET{val}" value="#GET{val}"[(#ENV{#GET{name},#GET{defaut}}|=={#GET{val}}|oui)checked="checked"] />
+						<label for="#GET{name}_#GET{val}"><:souscription:label_informer_comite_local:></label>
+					</div>
+				</li>
 				]
       </ul>