From: Erik Moeller <erik@users.mediawiki.org>
Date: Mon, 19 Jan 2004 21:24:01 +0000 (+0000)
Subject: 1) nowiki button
X-Git-Tag: 1.3.0beta1~1131
X-Git-Url: http://git.cyclocoop.org/%22%20%20.%20generer_url_ecrire%28%22mots_tous%22%29%20.%20%22?a=commitdiff_plain;h=85bce52cd9ea91256a7521e8ae53723285374583;p=lhc%2Fweb%2Fwiklou.git

1) nowiki button
2) remove toolbar border to avoid button wrapping in IE
---

diff --git a/includes/Skin.php b/includes/Skin.php
index ae3fafe98d..ecdee838d5 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -2251,11 +2251,6 @@ class Skin {
 				"close"=>" ==\\n",
 				"sample"=>wfMsg("headline_sample"),
 				"tip"=>wfMsg("headline_tip")),
-			array(	"image"=>"button_math.gif",
-				"open"=>"\\<math\\>",
-				"close"=>"\\</math\\>",
-				"sample"=>wfMsg("math_sample"),
-				"tip"=>wfMsg("math_tip")),
 			array(	"image"=>"button_image.gif",
 				"open"=>"[[Image:",
 				"close"=>"]]",
@@ -2266,6 +2261,16 @@ class Skin {
 				"close"=>"]]",
 				"sample"=>wfMsg("media_sample"),
 				"tip"=>wfMsg("media_tip")),
+			array(	"image"=>"button_math.gif",
+				"open"=>"\\<math\\>",
+				"close"=>"\\</math\\>",
+				"sample"=>wfMsg("math_sample"),
+				"tip"=>wfMsg("math_tip")),
+			array(	"image"=>"button_nowiki.gif",
+				"open"=>"\\<nowiki\\>",
+				"close"=>"\\</nowiki\\>",
+				"sample"=>wfMsg("nowiki_sample"),
+				"tip"=>wfMsg("nowiki_tip")),
 			array(	"image"=>"button_sig.gif",
 				"open"=>"--~~~~",
 				"close"=>"",
diff --git a/languages/Language.php b/languages/Language.php
index f53826e018..78d2450e9d 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -609,6 +609,8 @@ Please log in again after you receive it.",
 "headline_tip"=>"Level 2 headline",
 "math_sample"=>"Insert formula here",
 "math_tip"=>"Mathematical formula (LaTeX)",
+"nowiki_sample"=>"Insert non-formatted text here",
+"nowiki_tip"=>"Ignore wiki formatting",
 "image_sample"=>"Example.jpg",
 "image_tip"=>"Embedded image",
 "media_sample"=>"Example.mp3",
diff --git a/languages/LanguageDe.php b/languages/LanguageDe.php
index dd3edbbbc1..7c8c2ff293 100644
--- a/languages/LanguageDe.php
+++ b/languages/LanguageDe.php
@@ -225,6 +225,8 @@
 "headline_tip"=>"Ebene 2 Überschrift",
 "math_sample"=>"Formel hier einfügen",
 "math_tip"=>"Mathematische Formel (LaTeX)",
+"nowiki_sample"=>"Unformatierten Text hier einfügen",
+"nowiki_tip"=>"Unformatierter Text",
 "image_sample"=>"Beispiel.jpg",
 "image_tip"=>"Bild-Verweis",
 "media_sample"=>"Beispiel.mp3",
diff --git a/stylesheets/wikistandard.css b/stylesheets/wikistandard.css
index a6f30b5d11..f167a3717e 100644
--- a/stylesheets/wikistandard.css
+++ b/stylesheets/wikistandard.css
@@ -8,7 +8,7 @@
 #quickbar { width: 140px; padding: 4px; visibility: visible; z-index:99;font-size:95%;}
 #topbar { padding: 4px;font-size:95%; }
 #toc { border:1px solid #8888aa; background-color:#f7f8ff;padding:5px;font-size:95%; }
-#toolbar { border-width:2px;border-style:groove;border-color:black;padding:0px;width:230px;}
+#toolbar { padding:0px; }
 #editform { margin-top:1px; }
 .bodytext { }
 a.interwiki, a.external { color: #3366BB; }