Merge "document CASE (0th array element) for $magicWords"

[lhc/web/wiklou.git] / skins / CologneBlue.php

diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index 52154e3..214d9bc 100644 (file)
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -2,6 +2,21 @@
 /**
  * Cologne Blue: A nicer-looking alternative to Standard.
  *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @todo document
  * @file
  * @ingroup Skins
@@ -32,23 +47,23 @@ class SkinCologneBlue extends SkinLegacy {
                if ( 2 == $qb ) { # Right
                        $rules[] = "/* @noflip */#quickbar { position: absolute; right: 4px; }";
                        $rules[] = "/* @noflip */#article { margin-left: 4px; margin-right: 148px; }";
-                       $rules[] = "/* @noflip */#topbar, #footer { margin-right: 152px; }";
+                       $rules[] = "/* @noflip */#footer { margin-right: 152px; }";
                } elseif ( 1 == $qb ) {
                        $rules[] = "/* @noflip */#quickbar { position: absolute; left: 4px; }";
                        $rules[] = "/* @noflip */#article { margin-left: 148px; margin-right: 4px; }";
-                       $rules[] = "/* @noflip */#topbar, #footer { margin-left: 152px; }";
+                       $rules[] = "/* @noflip */#footer { margin-left: 152px; }";
                } elseif ( 3 == $qb ) { # Floating left
                        $rules[] = "/* @noflip */#quickbar { position:absolute; left:4px }";
                        $rules[] = "/* @noflip */#topbar { margin-left: 148px }";
                        $rules[] = "/* @noflip */#article { margin-left:148px; margin-right: 4px; }";
                        $rules[] = "/* @noflip */body>#quickbar { position:fixed; left:4px; top:4px; overflow:auto; bottom:4px;}"; # Hides from IE
-                       $rules[] = "/* @noflip */#topbar, #footer { margin-left: 152px; }";
+                       $rules[] = "/* @noflip */#footer { margin-left: 152px; }";
                } elseif ( 4 == $qb ) { # Floating right
                        $rules[] = "/* @noflip */#quickbar { position: fixed; right: 4px; }";
                        $rules[] = "/* @noflip */#topbar { margin-right: 148px }";
                        $rules[] = "/* @noflip */#article { margin-right: 148px; margin-left: 4px; }";
                        $rules[] = "/* @noflip */body>#quickbar { position: fixed; right: 4px; top: 4px; overflow: auto; bottom:4px;}"; # Hides from IE
-                       $rules[] = "/* @noflip */#topbar, #footer { margin-left: 152px; }";
+                       $rules[] = "/* @noflip */#footer { margin-right: 152px; }";
                }
                $style = implode( "\n", $rules );
                $out->addInlineStyle( $style, 'flip' );
@@ -68,12 +83,12 @@ class CologneBlueTemplate extends LegacyTemplate {
                  '<table width="100%" border="0" cellspacing="0" cellpadding="8"><tr>';
 
                $s .= '<td class="top" nowrap="nowrap">';
-               $s .= '<a href="' . $mainPageObj->escapeLocalURL() . '">';
+               $s .= '<a href="' . htmlspecialchars( $mainPageObj->getLocalURL() ) . '">';
                $s .= '<span id="sitetitle">' . wfMsg( 'sitetitle' ) . '</span></a>';
 
                $s .= '</td><td class="top" id="top-syslinks" width="100%">';
                $s .= $this->sysLinks();
-               $s .= '</td></tr><tr><td class="top-linkcollection">';
+               $s .= '</td></tr><tr><td class="top-subheader">';
 
                $s .= '<font size="-1"><span id="sitesub">';
                $s .= htmlspecialchars( wfMsg( 'sitesubtitle' ) ) . '</span></font>';
@@ -112,7 +127,7 @@ class CologneBlueTemplate extends LegacyTemplate {
                $s .= '<td class="bottom">';
 
                $s .= $this->bottomLinks();
-               $s .= $this->getSkin()->getLang()->pipeList( array(
+               $s .= $this->getSkin()->getLanguage()->pipeList( array(
                        "\n<br />" . Linker::link(
                                Title::newMainPage(),
                                null,
@@ -189,7 +204,7 @@ class CologneBlueTemplate extends LegacyTemplate {
                        );
                }
 
-               return $this->getSkin()->getLang()->pipeList( $s );
+               return $this->getSkin()->getLanguage()->pipeList( $s );
        }
 
        /**