Merge pull request #4 from Ybbet/master

Master
ipeos-and-co · Jun 13, 2017 · 81a77c2 · 81a77c2
2 parents 4ce9f73 + 179687d
commit 81a77c2
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 7 deletions.
diff --git a/paquet.xml b/paquet.xml
@@ -1,7 +1,7 @@
 <paquet
     prefix="comarquage"
     categorie="divers"
-    version="1.0.3"
+    version="1.0.4"
     etat="stable"
     compatibilite="[3.0.0;3.1.*]"
     logo="prive/themes/spip/images/picto-comarquage-service-public.png"

diff --git a/xml_templates/balises/attention.html b/xml_templates/balises/attention.html
@@ -10,4 +10,4 @@
   [(#CLE|=={titre}|non)<INCLURE{fond=xml_templates/balises/#CLE, env}{data=#VALEUR} />]
   </BOUCLE_elements>
 </div>
-</BOUCLE_attention>
+</BOUCLE_attention>
diff --git a/xml_templates/balises/cas.html b/xml_templates/balises/cas.html
@@ -11,7 +11,7 @@
       <div class="panel-heading" id="cas-head-#ENV{token}-#_cas:COMPTEUR_BOUCLE">
         <h4 class="panel-title">
           <a href="#[cas-#ENV{token}-(#_cas:COMPTEUR_BOUCLE)]" data-parent="#bloccas-#ENV{token}" data-toggle="collapse">
-            #VALEUR{0/children/paragraphe/0/children/0/texteinterne/0/text}
+            [(#VALEUR{0/children/paragraphe/0/children/0/texteinterne/0/text}|sinon{[(#VALEUR{0/children/paragraphe/0/text})]})]
         </a></h4>
       </div>]
     [(#_elements:COMPTEUR_BOUCLE|=={1}|oui)

diff --git a/xml_templates/balises/citation.html b/xml_templates/balises/citation.html
@@ -4,5 +4,5 @@
 -->]
 
 <BOUCLE_citation(DATA){source tableau, #ENV{data}}>
-  <blockquote class="xml-citation">[(#VALEUR{text})]</blockquote>
+<span class="xml-citation citation"><em>[(#VALEUR{text})]</em></span>
 </BOUCLE_citation>
diff --git a/xml_templates/balises/liste.html b/xml_templates/balises/liste.html
@@ -6,11 +6,13 @@
 <BOUCLE_liste(DATA){source tableau, #ENV{data}}>
 [(#VALEUR{attributes/type}|=={puce}|oui)<ul class="xml-liste">]
 <BOUCLE_elements(DATA){source tableau, #VALEUR{children/item}}>
+	<B_item_elements>
   <li class="xml-item">
   <BOUCLE_item_elements(DATA){source tableau, #VALEUR{children}}>
     <INCLURE{fond=xml_templates/balises/#CLE, env}{data=#VALEUR} />
   </BOUCLE_item_elements>
   </li>
+	</B_item_elements>
 </BOUCLE_elements>
 [(#VALEUR{attributes/type}|=={puce}|oui)</ul>]
 </BOUCLE_liste>
diff --git a/xml_templates/balises/reference.html b/xml_templates/balises/reference.html
@@ -16,6 +16,7 @@ <h3 class="panel-title"><:comarquage:reference:></h3>
 <BOUCLE_reference(DATA){source tableau, #ENV{data}}>
   <li><a href="#VALEUR{attributes/url}" target="_blank">[(#VALEUR{children/titre/0/text}) ]<i class="fa fa-external-link"></i></a>
     [<br />(#VALEUR{children/complement/0/text})]
+  </li>
 </BOUCLE_reference>
 </ul>
 [(#ENV{bloc}|!={non}|oui)

diff --git a/xml_templates/balises/serviceenligne.html b/xml_templates/balises/serviceenligne.html
@@ -16,11 +16,16 @@ <h3 class="panel-title"><:comarquage:services_en_ligne:></h3>
     <div class="panel-body">]
 <ul class="xml-serviceenligne">
 <BOUCLE_serviceenligne(DATA){source tableau, #ENV{data}}>
-  <li>
+	<li>
     [(#VALEUR{attributes/url}|oui)<a href="#VALEUR{attributes/url}" target="_blank">]
     [(#VALEUR{attributes/url}|non)<a href="[(#SELF|parametre_url{xml,#VALEUR{attributes/id}})]">]
-      #VALEUR{children/titre/0/text} [(#VALEUR{attributes/url}|oui)<i class="fa fa-external-link"></i>]</a><br />
-    <small class="xml-serviceenligne-source"><i>#VALEUR{children/source/0/text}</i></small>
+      #VALEUR{children/titre/0/text} [(#VALEUR{attributes/url}|oui)<i class="fa fa-external-link"></i>]</a>[ (#VALEUR{attributes/numerocerfa}|oui)<span class="cerfa">Cerfa n°[(#VALEUR{attributes/numerocerfa})]</span> ]<br />
+    [<small class="xml-serviceenligne-source"><i>(#VALEUR{children/source/0/text})</i></small>]
+	<B_children>
+	  <BOUCLE_children (DATA) {source tableau, #VALEUR{children}} {cle !IN source,titre}>
+		  <INCLURE{fond=xml_templates/balises/#CLE, env}{data=#VALEUR} />
+	  </BOUCLE_children>
+	</B_children>
   </li>
 </BOUCLE_serviceenligne>
 </ul>

diff --git a/xml_templates/balises/texteinterne.html b/xml_templates/balises/texteinterne.html
@@ -6,3 +6,4 @@
 <BOUCLE_texteinterne(DATA){source tableau, #ENV{data}}>
   <span class="texteinterne">#VALEUR{text}</span>
 </BOUCLE_texteinterne>
+[(#FILTRE{trim})]