From: Olivier Tétard <olivier.tetard@miskin.fr>
Date: Wed, 11 Dec 2013 08:59:36 +0000 (+0100)
Subject: Merge remote-tracking branch 'cedric/refactor/nommage_inclure'
X-Git-Url: http://olivier.miskin.fr/git/?a=commitdiff_plain;h=a481dd24e143ea258da99cf600d69f7d5ad96862;hp=1f9e3e5c4eb3dd6b5a01391471b3fe4ccbafcfb4;p=spip_souscriptions.git

Merge remote-tracking branch 'cedric/refactor/nommage_inclure'

Amélioration du nommage des fichiers <INCLURE>
---

diff --git a/formulaires/configurer_souscription.html b/formulaires/configurer_souscription.html
index 409031c..9ef857f 100644
--- a/formulaires/configurer_souscription.html
+++ b/formulaires/configurer_souscription.html
@@ -171,4 +171,4 @@
 	</div>
 	</form>
 </div>
-<INCLURE{fond=formulaires/inc-formulaires-suite} />
+<INCLURE{fond=formulaires/inc-souscription-suites} />
diff --git a/formulaires/editer_souscription_campagne.html b/formulaires/editer_souscription_campagne.html
index e14cb95..ef94722 100644
--- a/formulaires/editer_souscription_campagne.html
+++ b/formulaires/editer_souscription_campagne.html
@@ -132,7 +132,7 @@
   </form>
   ]
 </div>
-<INCLURE{fond=formulaires/inc-formulaires-suite} />
+<INCLURE{fond=formulaires/inc-souscription-suites} />
 <script type="application/javascript">
 function up_visibility_montants(){
 	var val = jQuery('select[name="type_saisie"]').val();
diff --git a/formulaires/inc-formulaires-suite.html b/formulaires/inc-souscription-suites.html
similarity index 100%
rename from formulaires/inc-formulaires-suite.html
rename to formulaires/inc-souscription-suites.html
diff --git a/formulaires/souscription.html b/formulaires/souscription.html
index 7d7184a..776109d 100644
--- a/formulaires/souscription.html
+++ b/formulaires/souscription.html
@@ -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}}}
diff --git a/inclure/presentation_type.html b/inclure/presentation_type.html
deleted file mode 100644
index 8b6535f..0000000
--- a/inclure/presentation_type.html
+++ /dev/null
@@ -1 +0,0 @@
-[(#INCLURE{fond=#VAL{inclure/presentation_type_}|concat{#ENV{type_objectif}}})]
diff --git a/modeles/avancement-campagne.html b/inclure/souscription/avancement-campagne.html
similarity index 100%
rename from modeles/avancement-campagne.html
rename to inclure/souscription/avancement-campagne.html
diff --git a/inclure/souscription_bloc_fiscal_adhesion.html b/inclure/souscription/bloc_fiscal_adhesion.html
similarity index 100%
rename from inclure/souscription_bloc_fiscal_adhesion.html
rename to inclure/souscription/bloc_fiscal_adhesion.html
diff --git a/inclure/souscription_bloc_fiscal_don.html b/inclure/souscription/bloc_fiscal_don.html
similarity index 100%
rename from inclure/souscription_bloc_fiscal_don.html
rename to inclure/souscription/bloc_fiscal_don.html
diff --git a/inclure/souscription/bloc_fiscal_intro.html b/inclure/souscription/bloc_fiscal_intro.html
new file mode 100644
index 0000000..0ea3a8a
--- /dev/null
+++ b/inclure/souscription/bloc_fiscal_intro.html
@@ -0,0 +1 @@
+[(#INCLURE{fond=#VAL{inclure/souscription/bloc_fiscal_}|concat{#ENV{type_souscription}}})]
diff --git a/inclure/objectif_atteint.html b/inclure/souscription/objectif_atteint.html
similarity index 100%
rename from inclure/objectif_atteint.html
rename to inclure/souscription/objectif_atteint.html
diff --git a/inclure/souscription/presentation_type.html b/inclure/souscription/presentation_type.html
new file mode 100644
index 0000000..725b6b6
--- /dev/null
+++ b/inclure/souscription/presentation_type.html
@@ -0,0 +1 @@
+[(#INCLURE{fond=#VAL{inclure/souscription/presentation_type_}|concat{#ENV{type_objectif}}})]
diff --git a/inclure/presentation_type_adhesion.html b/inclure/souscription/presentation_type_adhesion.html
similarity index 100%
rename from inclure/presentation_type_adhesion.html
rename to inclure/souscription/presentation_type_adhesion.html
diff --git a/inclure/presentation_type_don.html b/inclure/souscription/presentation_type_don.html
similarity index 100%
rename from inclure/presentation_type_don.html
rename to inclure/souscription/presentation_type_don.html
diff --git a/inclure/souscription_bloc_fiscal_intro.html b/inclure/souscription_bloc_fiscal_intro.html
deleted file mode 100644
index 42f36f3..0000000
--- a/inclure/souscription_bloc_fiscal_intro.html
+++ /dev/null
@@ -1 +0,0 @@
-[(#INCLURE{fond=#VAL{inclure/souscription_bloc_fiscal_}|concat{#ENV{type_souscription}}})]
diff --git a/modeles/souscription.html b/modeles/souscription.html
index ecfedc0..ffce4b1 100644
--- a/modeles/souscription.html
+++ b/modeles/souscription.html
@@ -1,14 +1,14 @@
 <BOUCLE_campagne(SOUSCRIPTION_CAMPAGNES){id_souscription_campagne=#ENV{campagne}}>
 <div class="souscription">
 <h3>#TITRE</h3>
-[<span class="souscription_type">(#INCLURE{fond=#VAL{inclure/presentation_type},type_objectif=#TYPE_OBJECTIF})</span>]
+[<span class="souscription_type">(#INCLURE{fond=#VAL{inclure/souscription/presentation_type},type_objectif=#TYPE_OBJECTIF})</span>]
 [<div class="souscription_presentation">(#TEXTE)</div>]
-[<div class="souscription_avancement">(#ENV{avancement}|!={non}|?{#MODELE{avancement-campagne,campagne=#ENV{campagne}}})</div>]
+[<div class="souscription_avancement">(#ENV{avancement}|!={non}|?{#INCLURE{fond=inclure/souscription/avancement-campagne,campagne=#ENV{campagne}}})</div>]
 [(#OBJECTIF_LIMITER|non|ou{#OBJECTIF_LIMITER|=={on}|oui|et{#AVANCEMENT_CAMPAGNE|<{#OBJECTIF}|oui}})
 #FORMULAIRE_SOUSCRIPTION{#ENV{campagne}}
 ]
 [(#OBJECTIF_LIMITER|=={on}|oui|et{#AVANCEMENT_CAMPAGNE|<{#OBJECTIF}|non})
-[(#INCLURE{fond=inclure/objectif_atteint,env})]
+[(#INCLURE{fond=inclure/souscription/objectif_atteint,env})]
 ]
 </div>
 </BOUCLE_campagne>