FOR UPDATE mode for Article class, and for getArticleID function of Title. Using...

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

diff --git a/includes/SkinCologneBlue.php b/includes/SkinCologneBlue.php
index 5365532..b2f99aa 100644 (file)
--- a/includes/SkinCologneBlue.php
+++ b/includes/SkinCologneBlue.php
@@ -1,49 +1,55 @@
-<?
+<?php
 # See skin.doc
 
 class SkinCologneBlue extends Skin {
 
-       function initPage()
+       function getStylesheet()
        {
-               global $wgOut, $wgStyleSheetPath;
-
-               $wgOut->addLink( "stylesheet", "",
-                 "{$wgStyleSheetPath}/cologneblue.css" );
+               return "cologneblue.css";
+       }
+       function getSkinName() {
+               return "cologneblue";
        }
 
        function doBeforeContent()
        {
-               global $wgUser, $wgOut, $wgTitle;
+               global $wgUser, $wgOut, $wgTitle, $wgSiteNotice;
 
                $s = "";
                $qb = $this->qbSetting();
-
+               $mainPageObj = Title::newMainPage();
+               
                $s .= "\n<div id='content'>\n<div id='topbar'>" .
-                 "<table width='100%' border=0 cellspacing=0 cellpadding=8><tr>";
+                 "<table width='100%' border='0' cellspacing='0' cellpadding='8'><tr>";
 
-               $s .= "<td class='top' align=left valign=middle nowrap>";
-               $s .= "<a href=\"" . wfLocalUrlE( urlencode( wfMsg( "mainpage" ) ) ) . "\">";
+               $s .= "<td class='top' align='left' valign='middle' nowrap='nowrap'>";
+               $s .= "<a href=\"" . $mainPageObj->escapeLocalURL() . "\">";
                $s .= "<span id='sitetitle'>" . wfMsg( "sitetitle" ) . "</span></a>";
 
-               $s .= "</td><td class='top' align=right valign=bottom width='100%'>";
+               $s .= "</td><td class='top' align='right' valign='bottom' width='100%'>";
                $s .= $this->sysLinks();
-               $s .= "</td></tr><tr><td valign=top>";
+               $s .= "</td></tr><tr><td valign='top'>";
 
                $s .= "<font size='-1'><span id='sitesub'>";
-               $s .= wfMsg( "sitesubtitle" ) . "</span></font>";
-               $s .= "</td><td align=right>" ;
+               $s .= htmlspecialchars( wfMsg( "sitesubtitle" ) ) . "</span></font>";
+               $s .= "</td><td align='right'>" ;
 
                $s .= "<font size='-1'><span id='langlinks'>" ;
-               $s .= str_replace ( "<br>" , "" , $this->otherLanguages() ) ;
-               $s .= "<br>" . $this->pageTitleLinks();
+               $s .= str_replace ( "<br>" , "" , $this->otherLanguages() );
+               $cat = $this->getCategoryLinks();
+               if( $cat ) $s .= "<br />$cat\n";
+               $s .= "<br />" . $this->pageTitleLinks();
                $s .= "</span></font>";
 
                $s .= "</td></tr></table>\n";
 
                $s .= "\n</div>\n<div id='article'>";
 
+               if( $wgSiteNotice ) {
+                       $s .= "\n<div id='siteNotice'>$wgSiteNotice</div>\n";
+               }
                $s .= $this->pageTitle();
-               $s .= $this->pageSubtitle() . "\n<p>";
+               $s .= $this->pageSubtitle() . "\n";
                return $s;
        }
 
@@ -51,24 +57,23 @@ class SkinCologneBlue extends Skin {
        {
                global $wgUser, $wgOut;
 
-               $s = "\n</div><br clear=all>\n";
+               $s = "\n</div><br clear='all' />\n";
 
                $s .= "\n<div id='footer'>";
-               $s .= "<table width='98%' border=0 cellspacing=0><tr>";
+               $s .= "<table width='98%' border='0' cellspacing='0'><tr>";
 
                $qb = $this->qbSetting();
                if ( 1 == $qb || 3 == $qb ) { # Left
                        $s .= $this->getQuickbarCompensator();
                }
-               $s .= "<td class='bottom' align=center valign=top>";
+               $s .= "<td class='bottom' align='center' valign='top'>";
 
                $s .= $this->bottomLinks();
-               $s .= "\n<br>" . $this->makeKnownLink( wfMsg( "mainpage" ),
-                 wfMsg( "mainpage" ) ) . " | "
+               $s .= "\n<br />" . $this->makeKnownLink( wfMsg( "mainpage" ) ) . " | "
                  . $this->aboutLink() . " | "
                  . $this->searchForm( wfMsg( "qbfind" ) );
 
-               $s .= "\n<br>" . $this->pageStats();
+               $s .= "\n<br />" . $this->pageStats();
 
                $s .= "</td>";
                if ( 2 == $qb ) { # Right
@@ -82,17 +87,22 @@ class SkinCologneBlue extends Skin {
        function doGetUserStyles()
        {
                global $wgUser, $wgOut, $wgStyleSheetPath;
-
-               $s = parent::doGetUserStyles();
+               $s = '';
                $qb = $this->qbSetting();
 
                if ( 2 == $qb ) { # Right
                        $s .= "#quickbar { position: absolute; right: 4px; }\n" .
                          "#article { margin-left: 4px; margin-right: 148px; }\n";
-               } else if ( 1 == $qb || 3 == $qb ) {
+               } else if ( 1 == $qb ) {
                        $s .= "#quickbar { position: absolute; left: 4px; }\n" .
                          "#article { margin-left: 148px; margin-right: 4px; }\n";
+               } else if ( 3 == $qb ) { # Floating
+                       $s .= "#quickbar { position:absolute; left:4px } \n" .
+                         "#topbar { margin-left: 148px }\n" .
+                         "#article { margin-left:148px; margin-right: 4px; } \n" .
+                         "body>#quickbar { position:fixed; left:4px; top:4px; overflow:auto ;bottom:4px;} \n"; # Hides from IE
                }
+               $s .= parent::doGetUserStyles();
                return $s;
        }
        function sysLinks()
@@ -108,9 +118,6 @@ class SkinCologneBlue extends Skin {
                        $q = "returnto={$rt}"; 
                }
                
-               $s .= "\n<br>" . $this->makeKnownLink( $li,
-                 wfMsg( "login" ), $q );
-
                $s = "" .
                  $this->makeKnownLink( wfMsg( "mainpage" ), wfMsg( "mainpage" ) )
                  . " | " .
@@ -142,7 +149,7 @@ class SkinCologneBlue extends Skin {
 
                $s = "\n<div id='quickbar'>";
 
-               $sep = "<br>";
+               $sep = "<br />";
                $s .= $this->menuHead( "qbfind" );
                $s .= $this->searchForm();
 
@@ -188,12 +195,12 @@ class SkinCologneBlue extends Skin {
                          . $this->historyLink()
                          . $sep . $this->whatLinksHere()
                          . $sep . $this->watchPageLinksLink();
-
+                         
                        if ( Namespace::getUser() == $tns || Namespace::getTalk(Namespace::getUser()) == $tns ) {
-                               if ( 0 != $wgUser->getID() ) {
-                                       $id=User::idFromName($wgTitle->getText());                              
-                                       if ($id != 0) {
-                                               $s .= $sep . $this->userContribsLink();
+                               $id=User::idFromName($wgTitle->getText());
+                               if ($id != 0) {
+                                       $s .= $sep . $this->userContribsLink();
+                                       if ( 0 != $wgUser->getID() ) {
                                                $s .= $sep . $this->emailUserLink();
                                        }
                                }
@@ -213,6 +220,8 @@ class SkinCologneBlue extends Skin {
                          Namespace::getUser() ) . ":{$name}", wfMsg( "mypage" ) )
                          . $sep . $tl
                          . $sep . $this->specialLink( "watchlist" )
+                         . $sep . $this->makeKnownLink( $wgLang->specialPage( "Contributions" ),
+                               wfMsg( "mycontris" ), "target=" . wfUrlencode($wgUser->getName() ) )            
                          . $sep . $this->specialLink( "preferences" )
                          . $sep . $this->specialLink( "userlogout" );
                } else {
@@ -227,7 +236,12 @@ class SkinCologneBlue extends Skin {
                if ( 0 != $wgUser->getID() && !$wgDisableUploads ) {
                        $s .= $sep . $this->specialLink( "upload" );
                }
-
+               global $wgSiteSupportPage;
+               if( $wgSiteSupportPage) {
+                       $s .= $sep."<a href=\"".htmlspecialchars($wgSiteSupportPage)."\" class =\"internal\">"
+                             .wfMsg( "sitesupport" )."</a>";
+               }
+               
                $s .= $sep . $this->makeKnownLink( $wgLang->specialPage( "Specialpages" ), wfMsg("moredotdotdot") );
 
                $s .= $sep . "\n</div>\n";
@@ -242,14 +256,16 @@ class SkinCologneBlue extends Skin {
 
        function searchForm( $label = "" )
        {
-               global $search;
-               $s = "<form id=\"search\" method=\"get\" class=\"inline\" action=\"" .
-                 wfLocalUrlE( "" ) . "\">";
+               global $wgRequest;
+
+               $search = $wgRequest->getText( 'search' );
+               $action = $this->escapeSearchLink();
+               $s = "<form id=\"search\" method=\"get\" class=\"inline\" action=\"$action\">";
                if ( "" != $label ) { $s .= "{$label}: "; }
 
-               $s .= "<input type=text name=\"search\" size=14 value=\""
-                 . htmlspecialchars(substr($search,0,256)) . "\">"
-                 . "<br><input type=submit name=\"go\" value=\"" . wfMsg( "go" ) . "\"> <input type=submit value=\"" . wfMsg( "search" ) . "\"></form>";
+               $s .= "<input type='text' name=\"search\" size='14' value=\""
+                 . htmlspecialchars(substr($search,0,256)) . "\" />"
+                 . "<br /><input type='submit' name=\"go\" value=\"" . htmlspecialchars( wfMsg( "go" ) ) . "\" /> <input type='submit' name=\"fulltext\" value=\"" . htmlspecialchars( wfMsg( "search" ) ) . "\" /></form>";
 
                return $s;
        }