dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Declare visibility on class properties of LoginForm"
[lhc/web/wiklou.git]
/
skins
/
MonoBook.php
diff --git
a/skins/MonoBook.php
b/skins/MonoBook.php
index
f7fb0d8
..
34f5965
100644
(file)
--- a/
skins/MonoBook.php
+++ b/
skins/MonoBook.php
@@
-45,7
+45,7
@@
class SkinMonoBook extends SkinTemplate {
function setupSkinUserCss( OutputPage $out ) {
parent::setupSkinUserCss( $out );
function setupSkinUserCss( OutputPage $out ) {
parent::setupSkinUserCss( $out );
- $out->addModuleStyles(
'skins.monobook'
);
+ $out->addModuleStyles(
array( 'skins.common.interface', 'skins.monobook.styles' )
);
// TODO: Migrate all of these
$out->addStyle( 'monobook/IE60Fixes.css', 'screen', 'IE 6' );
// TODO: Migrate all of these
$out->addStyle( 'monobook/IE60Fixes.css', 'screen', 'IE 6' );
@@
-221,6
+221,8
@@
echo $footerEnd;
} ?>
</form>
} ?>
</form>
+
+ <?php $this->renderAfterPortlet( 'search' ); ?>
</div>
</div>
<?php
</div>
</div>
<?php
@@
-242,6
+244,7
@@
echo $footerEnd;
} ?>
</ul>
} ?>
</ul>
+<?php $this->renderAfterPortlet( 'cactions' ); ?>
</div>
</div>
<?php
</div>
</div>
<?php
@@
-263,6
+266,7
@@
echo $footerEnd;
wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this, true ) );
?>
</ul>
wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this, true ) );
?>
</ul>
+<?php $this->renderAfterPortlet( 'tb' ); ?>
</div>
</div>
<?php
</div>
</div>
<?php
@@
-270,7
+274,7
@@
echo $footerEnd;
/*************************************************************************************************/
function languageBox() {
/*************************************************************************************************/
function languageBox() {
- if ( $this->data['language_urls'] ) {
+ if ( $this->data['language_urls']
!== false
) {
?>
<div id="p-lang" class="portlet" role="navigation">
<h3<?php $this->html( 'userlangattributes' ) ?>><?php $this->msg( 'otherlanguages' ) ?></h3>
?>
<div id="p-lang" class="portlet" role="navigation">
<h3<?php $this->html( 'userlangattributes' ) ?>><?php $this->msg( 'otherlanguages' ) ?></h3>
@@
-281,6
+285,8
@@
echo $footerEnd;
<?php } ?>
</ul>
<?php } ?>
</ul>
+
+<?php $this->renderAfterPortlet( 'lang' ); ?>
</div>
</div>
<?php
</div>
</div>
<?php
@@
-315,9
+321,12
@@
echo $footerEnd;
# allow raw HTML block to be defined by extensions
print $cont;
}
# allow raw HTML block to be defined by extensions
print $cont;
}
+
+ $this->renderAfterPortlet( $bar );
?>
</div>
</div>
<?php
}
?>
</div>
</div>
<?php
}
+
} // end of class
} // end of class