From f6919fe6c93dbd76950e98305a6b42c84f01821d Mon Sep 17 00:00:00 2001
From: "cedric@yterium.com" <>
Date: Fri, 18 Mar 2011 07:56:17 +0000
Subject: [PATCH] deplacement des icones utiles et utilisation systematique de
#CHEMIN_IMAGE
---
.gitattributes | 24 +++++++++---------
formulaires/joindre_document.html | 6 ++---
modeles/document_case.html | 2 +-
modeles/document_desc.html | 4 +--
.../squelettes/inclure/ajouter-documents.html | 4 +--
prive/squelettes/inclure/document_infos.html | 4 +--
.../inclure/mediatheque-choisir.html | 10 ++++----
.../inclure/mediatheque-galerie.html | 10 ++++----
.../inclure/mediatheque-navigation.html | 2 +-
prive/style_prive_plugin_medias.html | 6 ++---
.../themes/spip/images}/distant-16.png | Bin
.../spip/images}/document-distant-24.png | Bin
.../spip/images}/document-manquant-24.png | Bin
.../themes/spip/images}/document-vu-24.png | Bin
.../themes/spip/images}/image-24.png | Bin
.../themes/spip/images}/media-audio-32.png | Bin
.../themes/spip/images}/media-image-32.png | Bin
.../themes/spip/images}/media-video-32.png | Bin
.../themes/spip/images}/portfolio-128.png | Bin
.../themes/spip/images}/portfolio-24.png | Bin
.../themes/spip/images}/portfolio-64.png | Bin
.../themes/spip/images}/vu-16-10.png | Bin
22 files changed, 36 insertions(+), 36 deletions(-)
rename {images => prive/themes/spip/images}/distant-16.png (100%)
rename {images => prive/themes/spip/images}/document-distant-24.png (100%)
rename {images => prive/themes/spip/images}/document-manquant-24.png (100%)
rename {images => prive/themes/spip/images}/document-vu-24.png (100%)
rename {images => prive/themes/spip/images}/image-24.png (100%)
rename {images => prive/themes/spip/images}/media-audio-32.png (100%)
rename {images => prive/themes/spip/images}/media-image-32.png (100%)
rename {images => prive/themes/spip/images}/media-video-32.png (100%)
rename {images => prive/themes/spip/images}/portfolio-128.png (100%)
rename {images => prive/themes/spip/images}/portfolio-24.png (100%)
rename {images => prive/themes/spip/images}/portfolio-64.png (100%)
rename {images => prive/themes/spip/images}/vu-16-10.png (100%)
diff --git a/.gitattributes b/.gitattributes
index b4ede189..2a7c1c24 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -28,29 +28,17 @@ images/audio-22.png -text
images/audio-32.png -text
images/croissant-16.png -text
images/decroissant-16.png -text
-images/distant-16.png -text
images/distant-22.png -text
images/document-16.png -text
images/document-24.png -text
images/document-32.png -text
-images/document-distant-24.png -text
-images/document-manquant-24.png -text
-images/document-vu-24.png -text
-images/image-24.png -text
-images/media-audio-32.png -text
-images/media-image-32.png -text
-images/media-video-32.png -text
images/photo-16.png -text
images/photo-22.png -text
images/photo-32.png -text
-images/portfolio-128.png -text
-images/portfolio-24.png -text
-images/portfolio-64.png -text
images/unreadable-22.png -text
images/video-16.png -text
images/video-22.png -text
images/video-32.png -text
-images/vu-16-10.png -text
images/vu-16.png -text
inc/choisir_mode_document.php -text
inc/documenter_objet.php -text
@@ -99,13 +87,25 @@ prive/squelettes/inclure/portfolio-documents.html -text
prive/squelettes/navigation/document_edit.html -text
prive/squelettes/top/mediatheque.html -text
prive/style_prive_plugin_medias.html -text
+prive/themes/spip/images/distant-16.png -text
prive/themes/spip/images/document-16.png -text
prive/themes/spip/images/document-24.png -text
prive/themes/spip/images/document-32.png -text
+prive/themes/spip/images/document-distant-24.png -text
+prive/themes/spip/images/document-manquant-24.png -text
+prive/themes/spip/images/document-vu-24.png -text
+prive/themes/spip/images/image-24.png -text
+prive/themes/spip/images/media-audio-32.png -text
+prive/themes/spip/images/media-image-32.png -text
+prive/themes/spip/images/media-video-32.png -text
+prive/themes/spip/images/portfolio-128.png -text
prive/themes/spip/images/portfolio-16.png -text
+prive/themes/spip/images/portfolio-24.png -text
+prive/themes/spip/images/portfolio-64.png -text
prive/themes/spip/images/tourner-180-10.png -text
prive/themes/spip/images/tourner-droite-10.png -text
prive/themes/spip/images/tourner-gauche-10.png -text
+prive/themes/spip/images/vu-16-10.png -text
squelettes/contenu/document.html -text
squelettes/document.html -text
squelettes/head/document.html -text
diff --git a/formulaires/joindre_document.html b/formulaires/joindre_document.html
index 4034b598..aeee7aa1 100644
--- a/formulaires/joindre_document.html
+++ b/formulaires/joindre_document.html
@@ -1,11 +1,11 @@
[(#ENV{editable})
<div class='formulaire_spip formulaire_joindre formulaire_joindre_document' id='formulaire_joindre_document-#ENV{id,new}'>
[(#ENV{mode}|=={image}|oui)
- <h3 class='titrem'>[(#CHEMIN{images/image-24.gif}|balise_img{'',cadre-icone})][(#ENV{id,new}|intval|?{<:medias:bouton_remplacer_image:>,<:bouton_ajouter_image:>}) #AIDER{ins_img}]</h3>
+ <h3 class='titrem'>[(#CHEMIN_IMAGE{image-24.png}|balise_img{'',cadre-icone})][(#ENV{id,new}|intval|?{<:medias:bouton_remplacer_image:>,<:bouton_ajouter_image:>}) #AIDER{ins_img}]</h3>
][(#ENV{mode}|=={document}|oui)
- <h3 class='titrem'>[(#CHEMIN{images/doc-24.gif}|balise_img{'',cadre-icone})][(#ENV{id,new}|intval|?{<:medias:bouton_remplacer_document:>,<:bouton_ajouter_document:>}) #AIDER{ins_doc}]</h3>
+ <h3 class='titrem'>[(#CHEMIN_IMAGE{doc-24.gif}|balise_img{'',cadre-icone})][(#ENV{id,new}|intval|?{<:medias:bouton_remplacer_document:>,<:bouton_ajouter_document:>}) #AIDER{ins_doc}]</h3>
][(#ENV{mode}|=={choix}|oui)
- <h3 class='titrem'>[(#CHEMIN{images/doc-24.gif}|balise_img{'',cadre-icone})][(#ENV{id,new}|intval|?{<:medias:bouton_remplacer_image_document:>,<:bouton_ajouter_image_document:>}) #AIDER{ins_doc}]</h3>
+ <h3 class='titrem'>[(#CHEMIN_IMAGE{doc-24.gif}|balise_img{'',cadre-icone})][(#ENV{id,new}|intval|?{<:medias:bouton_remplacer_image_document:>,<:bouton_ajouter_image_document:>}) #AIDER{ins_doc}]</h3>
]
<span class="image_loading"></span>
[<div class="reponse_formulaire reponse_formulaire_ok">(#ENV**{message_ok})</div>]
diff --git a/modeles/document_case.html b/modeles/document_case.html
index 113669b1..2b97ef7b 100644
--- a/modeles/document_case.html
+++ b/modeles/document_case.html
@@ -11,7 +11,7 @@
<h3 class="titrem">[<span class="fichier">(#FICHIER*|basename)</span>]
<span class="image_loading"></span>
[<span class="#EDIT{titre} titre">(#TITRE|sinon{<i class="sanstitre"><:info_sans_titre:></i>})</span>]
- [(#CHEMIN{#MODE|=={image}|?{images/image-24.gif,images/doc-24.gif}}|balise_img{'',cadre-icone})]
+ [(#CHEMIN_IMAGE{#MODE|=={image}|?{image-24.png,doc-24.gif}}|balise_img{'',cadre-icone})]
</h3>
<div class="infos">
[(#EXTENSION|match{gif|png|jpg}|oui) #SET{id,#ID_VIGNETTE|?{#ID_VIGNETTE,#ID_DOCUMENT}}
diff --git a/modeles/document_desc.html b/modeles/document_desc.html
index 5cb57093..ef674375 100644
--- a/modeles/document_desc.html
+++ b/modeles/document_desc.html
@@ -16,13 +16,13 @@
</div>]
[(#LOGO_DOCUMENT{#URL_DOCUMENT,60,60})]
<h4 class="titrem">
- [(#VU|=={oui}|oui)<img src='#CHEMIN{images/vu-16-10.png}' width='16' height='10' alt='<:medias:document_vu:>' title='<:medias:document_vu:>'/> ]
+ [(#VU|=={oui}|oui)<img src='#CHEMIN_IMAGES{vu-16-10.png}' width='16' height='10' alt='<:medias:document_vu:>' title='<:medias:document_vu:>'/> ]
[<span class="fichier">(#FICHIER*|basename)</span>]
[<span class="#EDIT{titre} titre">(#TITRE|sinon{<i class="sanstitre"><:info_sans_titre:></i>})</span>]
<span class="image_loading"></span>
</h4>
<div class="infos">
- [(#DISTANT|=={oui}|oui)<img src='#CHEMIN{images/distant-16.png}' width='16' height='16' alt='<:medias:fichier_distant:>' title='<:medias:fichier_distant:>'/> ]<:info_numero_abbreviation:>#ID_DOCUMENT - #EXTENSION - [(#TAILLE|taille_en_octets)]
+ [(#DISTANT|=={oui}|oui)<img src='#CHEMIN_IMAGES{distant-16.png}' width='16' height='16' alt='<:medias:fichier_distant:>' title='<:medias:fichier_distant:>'/> ]<:info_numero_abbreviation:>#ID_DOCUMENT - #EXTENSION - [(#TAILLE|taille_en_octets)]
</div>
[<div class="mode">(#INCLUS|=={image}|et{#EVAL{_BOUTON_MODE_IMAGE}}|oui)
[(#MODE|=={image}|oui)
diff --git a/prive/squelettes/inclure/ajouter-documents.html b/prive/squelettes/inclure/ajouter-documents.html
index d7e54a28..2012839a 100644
--- a/prive/squelettes/inclure/ajouter-documents.html
+++ b/prive/squelettes/inclure/ajouter-documents.html
@@ -1,11 +1,11 @@
[(#ENV{ajouter}|=={oui}|oui)
<div class='nettoyeur'></div>
-<a href='[(#SELF|parametre_url{ajouter,non})]' class='ajax bouton_fermer'>[(#CHEMIN{images/frame-close.png}|balise_img)]</a>
+<a href='[(#SELF|parametre_url{ajouter,non})]' class='ajax bouton_fermer'>[(#CHEMIN_IMAGE{fermer-16.png}|balise_img)]</a>
<div class="ajax">
#FORMULAIRE_JOINDRE_DOCUMENT{new,#ENV{id_objet,0},#ENV{objet,''}}
</div>
<div class='nettoyeur'></div>
]
[(#ENV{ajouter}|=={oui}|non)
-[(#SELF|parametre_url{ajouter,oui}|icone{<:medias:icone_creer_document:>,#CHEMIN{images/document-24.png},#LANG_RIGHT,creer.gif,ajax})]
+[(#SELF|parametre_url{ajouter,oui}|icone{<:medias:icone_creer_document:>,#CHEMIN_IMAGE{document-24.png},#LANG_RIGHT,creer.gif,ajax})]
]
diff --git a/prive/squelettes/inclure/document_infos.html b/prive/squelettes/inclure/document_infos.html
index 3b3a0b9d..5cbbfd7e 100644
--- a/prive/squelettes/inclure/document_infos.html
+++ b/prive/squelettes/inclure/document_infos.html
@@ -6,9 +6,9 @@
<h3>[(#TOTAL_BOUCLE|singulier_ou_pluriel{medias:une_utilisation,medias:des_utilisations})]</h3>
<ul class='liste_items'>
<BOUCLE_liens(documents_liens){id_document}>
- <li class='item #OBJET'>[(#CHEMIN{images/#OBJET|concat{-12.png}}|balise_img) ][(#ID_OBJET|lien_objet{#OBJET})]
+ <li class='item #OBJET'>[(#CHEMIN_IMAGE{#OBJET|info_objet{icone_objet}|concat{-16.png}}|balise_img) ][(#ID_OBJET|lien_objet{#OBJET})]
[(#VU|=={oui}|oui)
- [<span class='vu'>(#CHEMIN{images/document-vu-24.png}|balise_img|inserer_attribut{title,<:medias:document_vu:>}|inserer_attribut{alt,<:medias:document_vu:>})</span>]
+ [<span class='vu'>(#CHEMIN_IMAGE{document-vu-24.png}|balise_img|inserer_attribut{title,<:medias:document_vu:>}|inserer_attribut{alt,<:medias:document_vu:>})</span>]
]
</li>
</BOUCLE_liens>
diff --git a/prive/squelettes/inclure/mediatheque-choisir.html b/prive/squelettes/inclure/mediatheque-choisir.html
index 229ebdb6..b2f2febe 100644
--- a/prive/squelettes/inclure/mediatheque-choisir.html
+++ b/prive/squelettes/inclure/mediatheque-choisir.html
@@ -4,8 +4,8 @@
<h3>[(#GRAND_TOTAL|singulier_ou_pluriel{#VAL{medias:un_}|concat{#ENV{media,document}},#VAL{medias:des_}|concat{#ENV{media,document},s}})]</h3>
<div class='pagination tri'>
- [(#TRI{'<',#CHEMIN{images/tri_asc-16.png}|balise_img{<:medias:par_tri_croissant:>}}) |]
- [(#TRI{'>',#CHEMIN{images/tri_desc-16.png}|balise_img{<:medias:par_tri_decroissant:>}}) |]
+ [(#TRI{'>',#CHEMIN_IMAGE{tri-asc-16.png}|balise_img{<:medias:par_tri_croissant:>}}) |]
+ [(#TRI{'<',#CHEMIN_IMAGE{tri-desc-16.png}|balise_img{<:medias:par_tri_decroissant:>}}) |]
[(#TRI{id_document,<:medias:par_id:>}) |]
[(#TRI{date,<:medias:par_date:>}) |]
[(#TRI{taille,<:medias:par_taille:>}) |]
@@ -28,9 +28,9 @@
<tr class="[(#ENV{media}|non)[ media-(#MEDIA)]]" id="#ENV{iddoc,media}#ID_DOCUMENT">
<td class='infos'>
[(#DISTANT|=={oui}|non)#SET{missing,#FICHIER|file_exists|non}]
- [(#ENV{media}|non|et{#MEDIA|!={file}})[(#CHEMIN{images/media-#MEDIA|concat{-32.png}}|balise_img|inserer_attribut{alt,#VAL{medias:media_#MEDIA}|_T}|inserer_attribut{title,#VAL{medias:media_#MEDIA}|_T})]]
- [(#GET{missing}|oui)<img src='#CHEMIN{images/document-manquant-24.png}' width='22' height='22' alt='<:medias:fichier_manquant:>' />]
- [(#DISTANT|=={oui}|oui)<img src='#CHEMIN{images/document-distant-24.png}' width='22' height='22' alt='<:medias:fichier_distant:>' />]
+ [(#ENV{media}|non|et{#MEDIA|!={file}})[(#CHEMIN_IMAGE{media-#MEDIA|concat{-32.png}}|balise_img|inserer_attribut{alt,#VAL{medias:media_#MEDIA}|_T}|inserer_attribut{title,#VAL{medias:media_#MEDIA}|_T})]]
+ [(#GET{missing}|oui)<img src='#CHEMIN_IMAGE{document-manquant-24.png}' width='22' height='22' alt='<:medias:fichier_manquant:>' />]
+ [(#DISTANT|=={oui}|oui)<img src='#CHEMIN_IMAGE{document-distant-24.png}' width='22' height='22' alt='<:medias:fichier_distant:>' />]
</td>
<td class="id">
<strong>#ID_DOCUMENT</strong>
diff --git a/prive/squelettes/inclure/mediatheque-galerie.html b/prive/squelettes/inclure/mediatheque-galerie.html
index f37e4e22..ecf19e2d 100644
--- a/prive/squelettes/inclure/mediatheque-galerie.html
+++ b/prive/squelettes/inclure/mediatheque-galerie.html
@@ -5,8 +5,8 @@
<h2>[(#GRAND_TOTAL|singulier_ou_pluriel{#VAL{medias:un_}|concat{#ENV{media,document}},#VAL{medias:des_}|concat{#ENV{media,document},s}})]</h2>
<div class='pagination tri'>
- [(#TRI{'<',#CHEMIN{images/tri_asc-16.png}|balise_img{<:medias:par_tri_croissant:>}}) |]
- [(#TRI{'>',#CHEMIN{images/tri_desc-16.png}|balise_img{<:medias:par_tri_decroissant:>}}) |]
+ [(#TRI{'>',#CHEMIN_IMAGE{tri-asc-16.png}|balise_img{<:medias:par_tri_croissant:>}}) |]
+ [(#TRI{'<',#CHEMIN_IMAGE{tri-desc-16.png}|balise_img{<:medias:par_tri_decroissant:>}}) |]
[(#TRI{id_document,<:medias:par_id:>}) |]
[(#TRI{date,<:medias:par_date:>}) |]
[(#TRI{taille,<:medias:par_taille:>}) |]
@@ -29,9 +29,9 @@
<tr class="[(#ENV{media}|non)[ media-(#MEDIA)]]" id="#ENV{iddoc,media}#ID_DOCUMENT">
<td class='infos'>
[(#DISTANT|=={oui}|non)#SET{missing,#FICHIER|file_exists|non}]
- [(#ENV{media}|non|et{#MEDIA|!={file}})[(#CHEMIN{images/media-#MEDIA|concat{-32.png}}|balise_img|inserer_attribut{alt,#VAL{medias:media_#MEDIA}|_T}|inserer_attribut{title,#VAL{medias:media_#MEDIA}|_T})]]
- [(#GET{missing}|oui)<img src='#CHEMIN{images/document-manquant-24.png}' width='22' height='22' alt='<:medias:fichier_manquant:>' />]
- [(#DISTANT|=={oui}|oui)<img src='#CHEMIN{images/document-distant-24.png}' width='22' height='22' alt='<:medias:fichier_distant:>' />]
+ [(#ENV{media}|non|et{#MEDIA|!={file}})[(#CHEMIN_IMAGE{media-#MEDIA|concat{-32.png}}|balise_img|inserer_attribut{alt,#VAL{medias:media_#MEDIA}|_T}|inserer_attribut{title,#VAL{medias:media_#MEDIA}|_T})]]
+ [(#GET{missing}|oui)<img src='#CHEMIN_IMAGE{document-manquant-24.png}' width='22' height='22' alt='<:medias:fichier_manquant:>' />]
+ [(#DISTANT|=={oui}|oui)<img src='#CHEMIN_IMAGE{document-distant-24.png}' width='22' height='22' alt='<:medias:fichier_distant:>' />]
</td>
<td class="id">
<strong>#ID_DOCUMENT</strong>
diff --git a/prive/squelettes/inclure/mediatheque-navigation.html b/prive/squelettes/inclure/mediatheque-navigation.html
index 69b20164..cab6fd6e 100644
--- a/prive/squelettes/inclure/mediatheque-navigation.html
+++ b/prive/squelettes/inclure/mediatheque-navigation.html
@@ -15,7 +15,7 @@
</div>
[(#ENV{id_document}|oui)
-<a class='annule_filtre' href='[(#GET{self}|parametre_url{id_document,''})]' title="<:medias:tout_voir|attribut_html:>">[(#CHEMIN{images/annuler-recherche.png}|balise_img|inserer_attribut{alt,<:medias:tout_voir:>})]</a>
+<a class='annule_filtre' href='[(#GET{self}|parametre_url{id_document,''})]' title="<:medias:tout_voir|attribut_html:>">[(#CHEMIN_IMAGE{fermer-16.png}|balise_img|inserer_attribut{alt,<:medias:tout_voir:>})]</a>
]
<div class='onglets_simple second clearfix'>
diff --git a/prive/style_prive_plugin_medias.html b/prive/style_prive_plugin_medias.html
index 8843c642..547004dd 100644
--- a/prive/style_prive_plugin_medias.html
+++ b/prive/style_prive_plugin_medias.html
@@ -78,9 +78,9 @@ a.bouton_fermer {display:block;text-align:#GET{right};}
.galerie table .supprimer {display:block;font-size:0.8em;margin-top:1em;}
-.galerie.media-image h2 { background: url(#CHEMIN{images/media-image-32.png}) no-repeat center left; padding: 6px;padding-left: 40px;}
-.galerie.media-audio h2 { background: url(#CHEMIN{images/media-audio-32.png}) no-repeat center left; padding: 6px;padding-left: 40px;}
-.galerie.media-video h2 { background: url(#CHEMIN{images/media-video-32.png}) no-repeat center left; padding: 6px;padding-left: 40px;}
+.galerie.media-image h2 { background: url(#CHEMIN_IMAGE{media-image-32.png}) no-repeat center left; padding: 6px;padding-left: 40px;}
+.galerie.media-audio h2 { background: url(#CHEMIN_IMAGE{media-audio-32.png}) no-repeat center left; padding: 6px;padding-left: 40px;}
+.galerie.media-video h2 { background: url(#CHEMIN_IMAGE{media-video-32.png}) no-repeat center left; padding: 6px;padding-left: 40px;}
.galerie table td.exif { background-repeat: no-repeat; background-position: top right; }
diff --git a/images/distant-16.png b/prive/themes/spip/images/distant-16.png
similarity index 100%
rename from images/distant-16.png
rename to prive/themes/spip/images/distant-16.png
diff --git a/images/document-distant-24.png b/prive/themes/spip/images/document-distant-24.png
similarity index 100%
rename from images/document-distant-24.png
rename to prive/themes/spip/images/document-distant-24.png
diff --git a/images/document-manquant-24.png b/prive/themes/spip/images/document-manquant-24.png
similarity index 100%
rename from images/document-manquant-24.png
rename to prive/themes/spip/images/document-manquant-24.png
diff --git a/images/document-vu-24.png b/prive/themes/spip/images/document-vu-24.png
similarity index 100%
rename from images/document-vu-24.png
rename to prive/themes/spip/images/document-vu-24.png
diff --git a/images/image-24.png b/prive/themes/spip/images/image-24.png
similarity index 100%
rename from images/image-24.png
rename to prive/themes/spip/images/image-24.png
diff --git a/images/media-audio-32.png b/prive/themes/spip/images/media-audio-32.png
similarity index 100%
rename from images/media-audio-32.png
rename to prive/themes/spip/images/media-audio-32.png
diff --git a/images/media-image-32.png b/prive/themes/spip/images/media-image-32.png
similarity index 100%
rename from images/media-image-32.png
rename to prive/themes/spip/images/media-image-32.png
diff --git a/images/media-video-32.png b/prive/themes/spip/images/media-video-32.png
similarity index 100%
rename from images/media-video-32.png
rename to prive/themes/spip/images/media-video-32.png
diff --git a/images/portfolio-128.png b/prive/themes/spip/images/portfolio-128.png
similarity index 100%
rename from images/portfolio-128.png
rename to prive/themes/spip/images/portfolio-128.png
diff --git a/images/portfolio-24.png b/prive/themes/spip/images/portfolio-24.png
similarity index 100%
rename from images/portfolio-24.png
rename to prive/themes/spip/images/portfolio-24.png
diff --git a/images/portfolio-64.png b/prive/themes/spip/images/portfolio-64.png
similarity index 100%
rename from images/portfolio-64.png
rename to prive/themes/spip/images/portfolio-64.png
diff --git a/images/vu-16-10.png b/prive/themes/spip/images/vu-16-10.png
similarity index 100%
rename from images/vu-16-10.png
rename to prive/themes/spip/images/vu-16-10.png
--
GitLab