diff --git a/.gitattributes b/.gitattributes
index 4dcb4a70a9ec1df95243a08d80bb260d593fbc4f..78c126fc9f611c55dc84a603761b0ede64ed7f3b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -426,6 +426,8 @@ ecrire/xml/interfaces.php -text
ecrire/xml/valider.php -text
/index.php -text
local/remove.txt -text
+prive/aide_body.css -text
+prive/aide_menu.css -text
prive/contenu/article.html -text
prive/contenu/breve.html -text
prive/contenu/item_rss_plugin.html -text
diff --git a/ecrire/exec/aide_index.php b/ecrire/exec/aide_index.php
index 326897c629e8ea586f42f4961948f07fc7582de3..bbdc696598f34603cee1bafe0c1f4c1dac8d5a10 100644
--- a/ecrire/exec/aide_index.php
+++ b/ecrire/exec/aide_index.php
@@ -74,7 +74,7 @@ function help_panneau() {
</div></div>
<div style='position:absolute; bottom: 10px; right:20px;
font-size: 12px; '>" .
- $copyleft .
+ preg_replace(",<a ,i", "<a class='target_blank", $copyleft) .
'</div>';
}
@@ -163,105 +163,6 @@ function help_img_cache($img, $ext)
readfile($img);
}
-define('_STYLE_AIDE_BODY', '
-<style type="text/css"><!--
-.spip_cadre {
- width : 100%;
- background-color: #FFFFFF;
- padding: 5px;
-}
-.spip_quote {
- margin-left : 40px;
- margin-top : 10px;
- margin-bottom : 10px;
- border : solid 1px #aaaaaa;
- background-color: #dddddd;
- padding: 5px;
-}
-
-a { text-decoration: none; }
-a:focus,a:hover,a:active { color: #FF9900; text-decoration: underline; }
-
-body {
- font-family: Georgia, Garamond, Times New Roman, serif;
-}
-h3.spip {
- font-family: Verdana, Geneva, Sans, sans-serif;
- font-weight: bold;
- font-size: 115%;
- text-align: center;
-}
-
-table.spip {
-}
-
-table.spip tr.row_first {
- background-color: #FCF4D0;
-}
-
-table.spip tr.row_odd {
- background-color: #C0C0C0;
-}
-
-table.spip tr.row_even {
- background-color: #F0F0F0;
-}
-
-table.spip td {
- padding: 1px;
- text-align: left;
- vertical-align: center;
-}
-
---></style>');
-
-define('AIDE_STYLE_MENU', '<style type="text/css">
-<!--
- a {text-decoration: none; }
- A:Hover {text-decoration: underline;}
-
- .article-inactif {
- float: '.$GLOBALS['spip_lang_left'].';
- text-align: '.$GLOBALS['spip_lang_left'].';
- width: 80%;
- background: ' . "url(" . chemin_image('triangle'.$GLOBALS['spip_lang_rtl'].'.gif') . ') ' . $GLOBALS['spip_lang_left'].' center no-repeat;
- margin: 2px;
- padding: 0px;
- padding-'.$GLOBALS['spip_lang_left'].': 20px;
- font-family: Arial, Sans, sans-serif;
- font-size: 12px;
- }
- .article-actif {
- float: '.$GLOBALS['spip_lang_right'].';
- text-align: '.$GLOBALS['spip_lang_right'].';
- width: 80%;
- background: ' . "url(" . chemin_image('triangle'.$GLOBALS['spip_lang_rtl'].'.gif') . ') ' . $GLOBALS['spip_lang_right'].' center no-repeat;
- margin: 4px;
- padding: 0px;
- padding-'.$GLOBALS['spip_lang_right'].': 20px;
- font-family: Arial, Sans, sans-serif;
- font-size: 12px;
- font-weight: bold;
- color: black;
- }
- .article-actif:hover {
- text-decoration: none;
- }
- .rubrique {
- width: 90%;
- margin: 0px;
- margin-top: 6px;
- margin-bottom: 4px;
- padding: 4px;
- font-family: Trebuchet MS, Arial, Sans, sans-serif;
- font-size: 14px;
- font-weight: bold;
- color: black;
- background-color: #EEEECC;
- }
--->
-</style>');
-
// Affichage du menu de gauche avec analyse de l'aide demandee
// afin d'ouvrir le sous-menu correspondant a l'affichage a droite
// http://doc.spip.org/@help_menu_rubrique
@@ -365,8 +266,10 @@ function help_frame($frame, $aide, $html, $lang)
echo _DOCTYPE_AIDE, html_lang_attributes();
$titre = _T('info_aide_en_ligne');
if ($frame === 'menu') {
- echo "<head>\n<title>",$titre,"</title>\n",
- AIDE_STYLE_MENU, $GLOBALS['browser_layer'],
+ echo "<head>\n<title>",$titre,"</title>\n";
+ echo '<link rel="stylesheet" type="text/css" href="';
+ echo url_absolue(find_in_path('aide_menu.css'));
+ echo "\"/>\n", $GLOBALS['browser_layer'],
http_script('', 'jquery.js'),
http_script('var curr_article;
function activer_article(id) {
@@ -385,7 +288,10 @@ function activer_article(id) {
help_menu_rubrique($aide, $html);
echo '</body>';
} elseif ($frame === 'body') {
- echo "<head>\n<title>",$titre,"</title>\n",_STYLE_AIDE_BODY;
+ echo "<head>\n<title>",$titre,"</title>\n";
+ echo '<link rel="stylesheet" type="text/css" href="';
+ echo url_absolue(find_in_path('aide_body.css'));
+ echo "\"/>\n";
echo "</head>\n";
echo '<body bgcolor="#FFFFFF" text="#000000" topmargin="24" leftmargin="24" marginwidth="24" marginheight="24"';
if ($spip_lang_rtl)
diff --git a/prive/aide_body.css b/prive/aide_body.css
new file mode 100644
index 0000000000000000000000000000000000000000..7a8bc4a927c780013f2428ca1100bbd51fa62321
--- /dev/null
+++ b/prive/aide_body.css
@@ -0,0 +1,57 @@
+/**************************************************************************/
+/* SPIP, Systeme de publication pour l'internet */
+/* */
+/* Copyright (c) 2001-2009 */
+/* Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James */
+/* */
+/* Ce programme est un logiciel libre distribue sous licence GNU/GPL. */
+/* Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. */
+\**************************************************************************/
+
+.spip_cadre {
+ width : 100%;
+ background-color: #FFFFFF;
+ padding: 5px;
+}
+.spip_quote {
+ margin-left : 40px;
+ margin-top : 10px;
+ margin-bottom : 10px;
+ border : solid 1px #aaaaaa;
+ background-color: #dddddd;
+ padding: 5px;
+}
+
+a { text-decoration: none; }
+a:focus,a:hover,a:active { color: #FF9900; text-decoration: underline; }
+
+body {
+ font-family: Georgia, Garamond, Times New Roman, serif;
+}
+h3.spip {
+ font-family: Verdana, Geneva, Sans, sans-serif;
+ font-weight: bold;
+ font-size: 115%;
+ text-align: center;
+}
+
+table.spip {
+}
+
+table.spip tr.row_first {
+ background-color: #FCF4D0;
+}
+
+table.spip tr.row_odd {
+ background-color: #C0C0C0;
+}
+
+table.spip tr.row_even {
+ background-color: #F0F0F0;
+}
+
+table.spip td {
+ padding: 1px;
+ text-align: left;
+ vertical-align: center;
+}
diff --git a/prive/aide_menu.css b/prive/aide_menu.css
new file mode 100644
index 0000000000000000000000000000000000000000..b64abb6d5bfb0c9399fab7a44a8c5e24e58bf391
--- /dev/null
+++ b/prive/aide_menu.css
@@ -0,0 +1,54 @@
+/**************************************************************************/
+/* SPIP, Systeme de publication pour l'internet */
+/* */
+/* Copyright (c) 2001-2009 */
+/* Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James */
+/* */
+/* Ce programme est un logiciel libre distribue sous licence GNU/GPL. */
+/* Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. */
+\**************************************************************************/
+
+a {text-decoration: none; }
+A:Hover {text-decoration: underline;}
+
+.article-inactif {
+ float: '.$GLOBALS['spip_lang_left'].';
+ text-align: '.$GLOBALS['spip_lang_left'].';
+ width: 80%;
+ background: ' . "url(" . chemin_image('triangle'.$GLOBALS['spip_lang_rtl'].'.gif') . ') ' . $GLOBALS['spip_lang_left'].' center no-repeat;
+ margin: 2px;
+ padding: 0px;
+ padding-'.$GLOBALS['spip_lang_left'].': 20px;
+ font-family: Arial, Sans, sans-serif;
+ font-size: 12px;
+}
+
+.article-actif {
+ float: '.$GLOBALS['spip_lang_right'].';
+ text-align: '.$GLOBALS['spip_lang_right'].';
+ width: 80%;
+ background: ' . "url(" . chemin_image('triangle'.$GLOBALS['spip_lang_rtl'].'.gif') . ') ' . $GLOBALS['spip_lang_right'].' center no-repeat;
+ margin: 4px;
+ padding: 0px;
+ padding-'.$GLOBALS['spip_lang_right'].': 20px;
+ font-family: Arial, Sans, sans-serif;
+ font-size: 12px;
+ font-weight: bold;
+ color: black;
+}
+
+.article-actif:hover {
+ text-decoration: none;
+}
+.rubrique {
+ width: 90%;
+ margin: 0px;
+ margin-top: 6px;
+ margin-bottom: 4px;
+ padding: 4px;
+ font-family: Trebuchet MS, Arial, Sans, sans-serif;
+ font-size: 14px;
+ font-weight: bold;
+ color: black;
+ background-color: #EEEECC;
+}