[MediaWiki-commits] [Gerrit] Match the Roulette header with the new header in MF Beta - change (mediawiki...WikiGrok)
jenkins-bot has submitted this change and it was merged.
Change subject: Match the Roulette header with the new header in MF Beta
..
Match the Roulette header with the new header in MF Beta
Depends on I5af8568c028c8e833f8e4792d142dde3bba2b952
Change-Id: I5e646493f13d327edcb5baecd3c24cb9aec062ba
---
M includes/Resources.php
M resources/roulette/InfoOverlay.hogan
M resources/roulette/InfoOverlay.js
M resources/roulette/InfoOverlay.less
A resources/roulette/header.mustache
M resources/roulette/init.js
6 files changed, 29 insertions(+), 32 deletions(-)
Approvals:
Kaldari: Looks good to me, approved
Jdlrobson: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index a93d167..a528672 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -105,8 +105,11 @@
'templates' = array(
'Error.hogan' = 'roulette/error.hogan',
'InfoOverlay.hogan' = 'roulette/InfoOverlay.hogan',
+ // FIXME: this template should be shared with
MobileFrontend
+ 'header.hogan' = 'roulette/header.mustache',
),
'messages' = array(
+ 'mobile-frontend-main-menu',
'mobile-frontend-main-menu-button-tooltip',
'wikigrok-main-menu-wikigrok-roulette',
'wikigrok-roulette-info-overlay-title',
diff --git a/resources/roulette/InfoOverlay.hogan
b/resources/roulette/InfoOverlay.hogan
index 722c802..bdfb5f5 100644
--- a/resources/roulette/InfoOverlay.hogan
+++ b/resources/roulette/InfoOverlay.hogan
@@ -1,8 +1,5 @@
-div class=overlay-header-container position-fixed
- div class=overlay-header
- {{{hamburgerIcon}}}
- div class=titlespan{{{titleMsg}}}/span/div
- /div
+div class=header
+ {{header}}
/div
div class=overlay-content
p{{{contentMsg}}}/p
diff --git a/resources/roulette/InfoOverlay.js
b/resources/roulette/InfoOverlay.js
index 40d419c..cf73a82 100644
--- a/resources/roulette/InfoOverlay.js
+++ b/resources/roulette/InfoOverlay.js
@@ -1,7 +1,5 @@
( function ( M ) {
var InfoOverlay,
- mainMenu = M.require( 'skin' ).getMainMenu(),
- Icon = M.require( 'Icon' ),
Overlay = M.require( 'Overlay' ),
wikiGrokRoulette = M.require(
'ext.wikigrok.roulette/wikiGrokRoulette' );
@@ -20,14 +18,18 @@
/**
* @inheritdoc
*/
+ templatePartials: {
+ header: mw.template.get( 'ext.wikigrok.roulette',
'header.hogan' )
+ },
+ /**
+* @inheritdoc
+*/
defaults: {
- hamburgerIcon: new Icon( {
- additionalClassNames: 'mainmenu',
- name: 'mainmenu',
- label: mw.msg(
'mobile-frontend-main-menu-button-tooltip' ),
- title: mw.msg(
'mobile-frontend-main-menu-button-tooltip' )
- } ).toHtmlString(),
- titleMsg: mw.msg(
'wikigrok-roulette-info-overlay-title' ),
+ showTitle: true,
+ mobileMenuClass: 'mw-ui-icon mw-ui-icon-element
mw-ui-icon-search',
+ mobileMenuLink: '#', // we'll just hide the overlay on
click
+ mobileMenuTitle: mw.msg( 'mobile-frontend-main-menu' ),
+ siteName: mw.msg(
'wikigrok-roulette-info-overlay-title' ),
contentMsg: mw.msg(
'wikigrok-roulette-info-overlay-content' ),
startBtnLbl: mw.msg(
'wikigrok-roulette-info-overlay-start-button-label' )
},
@@ -35,7 +37,7 @@
* @inheritdoc
*/
events: {
- 'click .mainmenu': 'onClickMainMenu',
+ 'click .header a': 'onClickHeader',
'click .lets-go': 'onClickLetsGo'
},
/**
@@ -48,10 +50,8 @@
/**
* Hide the info and show the navigation drawer
*/
- onClickMainMenu: function () {
+ onClickHeader: function () {
this.hide();
- mainMenu.openNavigationDrawer( '' );
- this.detach();
},
/**
* Navigate to the next page that has a wikigrok campaign.
diff --git a/resources/roulette/InfoOverlay.less
b/resources/roulette/InfoOverlay.less
index 7b10b40..6d09217 100644
--- a/resources/roulette/InfoOverlay.less
+++ b/resources/roulette/InfoOverlay.less
@@ -3,20 +3,8
[MediaWiki-commits] [Gerrit] Match the Roulette header with the new header in MF Beta - change (mediawiki...WikiGrok)
Bmansurov has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193294
Change subject: Match the Roulette header with the new header in MF Beta
..
Match the Roulette header with the new header in MF Beta
Depends on I15b7149b898cecb850a5cc7a01cb57bb3e65
Change-Id: I5e646493f13d327edcb5baecd3c24cb9aec062ba
---
M includes/Resources.php
M resources/roulette/InfoOverlay.hogan
M resources/roulette/InfoOverlay.js
M resources/roulette/InfoOverlay.less
4 files changed, 15 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiGrok
refs/changes/94/193294/1
diff --git a/includes/Resources.php b/includes/Resources.php
index 385f981..4dae661 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -95,6 +95,7 @@
'ext.wikigrok.roulette' = $wgWikiGrokResourceFileModuleBoilerplate +
array(
'dependencies' = array(
'mobile.overlays',
+ 'mobile.templates.header',
'ext.wikigrok.dialog',
),
'scripts' = array(
diff --git a/resources/roulette/InfoOverlay.hogan
b/resources/roulette/InfoOverlay.hogan
index 722c802..bdfb5f5 100644
--- a/resources/roulette/InfoOverlay.hogan
+++ b/resources/roulette/InfoOverlay.hogan
@@ -1,8 +1,5 @@
-div class=overlay-header-container position-fixed
- div class=overlay-header
- {{{hamburgerIcon}}}
- div class=titlespan{{{titleMsg}}}/span/div
- /div
+div class=header
+ {{header}}
/div
div class=overlay-content
p{{{contentMsg}}}/p
diff --git a/resources/roulette/InfoOverlay.js
b/resources/roulette/InfoOverlay.js
index 40d419c..d304273 100644
--- a/resources/roulette/InfoOverlay.js
+++ b/resources/roulette/InfoOverlay.js
@@ -1,7 +1,5 @@
( function ( M ) {
var InfoOverlay,
- mainMenu = M.require( 'skin' ).getMainMenu(),
- Icon = M.require( 'Icon' ),
Overlay = M.require( 'Overlay' ),
wikiGrokRoulette = M.require(
'ext.wikigrok.roulette/wikiGrokRoulette' );
@@ -20,14 +18,15 @@
/**
* @inheritdoc
*/
+ templatePartials: {
+ header: mw.template.get( 'mobile.templates.header',
'Header.hogan' )
+ },
+ /**
+* @inheritdoc
+*/
defaults: {
- hamburgerIcon: new Icon( {
- additionalClassNames: 'mainmenu',
- name: 'mainmenu',
- label: mw.msg(
'mobile-frontend-main-menu-button-tooltip' ),
- title: mw.msg(
'mobile-frontend-main-menu-button-tooltip' )
- } ).toHtmlString(),
- titleMsg: mw.msg(
'wikigrok-roulette-info-overlay-title' ),
+ mobileMenuLink: '#', // we'll just hide the overlay on
click
+ siteName: mw.msg(
'wikigrok-roulette-info-overlay-title' ),
contentMsg: mw.msg(
'wikigrok-roulette-info-overlay-content' ),
startBtnLbl: mw.msg(
'wikigrok-roulette-info-overlay-start-button-label' )
},
@@ -35,7 +34,7 @@
* @inheritdoc
*/
events: {
- 'click .mainmenu': 'onClickMainMenu',
+ 'click .header a': 'onClickHeader',
'click .lets-go': 'onClickLetsGo'
},
/**
@@ -48,10 +47,8 @@
/**
* Hide the info and show the navigation drawer
*/
- onClickMainMenu: function () {
- this.hide();
- mainMenu.openNavigationDrawer( '' );
- this.detach();
+ onClickHeader: function () {
+ this.hide().detach();
},
/**
* Navigate to the next page that has a wikigrok campaign.
diff --git a/resources/roulette/InfoOverlay.less
b/resources/roulette/InfoOverlay.less
index 7b10b40..6d09217 100644
--- a/resources/roulette/InfoOverlay.less
+++ b/resources/roulette/InfoOverlay.less
@@ -3,20 +3,8 @@
@import mediawiki.mixins;
.wikigrok-roulette-info-overlay {
- .overlay-header-container {
- .mainmenu {
- cursor: pointer;
- }
- .title {
- font-weight: bold;
- height: 3.35em;
- text-align: center;
+ padding-top: 0;
- span {
- margin-left: -3.4em; // mainmenu icon width, so
that the text appears in the center
- }
-
