diff --git a/.gitattributes b/.gitattributes
index 3a8a4a3a5f0cbe8e298d75e3fae4ffda4273afff..26ffe5014d0d80b6545c6c409b596e7a587f5b01 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -126,6 +126,10 @@ dist/images/jauge-jaune.gif -text
dist/images/jauge-rouge.gif -text
dist/images/jauge-test-gd.gif -text
dist/images/jauge-vert.gif -text
+dist/images/label-fond-gauche-left.gif -text
+dist/images/label-fond-gauche-right.gif -text
+dist/images/label-fond-haut-left.gif -text
+dist/images/label-fond-haut-right.gif -text
dist/images/langues-12.gif -text
dist/images/langues-24.gif -text
dist/images/langues-modif-12.gif -text
diff --git a/dist/engines-list.txt b/dist/engines-list.txt
index a7c63a57e92413cfbce403eb4e616f240b863d00..c87212578129806fcbce35957907d07f946ea629 100644
--- a/dist/engines-list.txt
+++ b/dist/engines-list.txt
@@ -21,6 +21,7 @@ rien=
www\.cegetel\.net
search\.conduit\.com
search\.sweetim\.com
+chello\.fr
[Voila]
(kw|rdata)=
diff --git a/dist/images/label-fond-gauche-left.gif b/dist/images/label-fond-gauche-left.gif
new file mode 100644
index 0000000000000000000000000000000000000000..221faa6755018485d57c52b4708f636a40db30f5
Binary files /dev/null and b/dist/images/label-fond-gauche-left.gif differ
diff --git a/dist/images/label-fond-gauche-right.gif b/dist/images/label-fond-gauche-right.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fab63f68b493e425c55ee383a837460f9760a1e0
Binary files /dev/null and b/dist/images/label-fond-gauche-right.gif differ
diff --git a/dist/images/label-fond-haut-left.gif b/dist/images/label-fond-haut-left.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a72fa4acc8300f2d698e8e1dfeb5373e2c59ee1a
Binary files /dev/null and b/dist/images/label-fond-haut-left.gif differ
diff --git a/dist/images/label-fond-haut-right.gif b/dist/images/label-fond-haut-right.gif
new file mode 100644
index 0000000000000000000000000000000000000000..efa3bfbc74a8b2b192ac65486c7e7b21829c2933
Binary files /dev/null and b/dist/images/label-fond-haut-right.gif differ
diff --git a/dist/prive/editer/article.html b/dist/prive/editer/article.html
index c71cc71fc71c7cbb7aa5760c1e7d43611e8b572f..74aff91887ba2104fe15790e0174cd2df0ccf6db 100644
--- a/dist/prive/editer/article.html
+++ b/dist/prive/editer/article.html
@@ -43,19 +43,19 @@ $(function(){
<fieldset dir="#LANG_DIR">
- <ol>
+ <ol class="formfx">
[(#ENV**{config}|table_valeur{articles_surtitre}|=={non}|?{#ENV**{surtitre,''},' '}|?{' '})
- <li>
+ <li class="gauche">
<label for="surtitre"><:texte_sur_titre:><em>#AIDER{arttitre}</em></label>
<input type='text' name='surtitre' id='surtitre' class='forml' value="[(#ENV**{surtitre}|entites_html)]" />
</li>]
- <li>
- <label for="titre"><:texte_titre_obligatoire:><em>#AIDER{arttitre}</em></label>
+ <li class="gauche gauche_obligatoire">
+ <label for="titre"><:info_titre:><em>#AIDER{arttitre}</em></label>
<input type='text' name='titre' id='titre' class='formo' value="[(#ENV**{titre,#REM|concat{info_nouvel_article}|_T}|entites_html)]"
[(#ENV{titre,''}|?{'',' '})onfocus="if(!antifocus){this.value='';antifocus=true;}"]/>
</li>
[(#ENV**{config}|table_valeur{articles_soustitre}|=={non}|?{#ENV**{soustitre,''},' '}|?{' '})
- <li>
+ <li class="gauche">
<label for="soustitre"><:texte_sous_titre:><em>#AIDER{arttitre}</em></label>
<input type='text' name='soustitre' id='soustitre' class='forml' value="[(#ENV**{soustitre}|entites_html)]" />
</li>]
@@ -64,36 +64,38 @@ $(function(){
|chercher_rubrique{#ENV{id_rubrique}, #ENV{id_secteur},#ENV**{config}|table_valeur{restreint}})]
[(#ENV**{config}|table_valeur{articles_descriptif}|=={non}|?{#ENV**{descriptif,''},' '}|?{' '})
- <li>
+ <li class="gauche">
<label for="descriptif"><:texte_descriptif_rapide:><em>#AIDER{artdesc}</em></label>
<textarea name='descriptif' id='descriptif' class='forml' rows='2' cols='40'>[(#ENV**{descriptif}|entites_html)]</textarea>
</li>]
[(#ENV**{config}|table_valeur{articles_urlref}|=={non}|?{#ENV**{url_site,#ENV**{nom_site,''}},' '}|?{' '})
- <li>
- <label for="nom_site"><:entree_liens_sites:><br />
- <:info_titre:></label>
+ <li class="haut">
+ <label for="nom_site"><:entree_liens_sites:></label>
+ </li>
+ <li class="gauche">
+ <label><:info_titre:></label>
<input type='text' name='nom_site' id='nom_site' class='forml' value="[(#ENV**{nom_site}|entites_html)]" />
</li>
- <li>
+ <li class="gauche">
<label for="url_site"><:info_url:></label>
<input type='text' name='url_site' id='url_site' class='forml' value="[(#ENV**{url_site}|entites_html)]" />
</li>]
[(#ENV**{config}|table_valeur{articles_chapeau}|=={non}|?{#ENV**{chapo,''},' '}|?{' '})
- [<li class='redirection'>(#ENV**{chapo}|match{^=}|?{' '})
+ [<li class='gauche redirection'>(#ENV**{chapo}|match{^=}|?{' '})
<label for='virtuel'><:info_redirection:> :<em>#AIDER{artvirt}</em></label>
<input type='text' name='virtuel' id='virtuel' class='forml' value="[(#ENV**{chapo}|replace{^=,''}|entites_html)]" />
<input type='hidden' name='changer_virtuel' value='oui' />
- <span class='verdana1 spip_small'><:texte_article_virtuel_reference:></span>
+ <span class='verdana1'><:texte_article_virtuel_reference:></span>
</li>]
- [<li>(#ENV**{chapo}|match{^=}|?{'',' '})
+ [<li class="haut">(#ENV**{chapo}|match{^=}|?{'',' '})
<label for="chapo"><:info_chapeau:><em>#AIDER{arttitre}</em></label>
<textarea name='chapo' id='chapo' class='forml'[ rows='(#ENV**{config}|table_valeur{lignes})'] cols='40'>[(#ENV**{chapo}|entites_html)]</textarea>
</li>]
]
[(#ENV**{config}|table_valeur{articles_texte}|=={non}|?{#ENV**{texte,''},' '}|?{' '})
- <li>
- <label for="text_area"><:info_texte:><em>#AIDER{arttexte}</em><br />
- <span><:texte_enrichir_mise_a_jour:><em>#AIDER{raccourcis}</em></span></label>
+ <li class="haut">
+ <label for="text_area"><:info_texte:><em>#AIDER{arttexte}</em></label>
+ <div class="commentaire"><:texte_enrichir_mise_a_jour:><em>#AIDER{raccourcis}</em></div>
[(#ENV**{config}|table_valeur{afficher_barre}|?{#VAL{text_area}|barre_typo{#LANG}})]
<textarea name='texte' id='text_area' class='formo barre_inserer' rows='[(#ENV**{config}|table_valeur{lignes}|plus{2})]' cols='40'[
(#ENV**{browser_caret,''})]>[(#ENV**{texte}|entites_html)]</textarea>
@@ -107,14 +109,17 @@ $(function(){
</li>]
[(#ENV**{config}|table_valeur{articles_ps}|=={non}|?{#ENV**{ps,''},' '}|?{' '})
- <li>
+ <li class="gauche">
<label for="ps"><:info_post_scriptum:></label>
<textarea name='ps' id='ps' class='forml' rows='5' cols='40'>[(#ENV**{ps}|entites_html)]</textarea>
</li>]
</ol>
- [(#ENV**{config}|table_valeur{extra}|?{
- [(#ENV**{extra}|editer_extra{#ENV{id_secteur}})]
- })]
+ [(#ENV**{config}|table_valeur{extra}|?{
+
+ [(#ENV**{extra}|editer_extra{#ENV{id_secteur}})]
+
+ })]
+
</fieldset>
diff --git a/dist/spip_style.css b/dist/spip_style.css
index b49ef52deedf41cdf229ea004d4126fe778d241b..befaccadf1403b87dd69dae529ba6a851a2a0906 100644
--- a/dist/spip_style.css
+++ b/dist/spip_style.css
@@ -55,6 +55,14 @@ table.spip_barre a img { background: #FDA; padding: 3px; border: 1px outset #CC9
table.spip_barre a:hover img { background: #FFF; border: 1px solid #CC9; }
table.spip_barre input.barre { width: 99%; background: transparent; border: 0; color: #F57900; }
+/* Barre de raccourcis typographiques */
+table.spip_barre { width: 100%; }
+table.spip_barre a img { background: #FDA; padding: 3px; border: 1px outset #CC9; }
+table.spip_barre a:hover img { background: #FFF; border: 1px solid #CC9; }
+table.spip_barre input.barre { width: 99%; background: transparent; border: 0; color: #F57900; }
+
+
+
/* * Couleurs des liens de SPIP */
a.spip_note {} /* liens vers notes de bas de page */
a.spip_in { color: #900; } /* liens internes */
diff --git a/dist/style_prive.html b/dist/style_prive.html
index 9225002b79d63d9d1cd7cc0608268bb74da99611..831144449519f8eeee5782c666f0942c9da4a0af 100644
--- a/dist/style_prive.html
+++ b/dist/style_prive.html
@@ -60,13 +60,109 @@ h3 { color: #666; font-size: medium; font-family: Arial, Sans, sans-serif; margi
td { text-align: #GET{left}; }
/* * Formulaires */
-.forml { width: 100%; display: block; padding: 3px; background-color: #e4e4e4; border: 1px solid #GET{claire}; background-position: center bottom; float: none; behavior: url(../dist/win_width.htc); font-size: 12px; }
-.formo { width: 100%; display: block; padding: 3px; background-color: #FFF; border: 1px solid #GET{claire}; background-position: center bottom; float: none; behavior: url(../dist/win_width.htc); font-size: 12px; }
-.fondl { padding: 3px; background-color: #e4e4e4; border: 1px solid #GET{claire}; background-position: center bottom; float: none; font-size: 11px; }
-.fondo { background-color: #GET{foncee}; background-position: center bottom; float: none; color: #FFF; font-size: 11px;font-weight: bold; }
-.fondf { background-color: #FFF; border-style: solid ; border-width: 1px; border-color: #e86519; color: #e86519; }
+.forml { margin-top: 0px; width: 100%; display: block; padding: 3px; background-color: #f0f0f0; border: 1px solid #GET{claire}; background-position: center bottom; float: none; behavior: url(../dist/win_width.htc); font-size: 12px; }
+.formo { margin-top: 0px; width: 100%; display: block; padding: 3px; background-color: #FFF; border: 1px solid #GET{claire}; background-position: center bottom; float: none; behavior: url(../dist/win_width.htc); font-size: 12px; }
+.fondl { margin-top: 0px; padding: 3px; background-color: #e4e4e4; border: 1px solid #GET{claire}; background-position: center bottom; float: none; font-size: 11px; }
+.fondo { margin-top: 0px; background-color: #GET{foncee}; background-position: center bottom; float: none; color: #FFF; font-size: 11px;font-weight: bold; }
+.fondf { margin-top: 0px; background-color: #FFF; border-style: solid ; border-width: 1px; border-color: #e86519; color: #e86519; }
+
+
+ol.formfx {
+ line-height: auto;
+ padding: 0px;
+ margin: 0px;
+ list-style-type: none;
+}
+ol.formfx .commentaire {
+ margin-top: 0px;
+ border: 1px solid #GET{claire};
+ border-bottom: 0px;
+ padding: 5px;
+ background-color: #eeeeee;
+ color: #GET{foncee};
+}
+
+
+ol.formfx li.gauche {
+ clear: left;
+ list-style: none;
+ margin-#GET{left}: 100px;
+ margin-top: 2px;
+ padding: 0px;
+}
+ol.formfx li.gauche label {
+ clear: #GET{left};
+ float: #GET{left};
+ margin-#GET{left}: -100px;
+ display: block;
+ width: 90px;
+
+
+ background: url([(#REM|sinon{[(#EVAL{ _DIR_IMG_PACK})]label-fond-gauche-[(#ENV{ltr})].gif}|image_sepia{#ENV{couleur_foncee,3874b0}}|extraire_attribut{src})]) center [(#GET{right})] no-repeat;
+
+ font-size: 9px;
+ color: white;
+ line-height: 11px;
+ text-transform: uppercase;
+ font-family: verdana, arial, helvetica, sans;
+ text-shadow: #GET{foncee} -1px -1px 1px;
+
+ padding-top: 5px;
+ padding-bottom: 5px;
+ padding-left: 5px;
+ padding-right: 5px;
+ }
+ol.formfx li.gauche_obligatoire label {
+ background: url([(#REM|sinon{[(#EVAL{ _DIR_IMG_PACK})]label-fond-gauche-[(#ENV{ltr})].gif}|image_sepia{#444444}|extraire_attribut{src})]) center [(#GET{right})] no-repeat;
+ text-shadow: #444444 -1px -1px 1px;
+ font-weight: bold;
+}
+ol.formfx li.gauche input, ol.formfx textarea {
+// border-color: #GET{foncee};
+}
+ol.formfx li.gauche_obligatoire input, ol.formfx li.haut_obligatoire input {
+ font-weight: bold;
+ border-color: #GET{foncee};
+}
+
+ol.formfx li.haut {
+ margin-#GET{left}: 0px;
+ clear: #GET{left};
+ padding: 0px;
+ padding-top: 7px;
+}
+
+ol.formfx li.haut label {
+ font-size: 9px;
+ display: inline-block;
+ color: white;
+ line-height: 11px;
+ text-transform: uppercase;
+ font-family: verdana, arial, helvetica, sans;
+ text-shadow: #GET{foncee} -1px -1px 1px;
+
+ width: auto;
+
+ padding-top: 6px;
+ padding-bottom: 9px;
+ padding-left: 5px;
+ padding-right: 5px;
+ margin-bottom: 0px;
+ background: url([(#REM|sinon{[(#EVAL{ _DIR_IMG_PACK})]label-fond-haut-[(#ENV{ltr})].gif}|image_sepia{#ENV{couleur_foncee,3874b0}}|extraire_attribut{src})]) bottom [(#GET{left})] no-repeat;
+
+}
+table.spip_barre {
+ background-color: #GET{claire};
+ padding: 3px;
+ padding-bottom: 0px;
+}
+
+table.spip_barre a img { background: #GET{claire}; padding: 3px; border: 1px outset #GET{claire}; }
+table.spip_barre a:hover img { background: #FFF; border: 1px solid #CC9; }
+table.spip_barre input.barre { width: 99%; background: transparent; border: 0; color: #F57900; }
+
select.fondl { padding: 0; }
.maj-debut:first-letter { text-transform: uppercase; }
@@ -184,7 +280,7 @@ a.icone36.suivi-forum-24 { width: 100px; }
.cellule36 a:hover span, .cellule48 a:hover span { color: #000; display: block; margin: 1px; width: 100%; }
.cellule36 a.selection span, .cellule48 a.selection span { color: #000; display: block; margin: 1px; width: 100%; }
-img.aide { width: 12px; height: 12px; margin-top: 5px; vertical-align: middle; }
+img.aide { width: 12px; height: 12px; vertical-align: top; }
.cellule36 a.aide, .cellule36 a.aide:hover { display: inline; background: none; margin: 0; padding: 0; }
.cellule36 a.aide img { margin: 0; padding: 0; }
@@ -545,7 +641,7 @@ td.message, a.message { background: url(#EVAL{ _DIR_IMG_PACK}wrapper.php?file=m_
.couleur_langue { background: #GET{foncee}; }
.statistiques_visites ul.referers { margin-left: 0px; padding-left: 0px; list-style-type: none; font-family: arial, helvetica, sans; }
-.statistiques_visites ul.referers li {clear:both; margin-bottom: 1em; }
+.statistiques_visites ul.referers li {margin-bottom: 1em; }
.statistiques_visites ul.referers li ul { font-size:x-small; list-style-type: disc;}
.statistiques_visites ul.referers li li {clear: none; margin-bottom:0; }
diff --git a/ecrire/exec/mots_edit.php b/ecrire/exec/mots_edit.php
index 913ee40e06976b90ccd2f7d7dd2fb5a9edef496c..b7aa46a5f41b55baf81bd93f425f106b1067671f 100644
--- a/ecrire/exec/mots_edit.php
+++ b/ecrire/exec/mots_edit.php
@@ -180,23 +180,31 @@ function exec_mots_edit_args($id_mot, $id_groupe, $new, $table='', $table_id='',
$descriptif = entites_html($descriptif);
$texte = entites_html($texte);
- $res .= "<label for='titre'><b>"._T('info_titre_mot_cle')."</b></label> "._T('info_obligatoire_02');
- $res .= aide ("mots");
+ $res .= "<ol class='formfx'>";
+
+
+ $res .= "<li class='gauche gauche_obligatoire'>";
+ $res .= "<label for='titre'>"._T('info_titre_mot_cle');
+ $res .= aide ("mots")."</label>";
- $res .= "<br /><input type='text' name='titre' id='titre' class='formo' value=\"$titre_mot\" size='40' $onfocus />";
+ $res .= "<input type='text' name='titre' id='titre' class='formo' value=\"$titre_mot\" size='40' $onfocus /></li>";
- $res .= determine_groupe_mots($table, $id_groupe);
+ $res .= "<li class='gauche'>".determine_groupe_mots($table, $id_groupe)."</li>";
- $res .= "<label for='descriptif'><b>"._T('texte_descriptif_rapide')."</b></label><br />";
+ $res .= "<li class='gauche'>";
+ $res .= "<label for='descriptif'>"._T('texte_descriptif_rapide')."</label>";
$res .= "<textarea name='descriptif' id='descriptif' class='forml' rows='4' cols='40'>";
$res .= $descriptif;
- $res .= "</textarea><br />\n";
+ $res .= "</textarea>\n";
+ $res .= "</li>";
- $res .= "<label for='texte'><b>"._T('info_texte_explicatif')."</b></label><br />";
- $res .= "<textarea name='texte' id='texte' rows='8' class='forml' cols='40'>";
+ $res .= "<li class='gauche'>";
+ $res .= "<label for='texte'>"._T('info_texte_explicatif')."</label>";
+ $res .= "<textarea name='texte' id='texte' rows='12' class='forml' cols='40'>";
$res .= $texte;
- $res .= "</textarea><br />";
+ $res .= "</textarea>";
+ $res .= "</li>";
if ($GLOBALS['champs_extra']) {
include_spip('inc/extra');
@@ -208,8 +216,12 @@ function exec_mots_edit_args($id_mot, $id_groupe, $new, $table='', $table_id='',
include_spip('inc/editer');
$res .= controles_md5($row);
}
+
$res .= "<div style='text-align: right'><input type='submit' value='"._T('bouton_enregistrer')."' class='fondo' /></div>";
+
+ $res .= "</ol>";
+
$res .= "</div>";
diff --git a/ecrire/exec/rubriques_edit.php b/ecrire/exec/rubriques_edit.php
index 435d704542d0c7739143f1c43309b9d4ab09106f..f8dbbdd43a161e00a582f9de4d977e3de20b4f77 100644
--- a/ecrire/exec/rubriques_edit.php
+++ b/ecrire/exec/rubriques_edit.php
@@ -110,12 +110,15 @@ function exec_rubriques_edit_args($id_rubrique, $id_parent, $new)
$titre = entites_html($titre);
$chercher_rubrique = charger_fonction('chercher_rubrique', 'inc');
+
+ $form = "<ol class='formfx'>";
- $form = "<label for='titre'>" . _T('entree_titre_obligatoire') ."</label>"
- . "<input type='text' class='formo' name='titre' id='titre' value=\"$titre\" size='40' $onfocus />"
- . debut_cadre_couleur("$logo_parent", true, '', _T('entree_interieur_rubrique').aide ("rubrub"))
- . $chercher_rubrique($id_parent, 'rubrique', !$connect_toutes_rubriques, $id_rubrique);
-
+ $form .= "<li class='gauche gauche_obligatoire'><label for='titre'>" . _T('info_titre') ."</label>"
+ . "<input type='text' class='formo' name='titre' id='titre' value=\"$titre\" size='40' $onfocus /></li>";
+
+ $form .= "<li>"
+ . debut_cadre_couleur("$logo_parent", true, '', _T('entree_interieur_rubrique').aide ("rubrub"))
+ . $chercher_rubrique($id_parent, 'rubrique', !$connect_toutes_rubriques, $id_rubrique);
// si c'est une rubrique-secteur contenant des breves, demander la
// confirmation du deplacement
$contient_breves = sql_countsel('spip_breves', "id_rubrique=$id_rubrique",'',2);
@@ -130,28 +133,28 @@ function exec_rubriques_edit_args($id_rubrique, $id_parent, $new)
$form .= "<input type='hidden' name='confirme_deplace' value='oui' />\n";
$form .= fin_cadre_couleur(true)
- . "<br />\n";
+ . "</li>\n";
if (($GLOBALS['meta']['rubriques_descriptif'] == "oui") OR strlen($descriptif)) {
- $form .= "<b>"
+ $form .= "<li class='gauche'><label>"
. _T('texte_descriptif_rapide')
- ."</b><br />\n"
- . "<label for='descriptif'>"
+ ."</label>\n"
+ . "<div class='commentaire'>"
. _T('entree_contenu_rubrique')
- . "</label><br />"
+ . "</div>"
. "<textarea name='descriptif' id='descriptif' class='forml' rows='4' cols='40'>"
. entites_html($descriptif)
- . "</textarea>\n";
+ . "</textarea></li>\n";
}
if (($GLOBALS['meta']['rubriques_texte'] == "oui") OR strlen($texte)) {
- $form .= "<label for='texte'><b>"
+ $form .= "<li class='haut'><label for='texte'>"
. _T('info_texte_explicatif')
- . "</b></label>"
. aide ("raccourcis")
- . "\n<br /><textarea name='texte' id='texte' rows='15' class='formo barre_inserer' cols='40'>"
+ . "</label>"
+ . "\n<textarea name='texte' id='texte' rows='15' class='formo barre_inserer' cols='40'>"
. entites_html($texte)
- . "</textarea>\n";
+ . "</textarea></li>\n";
}
// Ajouter le controles md5
@@ -169,6 +172,7 @@ function exec_rubriques_edit_args($id_rubrique, $id_parent, $new)
$form .= "\n<div style='text-align: right'><input type='submit' value='"
. _T('bouton_enregistrer')
. "' class='fondo' /></div>";
+ $form .= "</ol>";
echo redirige_action_auteur("editer_rubrique", $id_rubrique ? $id_rubrique : 'oui', 'naviguer', '', $form, " method='post'");
diff --git a/ecrire/inc/filtres_images.php b/ecrire/inc/filtres_images.php
index 03581e971adb51a5a2878c07f77b38d259127df1..557a457b9f0b508e949d09f326a0b1a6835b01c8 100644
--- a/ecrire/inc/filtres_images.php
+++ b/ecrire/inc/filtres_images.php
@@ -1881,6 +1881,8 @@ function image_decal_couleur_127 ($coul, $val) {
function image_sepia($im, $rgb = "896f5e")
{
+ if (!function_exists("imagecreatetruecolor")) return $im;
+
$couleurs = couleur_hex_to_dec($rgb);
$dr= $couleurs["red"];
$dv= $couleurs["green"];
diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php
index 8a09ff87db06eaf0cc7665855c6ae850b088e692..a49dd6dedd0b8749e1fbf227cdf80b17d1ad1618 100644
--- a/ecrire/inc/presentation.php
+++ b/ecrire/inc/presentation.php
@@ -793,14 +793,6 @@ function envoi_link($nom_site_spip, $minipres=false) {
. '<link rel="stylesheet" type="text/css" href="'
. url_absolue(find_in_path('agenda.css')) .'" />' . "\n"
- // CSS espace prive : la vraie
- . '<link rel="stylesheet" type="text/css" href="'
- . generer_url_public('style_prive', $paramcss) .'" id="cssprivee" />' . "\n"
- . "<!--[if lt IE 8]>\n"
- . '<link rel="stylesheet" type="text/css" href="'
- . generer_url_public('style_prive_ie', $paramcss) .'" />' . "\n"
- . "<![endif]-->\n"
-
// CSS imprimante (masque des trucs, a completer)
. '<link rel="stylesheet" type="text/css" href="'
. url_absolue(find_in_path('spip_style.css'))
@@ -819,6 +811,14 @@ function envoi_link($nom_site_spip, $minipres=false) {
. '.css'))
.'" />' . "\n"
+ // CSS espace prive : la vraie
+ . '<link rel="stylesheet" type="text/css" href="'
+ . generer_url_public('style_prive', $paramcss) .'" id="cssprivee" />' . "\n"
+ . "<!--[if lt IE 8]>\n"
+ . '<link rel="stylesheet" type="text/css" href="'
+ . generer_url_public('style_prive_ie', $paramcss) .'" />' . "\n"
+ . "<![endif]-->\n"
+
// CSS optionelle minipres
. ($minipres?'<link rel="stylesheet" type="text/css" href="'
. url_absolue(find_in_path('minipres.css')).'" />' . "\n":"")