Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/161025
Change subject: Remove Language selector as image in beta
......................................................................
Remove Language selector as image in beta
Bug: 65907
Change-Id: I6033ed78c9b00fb938241294482f22fa1ed484f5
---
M includes/skins/MinervaTemplate.php
M includes/skins/MinervaTemplateBeta.php
D less/common/images/secondaryPageActions/languages.png
M less/common/secondaryPageActions.less
M templates/page.hogan
5 files changed, 5 insertions(+), 37 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/25/161025/1
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index 5adfa8f..dce1a4f 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -7,11 +7,6 @@
* Extended Template class of BaseTemplate for mobile devices
*/
class MinervaTemplate extends BaseTemplate {
- /**
- * @var string $languageButtonClassName Class names of language selector
- * @todo: Remove variable when secondary page actions menu moves to
stable
- */
- protected $languageButtonClassName = 'mw-ui-button mw-ui-progressive
button languageSelector';
/** @var string $searchPlaceHolderMsg Message used as placeholder in
search input */
protected $searchPlaceHolderMsg = 'mobile-frontend-placeholder';
@@ -195,7 +190,7 @@
$languageLabel = wfMessage(
'mobile-frontend-language-article-heading' )->text();
echo Html::element( 'a', array(
- 'class' => $this->languageButtonClassName,
+ 'class' => 'mw-ui-button mw-ui-progressive
button languageSelector',
'href' => $languageUrl
), $languageLabel );
}
diff --git a/includes/skins/MinervaTemplateBeta.php
b/includes/skins/MinervaTemplateBeta.php
index edc3002..cafa440 100644
--- a/includes/skins/MinervaTemplateBeta.php
+++ b/includes/skins/MinervaTemplateBeta.php
@@ -14,14 +14,6 @@
protected $searchPlaceHolderMsg = 'mobile-frontend-placeholder-beta';
/**
- * CSS classes for language button
- * @var string $languageButtonClassName
- * @todo Remove variable when secondary page actions menu moves to
stable
- */
- protected $languageButtonClassName = 'mw-ui-button mw-ui-progressive
button
- languageSelector icon icon-32px';
-
- /**
* Render available page actions
* @param array $data Data used to build page actions
*/
diff --git a/less/common/images/secondaryPageActions/languages.png
b/less/common/images/secondaryPageActions/languages.png
deleted file mode 100644
index e9ae058..0000000
--- a/less/common/images/secondaryPageActions/languages.png
+++ /dev/null
Binary files differ
diff --git a/less/common/secondaryPageActions.less
b/less/common/secondaryPageActions.less
index 1aa11b1..146c532 100644
--- a/less/common/secondaryPageActions.less
+++ b/less/common/secondaryPageActions.less
@@ -8,18 +8,11 @@
margin-top: 45px;
button,
.button {
- width: 70px;
- // buttons are inline-block so ensure that we avoid the
whitespace above 2nd button due to default value baseline
- vertical-align: top;
-
&.nearby {
+ width: 70px;
+ // buttons are inline-block so ensure that we
avoid the whitespace above 2nd button due to default value baseline
+ vertical-align: top;
.background-image('images/secondaryPageActions/geo.png');
- }
-
- &.languageSelector {
-
.background-image('images/secondaryPageActions/languages.png');
- // FIXME: Temporary override of one in
languages.less
- margin-top: 0;
}
}
}
diff --git a/templates/page.hogan b/templates/page.hogan
index dfae864..2db8069 100644
--- a/templates/page.hogan
+++ b/templates/page.hogan
@@ -19,22 +19,10 @@
</{{tag}}>
<div>{{{text}}}</div>
{{/sections}}
- {{#inBetaOrAlpha}}
- {{#hasLanguages}}
- <div id="page-secondary-actions">
- <a href="{{languageUrl}}"
- class="mw-ui-button mw-ui-progressive button
languageSelector icon icon-32px icon-text">
- {{languageLabel}}
- </a>
- </div>
- {{/hasLanguages}}
- {{/inBetaOrAlpha}}
- {{^inBetaOrAlpha}}
{{#hasLanguages}}
<a href="{{languageUrl}}"
- class="mw-ui-button mw-ui-progressive button languageSelector
icon icon-32px icon-text">
+ class="mw-ui-button mw-ui-progressive button languageSelector">
{{languageLabel}}
</a>
{{/hasLanguages}}
- {{/inBetaOrAlpha}}
</div>
--
To view, visit https://gerrit.wikimedia.org/r/161025
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6033ed78c9b00fb938241294482f22fa1ed484f5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow <florian.schmidt.wel...@t-online.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
