+
getSkin()->getSiteNotice() ) { ?>
getSkin()->getSiteNotice() ?>
-
data['title'] ?>
+
data['title'] ?>
translator->translate( 'tagline' ) ) { ?>
translator->translate( 'tagline' ) ) ?>
@@ -321,14 +311,12 @@ class CologneBlueTemplate extends BaseTemplate {
/**
* @return string
- *
- * @fixed
*/
function afterContent() {
ob_start();
?>
-
-quickBar() ?>
+
+
escaped() ?>
+
+
sysLinks() ?>
+
variantLinks() ?>
+
+ quickBar() ?>
+
$data ) {
if ( $heading == 'SEARCH' ) {
- $bar['qbfind'] = $this->searchForm( 'sidebar' );
+ $bar['search'] = $this->searchForm( 'sidebar' );
} elseif ( $heading == 'TOOLBOX' ) {
- $bar['toolbox'] = $this->getToolbox();
- } elseif ( $heading == 'navigation' ) {
- // Use the navigation heading from standard sidebar as the "browse" section
- $bar['qbbrowse'] = $data;
+ $bar['tb'] = $this->getToolbox();
} else {
$bar[$heading] = $data;
}
@@ -492,12 +479,22 @@ class CologneBlueTemplate extends BaseTemplate {
// Output the sidebar
+ // CologneBlue uses custom messages for some portlets, but we should keep the ids for consistency
+ $idToMessage = array(
+ 'search' => 'qbfind',
+ 'navigation' => 'qbbrowse',
+ 'tb' => 'toolbox',
+ 'cactions' => 'qbedit',
+ 'personal' => 'qbmyoptions',
+ 'pageoptions' => 'qbpageoptions',
+ );
+
$s = "
\n";
foreach ( $bar as $heading => $data ) {
- $headingMsg = wfMessage( $heading );
- $headingHTML = "
" . ( $headingMsg->exists() ? $headingMsg->escaped() : htmlspecialchars( $heading ) ) . "
";
$portletId = Sanitizer::escapeId( "p-$heading" );
+ $headingMsg = wfMessage( $idToMessage[$heading] ? $idToMessage[$heading] : $heading );
+ $headingHTML = "
" . ( $headingMsg->exists() ? $headingMsg->escaped() : htmlspecialchars( $heading ) ) . "
";
$listHTML = "";
if ( is_array( $data ) ) {
@@ -517,7 +514,8 @@ class CologneBlueTemplate extends BaseTemplate {
}
if ( $listHTML ) {
- $s .= "
\n$headingHTML\n$listHTML\n
\n";
+ $role = ( $heading == 'search' ) ? 'search' : 'navigation';
+ $s .= "
\n$headingHTML\n$listHTML\n
\n";
}
}
@@ -528,8 +526,6 @@ class CologneBlueTemplate extends BaseTemplate {
/**
* @param $label string
* @return string
- *
- * @fixed
*/
function searchForm( $which ) {
global $wgUseTwoButtonsSearchForm;