moved rtl stylesheet to separate style section again, after all other styles to be...

[lhc/web/wiklou.git] / includes / EditPage.php

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 5e6df2b..7a1b6fd 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -278,9 +278,11 @@ class EditPage {
                $copywarn = wfMsg( "copyrightwarning", $sk->makeKnownLink(
                  wfMsg( "copyrightpage" ) ) );
 
-               if($wgUser->getOption("showtoolbar")) {
-                       // prepare toolbar for edit buttons
-                       $toolbar=$sk->getEditToolbar();
+               if( $wgUser->getOption("showtoolbar") ) {
+                       # prepare toolbar for edit buttons
+                       $toolbar = $sk->getEditToolbar();
+               } else {
+                       $toolbar = "";
                }
 
                // activate checkboxes if user wants them to be always active
@@ -298,15 +300,17 @@ class EditPage {
 
                if ( 0 != $wgUser->getID() || $wgAllowAnonymousMinor ) {
                        $minoredithtml =
-                       "<input tabindex='3' type='checkbox' value='1' name='wpMinoredit'".($this->minoredit?" checked":"")." id='wpMinoredit' />".
-                       "<label for='wpMinoredit'>{$minor}</label>";
+                       "<input tabindex='3' type='checkbox' value='1' name='wpMinoredit'".($this->minoredit?" checked='checked'":"").
+                       " accesskey='".wfMsg('accesskey-minoredit')."' id='wpMinoredit' />".
+                       "<label for='wpMinoredit' title='".wfMsg('tooltip-minoredit')."'>{$minor}</label>";
                }
 
                $watchhtml = "";
 
                if ( 0 != $wgUser->getID() ) {
-                       $watchhtml = "<input tabindex='4' type='checkbox' name='wpWatchthis'".($this->watchthis?" checked":"")." id='wpWatchthis' />".
-                       "<label for='wpWatchthis'>{$watchthis}</label>";
+                       $watchhtml = "<input tabindex='4' type='checkbox' name='wpWatchthis'".($this->watchthis?" checked='checked'":"").
+                       " accesskey='".wfMsg('accesskey-watch')."' id='wpWatchthis'  />".
+                       "<label for='wpWatchthis' title='".wfMsg('tooltip-watch')."'>{$watchthis}</label>";
                }
 
                $checkboxhtml = $minoredithtml . $watchhtml . "<br />";
@@ -355,15 +359,17 @@ class EditPage {
 <form id=\"editform\" name=\"editform\" method=\"post\" action=\"$action\"
 enctype=\"application/x-www-form-urlencoded\">
 {$commentsubject}
-<textarea tabindex='1' accesskey=\",\" name=\"wpTextbox1\" rows='{$rows}'
+<div id=\"tawrapper\"><textarea tabindex='1' accesskey=\",\" name=\"wpTextbox1\" rows='{$rows}'
 cols='{$cols}'{$ew}>" .
 htmlspecialchars( $wgLang->recodeForEdit( $this->textbox1 ) ) .
 "
-</textarea>
+</textarea></div>
 <br />{$editsummary}
 {$checkboxhtml}
-<input tabindex='5' type='submit' value=\"{$save}\" name=\"wpSave\" accesskey=\"s\" />
-<input tabindex='6' type='submit' value=\"{$prev}\" name=\"wpPreview\" accesskey=\"p\" />
+<input tabindex='5' type='submit' value=\"{$save}\" name=\"wpSave\" accesskey=\"".wfMsg('accesskey-save')."\"".
+" title=\"".wfMsg('tooltip-save')."\"/>
+<input tabindex='6' type='submit' value=\"{$prev}\" name=\"wpPreview\" accesskey=\"".wfMsg('accesskey-preview')."\"".
+" title=\"".wfMsg('tooltip-preview')."\"/>
 <em>{$cancel}</em> | <em>{$edithelp}</em>
 <br /><br />{$copywarn}
 <input type='hidden' value=\"" . htmlspecialchars( $this->section ) . "\" name=\"wpSection\" />
@@ -404,7 +410,7 @@ htmlspecialchars( $wgLang->recodeForEdit( $this->textbox1 ) ) .
                $link = "[[" . $wgLang->getNsText( Namespace::getUser() ) .
                  ":{$name}|{$name}]]";
 
-               $wgOut->addWikiText( wfMsg( "blockedtext", $link, $reason, $ip ) );
+               $wgOut->addWikiText( wfMsg( "blockedtext", $link, $reason, $ip, $name ) );
                $wgOut->returnToMain( false );
        }