Jdlrobson has submitted this change and it was merged.
Change subject: Reorganize navigation (#362)
......................................................................
Reorganize navigation (#362)
Update icons, remove contact and fix other minor things in the main
menu.
Change-Id: I2fbd170ff530b3f442670ab0d36021c3ede70383
---
M MobileFrontend.i18n.php
M includes/skins/SkinMobile.php
M less/common/mf-navigation.less
M stylesheets/common/images/menu/README
D stylesheets/common/images/menu/featured.png
D stylesheets/common/images/menu/login.png
A stylesheets/common/images/menu/loginout.png
D stylesheets/common/images/menu/logout.png
D stylesheets/common/images/menu/lowres/contact.png
M stylesheets/common/images/menu/lowres/home.png
D stylesheets/common/images/menu/lowres/login.png
A stylesheets/common/images/menu/lowres/loginout.png
D stylesheets/common/images/menu/lowres/logout.png
D stylesheets/common/images/menu/lowres/nearby.png
M stylesheets/common/images/menu/lowres/random.png
M stylesheets/common/images/menu/lowres/settings.png
R stylesheets/common/images/menu/uploads.png
M stylesheets/common/images/menu/watchlist.png
M stylesheets/common/mf-navigation.css
19 files changed, 55 insertions(+), 113 deletions(-)
Approvals:
Jdlrobson: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/MobileFrontend.i18n.php b/MobileFrontend.i18n.php
index 3c43d54..d47ee58 100644
--- a/MobileFrontend.i18n.php
+++ b/MobileFrontend.i18n.php
@@ -142,7 +142,7 @@
'mobile-frontend-main-menu-logout' => 'Log out',
'mobile-frontend-main-menu-watchlist' => 'Watchlist',
'mobile-frontend-main-menu-settings' => 'Settings',
- 'mobile-frontend-main-menu-upload' => 'Upload',
+ 'mobile-frontend-main-menu-upload' => 'Uploads',
'mobile-frontend-main-menu-settings-heading' => 'Mobile site settings',
'mobile-frontend-settings-site-header' => '{{SITENAME}} Languages',
'mobile-frontend-settings-site-description' => '{{SITENAME}} is
available in $1 {{PLURAL:$1|language|languages}}. All available versions are
listed below',
@@ -477,7 +477,7 @@
'mobile-frontend-main-menu-watchlist' => 'Text for watchlist link in
main menu.
{{Identical|My watchlist}}',
'mobile-frontend-main-menu-settings' => 'Settings link text in main
menu',
- 'mobile-frontend-main-menu-upload' => 'Upload link text in main menu.
+ 'mobile-frontend-main-menu-upload' => 'Uploads link text in main menu.
{{Identical|Upload}}',
'mobile-frontend-main-menu-settings-heading' => 'Heading for
Special:MobileOptions page',
'mobile-frontend-settings-site-header' => 'Heading for the
Special:MobileOptions/Language page - only visible to non javascript users',
diff --git a/includes/skins/SkinMobile.php b/includes/skins/SkinMobile.php
index 9f8af15..e101ed5 100644
--- a/includes/skins/SkinMobile.php
+++ b/includes/skins/SkinMobile.php
@@ -771,12 +771,20 @@
<div id="mw-mf-page-left">
<div id='mw-mf-content-left'>
<ul id="mw-mf-menu-main">
- <li class='icon'><a href="<?php $this->text(
'mainPageUrl' ) ?>"
+ <li class="icon-home"><a href="<?php $this->text(
'mainPageUrl' ) ?>"
title="<?php $this->msg(
'mobile-frontend-home-button' ) ?>">
<?php $this->msg( 'mobile-frontend-home-button'
) ?></a></li>
- <li class='icon2'><a href="<?php $this->text(
'randomPageUrl' ) ?>#mw-mf-page-left" id="randomButton"
+ <li class="icon-random"><a href="<?php $this->text(
'randomPageUrl' ) ?>#mw-mf-page-left" id="randomButton"
title="<?php $this->msg(
'mobile-frontend-random-button' ) ?>"
><?php $this->msg(
'mobile-frontend-random-button' ) ?></a></li>
+ <?php if ( $this->data['supports_jquery'] &&
$this->data['isAlphaGroupMember'] && $wgMFNearby ) { ?>
+ <li class='icon-nearby'>
+ <a href="<?php $this->text( 'nearbyURL' ) ?>"
+ title="<?php $this->msg(
'mobile-frontend-main-menu-nearby' ) ?>">
+ <?php $this->msg(
'mobile-frontend-main-menu-nearby' ) ?>
+ </a>
+ </li>
+ <?php } ?>
<?php if ( $this->data['supports_jquery'] ) { ?>
<li class='icon-watchlist'>
<a href="<?php $this->text( 'watchlistUrl' ) ?>"
@@ -785,8 +793,8 @@
</a>
</li>
<?php } ?>
- <?php if ( $this->data['isBetaGroupMember'] ) { ?>
- <li class='iconUpload'>
+ <?php if ( $this->data['supports_jquery'] &&
$this->data['isBetaGroupMember'] ) { ?>
+ <li class='icon-uploads'>
<a href="<?php $this->text(
'donateImageUrl' ) ?>"
class="noHijack"
title="<?php $this->msg(
'mobile-frontend-main-menu-upload' ) ?>">
@@ -794,30 +802,14 @@
</a>
</li>
<?php } ?>
- <?php if ( $this->data['isBetaGroupMember'] ) { ?>
- <li class='icon4'>
- <a href="<?php $this->text( 'leaveFeedbackURL'
) ?>"
- title="<?php $this->msg(
'mobile-frontend-main-menu-contact' ) ?>">
- <?php $this->msg(
'mobile-frontend-main-menu-contact' ) ?>
- </a>
- </li>
- <?php } ?>
- <li class='icon5'>
+ <li class='icon-settings'>
<a href="<?php $this->text( 'settingsUrl' ) ?>"
title="<?php $this->msg(
'mobile-frontend-main-menu-settings' ) ?>">
<?php $this->msg(
'mobile-frontend-main-menu-settings' ) ?>
</a>
</li>
- <?php if ( $this->data['isAlphaGroupMember'] &&
$wgMFNearby ) { ?>
- <li class='iconImage'>
- <a href="<?php $this->text( 'nearbyURL' ) ?>"
- title="<?php $this->msg(
'mobile-frontend-main-menu-nearby' ) ?>">
- <?php $this->msg(
'mobile-frontend-main-menu-nearby' ) ?>
- </a>
- </li>
- <?php } ?>
<?php if ( $this->data['supports_jquery'] ) { ?>
- <li class='icon6'>
+ <li class='icon-loginout'>
<?php $this->html( 'logInOut' ) ?>
</li>
<?php } ?>
diff --git a/less/common/mf-navigation.less b/less/common/mf-navigation.less
index 1f2d452..1bc736a 100644
--- a/less/common/mf-navigation.less
+++ b/less/common/mf-navigation.less
@@ -158,81 +158,53 @@
border-right: solid 1px black;
}
+// low-res icons for old phones that don't support background-size
#mw-mf-menu-main li {
- &.icon a {
+ &.icon-home a {
background-image: url(images/menu/lowres/home.png);
}
- &.icon2 a {
+ &.icon-random a {
background-image: url(images/menu/lowres/random.png);
}
- &.icon3 a {
- background-image: url(images/menu/lowres/nearby.png);
- }
-
- &.icon4 a {
- background-image: url(images/menu/lowres/contact.png);
- }
-
- &.icon5 a {
+ &.icon-settings a {
background-image: url(images/menu/lowres/settings.png);
}
- &.iconImage a {
- background-image: url(images/100px-globe.png); // FIXME: use
different image
- }
-
- &.icon6 {
- a.logout {
- background-image: url(images/menu/lowres/logout.png);
- }
-
- a.login {
- background-image: url(images/menu/lowres/login.png);
- }
- }
-
- &.iconUpload a {
- background-image: url(images/menu/upload.png);
+ &.icon-loginout a {
+ background-image: /* @embed
*/url(images/menu/lowres/loginout.png);
}
}
.jsEnabled #mw-mf-menu-main li {
-
- &.icon a {
+ &.icon-home a {
background-image: /* @embed */url(images/menu/home.png);
}
- &.icon2 a {
+ &.icon-random a {
background-image: /* @embed */url(images/menu/random.png);
}
- &.icon3 a {
+ &.icon-watchlist a {
+ background-image: /* @embed */url(images/menu/watchlist.png);
+ }
+
+ &.icon-uploads a {
+ background-image: /* @embed */url(images/menu/uploads.png);
+ }
+
+ &.icon-nearby a {
background-image: /* @embed */url(images/menu/nearby.png);
}
- &.icon4 a {
- background-image: /* @embed */url(images/menu/contact.png);
- }
-
- &.icon5 a {
+ &.icon-settings a {
background-image: /* @embed */url(images/menu/settings.png);
}
- &.icon6 {
- a.logout {
- background-image: /* @embed
*/url(images/menu/logout.png);
- }
-
- a.login {
- background-image: /* @embed
*/url(images/menu/login.png);
- }
+ &.icon-loginout a {
+ background-image: /* @embed */url(images/menu/loginout.png);
}
-}
-
-#mw-mf-menu-main li.icon-watchlist a {
- background-image: /* @embed */url(images/menu/watchlist.png);
}
#mw-mf-menu-main li.disabled {
diff --git a/stylesheets/common/images/menu/README
b/stylesheets/common/images/menu/README
index c3eb97d..8f62bfc 100644
--- a/stylesheets/common/images/menu/README
+++ b/stylesheets/common/images/menu/README
@@ -1,9 +1,5 @@
These images are all at 2x resolution (48x48) for Retina and xhdpi devices.
Currently, they are scaled down in the browser for hdpi and mdpi/non-Retina
devices.
-We may wish to make 24x24 and 36x36 assets as well if they don't scale cleanly.
-
-
-Extracted from the (vector?) icon sets in Heather & Lindsey's designer domain,
-converted to grayscale+alpha and pngcrush -brute'd.
-
+There are lowres icons available for old phones (only for features available on
+those phones).
diff --git a/stylesheets/common/images/menu/featured.png
b/stylesheets/common/images/menu/featured.png
deleted file mode 100644
index 718e8a9..0000000
--- a/stylesheets/common/images/menu/featured.png
+++ /dev/null
Binary files differ
diff --git a/stylesheets/common/images/menu/login.png
b/stylesheets/common/images/menu/login.png
deleted file mode 100644
index ebd53df..0000000
--- a/stylesheets/common/images/menu/login.png
+++ /dev/null
Binary files differ
diff --git a/stylesheets/common/images/menu/loginout.png
b/stylesheets/common/images/menu/loginout.png
new file mode 100644
index 0000000..802e5ee
--- /dev/null
+++ b/stylesheets/common/images/menu/loginout.png
Binary files differ
diff --git a/stylesheets/common/images/menu/logout.png
b/stylesheets/common/images/menu/logout.png
deleted file mode 100644
index ebd53df..0000000
--- a/stylesheets/common/images/menu/logout.png
+++ /dev/null
Binary files differ
diff --git a/stylesheets/common/images/menu/lowres/contact.png
b/stylesheets/common/images/menu/lowres/contact.png
deleted file mode 100644
index d59fb34..0000000
--- a/stylesheets/common/images/menu/lowres/contact.png
+++ /dev/null
Binary files differ
diff --git a/stylesheets/common/images/menu/lowres/home.png
b/stylesheets/common/images/menu/lowres/home.png
index 0676344..22afe3c 100644
--- a/stylesheets/common/images/menu/lowres/home.png
+++ b/stylesheets/common/images/menu/lowres/home.png
Binary files differ
diff --git a/stylesheets/common/images/menu/lowres/login.png
b/stylesheets/common/images/menu/lowres/login.png
deleted file mode 100644
index 23589ae..0000000
--- a/stylesheets/common/images/menu/lowres/login.png
+++ /dev/null
Binary files differ
diff --git a/stylesheets/common/images/menu/lowres/loginout.png
b/stylesheets/common/images/menu/lowres/loginout.png
new file mode 100644
index 0000000..b6ff9eb
--- /dev/null
+++ b/stylesheets/common/images/menu/lowres/loginout.png
Binary files differ
diff --git a/stylesheets/common/images/menu/lowres/logout.png
b/stylesheets/common/images/menu/lowres/logout.png
deleted file mode 100644
index 23589ae..0000000
--- a/stylesheets/common/images/menu/lowres/logout.png
+++ /dev/null
Binary files differ
diff --git a/stylesheets/common/images/menu/lowres/nearby.png
b/stylesheets/common/images/menu/lowres/nearby.png
deleted file mode 100644
index 5f882a6..0000000
--- a/stylesheets/common/images/menu/lowres/nearby.png
+++ /dev/null
Binary files differ
diff --git a/stylesheets/common/images/menu/lowres/random.png
b/stylesheets/common/images/menu/lowres/random.png
index 1973a03..99b2897 100644
--- a/stylesheets/common/images/menu/lowres/random.png
+++ b/stylesheets/common/images/menu/lowres/random.png
Binary files differ
diff --git a/stylesheets/common/images/menu/lowres/settings.png
b/stylesheets/common/images/menu/lowres/settings.png
index 712b73f..643dc95 100644
--- a/stylesheets/common/images/menu/lowres/settings.png
+++ b/stylesheets/common/images/menu/lowres/settings.png
Binary files differ
diff --git a/stylesheets/common/images/menu/upload.png
b/stylesheets/common/images/menu/uploads.png
similarity index 100%
rename from stylesheets/common/images/menu/upload.png
rename to stylesheets/common/images/menu/uploads.png
Binary files differ
diff --git a/stylesheets/common/images/menu/watchlist.png
b/stylesheets/common/images/menu/watchlist.png
old mode 100755
new mode 100644
index fd4942a..c1f99c8
--- a/stylesheets/common/images/menu/watchlist.png
+++ b/stylesheets/common/images/menu/watchlist.png
Binary files differ
diff --git a/stylesheets/common/mf-navigation.css
b/stylesheets/common/mf-navigation.css
index bc263cb..b431119 100644
--- a/stylesheets/common/mf-navigation.css
+++ b/stylesheets/common/mf-navigation.css
@@ -255,56 +255,38 @@
border-left: solid 12px #252525;
border-right: solid 1px black;
}
-#mw-mf-menu-main li.icon a {
+#mw-mf-menu-main li.icon-home a {
background-image: url(images/menu/lowres/home.png);
}
-#mw-mf-menu-main li.icon2 a {
+#mw-mf-menu-main li.icon-random a {
background-image: url(images/menu/lowres/random.png);
}
-#mw-mf-menu-main li.icon3 a {
- background-image: url(images/menu/lowres/nearby.png);
-}
-#mw-mf-menu-main li.icon4 a {
- background-image: url(images/menu/lowres/contact.png);
-}
-#mw-mf-menu-main li.icon5 a {
+#mw-mf-menu-main li.icon-settings a {
background-image: url(images/menu/lowres/settings.png);
}
-#mw-mf-menu-main li.iconImage a {
- background-image: url(images/100px-globe.png);
+#mw-mf-menu-main li.icon-loginout a {
+ background-image: /* @embed */ url(images/menu/lowres/loginout.png);
}
-#mw-mf-menu-main li.icon6 a.logout {
- background-image: url(images/menu/lowres/logout.png);
-}
-#mw-mf-menu-main li.icon6 a.login {
- background-image: url(images/menu/lowres/login.png);
-}
-#mw-mf-menu-main li.iconUpload a {
- background-image: url(images/menu/upload.png);
-}
-.jsEnabled #mw-mf-menu-main li.icon a {
+.jsEnabled #mw-mf-menu-main li.icon-home a {
background-image: /* @embed */ url(images/menu/home.png);
}
-.jsEnabled #mw-mf-menu-main li.icon2 a {
+.jsEnabled #mw-mf-menu-main li.icon-random a {
background-image: /* @embed */ url(images/menu/random.png);
}
-.jsEnabled #mw-mf-menu-main li.icon3 a {
+.jsEnabled #mw-mf-menu-main li.icon-watchlist a {
+ background-image: /* @embed */ url(images/menu/watchlist.png);
+}
+.jsEnabled #mw-mf-menu-main li.icon-uploads a {
+ background-image: /* @embed */ url(images/menu/uploads.png);
+}
+.jsEnabled #mw-mf-menu-main li.icon-nearby a {
background-image: /* @embed */ url(images/menu/nearby.png);
}
-.jsEnabled #mw-mf-menu-main li.icon4 a {
- background-image: /* @embed */ url(images/menu/contact.png);
-}
-.jsEnabled #mw-mf-menu-main li.icon5 a {
+.jsEnabled #mw-mf-menu-main li.icon-settings a {
background-image: /* @embed */ url(images/menu/settings.png);
}
-.jsEnabled #mw-mf-menu-main li.icon6 a.logout {
- background-image: /* @embed */ url(images/menu/logout.png);
-}
-.jsEnabled #mw-mf-menu-main li.icon6 a.login {
- background-image: /* @embed */ url(images/menu/login.png);
-}
-#mw-mf-menu-main li.icon-watchlist a {
- background-image: /* @embed */ url(images/menu/watchlist.png);
+.jsEnabled #mw-mf-menu-main li.icon-loginout a {
+ background-image: /* @embed */ url(images/menu/loginout.png);
}
#mw-mf-menu-main li.disabled {
opacity: 0.2;
--
To view, visit https://gerrit.wikimedia.org/r/51628
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2fbd170ff530b3f442670ab0d36021c3ede70383
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: JGonera <jgon...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: awjrichards <aricha...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
