X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=skins%2FStandard.php;h=ed00d59daacf4fc8209eacc9a53515bd2c8d0b19;hb=79fe75158833f6c357adb112d0180df1683875a7;hp=d4dd53db9eee1656863620f5a75fe09cd9087a7c;hpb=a0d30b1e0365a84d407ec54b4e51d050410d1fad;p=lhc%2Fweb%2Fwiklou.git
diff --git a/skins/Standard.php b/skins/Standard.php
index d4dd53db9e..ed00d59daa 100644
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -1,29 +1,30 @@
qbSetting() ) { # Floating left
- $s .= "\n";
+ $s .= "\n";
}
return $s;
}
@@ -32,11 +33,14 @@ class SkinStandard extends Skin {
*
*/
function getUserStyles() {
- global $wgStylePath;
+ global $wgStylePath, $wgStyleVersion;
$s = '';
if ( 3 == $this->qbSetting() ) { # Floating left
$s .= "\n";
+ "@import '{$wgStylePath}/common/quickbar.css?$wgStyleVersion';\n\n";
+ } else if ( 4 == $this->qbSetting() ) { # Floating right
+ $s .= "\n";
}
$s .= parent::getUserStyles();
return $s;
@@ -46,7 +50,7 @@ class SkinStandard extends Skin {
*
*/
function doGetUserStyles() {
- global $wgUser, $wgOut, $wgStylePath;
+ global $wgStylePath;
$s = parent::doGetUserStyles();
$qb = $this->qbSetting();
@@ -59,6 +63,9 @@ class SkinStandard extends Skin {
$s .= "#quickbar { position: absolute; top: 4px; left: 4px; " .
"border-right: 1px solid gray; }\n" .
"#article { margin-left: 152px; margin-right: 4px; }\n";
+ } else if ( 4 == $qb) {
+ $s .= "#quickbar { border-right: 1px solid gray; }\n" .
+ "#article { margin-right: 152px; margin-left: 4px; }\n";
}
return $s;
}
@@ -79,6 +86,217 @@ class SkinStandard extends Skin {
}
return $a;
}
+
+ function doAfterContent() {
+ global $wgContLang;
+ $fname = 'SkinStandard::doAfterContent';
+ wfProfileIn( $fname );
+ wfProfileIn( $fname.'-1' );
+
+ $s = "\n
\n";
+ $s .= "\n
\n\n";
+
+ wfProfileOut( $fname.'-3' );
+ wfProfileIn( $fname.'-4' );
+ if ( 0 != $qb ) { $s .= $this->quickBar(); }
+ wfProfileOut( $fname.'-4' );
+ wfProfileOut( $fname );
+ return $s;
+ }
+
+ function quickBar() {
+ global $wgOut, $wgTitle, $wgUser, $wgRequest, $wgContLang;
+ global $wgEnableUploads, $wgRemoteUploads;
+
+ $fname = 'Skin::quickBar';
+ wfProfileIn( $fname );
+
+ $action = $wgRequest->getText( 'action' );
+ $wpPreview = $wgRequest->getBool( 'wpPreview' );
+ $tns=$wgTitle->getNamespace();
+
+ $s = "\n";
+ $s .= "\n" . $this->logoText() . "\n
";
+
+ $sep = "\n
";
+
+ # Use the first heading from the Monobook sidebar as the "browse" section
+ $bar = $this->buildSidebar();
+ $browseLinks = reset( $bar );
+
+ foreach ( $browseLinks as $link ) {
+ if ( $link['text'] != '-' ) {
+ $s .= "
" .
+ htmlspecialchars( $link['text'] ) . '' . $sep;
+ }
+ }
+
+ if( $wgUser->isLoggedIn() ) {
+ $s.= $this->specialLink( 'watchlist' ) ;
+ $s .= $sep . $this->makeKnownLink( $wgContLang->specialPage( 'Contributions' ),
+ wfMsg( 'mycontris' ), 'target=' . wfUrlencode($wgUser->getName() ) );
+ }
+ // only show watchlist link if logged in
+ $s .= "\n
";
+ $articleExists = $wgTitle->getArticleId();
+ if ( $wgOut->isArticle() || $action =='edit' || $action =='history' || $wpPreview) {
+ if($wgOut->isArticle()) {
+ $s .= '
' . $this->editThisPage() . '';
+ } else { # backlink to the article in edit or history mode
+ if($articleExists){ # no backlink if no article
+ switch($tns) {
+ case NS_TALK:
+ case NS_USER_TALK:
+ case NS_PROJECT_TALK:
+ case NS_IMAGE_TALK:
+ case NS_MEDIAWIKI_TALK:
+ case NS_TEMPLATE_TALK:
+ case NS_HELP_TALK:
+ case NS_CATEGORY_TALK:
+ $text = wfMsg('viewtalkpage');
+ break;
+ case NS_MAIN:
+ $text = wfMsg( 'articlepage' );
+ break;
+ case NS_USER:
+ $text = wfMsg( 'userpage' );
+ break;
+ case NS_PROJECT:
+ $text = wfMsg( 'projectpage' );
+ break;
+ case NS_IMAGE:
+ $text = wfMsg( 'imagepage' );
+ break;
+ case NS_MEDIAWIKI:
+ $text = wfMsg( 'mediawikipage' );
+ break;
+ case NS_TEMPLATE:
+ $text = wfMsg( 'templatepage' );
+ break;
+ case NS_HELP:
+ $text = wfMsg( 'viewhelppage' );
+ break;
+ case NS_CATEGORY:
+ $text = wfMsg( 'categorypage' );
+ break;
+ default:
+ $text= wfMsg( 'articlepage' );
+ }
+
+ $link = $wgTitle->getText();
+ if ($nstext = $wgContLang->getNsText($tns) ) { # add namespace if necessary
+ $link = $nstext . ':' . $link ;
+ }
+
+ $s .= $this->makeLink( $link, $text );
+ } elseif( $wgTitle->getNamespace() != NS_SPECIAL ) {
+ # we just throw in a "New page" text to tell the user that he's in edit mode,
+ # and to avoid messing with the separator that is prepended to the next item
+ $s .= '
' . wfMsg('newpage') . '';
+ }
+
+ }
+
+ # "Post a comment" link
+ if( ( $wgTitle->isTalkPage() || $wgOut->showNewSectionLink() ) && $action != 'edit' && !$wpPreview )
+ $s .= '
' . $this->makeKnownLinkObj( $wgTitle, wfMsg( 'postcomment' ), 'action=edit§ion=new' );
+
+ #if( $tns%2 && $action!='edit' && !$wpPreview) {
+ #$s.= '
'.$this->makeKnownLink($wgTitle->getPrefixedText(),wfMsg('postcomment'),'action=edit§ion=new');
+ #}
+
+ /*
+ watching could cause problems in edit mode:
+ if user edits article, then loads "watch this article" in background and then saves
+ article with "Watch this article" checkbox disabled, the article is transparently
+ unwatched. Therefore we do not show the "Watch this page" link in edit mode
+ */
+ if ( $wgUser->isLoggedIn() && $articleExists) {
+ if($action!='edit' && $action != 'submit' )
+ {
+ $s .= $sep . $this->watchThisPage();
+ }
+ if ( $wgTitle->userCan( 'edit' ) )
+ $s .= $sep . $this->moveThisPage();
+ }
+ if ( $wgUser->isAllowed('delete') and $articleExists ) {
+ $s .= $sep . $this->deleteThisPage() .
+ $sep . $this->protectThisPage();
+ }
+ $s .= $sep . $this->talkLink();
+ if ($articleExists && $action !='history') {
+ $s .= $sep . $this->historyLink();
+ }
+ $s.=$sep . $this->whatLinksHere();
+
+ if($wgOut->isArticleRelated()) {
+ $s .= $sep . $this->watchPageLinksLink();
+ }
+
+ if ( NS_USER == $wgTitle->getNamespace()
+ || $wgTitle->getNamespace() == NS_USER_TALK ) {
+
+ $id=User::idFromName($wgTitle->getText());
+ $ip=User::isIP($wgTitle->getText());
+
+ if($id||$ip) {
+ $s .= $sep . $this->userContribsLink();
+ }
+ if( $this->showEmailUser( $id ) ) {
+ $s .= $sep . $this->emailUserLink();
+ }
+ }
+ $s .= "\n
";
+ }
+
+ if ( $wgUser->isLoggedIn() && ( $wgEnableUploads || $wgRemoteUploads ) ) {
+ $s .= $this->specialLink( 'upload' ) . $sep;
+ }
+ $s .= $this->specialLink( 'specialpages' )
+ . $sep . $this->bugReportsLink();
+
+ global $wgSiteSupportPage;
+ if( $wgSiteSupportPage ) {
+ $s .= "\n
' . wfMsg( 'sitesupport' ) . '';
+ }
+
+ $s .= "\n
\n";
+ wfProfileOut( $fname );
+ return $s;
+ }
+
+
}
-?>
+