diff -Naur -x CVS -x LocalSettings.php -x AdminSettings.php wikipedia.cvs20031121/includes/Skin.php wikipedia.cvs20031121.with-cb-quickbar-reorg/includes/Skin.php
--- wikipedia.cvs20031121/includes/Skin.php 2003-11-21 01:12:01.000000000 +0000
+++ wikipedia.cvs20031121.with-cb-quickbar-reorg/includes/Skin.php 2003-11-22 02:10:56.000000000 +0000
@@ -919,7 +919,7 @@
$s = $this->makeKnownLink( $n, $t, "action=delete" );
} else {
- $s = wfMsg( "error" );
+ $s = "";
}
return $s;
}
@@ -940,7 +940,7 @@
}
$s = $this->makeKnownLink( $n, $t, $q );
} else {
- $s = wfMsg( "error" );
+ $s = "";
}
return $s;
}
@@ -1151,6 +1151,29 @@
return $s;
}
+ function commentLink()
+ {
+ global $wgLang, $wgTitle, $wgLinkCache;
+
+ $tns = $wgTitle->getNamespace();
+ if ( -1 == $tns ) { return ""; }
+
+ $lns = ( Namespace::isTalk( $tns ) ) ? $tns : Namespace::getTalk( $tns );
+
+ # assert Namespace::isTalk( $lns )
+
+ $n = $wgLang->getNsText( $lns );
+ $pn = $wgTitle->getText();
+
+ $link = "{$n}:{$pn}";
+
+ $wgLinkCache->suspend();
+ $s = $this->makeKnownLink($link, wfMsg("postcomment"), "action=edit§ion=new");
+ $wgLinkCache->resume();
+
+ return $s;
+ }
+
# After all the page content is transformed into HTML, it makes
# a final pass through here for things like table backgrounds.
#
diff -Naur -x CVS -x LocalSettings.php -x AdminSettings.php wikipedia.cvs20031121/includes/SkinCologneBlue.php wikipedia.cvs20031121.with-cb-quickbar-reorg/includes/SkinCologneBlue.php
--- wikipedia.cvs20031121/includes/SkinCologneBlue.php 2003-11-09 11:43:15.000000000 +0000
+++ wikipedia.cvs20031121.with-cb-quickbar-reorg/includes/SkinCologneBlue.php 2003-11-22 02:12:48.000000000 +0000
@@ -138,6 +138,8 @@
{
global $wgOut, $wgTitle, $wgUser, $wgLang;
+ $tns=$wgTitle->getNamespace();
+
$s = "\n
";
$sep = "
";
@@ -146,46 +148,48 @@
$s .= $this->menuHead( "qbbrowse" )
. $this->mainPageLink()
- . $sep . $this->specialLink( "recentchanges" )
- . $sep . $this->specialLink( "randompage" )
- . $sep . $this->specialLink( "newpages" )
- . $sep . $this->specialLink( "imagelist" )
- . $sep . $this->specialLink( "statistics" )
- . $sep . $this->specialLink( "specialpages" )
- . $sep . $this->bugReportsLink() ;
+ . $sep . $this->specialLink( "recentchanges" )
+ . $sep . $this->specialLink( "randompage" );
if ( wfMsg ( "currentevents" ) != "-" ) $s .= $sep . $this->makeKnownLink( wfMsg( "currentevents" ), "" ) ;
$s .= "\n";
if ( $wgOut->isArticle() ) {
$s .= $this->menuHead( "qbedit" );
- $s .= "" . $this->editThisPage() . ""
- . $sep . $this->makeKnownLink( wfMsg( "edithelppage" ),
- wfMsg( "edithelp" ) );
+ $s .= "" . $this->editThisPage() . "";
+
+ $s .= $sep . $this->makeKnownLink( wfMsg( "edithelppage" ), wfMsg( "edithelp" ) );
if ( 0 != $wgUser->getID() ) {
- $s .= $sep . $this->specialLink( "upload" )
- . $sep . $this->moveThisPage();
+ $s .= $sep . $this->moveThisPage();
}
if ( $wgUser->isSysop() ) {
- $s .= $sep . $this->deleteThisPage() .
- $sep . $this->protectThisPage();
+ $dtp = $this->deleteThisPage();
+ if ( "" != $dtp ) {
+ $s .= $sep . $dtp;
+ }
+ $ptp = $this->protectThisPage();
+ if ( "" != $ptp ) {
+ $s .= $sep . $ptp;
+ }
}
$s .= $sep;
$s .= $this->menuHead( "qbpageoptions" );
$s .= $this->talkLink()
+ . $sep . $this->commentLink()
. $sep . $this->printableLink();
if ( 0 != $wgUser->getID() ) {
$s .= $sep . $this->watchThisPage();
}
+
$s .= $sep;
- $s .= $this->menuHead( "qbpageinfo" )
- . $this->historyLink()
+ $s .= $this->menuHead("qbpageinfo")
+ . $this->historyLink()
. $sep . $this->whatLinksHere()
. $sep . $this->watchPageLinksLink();
- if ( Namespace::getUser() == $wgTitle->getNamespace() ) {
+ if ( Namespace::getUser() == $tns ) {
$s .= $sep . $this->userContribsLink();
if ( 0 != $wgUser->getID() ) {
$s .= $sep . $this->emailUserLink();
@@ -193,6 +197,7 @@
}
$s .= $sep;
}
+
$s .= $this->menuHead( "qbmyoptions" );
if ( 0 != $wgUser->getID() ) {
$name = $wgUser->getName();
@@ -210,6 +215,18 @@
} else {
$s .= $this->specialLink( "userlogin" );
}
+
+ $s .= $this->menuHead( "qbspecialpages" )
+ . $this->specialLink( "newpages" )
+ . $sep . $this->specialLink( "imagelist" )
+ . $sep . $this->specialLink( "statistics" )
+ . $sep . $this->bugReportsLink();
+ if ( 0 != $wgUser->getID() ) {
+ $s .= $sep . $this->specialLink( "upload" );
+ }
+
+ $s .= $sep . $this->makeKnownLink( wfMsg("specialpages" ), wfMsg("moredotdotdot") );
+
$s .= $sep . "\n
\n";
return $s;
}
diff -Naur -x CVS -x LocalSettings.php -x AdminSettings.php wikipedia.cvs20031121/languages/Language.php wikipedia.cvs20031121.with-cb-quickbar-reorg/languages/Language.php
--- wikipedia.cvs20031121/languages/Language.php 2003-11-20 13:40:30.000000000 +0000
+++ wikipedia.cvs20031121.with-cb-quickbar-reorg/languages/Language.php 2003-11-22 00:25:35.000000000 +0000
@@ -374,9 +374,11 @@
"qbfind" => "Find",
"qbbrowse" => "Browse",
"qbedit" => "Edit",
-"qbpageoptions" => "Page options",
-"qbpageinfo" => "Page info",
-"qbmyoptions" => "My options",
+"qbpageoptions" => "This page",
+"qbpageinfo" => "Context",
+"qbmyoptions" => "My pages",
+"qbspecialpages" => "Special pages",
+"moredotdotdot" => "More...",
"mypage" => "My page",
"mytalk" => "My talk",
"currentevents" => "Current events",