From 552c75569f521d615b2ee3b0df15f07f54c94e60 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Sun, 4 Sep 2011 11:33:32 +0000
Subject: [PATCH] minipres passe dans le theme (avec les images de background
associee) et s'accompagne toujours de reset.css et clear.css (tetue)
---
.gitattributes | 20 +++++++++---------
ecrire/inc/minipres.php | 6 +++---
prive/login.html | 4 +++-
prive/spip_pass.html | 4 +++-
prive/{ => themes/spip}/images/background.gif | Bin
.../images/degrade-etapes-clair-left.gif | Bin
.../images/degrade-etapes-clair-right.gif | Bin
.../images/degrade-etapes-fonce-left.gif | Bin
.../images/degrade-etapes-fonce-right.gif | Bin
.../images/degrade-etapes-rouge-left.gif | Bin
.../images/degrade-etapes-rouge-right.gif | Bin
.../spip}/images/degrade-etapes-vert-left.gif | Bin
.../images/degrade-etapes-vert-right.gif | Bin
prive/{ => themes/spip}/minipres.css | 0
14 files changed, 19 insertions(+), 15 deletions(-)
rename prive/{ => themes/spip}/images/background.gif (100%)
rename prive/{ => themes/spip}/images/degrade-etapes-clair-left.gif (100%)
rename prive/{ => themes/spip}/images/degrade-etapes-clair-right.gif (100%)
rename prive/{ => themes/spip}/images/degrade-etapes-fonce-left.gif (100%)
rename prive/{ => themes/spip}/images/degrade-etapes-fonce-right.gif (100%)
rename prive/{ => themes/spip}/images/degrade-etapes-rouge-left.gif (100%)
rename prive/{ => themes/spip}/images/degrade-etapes-rouge-right.gif (100%)
rename prive/{ => themes/spip}/images/degrade-etapes-vert-left.gif (100%)
rename prive/{ => themes/spip}/images/degrade-etapes-vert-right.gif (100%)
rename prive/{ => themes/spip}/minipres.css (100%)
diff --git a/.gitattributes b/.gitattributes
index 0bd09f2171..9a0a7e4eb3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -381,15 +381,6 @@ prive/images/aide.gif -text
prive/images/aide_rtl.gif -text
prive/images/arrow_left.gif -text
prive/images/arrow_right.gif -text
-prive/images/background.gif -text
-prive/images/degrade-etapes-clair-left.gif -text
-prive/images/degrade-etapes-clair-right.gif -text
-prive/images/degrade-etapes-fonce-left.gif -text
-prive/images/degrade-etapes-fonce-right.gif -text
-prive/images/degrade-etapes-rouge-left.gif -text
-prive/images/degrade-etapes-rouge-right.gif -text
-prive/images/degrade-etapes-vert-left.gif -text
-prive/images/degrade-etapes-vert-right.gif -text
prive/images/deplierbas.gif -text
prive/images/deplierhaut.gif -text
prive/images/deplierhaut_rtl.gif -text
@@ -561,7 +552,6 @@ prive/javascript/ui/jquery.ui.slider.js -text
prive/javascript/ui/jquery.ui.sortable.js -text
prive/javascript/ui/jquery.ui.tabs.js -text
prive/javascript/ui/jquery.ui.widget.js -text
-prive/minipres.css -text
prive/modeles/formulaire.html -text
prive/modeles/mail_inscription.html -text
prive/modeles/object_jobs_list.html -text
@@ -761,6 +751,7 @@ prive/themes/spip/images/auteur-edit-32.png -text
prive/themes/spip/images/auteur-new-16.png -text
prive/themes/spip/images/auteur-new-24.png -text
prive/themes/spip/images/auteur-new-32.png -text
+prive/themes/spip/images/background.gif -text
prive/themes/spip/images/base-16.png -text
prive/themes/spip/images/base-24.png -text
prive/themes/spip/images/base-32.png -text
@@ -813,6 +804,14 @@ prive/themes/spip/images/cookie-edit-32.png -text
prive/themes/spip/images/cookie-new-16.png -text
prive/themes/spip/images/cookie-new-24.png -text
prive/themes/spip/images/cookie-new-32.png -text
+prive/themes/spip/images/degrade-etapes-clair-left.gif -text
+prive/themes/spip/images/degrade-etapes-clair-right.gif -text
+prive/themes/spip/images/degrade-etapes-fonce-left.gif -text
+prive/themes/spip/images/degrade-etapes-fonce-right.gif -text
+prive/themes/spip/images/degrade-etapes-rouge-left.gif -text
+prive/themes/spip/images/degrade-etapes-rouge-right.gif -text
+prive/themes/spip/images/degrade-etapes-vert-left.gif -text
+prive/themes/spip/images/degrade-etapes-vert-right.gif -text
prive/themes/spip/images/del-16.png -text
prive/themes/spip/images/del-24.png -text
prive/themes/spip/images/del-32.png -text
@@ -976,6 +975,7 @@ prive/themes/spip/images/xml-24.png -text
prive/themes/spip/jquery-ui.css.html -text
prive/themes/spip/layout.css -text
prive/themes/spip/lists.css.html -text
+prive/themes/spip/minipres.css -text
prive/themes/spip/picker.css.html -text
prive/themes/spip/reset.css -text
prive/themes/spip/style_prive.css.html -text
diff --git a/ecrire/inc/minipres.php b/ecrire/inc/minipres.php
index 9e1b6e6c32..7837407433 100644
--- a/ecrire/inc/minipres.php
+++ b/ecrire/inc/minipres.php
@@ -43,9 +43,9 @@ function install_debut_html($titre = 'AUTO', $onLoad = '') {
"<title>".
textebrut($titre).
"</title>
- <link rel='stylesheet' href='".direction_css(find_in_path('reset.css'))."' type='text/css' />\n" .
- "<link rel='stylesheet' href='".direction_css(find_in_path('minipres.css'))."' type='text/css' />\n" .
- // cet appel permet d'assurer un copier-coller du nom du repertoire a creer dans tmp (esj)
+ <link rel='stylesheet' href='".direction_css(find_in_theme('reset.css'))."' type='text/css' />\n" .
+ "<link rel='stylesheet' href='".direction_css(find_in_theme('clear.css'))."' type='text/css' />\n" .
+ "<link rel='stylesheet' href='".direction_css(find_in_theme('minipres.css'))."' type='text/css' />\n" . // cet appel permet d'assurer un copier-coller du nom du repertoire a creer dans tmp (esj)
http_script('', "spip_barre.js") .
"</head>
<body".$onLoad." class='minipres'>
diff --git a/prive/login.html b/prive/login.html
index 0f6040dea5..8d28bfce57 100644
--- a/prive/login.html
+++ b/prive/login.html
@@ -10,7 +10,9 @@
<meta http-equiv="Content-Type" content="text/html; charset=#CHARSET" />
<meta name="robots" content="none" />
<meta name="generator" content="SPIP[ (#SPIP_VERSION)]" />
-[<link rel="stylesheet" href="(#CHEMIN{minipres.css}|direction_css)" type="text/css" />]
+<link rel="stylesheet" href="[(#VAL{reset.css}|find_in_theme|direction_css)]" type="text/css" />
+<link rel="stylesheet" href="[(#VAL{clear.css}|find_in_theme|direction_css)]" type="text/css" />
+<link rel="stylesheet" href="[(#VAL{minipres.css}|find_in_theme|direction_css)]" type="text/css" />
#INSERT_HEAD
<script type='text/javascript'><!--
jQuery(function(){ jQuery('input#var_login').focus();
diff --git a/prive/spip_pass.html b/prive/spip_pass.html
index 40a9d3846a..b3410fccd2 100644
--- a/prive/spip_pass.html
+++ b/prive/spip_pass.html
@@ -9,7 +9,9 @@
<meta http-equiv="Content-Type" content="text/html; charset=#CHARSET" />
<meta name="robots" content="none" />
<meta name="generator" content="SPIP[ (#SPIP_VERSION)]" />
-<link rel="stylesheet" href="[(#CHEMIN{minipres.css}|direction_css)]" type="text/css" />
+<link rel="stylesheet" href="[(#VAL{reset.css}|find_in_theme|direction_css)]" type="text/css" />
+<link rel="stylesheet" href="[(#VAL{clear.css}|find_in_theme|direction_css)]" type="text/css" />
+<link rel="stylesheet" href="[(#VAL{minipres.css}|find_in_theme|direction_css)]" type="text/css" />
[(#REM) Balise permettant aux plugins d'inserer des appels javascript ou css ;
C'est ici que SPIP va inserer l'appel de la librairie jQuery
diff --git a/prive/images/background.gif b/prive/themes/spip/images/background.gif
similarity index 100%
rename from prive/images/background.gif
rename to prive/themes/spip/images/background.gif
diff --git a/prive/images/degrade-etapes-clair-left.gif b/prive/themes/spip/images/degrade-etapes-clair-left.gif
similarity index 100%
rename from prive/images/degrade-etapes-clair-left.gif
rename to prive/themes/spip/images/degrade-etapes-clair-left.gif
diff --git a/prive/images/degrade-etapes-clair-right.gif b/prive/themes/spip/images/degrade-etapes-clair-right.gif
similarity index 100%
rename from prive/images/degrade-etapes-clair-right.gif
rename to prive/themes/spip/images/degrade-etapes-clair-right.gif
diff --git a/prive/images/degrade-etapes-fonce-left.gif b/prive/themes/spip/images/degrade-etapes-fonce-left.gif
similarity index 100%
rename from prive/images/degrade-etapes-fonce-left.gif
rename to prive/themes/spip/images/degrade-etapes-fonce-left.gif
diff --git a/prive/images/degrade-etapes-fonce-right.gif b/prive/themes/spip/images/degrade-etapes-fonce-right.gif
similarity index 100%
rename from prive/images/degrade-etapes-fonce-right.gif
rename to prive/themes/spip/images/degrade-etapes-fonce-right.gif
diff --git a/prive/images/degrade-etapes-rouge-left.gif b/prive/themes/spip/images/degrade-etapes-rouge-left.gif
similarity index 100%
rename from prive/images/degrade-etapes-rouge-left.gif
rename to prive/themes/spip/images/degrade-etapes-rouge-left.gif
diff --git a/prive/images/degrade-etapes-rouge-right.gif b/prive/themes/spip/images/degrade-etapes-rouge-right.gif
similarity index 100%
rename from prive/images/degrade-etapes-rouge-right.gif
rename to prive/themes/spip/images/degrade-etapes-rouge-right.gif
diff --git a/prive/images/degrade-etapes-vert-left.gif b/prive/themes/spip/images/degrade-etapes-vert-left.gif
similarity index 100%
rename from prive/images/degrade-etapes-vert-left.gif
rename to prive/themes/spip/images/degrade-etapes-vert-left.gif
diff --git a/prive/images/degrade-etapes-vert-right.gif b/prive/themes/spip/images/degrade-etapes-vert-right.gif
similarity index 100%
rename from prive/images/degrade-etapes-vert-right.gif
rename to prive/themes/spip/images/degrade-etapes-vert-right.gif
diff --git a/prive/minipres.css b/prive/themes/spip/minipres.css
similarity index 100%
rename from prive/minipres.css
rename to prive/themes/spip/minipres.css
--
GitLab