diff --git a/.gitattributes b/.gitattributes index 2a7c1c243aae766501820634236389b6657e07e1..853d3aa2fa175dc9e3a2770f91e93666a5c33b38 100644 --- a/.gitattributes +++ b/.gitattributes @@ -23,23 +23,6 @@ formulaires/inc-lister_archive_jointe.html -text formulaires/inc-upload_document.html -text formulaires/joindre_document.html -text formulaires/joindre_document.php -text -images/audio-16.png -text -images/audio-22.png -text -images/audio-32.png -text -images/croissant-16.png -text -images/decroissant-16.png -text -images/distant-22.png -text -images/document-16.png -text -images/document-24.png -text -images/document-32.png -text -images/photo-16.png -text -images/photo-22.png -text -images/photo-32.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.png -text inc/choisir_mode_document.php -text inc/documenter_objet.php -text inc/documents.php -text @@ -87,6 +70,18 @@ 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/base/audio-16.png -text +prive/themes/spip/images/base/audio-22.png -text +prive/themes/spip/images/base/audio-32.png -text +prive/themes/spip/images/base/distant-22.png -text +prive/themes/spip/images/base/photo-16.png -text +prive/themes/spip/images/base/photo-22.png -text +prive/themes/spip/images/base/photo-32.png -text +prive/themes/spip/images/base/unreadable-22.png -text +prive/themes/spip/images/base/video-16.png -text +prive/themes/spip/images/base/video-22.png -text +prive/themes/spip/images/base/video-32.png -text +prive/themes/spip/images/base/vu-16.png -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 @@ -95,17 +90,25 @@ 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-16.png -text +prive/themes/spip/images/media-audio-24.png -text prive/themes/spip/images/media-audio-32.png -text +prive/themes/spip/images/media-image-16.png -text +prive/themes/spip/images/media-image-24.png -text prive/themes/spip/images/media-image-32.png -text +prive/themes/spip/images/media-video-16.png -text +prive/themes/spip/images/media-video-24.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/tourner-180-12.png -text +prive/themes/spip/images/tourner-droite-12.png -text +prive/themes/spip/images/tourner-gauche-12.png -text prive/themes/spip/images/vu-16-10.png -text +prive/themes/spip/images/vu-16.png -text +prive/themes/spip/images/vu-32.png -text squelettes/contenu/document.html -text squelettes/document.html -text squelettes/head/document.html -text diff --git a/formulaires/editer_document.html b/formulaires/editer_document.html index 20eb48fef98d3136fd30c6def5df722e969efe21..8d5f6f3b3c78f0ab9a60a8122b1369a03eab69b5 100644 --- a/formulaires/editer_document.html +++ b/formulaires/editer_document.html @@ -40,9 +40,9 @@ <label><:medias:label_apercu:></label> [(#ENV{apercu}|oui) <div class="tourner"> - <input class="image" type="image" name="tournerL90" src="#CHEMIN_IMAGE{tourner-gauche-10.png}" alt="<:medias:tourner_90L:>" /> - <input class="image" type="image" name="tournerR90" src="#CHEMIN_IMAGE{tourner-droite-10.png}" alt="<:medias:tourner_90R:>" /> - <input class="image" type="image" name="tourner180" src="#CHEMIN_IMAGE{tourner-180-10.png}" alt="<:medias:tourner_180:>" /> + <input class="image" type="image" name="tournerL90" src="#CHEMIN_IMAGE{tourner-gauche-12.png}" alt="<:medias:tourner_90L:>" /> + <input class="image" type="image" name="tournerR90" src="#CHEMIN_IMAGE{tourner-droite-12.png}" alt="<:medias:tourner_90R:>" /> + <input class="image" type="image" name="tourner180" src="#CHEMIN_IMAGE{tourner-180-12.png}" alt="<:medias:tourner_180:>" /> </div> [<a href='#ENV{apercu}'>(#ENV{apercu}|image_reduire{300,200})</a>] ] diff --git a/images/croissant-16.png b/images/croissant-16.png deleted file mode 100644 index fba525cbf58f8cc8339343beede3483feb551779..0000000000000000000000000000000000000000 Binary files a/images/croissant-16.png and /dev/null differ diff --git a/images/decroissant-16.png b/images/decroissant-16.png deleted file mode 100644 index 706d109314484586b31ff04c7dedd03336cb6312..0000000000000000000000000000000000000000 Binary files a/images/decroissant-16.png and /dev/null differ diff --git a/images/document-16.png b/images/document-16.png deleted file mode 100644 index f93078194dace800212c0a05f999f335d39d4fc0..0000000000000000000000000000000000000000 Binary files a/images/document-16.png and /dev/null differ diff --git a/images/document-24.png b/images/document-24.png deleted file mode 100644 index 3d511c6b9ae8e6e4c461af4851d2776515bab6ba..0000000000000000000000000000000000000000 Binary files a/images/document-24.png and /dev/null differ diff --git a/images/document-32.png b/images/document-32.png deleted file mode 100644 index bc5e97e036e342f622a2b5fc16ad90054b0866d2..0000000000000000000000000000000000000000 Binary files a/images/document-32.png and /dev/null differ diff --git a/modeles/document_case.html b/modeles/document_case.html index 2b97ef7b1e755241d4320c1cb4eab67b57e074b6..de52bc53ebb1797d324f4faf66ec110ee765e679 100644 --- a/modeles/document_case.html +++ b/modeles/document_case.html @@ -16,9 +16,9 @@ <div class="infos"> [(#EXTENSION|match{gif|png|jpg}|oui) #SET{id,#ID_VIGNETTE|?{#ID_VIGNETTE,#ID_DOCUMENT}} <div class="tourner"> - [(#BOUTON_ACTION{[(#CHEMIN_IMAGE{tourner-gauche-10.png}|balise_img{<:medias:tourner_90L:>})],#URL_ACTION_AUTEUR{tourner,#GET{id}|concat{',-90'},#SELF},ajax})] - [(#BOUTON_ACTION{[(#CHEMIN_IMAGE{tourner-droite-10.png}|balise_img{<:medias:tourner_90R:>})],#URL_ACTION_AUTEUR{tourner,#GET{id}|concat{',90'},#SELF},ajax})] - [(#BOUTON_ACTION{[(#CHEMIN_IMAGE{tourner-180-10.png}|balise_img{<:medias:tourner_180:>})],#URL_ACTION_AUTEUR{tourner,#GET{id}|concat{',180'},#SELF},ajax})] + [(#BOUTON_ACTION{[(#CHEMIN_IMAGE{tourner-gauche-12.png}|balise_img{<:medias:tourner_90L:>})],#URL_ACTION_AUTEUR{tourner,#GET{id}|concat{',-90'},#SELF},ajax})] + [(#BOUTON_ACTION{[(#CHEMIN_IMAGE{tourner-droite-12.png}|balise_img{<:medias:tourner_90R:>})],#URL_ACTION_AUTEUR{tourner,#GET{id}|concat{',90'},#SELF},ajax})] + [(#BOUTON_ACTION{[(#CHEMIN_IMAGE{tourner-180-12.png}|balise_img{<:medias:tourner_180:>})],#URL_ACTION_AUTEUR{tourner,#GET{id}|concat{',180'},#SELF},ajax})] </div>] [(#LOGO_DOCUMENT{#URL_DOCUMENT})] <BOUCLE_type_doc(TYPES_DOCUMENTS){extension}> diff --git a/modeles/document_desc.html b/modeles/document_desc.html index ef6743753b0eb387e45450cd558e8c655a60e2ca..690276398800a5d70108eca554d5a2c411c6b930 100644 --- a/modeles/document_desc.html +++ b/modeles/document_desc.html @@ -10,9 +10,9 @@ <div class="item #MODE vu_#VU statut_#STATUT[(#DISTANT|=={oui}|oui)distant]" id="doc#ID_DOCUMENT"> [(#EXTENSION|match{gif|png|jpg}|oui) #SET{id,#ID_VIGNETTE|?{#ID_VIGNETTE,#ID_DOCUMENT}} <div class="tourner"> - [(#BOUTON_ACTION{[(#CHEMIN_IMAGE{tourner-gauche-10.png}|balise_img{<:medias:tourner_90L:>})],#URL_ACTION_AUTEUR{tourner,#GET{id}|concat{',-90'},#SELF},ajax})] - [(#BOUTON_ACTION{[(#CHEMIN_IMAGE{tourner-droite-10.png}|balise_img{<:medias:tourner_90R:>})],#URL_ACTION_AUTEUR{tourner,#GET{id}|concat{',90'},#SELF},ajax})] - [(#BOUTON_ACTION{[(#CHEMIN_IMAGE{tourner-180-10.png}|balise_img{<:medias:tourner_180:>})],#URL_ACTION_AUTEUR{tourner,#GET{id}|concat{',180'},#SELF},ajax})] + [(#BOUTON_ACTION{[(#CHEMIN_IMAGE{tourner-gauche-12.png}|balise_img{<:medias:tourner_90L:>})],#URL_ACTION_AUTEUR{tourner,#GET{id}|concat{',-90'},#SELF},ajax})] + [(#BOUTON_ACTION{[(#CHEMIN_IMAGE{tourner-droite-12.png}|balise_img{<:medias:tourner_90R:>})],#URL_ACTION_AUTEUR{tourner,#GET{id}|concat{',90'},#SELF},ajax})] + [(#BOUTON_ACTION{[(#CHEMIN_IMAGE{tourner-180-12.png}|balise_img{<:medias:tourner_180:>})],#URL_ACTION_AUTEUR{tourner,#GET{id}|concat{',180'},#SELF},ajax})] </div>] [(#LOGO_DOCUMENT{#URL_DOCUMENT,60,60})] <h4 class="titrem"> diff --git a/plugin.xml b/plugin.xml index 205d60dda9373a9333d1e731237da516fca3f1ed..1c82ca43ef3af2ae5540023fc10510300e7d7783 100644 --- a/plugin.xml +++ b/plugin.xml @@ -4,7 +4,7 @@ <icon>images/portfolio-64.png</icon> <version>2.0.0</version> <version_base>0.12.0</version_base> - <etat>dev</etat> + <etat>test</etat> <description>Gestion des medias de SPIP</description> <install>base/medias.php</install> <fonctions>medias_fonctions.php</fonctions> diff --git a/prive/squelettes/inclure/mediatheque-choisir.html b/prive/squelettes/inclure/mediatheque-choisir.html index b2f2febe718220c847bf026cac3613327a7f48ca..f2925d2c6c524927755d187844920f1b86122593 100644 --- a/prive/squelettes/inclure/mediatheque-choisir.html +++ b/prive/squelettes/inclure/mediatheque-choisir.html @@ -29,8 +29,8 @@ <td class='infos'> [(#DISTANT|=={oui}|non)#SET{missing,#FICHIER|file_exists|non}] [(#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:>' />] + [(#GET{missing}|oui)<img src='#CHEMIN_IMAGE{document-manquant-24.png}' width='24' height='24' alt='<:medias:fichier_manquant:>' />] + [(#DISTANT|=={oui}|oui)<img src='#CHEMIN_IMAGE{document-distant-24.png}' width='24' height='24' 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 ecf19e2ddf9714e8c132e3713aaa0ba42bba30e5..4f1a7c90df553da251deb004ae101f309af02043 100644 --- a/prive/squelettes/inclure/mediatheque-galerie.html +++ b/prive/squelettes/inclure/mediatheque-galerie.html @@ -30,8 +30,8 @@ <td class='infos'> [(#DISTANT|=={oui}|non)#SET{missing,#FICHIER|file_exists|non}] [(#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:>' />] + [(#GET{missing}|oui)<img src='#CHEMIN_IMAGE{document-manquant-24.png}' width='24' height='24' alt='<:medias:fichier_manquant:>' />] + [(#DISTANT|=={oui}|oui)<img src='#CHEMIN_IMAGE{document-distant-24.png}' width='24' height='24' alt='<:medias:fichier_distant:>' />] </td> <td class="id"> <strong>#ID_DOCUMENT</strong> diff --git a/prive/style_prive_plugin_medias.html b/prive/style_prive_plugin_medias.html index 547004dd148712086dd7590c892cbad2658e20f3..9b01bcd79e3908e937194d1cfb6766ee0d5a36e3 100644 --- a/prive/style_prive_plugin_medias.html +++ b/prive/style_prive_plugin_medias.html @@ -119,7 +119,7 @@ p.actions {clear:both;} #documents_joints .item .tourner {display:block;float:#GET{right};} #documents_joints .item .tourner button {padding:1px;border:1px solid #eee;display:block;} -#documents_joints .item .tourner button img {margin:1px;} +#documents_joints .item .tourner button img {margin:0px;} #documents_joints .item .actions > *, #documents_joints .item .tourner, @@ -134,7 +134,7 @@ p.actions {clear:both;} #portfolios .liste_items {margin-top:0;} #portfolios .item {clear:both;padding-#GET{left}:82px;padding-#GET{right}:2px;} #portfolios .item .tourner {display:block;float:#GET{right};} -#portfolios .item .tourner button {border:1px solid #999;padding:0 1px;display:block;float:#GET{left};margin-#GET{left}:4px;} +#portfolios .item .tourner button {border:1px solid #999;padding:0;display:block;float:#GET{left};margin-#GET{left}:4px;} #portfolios .item .spip_logos {margin-#GET{left}:-80px;float:#GET{left};display:inline;position:relative;} #portfolios .item .titrem {margin:0 0 5px;font-size:1em;} diff --git a/images/audio-16.png b/prive/themes/spip/images/base/audio-16.png similarity index 100% rename from images/audio-16.png rename to prive/themes/spip/images/base/audio-16.png diff --git a/images/audio-22.png b/prive/themes/spip/images/base/audio-22.png similarity index 100% rename from images/audio-22.png rename to prive/themes/spip/images/base/audio-22.png diff --git a/images/audio-32.png b/prive/themes/spip/images/base/audio-32.png similarity index 100% rename from images/audio-32.png rename to prive/themes/spip/images/base/audio-32.png diff --git a/images/distant-22.png b/prive/themes/spip/images/base/distant-22.png similarity index 100% rename from images/distant-22.png rename to prive/themes/spip/images/base/distant-22.png diff --git a/images/photo-16.png b/prive/themes/spip/images/base/photo-16.png similarity index 100% rename from images/photo-16.png rename to prive/themes/spip/images/base/photo-16.png diff --git a/images/photo-22.png b/prive/themes/spip/images/base/photo-22.png similarity index 100% rename from images/photo-22.png rename to prive/themes/spip/images/base/photo-22.png diff --git a/images/photo-32.png b/prive/themes/spip/images/base/photo-32.png similarity index 100% rename from images/photo-32.png rename to prive/themes/spip/images/base/photo-32.png diff --git a/images/unreadable-22.png b/prive/themes/spip/images/base/unreadable-22.png similarity index 100% rename from images/unreadable-22.png rename to prive/themes/spip/images/base/unreadable-22.png diff --git a/images/video-16.png b/prive/themes/spip/images/base/video-16.png similarity index 100% rename from images/video-16.png rename to prive/themes/spip/images/base/video-16.png diff --git a/images/video-22.png b/prive/themes/spip/images/base/video-22.png similarity index 100% rename from images/video-22.png rename to prive/themes/spip/images/base/video-22.png diff --git a/images/video-32.png b/prive/themes/spip/images/base/video-32.png similarity index 100% rename from images/video-32.png rename to prive/themes/spip/images/base/video-32.png diff --git a/images/vu-16.png b/prive/themes/spip/images/base/vu-16.png similarity index 100% rename from images/vu-16.png rename to prive/themes/spip/images/base/vu-16.png diff --git a/prive/themes/spip/images/document-vu-24.png b/prive/themes/spip/images/document-vu-24.png index 098451ee79a6eeba638f63d85ff06ad5949e9499..04afe324a9dec73c404940da74f7c9ef7b7b82ac 100644 Binary files a/prive/themes/spip/images/document-vu-24.png and b/prive/themes/spip/images/document-vu-24.png differ diff --git a/prive/themes/spip/images/media-audio-16.png b/prive/themes/spip/images/media-audio-16.png new file mode 100755 index 0000000000000000000000000000000000000000..b62bf2e94d9ece3937049fd992801b4eaee93908 Binary files /dev/null and b/prive/themes/spip/images/media-audio-16.png differ diff --git a/prive/themes/spip/images/media-audio-24.png b/prive/themes/spip/images/media-audio-24.png new file mode 100644 index 0000000000000000000000000000000000000000..3eed26de71af4e92dada65ed248f27a5250f9c7b Binary files /dev/null and b/prive/themes/spip/images/media-audio-24.png differ diff --git a/prive/themes/spip/images/media-audio-32.png b/prive/themes/spip/images/media-audio-32.png index 12693cca0b49d63ebc2dba84bb6a33a71855e69e..045748cc3e4f9cc81aaaddd63d5e760415efb72f 100644 Binary files a/prive/themes/spip/images/media-audio-32.png and b/prive/themes/spip/images/media-audio-32.png differ diff --git a/prive/themes/spip/images/media-image-16.png b/prive/themes/spip/images/media-image-16.png new file mode 100755 index 0000000000000000000000000000000000000000..3b98f2d0b8624421a34774f9553dbc1c70b65f95 Binary files /dev/null and b/prive/themes/spip/images/media-image-16.png differ diff --git a/prive/themes/spip/images/media-image-24.png b/prive/themes/spip/images/media-image-24.png new file mode 100644 index 0000000000000000000000000000000000000000..745a1925aea6e6ce46216b2d2679c882e82f91e6 Binary files /dev/null and b/prive/themes/spip/images/media-image-24.png differ diff --git a/prive/themes/spip/images/media-image-32.png b/prive/themes/spip/images/media-image-32.png index 8ca7f7005a974641915eb037ff845b70de34ea26..adcd7b26e5186001d71c0c15747bb8e349ca8d6d 100644 Binary files a/prive/themes/spip/images/media-image-32.png and b/prive/themes/spip/images/media-image-32.png differ diff --git a/prive/themes/spip/images/media-video-16.png b/prive/themes/spip/images/media-video-16.png new file mode 100755 index 0000000000000000000000000000000000000000..d612c8b793850b7838ef5e408de16d3e22094ffa Binary files /dev/null and b/prive/themes/spip/images/media-video-16.png differ diff --git a/prive/themes/spip/images/media-video-24.png b/prive/themes/spip/images/media-video-24.png new file mode 100644 index 0000000000000000000000000000000000000000..fb61b29c222fdea25ee4a23e9fe6ad65ccd68f21 Binary files /dev/null and b/prive/themes/spip/images/media-video-24.png differ diff --git a/prive/themes/spip/images/media-video-32.png b/prive/themes/spip/images/media-video-32.png index c6861991b8b708f41905a8289bb14afe22892d43..70e5a6896121091db614990cf2fb64c3b9761d48 100644 Binary files a/prive/themes/spip/images/media-video-32.png and b/prive/themes/spip/images/media-video-32.png differ diff --git a/prive/themes/spip/images/tourner-180-10.png b/prive/themes/spip/images/tourner-180-10.png deleted file mode 100644 index 205fa26c2d55adc322308b259178601bce02cb24..0000000000000000000000000000000000000000 Binary files a/prive/themes/spip/images/tourner-180-10.png and /dev/null differ diff --git a/prive/themes/spip/images/tourner-180-12.png b/prive/themes/spip/images/tourner-180-12.png new file mode 100644 index 0000000000000000000000000000000000000000..82577f8343f90fc27ad12c92f8004ae92d69bf5e Binary files /dev/null and b/prive/themes/spip/images/tourner-180-12.png differ diff --git a/prive/themes/spip/images/tourner-droite-10.png b/prive/themes/spip/images/tourner-droite-10.png deleted file mode 100644 index a247053e48c18526c60bd2b2c811f59256236262..0000000000000000000000000000000000000000 Binary files a/prive/themes/spip/images/tourner-droite-10.png and /dev/null differ diff --git a/prive/themes/spip/images/tourner-droite-12.png b/prive/themes/spip/images/tourner-droite-12.png new file mode 100644 index 0000000000000000000000000000000000000000..8aaad974ad802316d4433c400ad46fbe5ec797be Binary files /dev/null and b/prive/themes/spip/images/tourner-droite-12.png differ diff --git a/prive/themes/spip/images/tourner-gauche-10.png b/prive/themes/spip/images/tourner-gauche-10.png deleted file mode 100644 index 7a4dd63b51a91c580ae29e89f2af1777e97a0db9..0000000000000000000000000000000000000000 Binary files a/prive/themes/spip/images/tourner-gauche-10.png and /dev/null differ diff --git a/prive/themes/spip/images/tourner-gauche-12.png b/prive/themes/spip/images/tourner-gauche-12.png new file mode 100644 index 0000000000000000000000000000000000000000..d1a4df79c01f009ebe9b528fbc31a43eaab45e7d Binary files /dev/null and b/prive/themes/spip/images/tourner-gauche-12.png differ diff --git a/prive/themes/spip/images/vu-16-10.png b/prive/themes/spip/images/vu-16-10.png index ab4cfaad551fbbd8b9477b119cdfe8af82aa6923..0fb062f122b1d4f3bc731f8226abd26de65e7827 100644 Binary files a/prive/themes/spip/images/vu-16-10.png and b/prive/themes/spip/images/vu-16-10.png differ diff --git a/prive/themes/spip/images/vu-16.png b/prive/themes/spip/images/vu-16.png new file mode 100755 index 0000000000000000000000000000000000000000..403aaa4126f68d7eeed54fa620142905e600387e Binary files /dev/null and b/prive/themes/spip/images/vu-16.png differ diff --git a/prive/themes/spip/images/vu-32.png b/prive/themes/spip/images/vu-32.png new file mode 100755 index 0000000000000000000000000000000000000000..72edb6b701fb7deb90d293ee71e3fab6e58b949b Binary files /dev/null and b/prive/themes/spip/images/vu-32.png differ