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="title"><span>{{{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 @@
@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
- }
- }
- }
.overlay-content {
@imageSize: 5em;
margin-top: 2em;
diff --git a/resources/roulette/header.mustache
b/resources/roulette/header.mustache
new file mode 100644
index 0000000..1fa8a56
--- /dev/null
+++ b/resources/roulette/header.mustache
@@ -0,0 +1,9 @@
+<a class="{{mobileMenuClass}}"
href="{{mobileMenuLink}}">{{mobileMenuTitle}}</a>
+{{#showSearchForm}}
+ {{{searchForm}}}
+{{/showSearchForm}}
+{{#showTitle}}
+ <div class="header-title">
+ <a href="{{mobileMenuLink}}">{{{siteName}}}</a>
+ </div>
+{{/showTitle}}
diff --git a/resources/roulette/init.js b/resources/roulette/init.js
index 1346da7..e24dac6 100644
--- a/resources/roulette/init.js
+++ b/resources/roulette/init.js
@@ -2,7 +2,7 @@
M.require( 'context' ).assertMode( [ 'alpha', 'beta' ] );
var browser = M.require( 'browser' ),
mainMenu = M.require( 'skin' ).mainMenu,
- $wikiGrokMenuItem = $( '#mw-mf-page-left' ).find(
'.wikigrok-roulette' ),
+ $wikiGrokMenuItem = $( 'nav' ).find( '.wikigrok-roulette' ),
wikiGrokRoulette = M.require(
'ext.wikigrok.roulette/wikiGrokRoulette' ),
InfoOverlay = M.require( 'ext.wikigrok.roulette/InfoOverlay' );
--
To view, visit https://gerrit.wikimedia.org/r/193294
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5e646493f13d327edcb5baecd3c24cb9aec062ba
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/WikiGrok
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <bmansu...@wikimedia.org>
Gerrit-Reviewer: Bmansurov <bmansu...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Kaldari <rkald...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
