Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225044

Change subject: Update metrolook test
......................................................................

Update metrolook test

Change-Id: Ie15e9f06b8de8adcc585f2eb2e9c1343bf076f7c
---
M Gruntfile.js
M MetrolookTemplate.php
M hooks.txt
3 files changed, 18 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook 
refs/changes/44/225044/1

diff --git a/Gruntfile.js b/Gruntfile.js
index cf68171..abb41c9 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -21,6 +21,7 @@
                banana: conf.MessagesDirs,
                jsonlint: {
                        all: [
+                               '*.json',
                                '**/*.json',
                                '!node_modules/**'
                        ]
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index e864641..ce60255 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -544,8 +544,14 @@
                        ?>
                </div>
 
-               <?php $this->printTrail(); ?>
+               <div id="mw-panel-right" class="noprint">
+                       <?php
+                       // Hook point for the ShoutWiki Ads extension
+                       Hooks::run( 'MetrolookRightPanel', array( $this ) );
+                       ?>
+               </div>
 
+               <?php $this->printTrail(); ?>
        </body>
 </html>
 <?php
@@ -581,6 +587,8 @@
                                        break;
                                case 'TOOLBOX':
                                        $this->renderPortal( 'tb', 
$this->getToolbox(), 'toolbox', 'SkinTemplateToolboxEnd' );
+                                       // Hook point for the ShoutWiki Ads 
extension
+                                       Hooks::run( 'MetrolookAfterToolbox', 
array( $this ) );
                                        break;
                                case 'LANGUAGES':
                                        if ( $this->data['language_urls'] !== 
false ) {
diff --git a/hooks.txt b/hooks.txt
index f226ef3..f59618d 100644
--- a/hooks.txt
+++ b/hooks.txt
@@ -1,6 +1,13 @@
 Hooks provided by the Metrolook skin.
 
+'MetrolookAfterToolbox': Called after the toolbox (#p-tb) has been rendered
+$tpl: MetrolookTemplate object
+
+'MetrolookRightPanel': Called inside div#mw-panel-right; can be used to 
populate
+that div element with ad HTML, for example.
+$tpl: MetrolookTemplate object
+
 'SkinMetrolookStyleModules': Called when defining the list of module styles to 
be
-loaded by the Vector skin.
+loaded by the Metrolook skin.
 $skin: SkinMetrolook object
 &$styles: Array of module names whose style will be loaded for the skin
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/225044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie15e9f06b8de8adcc585f2eb2e9c1343bf076f7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to