$text = wfGetHTTP($url . '?action=render');
if (!$text)
- return wfMsg('scarytranscludefailed');
+ return wfMsg('scarytranscludefailed', $url);
$dbw = wfGetDB(DB_MASTER);
$dbw->replace('transcache', array(), array(
);
/* private */ $wgQuickbarSettingsEn = array(
- 'None', 'Fixed left', 'Fixed right', 'Floating left'
+ 'None', 'Fixed left', 'Fixed right', 'Floating left', 'Floating right'
);
/* private */ $wgSkinNamesEn = array(
} else if ( 1 == $qb ) {
$s .= "#quickbar { position: absolute; left: 4px; }\n" .
"#article { margin-left: 148px; margin-right: 4px; }\n";
- } else if ( 3 == $qb ) { # Floating
+ } else if ( 3 == $qb ) { # Floating left
$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
+ } else if ( 4 == $qb ) { # Floating right
+ $s .= "#quickbar { position: fixed; right: 4px; } \n" .
+ "#topbar { margin-right: 148px }\n" .
+ "#article { margin-right: 148px; margin-left: 4px; } \n" .
+ "body>#quickbar { position: fixed; right: 4px; top: 4px; overflow: auto ;bottom:4px;} \n"; # Hides from IE
}
return $s;
}
if ( 3 == $this->qbSetting() ) { # Floating left
$s .= "<style type='text/css'>\n" .
"@import '{$wgStylePath}/common/quickbar.css';\n</style>\n";
+ } else if ( 4 == $this->qbSetting() ) { # Floating right
+ $s .= "<style type='text/css'>\n" .
+ "@import '{$wgStylePath}/common/quickbar-right.css';\n</style>\n";
}
$s .= parent::getUserStyles();
return $s;
$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;
}