X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=skins%2FCologneBlue.php;h=56c6b0868fd93e2067a717f42b9e0cf9a07ffe08;hb=c9a87713ac0bb3504f37735b81d4ce25cec4b636;hp=4d18eb5e48a0108eaafc559b994fd9383df2856b;hpb=8fe652709d40688d12603098e3c54dcfb4ef6444;p=lhc%2Fweb%2Fwiklou.git

diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index 4d18eb5e48..56c6b0868f 100644
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -71,8 +71,6 @@ class CologneBlueTemplate extends BaseTemplate {
 	/**
 	 * Language/charset variant links for classic-style skins
 	 * @return string
-	 *
-	 * @fixed
 	 */
 	function variantLinks() {
 		$s = array();
@@ -86,7 +84,6 @@ class CologneBlueTemplate extends BaseTemplate {
 		return $this->getSkin()->getLanguage()->pipeList( $s );
 	}
 
-	// @fixed
 	function otherLanguages() {
 		global $wgHideInterlanguageLinks;
 		if ( $wgHideInterlanguageLinks ) {
@@ -110,7 +107,6 @@ class CologneBlueTemplate extends BaseTemplate {
 			. $this->getSkin()->getLanguage()->pipeList( $s );
 	}
 
-	// @fixed
 	function pageTitleLinks() {
 		$s = array();
 		$footlinks = $this->getFooterLinks();
@@ -130,7 +126,6 @@ class CologneBlueTemplate extends BaseTemplate {
 	 * @param $message string Key of the message to use in place of standard text
 	 *
 	 * @return string
-	 * @fixed
 	 */
 	function processBottomLink( $key, $navlink, $message=null ) {
 		if ( !$navlink ) {
@@ -145,7 +140,6 @@ class CologneBlueTemplate extends BaseTemplate {
 		return $this->makeListItem( $key, $this->processNavlinkForDocument( $navlink ), array( 'tag' => 'span' ) );
 	}
 
-	// @fixed
 	function bottomLinks() {
 		$toolbox = $this->getToolbox();
 		$content_nav = $this->data['content_navigation'];
@@ -197,7 +191,6 @@ class CologneBlueTemplate extends BaseTemplate {
 		return implode( array_filter( $lines ), "<br />\n" ) . "<br />\n";
 	}
 
-	// @fixed
 	function talkLink() {
 		$title = $this->getSkin()->getTitle();
 
@@ -271,8 +264,6 @@ class CologneBlueTemplate extends BaseTemplate {
 
 	/**
 	 * @return string
-	 *
-	 * @fixed
 	 */
 	function beforeContent() {
 		ob_start();
@@ -285,10 +276,6 @@ class CologneBlueTemplate extends BaseTemplate {
 			</a>
 		</p>
 		<p id="sitesub"><?php echo wfMessage( 'sitesubtitle' )->escaped() ?></p>
-		<div id="toplinks" role="navigation">
-			<p id="syslinks"><?php echo $this->sysLinks() ?></p>
-			<p id="variantlinks"><?php echo $this->variantLinks() ?></p>
-		</div>
 		<div id="linkcollection" role="navigation">
 			<div id="langlinks"><?php echo str_replace( '<br />', '', $this->otherLanguages() ) ?></div>
 			<?php echo $this->getSkin()->getCategories() ?>
@@ -324,8 +311,6 @@ class CologneBlueTemplate extends BaseTemplate {
 
 	/**
 	 * @return string
-	 *
-	 * @fixed
 	 */
 	function afterContent() {
 		ob_start();
@@ -355,7 +340,14 @@ class CologneBlueTemplate extends BaseTemplate {
 ?>
 	</div>
 </div>
-<?php echo $this->quickBar() ?>
+<div id="mw-navigation">
+	<h2><?php echo wfMessage( 'navigation-heading' )->escaped() ?></h2>
+	<div id="toplinks" role="navigation">
+		<p id="syslinks"><?php echo $this->sysLinks() ?></p>
+		<p id="variantlinks"><?php echo $this->variantLinks() ?></p>
+	</div>
+	<?php echo $this->quickBar() ?>
+</div>
 <?php
 		$s = ob_get_contents();
 		ob_end_clean();
@@ -365,8 +357,6 @@ class CologneBlueTemplate extends BaseTemplate {
 
 	/**
 	 * @return string
-	 *
-	 * @fixed
 	 */
 	function sysLinks() {
 		$s = array(
@@ -400,8 +390,6 @@ class CologneBlueTemplate extends BaseTemplate {
 	 *
 	 * @param $bar sidebar data
 	 * @return array modified sidebar data
-	 *
-	 * @fixed
 	 */
 	function sidebarAdditions( $bar ) {
 		// "This page" and "Edit" menus
@@ -446,8 +434,6 @@ class CologneBlueTemplate extends BaseTemplate {
 	 * @access private
 	 *
 	 * @return string
-	 *
-	 * @fixed
 	 */
 	function quickBar() {
 		// Massage the sidebar. We want to:
@@ -508,7 +494,7 @@ class CologneBlueTemplate extends BaseTemplate {
 		foreach ( $bar as $heading => $data ) {
 			$portletId = Sanitizer::escapeId( "p-$heading" );
 			$headingMsg = wfMessage( $idToMessage[$heading] ? $idToMessage[$heading] : $heading );
-			$headingHTML = "<h6>" . ( $headingMsg->exists() ? $headingMsg->escaped() : htmlspecialchars( $heading ) ) . "</h6>";
+			$headingHTML = "<h3>" . ( $headingMsg->exists() ? $headingMsg->escaped() : htmlspecialchars( $heading ) ) . "</h3>";
 			$listHTML = "";
 
 			if ( is_array( $data ) ) {
@@ -540,8 +526,6 @@ class CologneBlueTemplate extends BaseTemplate {
 	/**
 	 * @param $label string
 	 * @return string
-	 *
-	 * @fixed
 	 */
 	function searchForm( $which ) {
 		global $wgUseTwoButtonsSearchForm;