$tpl->set( "helppage", wfMsg('helppage'));
*/
$tpl->set( 'searchaction', $this->escapeSearchLink() );
+ $tpl->set( 'search', trim( $wgRequest->getVal( 'search' ) ) );
$tpl->setRef( 'stylepath', $wgStylePath );
$tpl->setRef( 'logopath', $wgLogo );
$tpl->setRef( "lang", $wgContLanguageCode );
global $wgShowIPinHeader;
$personal_urls = array();
if ($this->loggedin) {
+ /* Logged in users personal toolbar */
$personal_urls['userpage'] = array(
- 'text' => $this->username,
- 'href' => &$this->userpageUrlDetails['href'],
- 'class' => $this->userpageUrlDetails['exists']?false:'new'
+ 'text' => wfMsg('mypage'),
+ 'href' => $this->makeSpecialUrl('Mypage')
);
- $usertalkUrlDetails = $this->makeTalkUrlDetails($this->userpage);
$personal_urls['mytalk'] = array(
'text' => wfMsg('mytalk'),
- 'href' => &$usertalkUrlDetails['href'],
- 'class' => $usertalkUrlDetails['exists']?false:'new'
+ 'href' => $this->makeSpecialUrl('Mytalk')
);
$personal_urls['preferences'] = array(
'text' => wfMsg('preferences'),
);
$personal_urls['mycontris'] = array(
'text' => wfMsg('mycontris'),
- 'href' => $this->makeSpecialUrl('Contributions','target=' . urlencode( $this->username ) )
+ 'href' => $this->makeSpecialUrl('Mycontributions')
);
$personal_urls['logout'] = array(
'text' => wfMsg('userlogout'),
);
} else {
if( $wgShowIPinHeader && isset( $_COOKIE[ini_get("session.name")] ) ) {
+ /* Anonymous with session users personal toolbar */
$personal_urls['anonuserpage'] = array(
- 'text' => $this->username,
- 'href' => &$this->userpageUrlDetails['href'],
- 'class' => $this->userpageUrlDetails['exists']?false:'new'
+ 'text' => wfMsg('mypage'),
+ 'href' => $this->makeSpecialUrl('Mypage')
);
- $usertalkUrlDetails = $this->makeTalkUrlDetails($this->userpage);
- $personal_urls['anontalk'] = array(
- 'text' => wfMsg('anontalk'),
- 'href' => &$usertalkUrlDetails['href'],
- 'class' => $usertalkUrlDetails['exists']?false:'new'
+ $personal_urls['mytalk'] = array(
+ 'text' => wfMsg('mytalk'),
+ 'href' => $this->makeSpecialUrl('Mytalk')
);
+
$personal_urls['anonlogin'] = array(
'text' => wfMsg('userlogin'),
'href' => $this->makeSpecialUrl('Userlogin', 'returnto=' . $this->thisurl )
);
} else {
-
+ /* Anonymous users personal toolbar */
$personal_urls['login'] = array(
'text' => wfMsg('userlogin'),
'href' => $this->makeSpecialUrl('Userlogin', 'returnto=' . $this->thisurl )
* @access private
*/
function buildContentActionUrls () {
+ global $wgContLang;
$fname = 'SkinTemplate::buildContentActionUrls';
wfProfileIn( $fname );
$nskey = $this->getNameSpaceKey();
$is_active = !Namespace::isTalk( $wgTitle->getNamespace()) ;
if ( $action == 'validate' ) $is_active = false ; # Show article tab deselected when validating
- $content_actions[$nskey] = array('class' => ($is_active) ? 'selected' : false,
- 'text' => wfMsg($nskey),
- 'href' => $this->makeArticleUrl($this->thispage));
+
+ $subjectTitle = $wgTitle->getSubjectPage();
+ if( $subjectTitle->getArticleId() != 0 ) {
+ $class = ($is_active) ? 'selected' : false;
+ } else {
+ $class = ($is_active) ? 'selected new' : 'new';
+ }
+ $content_actions[$nskey] = array('class' => $class,
+ 'text' => wfMsg($nskey),
+ 'href' => $this->makeArticleUrl($this->thispage));
/* set up the classes for the talk link */
wfProfileIn( "$fname-talk" );
}
}
wfProfileOut( "$fname-live" );
-
+
if ( $wgUser->getID() != 0 and $action != 'submit' ) {
if( !$wgTitle->userIsWatching()) {
$content_actions['watch'] = array(
'href' => $wgTitle->getLocalUrl( 'action=validate'.$article_time)
);
}
+
} else {
/* show special page tab */
);
}
+ /* show links to different language variants */
+ global $wgDisableLangConversion;
+ $variants = $wgContLang->getVariants();
+ if( !$wgDisableLangConversion && sizeof( $variants ) > 1 ) {
+ $preferred = $wgContLang->getPreferredVariant();
+ $actstr = '';
+ if( $action )
+ $actstr = 'action=' . $action . '&';
+ $vcount=0;
+ foreach( $variants as $code ) {
+ $varname = $wgContLang->getVariantname( $code );
+ if( $varname == 'disable' )
+ continue;
+ $selected = ( $code == $preferred )? 'selected' : false;
+ $content_actions['varlang-' . $vcount] = array(
+ 'class' => $selected,
+ 'text' => $varname,
+ 'href' => $wgTitle->getLocalUrl( $actstr . 'variant=' . $code )
+ );
+ $vcount ++;
+ }
+ }
+
wfProfileOut( $fname );
return $content_actions;
}
$fname = 'SkinTemplate::setupUserCss';
wfProfileIn( $fname );
- global $wgRequest, $wgTitle, $wgAllowUserCss, $wgUseSiteCss;
+ global $wgRequest, $wgTitle, $wgAllowUserCss, $wgUseSiteCss, $wgContLang, $wgSquidMaxage, $wgStylePath, $wgUser;
- $sitecss = "";
- $usercss = "";
- $siteargs = "";
+ $sitecss = '';
+ $usercss = '';
+ $siteargs = '&maxage=' . $wgSquidMaxage;
# Add user-specific code if this is a user and we allow that kind of thing
# if we're previewing the CSS page, use it
if($wgTitle->isCssSubpage() and $action == 'submit' and $wgTitle->userCanEditCssJsSubpage()) {
- $siteargs .= "&smaxage=0&maxage=0";
+ $siteargs = "&smaxage=0&maxage=0";
$usercss = $wgRequest->getText('wpTextbox1');
} else {
- $siteargs .= "&maxage=0";
$usercss = '@import "' .
$this->makeUrl($this->userpage . '/'.$this->skinname.'.css',
'action=raw&ctype=text/css') . '";' ."\n";
}
+
+ $siteargs .= '&ts=' . $wgUser->mTouched;
}
- # If we use the site's dynamic CSS, throw that in, too
+ if ($wgContLang->isRTL()) $sitecss .= '@import "' . $wgStylePath . '/' . $this->stylename . '/rtl.css";' . "\n";
+ # If we use the site's dynamic CSS, throw that in, too
if ( $wgUseSiteCss ) {
- $sitecss = '@import "'.$this->makeUrl('-','action=raw&gen=css' . $siteargs).'";'."\n";
+ $sitecss .= '@import "' . $this->makeNSUrl(ucfirst($this->skinname) . '.css', 'action=raw&ctype=text/css&smaxage=' . $wgSquidMaxage, NS_MEDIAWIKI) . '";' . "\n";
+ $sitecss .= '@import "' . $this->makeUrl('-','action=raw&gen=css' . $siteargs) . '";' . "\n";
}
# If we use any dynamic CSS, make a little CDATA block out of it.
if ( !empty($sitecss) || !empty($usercss) ) {
- $this->usercss = '/*<![CDATA[*/ ' . $sitecss . ' ' . $usercss . ' /*]]>*/';
+ $this->usercss = "/*<![CDATA[*/\n" . $sitecss . $usercss . '/*]]>*/';
}
wfProfileOut( $fname );
}
$fname = 'SkinTemplate::getUserStylesheet';
wfProfileIn( $fname );
- global $wgUser, $wgRequest, $wgTitle, $wgContLang, $wgSquidMaxage, $wgStylePath;
- $action = $wgRequest->getText('action');
- $maxage = $wgRequest->getText('maxage');
+ global $wgUser;
$s = "/* generated user stylesheet */\n";
- if($wgContLang->isRTL()) $s .= '@import "'.$wgStylePath.'/'.$this->stylename.'/rtl.css";'."\n";
- $s .= '@import "'.
- $this->makeNSUrl(ucfirst($this->skinname).'.css', 'action=raw&ctype=text/css&smaxage='.$wgSquidMaxage, NS_MEDIAWIKI)."\";\n";
+
if($wgUser->getID() != 0) {
if ( 1 == $wgUser->getOption( "underline" ) ) {
$s .= "a { text-decoration: underline; }\n";
/**
* Generic wrapper for template functions, with interface
* compatible with what we use of PHPTAL 0.7.
+ * @package MediaWiki
+ * @subpackage Skins
*/
class QuickTemplate {
/**
}
} // end of if( defined( 'MEDIAWIKI' ) )
-?>
+?>
\ No newline at end of file
dépôts / lhc / web / wiklou.git / blobdiff