'floating right' option for quickbar in classic and cologne blue skins

diff --git a/includes/Parser.php b/includes/Parser.php
index 599c104..163e654 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -2378,7 +2378,7 @@ class Parser
 
                $text = wfGetHTTP($url . '?action=render');
                if (!$text)
-                       return wfMsg('scarytranscludefailed');
+                       return wfMsg('scarytranscludefailed', $url);
 
                $dbw = wfGetDB(DB_MASTER);
                $dbw->replace('transcache', array(), array(

diff --git a/languages/Language.php b/languages/Language.php
index 888f61c..61aea4d 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -89,7 +89,7 @@ if(isset($wgExtraNamespaces)) {
 );
 
 /* private */ $wgQuickbarSettingsEn = array(
-       'None', 'Fixed left', 'Fixed right', 'Floating left'
+       'None', 'Fixed left', 'Fixed right', 'Floating left', 'Floating right'
 );
 
 /* private */ $wgSkinNamesEn = array(

diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index 6cc1d3d..27ad32c 100644 (file)
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -109,11 +109,16 @@ class SkinCologneBlue extends Skin {
                } 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;
        }

diff --git a/skins/Standard.php b/skins/Standard.php
index 257f65d..9e20e1a 100644 (file)
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -40,6 +40,9 @@ class SkinStandard extends Skin {
                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;
@@ -62,7 +65,10 @@ 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;
        }