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 I15b7149b898cecb850a5cc7a01cb57bb39999e65
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="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..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
- }
- }
- }
.overlay-content {
@imageSize: 5em;
margin-top: 2em;
--
To view, visit https://gerrit.wikimedia.org/r/193294
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e646493f13d327edcb5baecd3c24cb9aec062ba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiGrok
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
