1) nowiki button

2) remove toolbar border to avoid button wrapping in IE

diff --git a/includes/Skin.php b/includes/Skin.php
index ae3fafe..ecdee83 100644 (file)
--- 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 f53826e..78d2450 100644 (file)
--- 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 dd3edbb..7c8c2ff 100644 (file)
--- 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 a6f30b5..f167a37 100644 (file)
--- 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; }