From 8754a844dd8a4bb255665efe2d7c8197fabdfd4c Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Sat, 3 Jul 2004 03:14:49 +0000
Subject: [PATCH] =?UTF-8?q?gestion=20des=20r=C3=A9visions=20(suite)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/inc_base.php3 | 13 +++++--
ecrire/inc_version.php3 | 2 +-
ecrire/spip_style.php3 | 81 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 91 insertions(+), 5 deletions(-)
diff --git a/ecrire/inc_base.php3 b/ecrire/inc_base.php3
index fe42164223..7b2ccb1bb8 100644
--- a/ecrire/inc_base.php3
+++ b/ecrire/inc_base.php3
@@ -469,10 +469,7 @@ function creer_base() {
id_auteur bigint(21) NOT NULL,
titre_version text DEFAULT '' NOT NULL,
permanent char(3) NOT NULL,
- chapo text NOT NULL,
- texte text NOT NULL,
- ps text NOT NULL,
- extra text NOT NULL,
+ champs text NOT NULL,
PRIMARY KEY (id_article, id_version),
KEY date (id_article, date),
@@ -1503,6 +1500,14 @@ function maj_base() {
maj_version (1.732);
}
+ if ($version_installee < 1.733) {
+ // spip_query("ALTER TABLE spip_articles ADD id_version int unsigned DEFAULT '0' NOT NULL");
+ spip_query("DROP TABLE spip_versions");
+ spip_query("DROP TABLE spip_versions_fragments");
+ creer_base();
+ maj_version(1.733);
+ }
+
return true;
}
diff --git a/ecrire/inc_version.php3 b/ecrire/inc_version.php3
index 3de3deab89..a3a8747cca 100644
--- a/ecrire/inc_version.php3
+++ b/ecrire/inc_version.php3
@@ -173,7 +173,7 @@ if ($flag_ecrire) {
// (utilise pour les modifs de la base de donnees)
// version de la base
-$spip_version = 1.732;
+$spip_version = 1.733;
// version de spip
$spip_version_affichee = "1.8 alpha 1 CVS";
diff --git a/ecrire/spip_style.php3 b/ecrire/spip_style.php3
index ed7f1f7fe5..867f8494d3 100644
--- a/ecrire/spip_style.php3
+++ b/ecrire/spip_style.php3
@@ -618,6 +618,87 @@ a:hover { text-decoration: none; }
a.icone { text-decoration: none; }
a.icone:hover { text-decoration: none; }
+/*
+ * Correction orthographique
+ */
+
+.ortho {
+ background: #ffe0e0;
+ border: 2px transparent;
+ border-bottom: 2px dashed red;
+ color: inherit;
+ text-decoration: none;
+}
+a.ortho:hover {
+ border: 2px dashed red;
+ color: inherit;
+ text-decoration: none;
+}
+.suggest-actif, .suggest-inactif {
+ font-family: "Trebuchet Sans MS", Verdana, Arial, sans-serif;
+ font-size: 95%;
+ font-weight: bold;
+ margin: 8px;
+ z-index: 1;
+}
+.suggest-actif .detail, .suggest-inactif .detail {
+ margin: 8px;
+ margin-top: -0.5em;
+ padding: 0.5em;
+ padding-top: 1em;
+ border: 1px solid #c8c8c8;
+ background: #f3f2f3;
+ font-family: Georgia, Garamond, "Times New Roman", serif;
+ font-weight: normal;
+ z-index: 0;
+}
+.suggest-actif .detail {
+ display: block;
+}
+.suggest-inactif .detail {
+ display: none;
+}
+
+/*
+ * Comparaison d'articles
+ */
+
+.diff-para-deplace {
+ background: #e8e8ff;
+}
+.diff-para-ajoute {
+ background: #d0ffc0;
+ color: #000000;
+}
+.diff-para-supprime {
+ background: #ffd0c0;
+ color: #904040;
+ text-decoration: line-through;
+}
+.diff-deplace {
+ background: #e8e8ff;
+}
+.diff-ajoute {
+ background: #d0ffc0;
+}
+.diff-supprime {
+ background: #ffd0c0;
+ color: #802020;
+ text-decoration: line-through;
+}
+.diff-para-deplace .diff-ajoute {
+ border: 1px solid #808080;
+ background: #b8ffb8;
+}
+.diff-para-deplace .diff-supprime {
+ border: 1px solid #808080;
+ background: #ffb8b8;
+}
+.diff-para-deplace .diff-deplace {
+ border: 1px solid #808080;
+ background: #b8b8ff;
+}
+
/*
* Barre de raccourcis
*/
--
GitLab