diff --git a/.gitattributes b/.gitattributes index ec585b63e693ac4307b887918c3434f5917eb14f..0fd33123c3bcecbdd6f540076759d696337dcb1a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6,7 +6,6 @@ dist/choix_mots.html -text dist/favicon.ico -text dist/puce.gif -text dist/puce_rtl.gif -text -dist/rien.gif -text dist/style_prive.html -text ecrire/action/autoriser.php -text ecrire/action/ical.php -text @@ -285,7 +284,6 @@ ecrire/img_pack/redacteurs-48.png -text ecrire/img_pack/redacteurs-admin-24.gif -text ecrire/img_pack/redacteurs-poubelle-24.gif -text ecrire/img_pack/referers-24.gif -text -ecrire/img_pack/rien.gif -text ecrire/img_pack/rond-b.gif -text ecrire/img_pack/rond-bd.gif -text ecrire/img_pack/rond-bg.gif -text @@ -377,4 +375,5 @@ ecrire/urls/page.php -text ecrire/urls/propres-qs.php -text /inc-public.php3 -text /index.php -text +/rien.gif -text /spip.php -text diff --git a/dist/spip_style.css b/dist/spip_style.css index 776881074a0705c8792da27f5557762426b0a4cd..bb8fe544aa09b18e004dee66078e305ca4a296be 100644 --- a/dist/spip_style.css +++ b/dist/spip_style.css @@ -169,7 +169,7 @@ input.formrecherche { * Images typographiques (via image_typo) */ .format_png { - behavior: url("win_png.htc"); + behavior: url("dist/win_png.htc"); } diff --git a/dist/style_prive.html b/dist/style_prive.html index 57c524a690f05aaebffc8d817652ef30af633fb9..282ed315b813943684c623b8974dccc21e6af715 100644 --- a/dist/style_prive.html +++ b/dist/style_prive.html @@ -41,7 +41,7 @@ img { border: 1px solid ##ENV{couleur_claire,edf3fe}; background-position: center bottom; float: none; - behavior: url(#EVAL{_DIR_IMG_PACK}win_width.htc); + behavior: url(#URL_SITE_SPIP/dist/win_width.htc); font-size: 12px; font-family: Verdana,Arial,Sans,sans-serif; } @@ -52,7 +52,7 @@ img { background-color: white; border: 1px solid ##ENV{couleur_claire,edf3fe}; background-position: center bottom; float: none; - behavior: url(#EVAL{_DIR_IMG_PACK}win_width.htc); + behavior: url(#URL_SITE_SPIP/dist/win_width.htc); font-size: 12px; font-family: Verdana,Arial,Sans,sans-serif; } @@ -231,7 +231,7 @@ a.icone26:hover { } a.icone26 img { vertical-align: middle; - behavior: url(../win_png.htc); + behavior: url(#URL_SITE_SPIP/dist/win_png.htc); background-color: ##ENV{couleur_foncee,3874b0}; } a.icone26:hover img { @@ -337,7 +337,7 @@ a.icone26:hover img { .cellule48 a img { - behavior: url(../win_png.htc); + behavior: url(#URL_SITE_SPIP/dist/win_png.htc); display: inline; margin: 4px; padding: 0px; @@ -1235,7 +1235,7 @@ a.spip_glossaire:hover { margin-top: 10px; padding: 5px; border: 1px solid #666666; - behavior: url(#EVAL{_DIR_IMG_PACK}win_width.htc); + behavior: url(#URL_SITE_SPIP/dist/win_width.htc); } blockquote.spip { margin-[(#ENV{ltr}|choixsiegal{left,left,right})]: 40px; diff --git a/dist/win_png.htc b/dist/win_png.htc index 719f050b92f121f8a0dcff2d326360d7fca6310a..c6b9979291b95cce264002074b9edf163e558b2a 100755 --- a/dist/win_png.htc +++ b/dist/win_png.htc @@ -4,7 +4,7 @@ var supported = /MSIE (5\.5)|[6789]/.test(navigator.userAgent) && navigator.platform == "Win32"; var realSrc; -var blankSrc = "dist/rien.gif"; +var blankSrc = "rien.gif"; if (supported) fixImage(); @@ -39,7 +39,7 @@ function fixImage() { element.src = blankSrc; // set filter element.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + - src + "',sizingMethod='scale')"; + src + "',sizingMethod='image')"; } } diff --git a/ecrire/img_pack/rien.gif b/ecrire/img_pack/rien.gif deleted file mode 100644 index 73130b9919664ec9d423accc4952083c2cfbddef..0000000000000000000000000000000000000000 Binary files a/ecrire/img_pack/rien.gif and /dev/null differ diff --git a/ecrire/img_pack/win_width.htc b/ecrire/img_pack/win_width.htc deleted file mode 100644 index ed5a82973a63b170cec3c1884f914a87451a8de1..0000000000000000000000000000000000000000 --- a/ecrire/img_pack/win_width.htc +++ /dev/null @@ -1,23 +0,0 @@ -<public:component> -<public:property name="retrait"> -<script language="JScript"> - -function fixWidth(){ - if (element.className == "spip_cadre") retrait = 24; - else retrait = 16; - - if (element.offsetWidth) { - style.width = element.offsetWidth - retrait; - } else { - style.width = "90%"; - //alert (element.parentElement.tagName); - } -} - -var supported = /MSIE (5\.5)|[6789]/.test(navigator.userAgent) && navigator.platform == "Win32"; -if (supported) fixWidth(); - - -</script> -</public:component> - diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php index 0e1263cab4b6ea767eb94493dc81a56fae6db439..c4b343cd8224551225b374a9f85c1e6fa10b9a90 100644 --- a/ecrire/inc/presentation.php +++ b/ecrire/inc/presentation.php @@ -1736,7 +1736,7 @@ function envoi_link($nom_site_spip, $rubrique="") { // CSS espace prive . '<link rel="stylesheet" type="text/css" href="' - . generer_url_public('style_prive', $args) .'" /> + . generer_url_public('style_prive', $args."&rand=".rand(0,1000)) .'" /> ' // CSS calendrier . '<link rel="stylesheet" type="text/css" href="' diff --git a/dist/rien.gif b/rien.gif similarity index 100% rename from dist/rien.gif rename to rien.gif