fix: utiliser |attribut_url et |attribut_html dans les modèles

modeles/audio.html

@@ -16,7 +16,7 @@
   <div class="audio-wrapper"[ style='width:(#GET{largeur})px;max-width:100%;']>
   	<audio class="mejs mejs-#ID_DOCUMENT [ mejs-(#ENV{skin})]"
   	       data-id="[(#VAL{mejs-#ID_DOCUMENT}|concat{#ENV{skin}}|md5)]"
-  	       src="#URL_DOCUMENT"
+  	       src="[(#URL_DOCUMENT|attribut_url)]"
   	       type="#MIME_TYPE"
   	       preload="none"
   	       data-mejsoptions='{["iconSprite": "(#CHEMIN{lib/mejs/mejs-controls.svg})",]"alwaysShowControls": true[,"loop":(#ENV{loop}|?{true,false})],"audioWidth":"100%"[,"audioHeight":"(#ENV{hauteur})"][,"startVolume":"(#ENV{volume})"][,"duration":(#GET{duree})]}'

modeles/document_case.html

@@ -42,7 +42,7 @@
 				<//B_compte>
 				[(#AUTORISER{dissocierdocuments,#OBJET,#ID_OBJET})[(#BOUTON_ACTION{<:medias:bouton_enlever_document:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-#ID_DOCUMENT,#SELF},ajax btn_mini btn_secondaire,'','',[(function(){jQuery("#doc(#ID_DOCUMENT)").animateRemove();return true;})()]})]]
 				[(#AUTORISER{modifier,document,#ID_DOCUMENT}|oui)
-				<a href="#URL_ECRIRE{document_edit,id_document=#ID_DOCUMENT}" target="_blank" class="editbox btn btn_mini" tabindex="0" role="button"><:medias:bouton_modifier_document:></a>
+				<a href="[(#URL_ECRIRE{document_edit,id_document=#ID_DOCUMENT}|attribut_url)]" target="_blank" class="editbox btn btn_mini" tabindex="0" role="button"><:medias:bouton_modifier_document:></a>
 				]
 				[(#PIPELINE{document_desc_actions,#ARRAY{args,#ARRAY{id_document,#ID_DOCUMENT,position,document_case,objet,#OBJET,id_objet,#ID_OBJET},data,''}})]
 			</div>

modeles/document_desc.html

@@ -97,7 +97,7 @@ Distribue sous licence GPL
 				[(#AUTORISER{modifier,document,#ID_DOCUMENT}|oui)
 					<div class="deplacer-modifier">
 						<span class="deplacer-document" data-rang="#RANG_LIEN"><img src='#CHEMIN_IMAGE{deplacer-16.png}' width='16' height='16' alt='<:medias:ordonner_ce_document|attribut_html:>' title='<:medias:ordonner_ce_document|attribut_html:>' /></span>
-						<a href="#URL_ECRIRE{document_edit,id_document=#ID_DOCUMENT}" target="_blank" class="editbox btn btn_mini" tabindex="0" role="button"><:medias:bouton_modifier_document:></a>
+						<a href="[(#URL_ECRIRE{document_edit,id_document=#ID_DOCUMENT}|attribut_url)]" target="_blank" class="editbox btn btn_mini" tabindex="0" role="button"><:medias:bouton_modifier_document:></a>
 					</div>
 				]
 				[(#PIPELINE{document_desc_actions,#ARRAY{args,#ARRAY{id_document,#ID_DOCUMENT,position,document_desc,objet,#OBJET,id_objet,#ID_OBJET},data,''}})]

modeles/file.html

@@ -30,9 +30,9 @@
   (#ID_DOCUMENT|medias_modele_document_standard_attributs{file})
 ]>
 <figure class="spip_doc_inner">
-[<a href="(#GET{url})"[
-	class="(#ENV{lien_class}|concat{' spip_doc_lien'})"] title='[(#GET{title}|attribut_html)]'[
-	(#ENV{lien}|?{'',type="#MIME_TYPE"})]>]<img src='#GET{fichier}' width='#GET{width}' height='#GET{height}' alt='' />[(#GET{url}|?{</a>})]
+[<a href="(#GET{url}|attribut_url)"[
+	class="(#ENV{lien_class}|concat{' spip_doc_lien'}|attribut_html)"] title='[(#GET{title}|attribut_html)]'[
+	(#ENV{lien}|?{'',type="#MIME_TYPE"})]>]<img src='[(#GET{fichier}|attribut_url)]' width='[(#GET{width}|attribut_html)]' height='[(#GET{height}|attribut_html)]' alt='' />[(#GET{url}|?{</a>})]
 #GET{legende}
 </figure>
 </div>

modeles/file_emb_application.html

@@ -20,12 +20,12 @@
 ][(#EXTENSION|=={swf}|oui)
 <object classid='clsid:d27cdb6e-ae6d-11cf-96b8-444553540000'
  codebase='http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=#ENV{version,'6,0,0,0'}'
- width='#GET{largeur}' height='#GET{hauteur}'>
-	<param name='movie' value='#URL_DOCUMENT' />
+ width='[(#GET{largeur}|attribut_html)]' height='[(#GET{hauteur}|attribut_html)]'>
+	<param name='movie' value='[(#URL_DOCUMENT|attribut_url)]' />
 	[(#ENV{quality,''}|non)<param name="quality" value="high" />]
 	[(#ENV*|env_to_params)]
 	<!--\[if !IE\]> <-->
-	<object data="#URL_DOCUMENT" width='#GET{largeur}' height='#GET{hauteur}' type="application/x-shockwave-flash">
+	<object data="[(#URL_DOCUMENT|attribut_url)]" width='[(#GET{largeur}|attribut_html)]' height='[(#GET{hauteur}|attribut_html)]' type="application/x-shockwave-flash">
 		[(#ENV{quality,''}|non)<param name="quality" value="high" />]
 		[(#ENV*|env_to_params)]
 		<param name="pluginurl" value="http://www.macromedia.com/go/getflashplayer" />
@@ -34,11 +34,11 @@
 </object>
 #SET{done,1}
 ][(#GET{done,0}|non)
-<object width='#GET{largeur}' height='#GET{hauteur}'>
-<param name='movie' value='#URL_DOCUMENT' />
-<param name='src' value='#URL_DOCUMENT' />
+<object width='[(#GET{largeur}|attribut_html)]' height='[(#GET{hauteur}|attribut_html)]'>
+<param name='movie' value='[(#URL_DOCUMENT|attribut_url)]' />
+<param name='src' value='[(#URL_DOCUMENT|attribut_url)]' />
 [(#ENV*|env_to_params)]
-<embed src='#URL_DOCUMENT' [(#ENV*|env_to_attributs)] width='#GET{largeur}' height='#GET{hauteur}'></embed></object>
+<embed src='[(#URL_DOCUMENT|attribut_url)]' [(#ENV*|env_to_attributs)] width='[(#GET{largeur}|attribut_html)]' height='[(#GET{hauteur}|attribut_html)]'></embed></object>
 ][(#ENV{controls,''}|non)
 	#GET{legende}
 </figure>

modeles/file_emb_text_html.html

@@ -3,7 +3,7 @@
 ][<div
   class="[(#ID_DOCUMENT|medias_modele_document_standard_classes{text_html})]"[ 
   (#ID_DOCUMENT|medias_modele_document_standard_attributs{text_html})
-]><figure class="spip_doc_inner"><object data="(#URL_DOCUMENT)" width="100%" height="400"><a href="#URL_DOCUMENT">#FICHIER</a></object>
+]><figure class="spip_doc_inner"><object data="(#URL_DOCUMENT|attribut_url)" width="100%" height="400"><a href="[(#URL_DOCUMENT|attribut_url)]">#FICHIER</a></object>
 [(#GET{legende})
 ]</figure></div>
 ]</BOUCLE_texthtml>

modeles/image.html

@@ -7,7 +7,7 @@
 [(#SET{autolien,#MEDIA|media_determine_autolien{#EXTENSION,#LARGEUR,#HAUTEUR,#ID_DOCUMENT}|oui})]
 [(#SET{image,[(#ENV{largeur}|ou{#ENV{hauteur}}|?{
 		[(#FICHIER|image_reduire{#ENV{largeur,10000},#ENV{hauteur,10000}})],
-		[<img src='(#URL_DOCUMENT)'[ width="(#LARGEUR)"][ height="(#HAUTEUR)"]/>]})]})]
+		[<img src='(#URL_DOCUMENT|attribut_url)'[ width="(#LARGEUR|attribut_html)"][ height="(#HAUTEUR|attribut_html)"]/>]})]})]
 [(#SET{image,#GET{image}|inserer_attribut{alt,#ENV{alt,#ALT}|sinon{''}}})]
 [(#SET{legende,#INCLURE{fond=modeles/document_legende, env}|trim})]
 <div
@@ -15,8 +15,8 @@
   (#ID_DOCUMENT|medias_modele_document_standard_attributs{image})
 ]>
 <figure class="spip_doc_inner">
-[<a href="(#ENV{lien})"[ class="(#ENV{lien_class}|concat{' spip_doc_lien'}|trim)"]>]
-[(#ENV{lien}|non|et{#GET{autolien}})<a href="#URL_DOCUMENT" class="spip_doc_lien mediabox" type="#MIME_TYPE">]
+[<a href="(#ENV{lien}|attribut_url)"[ class="(#ENV{lien_class}|concat{' spip_doc_lien'}|trim|attribut_html)"]>]
+[(#ENV{lien}|non|et{#GET{autolien}})<a href="[(#URL_DOCUMENT|attribut_url)]" class="spip_doc_lien mediabox" type="#MIME_TYPE">]
 		#GET{image}
 [(#ENV{lien}|ou{#GET{autolien}}|?{</a>})]
 #GET{legende}

modeles/image_emb_svg.html

@@ -15,8 +15,8 @@
   (#ID_DOCUMENT|medias_modele_document_standard_attributs{image})
 ]>
 <figure class="spip_doc_inner">
-[<a href="(#ENV{lien})"[ class="(#ENV{lien_class}|concat{' spip_doc_lien'}|trim)"]>]
-[(#ENV{lien}|non|et{#GET{autolien}})<a href="#URL_DOCUMENT" class="spip_doc_lien mediabox" type="#MIME_TYPE">]
+[<a href="(#ENV{lien}|attribut_url)"[ class="(#ENV{lien_class}|concat{' spip_doc_lien'}|trim|attribut_html)"]>]
+[(#ENV{lien}|non|et{#GET{autolien}})<a href="[(#URL_DOCUMENT|attribut_url)]" class="spip_doc_lien mediabox" type="#MIME_TYPE">]
 		#GET{image}
 [(#ENV{lien}|ou{#GET{autolien}}|?{</a>})]
 #GET{legende}

modeles/logo.html

-[<a href="(#ENV{lien})">]<img
-	src="#ENV{logo_on}"
-	class="spip_logo[ spip_logo_(#ENV{align})][(#ENV{logo_off}|oui)spip_logo_survol]"[
-	width="(#ENV{width})"][
-	height="(#ENV{height})"]
+[<a href="(#ENV{lien}|attribut_url)">]<img
+	src="[(#ENV{logo_on}|attribut_url)]"
+	class="spip_logo[ spip_logo_(#ENV{align}|attribut_html)][(#ENV{logo_off}|oui)spip_logo_survol]"[
+	width="(#ENV{width}|attribut_html)"][
+	height="(#ENV{height}|attribut_html)"]
 	alt="[(#ENV{alt}|supprimer_tags|attribut_html)]"[
-	data-src-hover="(#ENV{logo_off})"]/>[(#ENV{lien}|?{</a>})]
+	data-src-hover="(#ENV{logo_off}|attribut_url)"]/>[(#ENV{lien}|?{</a>})]

modeles/video.html

@@ -26,15 +26,15 @@
 				preload="none"[
 				autoplay="autoplay"(#ENV{autoplay}|oui)]
 			>
-			<source type="[(#EXTENSION|in_array{#LISTE{mp4,webm,ogv}}|?{[(#MIME_TYPE|replace{application/,video/})],#MIME_TYPE})]" src="#URL_DOCUMENT" />
+			<source type="[(#EXTENSION|in_array{#LISTE{mp4,webm,ogv}}|?{[(#MIME_TYPE|replace{application/,video/})],#MIME_TYPE})]" src="[(#URL_DOCUMENT|attribut_url)]" />
 			[(#REM)
 
 				Flash fallback for non-HTML5 browsers without JavaScript
 
 			]<object width="#GET{largeur}" height="#GET{hauteur}" type="application/x-shockwave-flash" data="#CHEMIN{lib/mejs/mediaelement-flash-video.swf}">
 				<param name="movie" value="#CHEMIN{lib/mejs/mediaelement-flash-video.swf}" />
-				<param name="flashvars" value="controls=true&amp;file=#FICHIER" />
-				[(#REM) 
+				<param name="flashvars" value="controls=true&amp;file=[(#FICHIER|attribut_url)]" />
+				[(#REM)
 
 					Image as a last resort