$wgValidSkinNames[] = "Smarty";
$wgValidSkinNames[] = "Montparnasse";
}
+if( $wgUsePHPTal ) {
+ #$wgValidSkinNames[] = "PHPTal";
+ $wgValidSkinNames[] = "DaVinci";
+}
include_once( "RecentChange.php" );
function getUserStyles()
{
global $wgOut, $wgStyleSheetPath;
- if( $wgOut->isPrintable() ) {
- $sheet = "wikiprintable.css";
- } else {
- $sheet = $this->getStylesheet();
- }
+ $sheet = $this->getStylesheet();
$s = "<style type='text/css'><!--\n";
- $s .= "@import url(\"$wgStyleSheetPath/$sheet\");\n";
$s .= "/*/*/\n"; # <-- Hide the styles from Netscape 4 without hiding them from IE/Mac
+ $s .= "@import url(\"$wgStyleSheetPath/$sheet\");\n";
$s .= $this->doGetUserStyles();
$s .= "/* */\n";
$s .= "//--></style>\n";
$link = str_replace( "_", " ", $link );
$link = wfEscapeHTML( $link );
- if ( $wgOut->isPrintable() ) { $r = " class='printable'"; }
- else { $r = " class='external'"; }
+ $r = " class='external'";
if ( 1 == $wgUser->getOption( "hover" ) ) {
$r .= " title=\"{$link}\"";
$link = str_replace( "_", " ", $link );
$link = wfEscapeHTML( $link );
- if ( $wgOut->isPrintable() ) {
- $r = " class='printable'";
- } else if ( $broken == "stub" ) {
+ if ( $broken == "stub" ) {
$r = " class='stub'";
} else if ( $broken == "yes" ) {
$r = " class='new'";
} else {
- $r = " class='internal'";
+ $r = "";
}
if ( 1 == $wgUser->getOption( "hover" ) ) {
{
global $wgUser, $wgOut;
- if ( $wgOut->isPrintable() ) {
- $r = " class='printable'";
- } else if ( $broken == "stub" ) {
+ if ( $broken == "stub" ) {
$r = " class='stub'";
} else if ( $broken == "yes" ) {
$r = " class='new'";
} else {
- $r = " class='internal'";
+ $r = "";
}
if ( 1 == $wgUser->getOption( "hover" ) ) {
{
global $wgUser, $wgOut, $wgSiteNotice;
- if ( $wgOut->isPrintable() ) {
- $s = $this->pageTitle() . $this->pageSubtitle() . "\n";
- $s .= "\n<div class='bodytext'>";
- return $s;
- }
if( $wgSiteNotice ) {
$note = "\n<div id='notice' style='font-weight: bold; color: red; text-align: center'>$wgSiteNotice</div>\n";
} else {
}
$s .= "\n<div id='content'>\n<div id='topbar'>" .
- "<table width='98%' border=0 cellspacing=0><tr>";
+ "<table border=0 cellspacing=0><tr>";
$shove = ($qb != 0);
$left = ($qb == 1 || $qb == 3);
global $wgUser, $wgOut, $wgServer;
global $wgTitle, $wgLang;
- if ( $wgOut->isPrintable() ) {
- $s = "\n</div>\n";
-
- $u = htmlspecialchars( $wgServer . $wgTitle->getFullURL() );
- $u = "<a href=\"$u\">$u</a>";
- $rf = wfMsg( "retrievedfrom", $u );
-
- if ( $wgOut->isArticle() ) {
- $lm = "<br>" . $this->lastModified();
- } else { $lm = ""; }
-
- $cr = wfMsg( "gnunote" );
- $s .= "<p>" . $wgLang->emphasize("{$rf}{$lm} {$cr}\n");
- return $s;
- }
- return $this->doAfterContent();
+ $printfooter = "<div class=\"printfooter\">" . $this->printFooter() . "</div>\n";
+ return $printfooter . $this->doAfterContent();
}
-
+
+ function printFooter() {
+ global $wgTitle;
+ $url = htmlspecialchars( $wgTitle->getFullURL() );
+ return "<p>" . wfMsg( "retrievedfrom", "<a href=\"$url\">$url</a>" ) .
+ "</p>\n\n<p>" . $this->pageStats() . "</p>\n";
+ }
+
function doAfterContent()
{
global $wgUser, $wgOut, $wgLang;
$s = "\n</div><br clear=all>\n";
$s .= "\n<div id='footer'>";
- $s .= "<table width='98%' border=0 cellspacing=0><tr>";
+ $s .= "<table border=0 cellspacing=0><tr>";
wfProfileOut( "$fname-1" );
wfProfileIn( "$fname-2" );
. " | " . $this->aboutLink()
. " | " . $this->specialLink( "recentchanges" )
. " | " . $this->searchForm()
- . "<br>" . $this->pageStats();
+ . "<br><span id='pagestats'>" . $this->pageStats() . "</span>";
$s .= "</td>";
if ( $shove && !$left ) { # Right
function printableLink()
{
- global $wgOut, $wgFeedClasses;
+ global $wgOut, $wgFeedClasses, $wgRequest;
$baseurl = $_SERVER['REQUEST_URI'];
if( strpos( "?", $baseurl ) == false ) {
$baseurl .= "&";
}
$baseurl = htmlspecialchars( $baseurl );
+ $printurl = $wgRequest->escapeAppendQuery( "printable=yes" );
- $s = "<a href=\"{$baseurl}printable=yes\">" . wfMsg( "printableversion" ) . "</a>";
+ $s = "<a href=\"$printurl\">" . wfMsg( "printableversion" ) . "</a>";
if( $wgOut->isSyndicated() ) {
foreach( $wgFeedClasses as $format => $class ) {
- $s .= " | <a href=\"{$baseurl}feed={$format}\">{$format}</a>";
+ $feedurl = $wgRequest->escapeAppendQuery( "feed=$format" );
+ $s .= " | <a href=\"$feedurl\">{$format}</a>";
}
}
return $s;
}
$s .= $this->lastModified();
$s .= " " . wfMsg( "gnunote" );
- return "<span id='pagestats'>{$s}</span>";
+ return $s;
}
function lastModified()
$titleObj = Title::newFromText( $mp );
$s = "<a href=\"" . $titleObj->escapeLocalURL()
. "\"><img{$a} border=0 src=\""
- . $this->getLogo() . "\" alt=\"" . "[{$mp}]\"></a>";
+ . $this->getLogo() . "\" alt=\"" . "[{$mp}]\" /></a>";
return $s;
}
$trail = $m[2];
}
}
- if ( $wgOut->isPrintable() ||
- ( 1 == $wgUser->getOption( "highlightbroken" ) ) ) {
+ if ( $wgUser->getOption( "highlightbroken" ) ) {
$s = "<a href=\"{$u}\"{$style}>{$prefix}{$text}{$inside}</a>{$trail}";
} else {
$s = "{$prefix}{$text}{$inside}<a href=\"{$u}\"{$style}>?</a>{$trail}";
$trail = $m[2];
}
}
- if ( $wgOut->isPrintable() ||
- ( 1 == $wgUser->getOption( "highlightbroken" ) ) ) {
+ if ( $wgUser->getOption( "highlightbroken" ) ) {
$s = "<a href=\"{$u}\"{$style}>{$prefix}{$text}{$inside}</a>{$trail}";
} else {
$s = "{$prefix}{$text}{$inside}<a href=\"{$u}\"{$style}>!</a>{$trail}";
global $wgOut;
if ( "" == $alt ) { $alt = $this->fnamePart( $url ); }
- $s = "<img src=\"{$url}\" alt=\"{$alt}\">";
+ $s = "<img src=\"{$url}\" alt=\"{$alt}\" />";
return $s;
}
{
$s = str_replace( "$1", $name, wfMsg("missingimage") );
} else {
- $s = "<a href=\"{$u}\" class='image' title=\"{$alt}\">" .
- "<img border=\"0\" src=\"{$url}\" alt=\"{$alt}\"></a>";
+ $s = "\n <a href=\"{$u}\" class='image' title=\"{$alt}\">\n" .
+ " <img border=\"0\" src=\"{$url}\" alt=\"{$alt}\" />\n </a>";
}
if ( "" != $align ) {
- $s = "<div class=\"float{$align}\">{$s}</div>";
+ $s = "<div class=\"float{$align}\">{$s}\n</div>";
}
return $prefix.$s.$postfix;
}
if ( $thumbUrl == "" ) {
$s .= str_replace( "$1", $name, wfMsg("missingimage") );
} else {
- $s .= "<a href=\"{$u}\" class=\"internal\" title=\"{$alt}\">" .
- "<img border=\"0\" src=\"{$thumbUrl}\" alt=\"{$alt}\" " .
- " width=\"{$boxwidth}\" height=\"{$boxheight}\"></a>" .
- "<a href=\"{$u}\" class=\"internal\" title=\"{$more}\">" .
- "<img border=\"0\" src=\"{$wgUploadPath}/magnify-clip.png\" " .
- " width=\"26\" height=\"24\" align=\"{$magnifyalign}\" alt=\"{$more}\"></a>";
- }
- $s .= "<p{$textalign}>{$label}</p></div>";
+ $s .= "\n".' <a href="'.$u.'" class="internal" title="'.$alt.'">'."\n".
+ ' <img border="0" src="'.$thumbUrl.'" alt="'.$alt.'" ' .
+ ' width="'.$boxwidth.'" height="'.$boxheight.'" /></a>' ."\n".
+ ' <a href="'.$u.'" class="internal" title="'.$more.'"> ' ."\n".
+ ' <img border="0" src="'.$wgUploadPath.'/magnify-clip.png" ' .
+ 'width="26" height="24" align="'.$magnifyalign.'" alt="'.$more.'" /> </a>'."\n";
+ }
+ $s .= ' <p'.$textalign.'>'.$label."</p>\n</div>";
return $s;
}
function beginImageHistoryList()
{
$s = "\n<h2>" . wfMsg( "imghistory" ) . "</h2>\n" .
- "<p>" . wfMsg( "imghistlegend" ) . "\n<ul>";
+ "<p>" . wfMsg( "imghistlegend" ) . "\n<ul class='special'>";
return $s;
}
# Spacer image
$r = "" ;
- $r .= "<img src='{$wgUploadPath}/Arr_.png' width='12' height='12' border='0'>" ; $r .= "<tt>" ;
+ $r .= "<img src='{$wgUploadPath}/Arr_.png' width='12' height='12' border='0' />" ; $r .= "<tt>" ;
if ( $rc_type == RC_MOVE ) {
$r .= " ";
# Get rc_xxxx variables
extract( $rcObj->mAttribs );
- $r .= "<img src='{$wgUploadPath}/Arr_.png' width=12 height=12 border=0>";
+ $r .= "<img src='{$wgUploadPath}/Arr_.png' width=12 height=12 border=0 />";
$r .= "<tt> " ;
if ( $rc_new ) $r .= $N ;
else $r .= " " ;
$s = "";
if ( $date != $this->lastdate ) {
if ( "" != $this->lastdate ) { $s .= "</ul>\n"; }
- $s .= "<h4>{$date}</h4>\n<ul>";
+ $s .= "<h4>{$date}</h4>\n<ul class='special'>";
$this->lastdate = $date;
}
$s .= "<li> ";
}
function tocIndent($level) {
-
- while($level-->0) $rv.="<div style=\"margin-left:2em;\">\n";
- return $rv;
-
+ return str_repeat( "<div class='tocindent'>\n", $level );
}
function tocUnindent($level) {
- $rv = "";
- while($level-->0) $rv.="</div>\n";
- return $rv;
+ return str_repeat( "</div>\n", $level );
}
- // parameter level defines if we are on an indentation level
- function tocLine($anchor,$tocline,$level) {
-
- if($level) {
-
- return "<A CLASS=\"internal\" HREF=\"#".$anchor."\">".$tocline."</A><BR>\n";
- } else {
-
- return "<div style=\"margin-bottom:0px;\">\n".
- "<A CLASS=\"internal\" HREF=\"#".$anchor."\">".$tocline."</A><BR>\n".
- "</div>\n";
+ # parameter level defines if we are on an indentation level
+ function tocLine( $anchor, $tocline, $level ) {
+ $link = "<a href=\"#$anchor\">$tocline</a><br />";
+ if($level) {
+ return "$link\n";
+ } else {
+ return "<div class='tocline'>$link</div>\n";
}
}
function tocTable($toc) {
- // note to CSS fanatics: putting this in a div does not work -- div won't auto-expand
- global $printable;
-
- if (!$printable) {
- $hideline = " <script type='text/javascript'>showTocToggle(\"" . wfMsg("showtoc") . "\",\"" . wfMsg("hidetoc") . "\")</script>";
- }
+ # note to CSS fanatics: putting this in a div does not work -- div won't auto-expand
+ # try min-width & co when somebody gets a chance
+ $hideline = " <script type='text/javascript'>showTocToggle(\"" . addslashes( wfMsg("showtoc") ) . "\",\"" . addslashes( wfMsg("hidetoc") ) . "\")</script>";
return
"<p><table border=\"0\" id=\"toc\"><tr><td align=\"center\">\n".
"<b>".wfMsg("toc")."</b>" .
}
# These two do not check for permissions: check $wgTitle->userCanEdit before calling them
- function editSectionScript($section,$head) {
-
- global $wgTitle,$wgUser,$oldid;
- if($oldid) return $head;
+ function editSectionScript( $section, $head ) {
+ global $wgTitle, $wgRequest;
+ if( $wgRequest->getInt( "oldid" ) && ( $wgRequest->getVal( "diff" ) != "0" ) ) {
+ return $head;
+ }
$url = $wgTitle->escapeLocalURL( "action=edit§ion=$section" );
- return "<span onContextMenu='document.location=\"".$url."\";return false;'>{$head}</span>";
+ return "<span oncontextmenu='document.location=\"$url\";return false;'>{$head}</span>";
}
- function editSectionLink($section) {
- global $printable,$oldid;
+ function editSectionLink( $section ) {
+ global $wgRequest;
global $wgTitle, $wgUser, $wgLang;
-
- if( isset( $oldid ) ) return "";
- if( isset( $printable ) ) return "";
-
+
+ if( $wgRequest->getInt( "oldid" ) && ( $wgRequest->getVal( "diff" ) != "0" ) ) {
+ # Section edit links would be out of sync on an old page.
+ # But, if we're diffing to the current page, they'll be
+ # correct.
+ return "";
+ }
+
$editurl = "§ion={$section}";
$url = $this->makeKnownLink($wgTitle->getPrefixedText(),wfMsg("editsection"),"action=edit".$editurl);
-
+
if( $wgLang->isRTL() ) {
$farside = "left";
$nearside = "right";
$farside = "right";
$nearside = "left";
}
- return "<div style=\"float:$farside;margin-$nearside:5px;\"><small>[".$url."]</small></div>";
+ return "<div class=\"editsection\" style=\"float:$farside;margin-$nearside:5px;\">[".$url."]</div>";
}
if( $wgUseSmarty ) {
include_once( "SkinSmarty.php" );
}
+if( $wgUsePHPTal ) {
+ include_once( "SkinPHPTal.php" );
+}
+
?>
dépôts / lhc / web / wiklou.git / blobdiff