Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/354710 )
Change subject: MainMenu renames to Minerva not MobileFrontend ...................................................................... MainMenu renames to Minerva not MobileFrontend While trying to separate Minerva from MobileFrontend it became apparent the MainMenu as currently implemented is very Minerva specific. Distinction may be Change-Id: I695909d7ce81a7b2ca29d905650f5b09cc14337a --- M extension.json R includes/skins/MenuBuilder.php M includes/skins/MinervaTemplate.php M includes/skins/SkinMinerva.php M includes/specials/SpecialMobileMenu.php R resources/skins.minerva.mainMenu.icons/anonymous.svg R resources/skins.minerva.mainMenu.icons/contributions.svg R resources/skins.minerva.mainMenu.icons/home.svg R resources/skins.minerva.mainMenu.icons/logout.svg R resources/skins.minerva.mainMenu.icons/nearby.svg R resources/skins.minerva.mainMenu.icons/profile.svg R resources/skins.minerva.mainMenu.icons/random.svg R resources/skins.minerva.mainMenu.icons/settings.svg R resources/skins.minerva.mainMenu.icons/watchlist.svg R resources/skins.minerva.mainMenu.styles/mainmenu.less R resources/skins.minerva.mainMenu/MainMenu.js R resources/skins.minerva.mainMenu/menu.mustache R resources/skins.minerva.mainMenu/menuGroup.mustache M resources/skins.minerva.scripts.top/init.js M tests/phpunit/MenuBuilderTest.php 20 files changed, 55 insertions(+), 49 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/10/354710/1 diff --git a/extension.json b/extension.json index 7bac35e..c35de3b 100644 --- a/extension.json +++ b/extension.json @@ -86,8 +86,8 @@ "MFResourceLoaderParsedMessageModule": "includes/modules/MFResourceLoaderParsedMessageModule.php", "SkinMinerva": "includes/skins/SkinMinerva.php", "ICustomizableSkin": "includes/skins/ICustomizableSkin.php", - "MobileFrontend\\MenuBuilder": "includes/MenuBuilder.php", - "MobileFrontend\\MenuEntry": "includes/MenuBuilder.php", + "Minerva\\MenuBuilder": "includes/skins/MenuBuilder.php", + "Minerva\\MenuEntry": "includes/skins/MenuBuilder.php", "MobileFrontend\\Devices\\DeviceDetector": "includes/devices/DeviceDetector.php", "MobileFrontend\\Devices\\DeviceProperties": "includes/devices/DeviceProperties.php", "MobileFrontend\\Devices\\AMFDeviceDetector": "includes/devices/AMFDeviceDetector.php", @@ -284,48 +284,48 @@ "resources/skins.minerva.userpage.styles/userpage.less" ] }, - "mobile.mainMenu.icons": { + "skins.minerva.mainMenu.icons": { "class": "ResourceLoaderImageModule", "selector": ".mw-ui-icon-mf-{name}:before", "images": { - "anonymous": "resources/mobile.mainMenu.icons/anonymous.svg", - "home": "resources/mobile.mainMenu.icons/home.svg", - "logout": "resources/mobile.mainMenu.icons/logout.svg", - "nearby": "resources/mobile.mainMenu.icons/nearby.svg", - "profile": "resources/mobile.mainMenu.icons/profile.svg", - "random": "resources/mobile.mainMenu.icons/random.svg", - "settings": "resources/mobile.mainMenu.icons/settings.svg", - "watchlist": "resources/mobile.mainMenu.icons/watchlist.svg", - "contributions": "resources/mobile.mainMenu.icons/contributions.svg" + "anonymous": "resources/skins.minerva.mainMenu.icons/anonymous.svg", + "home": "resources/skins.minerva.mainMenu.icons/home.svg", + "logout": "resources/skins.minerva.mainMenu.icons/logout.svg", + "nearby": "resources/skins.minerva.mainMenu.icons/nearby.svg", + "profile": "resources/skins.minerva.mainMenu.icons/profile.svg", + "random": "resources/skins.minerva.mainMenu.icons/random.svg", + "settings": "resources/skins.minerva.mainMenu.icons/settings.svg", + "watchlist": "resources/skins.minerva.mainMenu.icons/watchlist.svg", + "contributions": "resources/skins.minerva.mainMenu.icons/contributions.svg" } }, - "mobile.mainMenu.styles": { + "skins.minerva.mainMenu.styles": { "targets": [ "mobile", "desktop" ], "styles": [ - "resources/mobile.mainMenu.styles/mainmenu.less" + "resources/skins.minerva.mainMenu.styles/mainmenu.less" ] }, - "mobile.mainMenu": { + "skins.minerva.mainMenu": { "targets": [ "mobile", "desktop" ], "dependencies": [ - "mobile.mainMenu.icons", - "mobile.mainMenu.styles", + "skins.minerva.mainMenu.icons", + "skins.minerva.mainMenu.styles", "mobile.startup", "mobile.loggingSchemas.mobileWebMainMenuClickTracking" ], "position": "bottom", "templates": { - "menu.hogan": "resources/mobile.mainMenu/menu.mustache", - "menuGroup.hogan": "resources/mobile.mainMenu/menuGroup.mustache" + "menu.hogan": "resources/skins.minerva.mainMenu/menu.mustache", + "menuGroup.hogan": "resources/skins.minerva.mainMenu/menuGroup.mustache" }, "scripts": [ - "resources/mobile.mainMenu/MainMenu.js" + "resources/skins.minerva.mainMenu/MainMenu.js" ] }, "mobile.messageBox.styles": { @@ -1381,7 +1381,7 @@ "mediawiki.router", "mediawiki.Title", "mobile.startup", - "mobile.mainMenu", + "skins.minerva.mainMenu", "mobile.issues", "mobile.search.api", "mobile.search", @@ -1431,7 +1431,7 @@ ], "position": "top", "dependencies": [ - "mobile.mainMenu" + "skins.minerva.mainMenu" ], "scripts": [ "resources/skins.minerva.scripts.top/init.js" @@ -1609,9 +1609,15 @@ ] }, "minerva": { + "mobile.special.mobilemenu.styles": [ + "skinStyles/mobile.special.mobilemenu.styles/minerva.less" + ], "mediawiki.notification": [ "resources/mobile.startup/toast.less" ] + }, + "vector": { + "mobile.special.mobilemenu.styles": "skinStyles/mobile.special.mobilemenu.styles/vector.less" } }, "Hooks": { diff --git a/includes/MenuBuilder.php b/includes/skins/MenuBuilder.php similarity index 98% rename from includes/MenuBuilder.php rename to includes/skins/MenuBuilder.php index e2e68b2..b3c1601 100644 --- a/includes/MenuBuilder.php +++ b/includes/skins/MenuBuilder.php @@ -1,6 +1,6 @@ <?php -namespace MobileFrontend; +namespace Minerva; use DomainException; diff --git a/includes/skins/MinervaTemplate.php b/includes/skins/MinervaTemplate.php index c0606c5..2da63a6 100644 --- a/includes/skins/MinervaTemplate.php +++ b/includes/skins/MinervaTemplate.php @@ -247,7 +247,7 @@ protected function getMainMenuHtml( $data ) { if ( $this->isSpecialMobileMenuPage ) { $templateParser = new TemplateParser( - __DIR__ . '/../../resources/mobile.mainMenu/' ); + __DIR__ . '/../../resources/skins.minerva.mainMenu/' ); return $templateParser->processTemplate( 'menu', $data['menu_data'] ); } else { diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php index 8cadaf4..bbd81c2 100644 --- a/includes/skins/SkinMinerva.php +++ b/includes/skins/SkinMinerva.php @@ -2,7 +2,7 @@ /** * SkinMinerva.php */ -use MobileFrontend\MenuBuilder; +use Minerva\MenuBuilder; use MediaWiki\MediaWikiServices; use MediaWiki\Logger\LoggerFactory; diff --git a/includes/specials/SpecialMobileMenu.php b/includes/specials/SpecialMobileMenu.php index 8b8fff7..30e09d3 100644 --- a/includes/specials/SpecialMobileMenu.php +++ b/includes/specials/SpecialMobileMenu.php @@ -33,8 +33,8 @@ $out->setProperty( 'bodyClassName', 'navigation-enabled navigation-full-screen' ); $out->addModuleStyles( [ - 'mobile.mainMenu.icons', - 'mobile.mainMenu.styles', + 'skins.minerva.mainMenu.icons', + 'skins.minerva.mainMenu.styles', ] ); } diff --git a/resources/mobile.mainMenu.icons/anonymous.svg b/resources/skins.minerva.mainMenu.icons/anonymous.svg similarity index 100% rename from resources/mobile.mainMenu.icons/anonymous.svg rename to resources/skins.minerva.mainMenu.icons/anonymous.svg diff --git a/resources/mobile.mainMenu.icons/contributions.svg b/resources/skins.minerva.mainMenu.icons/contributions.svg similarity index 100% rename from resources/mobile.mainMenu.icons/contributions.svg rename to resources/skins.minerva.mainMenu.icons/contributions.svg diff --git a/resources/mobile.mainMenu.icons/home.svg b/resources/skins.minerva.mainMenu.icons/home.svg similarity index 100% rename from resources/mobile.mainMenu.icons/home.svg rename to resources/skins.minerva.mainMenu.icons/home.svg diff --git a/resources/mobile.mainMenu.icons/logout.svg b/resources/skins.minerva.mainMenu.icons/logout.svg similarity index 100% rename from resources/mobile.mainMenu.icons/logout.svg rename to resources/skins.minerva.mainMenu.icons/logout.svg diff --git a/resources/mobile.mainMenu.icons/nearby.svg b/resources/skins.minerva.mainMenu.icons/nearby.svg similarity index 100% rename from resources/mobile.mainMenu.icons/nearby.svg rename to resources/skins.minerva.mainMenu.icons/nearby.svg diff --git a/resources/mobile.mainMenu.icons/profile.svg b/resources/skins.minerva.mainMenu.icons/profile.svg similarity index 100% rename from resources/mobile.mainMenu.icons/profile.svg rename to resources/skins.minerva.mainMenu.icons/profile.svg diff --git a/resources/mobile.mainMenu.icons/random.svg b/resources/skins.minerva.mainMenu.icons/random.svg similarity index 100% rename from resources/mobile.mainMenu.icons/random.svg rename to resources/skins.minerva.mainMenu.icons/random.svg diff --git a/resources/mobile.mainMenu.icons/settings.svg b/resources/skins.minerva.mainMenu.icons/settings.svg similarity index 100% rename from resources/mobile.mainMenu.icons/settings.svg rename to resources/skins.minerva.mainMenu.icons/settings.svg diff --git a/resources/mobile.mainMenu.icons/watchlist.svg b/resources/skins.minerva.mainMenu.icons/watchlist.svg similarity index 100% rename from resources/mobile.mainMenu.icons/watchlist.svg rename to resources/skins.minerva.mainMenu.icons/watchlist.svg diff --git a/resources/mobile.mainMenu.styles/mainmenu.less b/resources/skins.minerva.mainMenu.styles/mainmenu.less similarity index 100% rename from resources/mobile.mainMenu.styles/mainmenu.less rename to resources/skins.minerva.mainMenu.styles/mainmenu.less diff --git a/resources/mobile.mainMenu/MainMenu.js b/resources/skins.minerva.mainMenu/MainMenu.js similarity index 95% rename from resources/mobile.mainMenu/MainMenu.js rename to resources/skins.minerva.mainMenu/MainMenu.js index 70b7e46..5a45472 100644 --- a/resources/mobile.mainMenu/MainMenu.js +++ b/resources/skins.minerva.mainMenu/MainMenu.js @@ -20,10 +20,10 @@ /** @inheritdoc */ isTemplateMode: true, /** @inheritdoc */ - template: mw.template.get( 'mobile.mainMenu', 'menu.hogan' ), + template: mw.template.get( 'skins.minerva.mainMenu', 'menu.hogan' ), /** @inheritdoc */ templatePartials: { - menuGroup: mw.template.get( 'mobile.mainMenu', 'menuGroup.hogan' ) + menuGroup: mw.template.get( 'skins.minerva.mainMenu', 'menuGroup.hogan' ) }, /** @@ -159,6 +159,6 @@ } } ); - M.define( 'mobile.mainMenu/MainMenu', MainMenu ); + M.define( 'skins.minerva.mainMenu/MainMenu', MainMenu ); }( mw.mobileFrontend, jQuery ) ); diff --git a/resources/mobile.mainMenu/menu.mustache b/resources/skins.minerva.mainMenu/menu.mustache similarity index 100% rename from resources/mobile.mainMenu/menu.mustache rename to resources/skins.minerva.mainMenu/menu.mustache diff --git a/resources/mobile.mainMenu/menuGroup.mustache b/resources/skins.minerva.mainMenu/menuGroup.mustache similarity index 100% rename from resources/mobile.mainMenu/menuGroup.mustache rename to resources/skins.minerva.mainMenu/menuGroup.mustache diff --git a/resources/skins.minerva.scripts.top/init.js b/resources/skins.minerva.scripts.top/init.js index a0aae50..170c14e 100644 --- a/resources/skins.minerva.scripts.top/init.js +++ b/resources/skins.minerva.scripts.top/init.js @@ -1,5 +1,5 @@ ( function ( M, $ ) { - var MainMenu = M.require( 'mobile.mainMenu/MainMenu' ), + var MainMenu = M.require( 'skins.minerva.mainMenu/MainMenu' ), mainMenu = createMainMenu(); /** diff --git a/tests/phpunit/MenuBuilderTest.php b/tests/phpunit/MenuBuilderTest.php index 25322c4..ce40c43 100644 --- a/tests/phpunit/MenuBuilderTest.php +++ b/tests/phpunit/MenuBuilderTest.php @@ -2,7 +2,7 @@ namespace Tests\MobileFrontend; -use MobileFrontend\MenuBuilder; +use Minerva\MenuBuilder; /** * @group MobileFrontend @@ -22,7 +22,7 @@ ]; /** - * @covers \MobileFrontend\MenuBuilder::getEntries + * @covers \Minerva\MenuBuilder::getEntries */ public function test_it_shouldnt_have_entries_by_default() { $menu = new MenuBuilder(); @@ -31,9 +31,9 @@ } /** - * @covers \MobileFrontend\MenuBuilder::insert - * @covers \MobileFrontend\MenuEntry::addComponent - * @covers \MobileFrontend\MenuBuilder::getEntries + * @covers \Minerva\MenuBuilder::insert + * @covers \MobileFrontend\Minerva\MenuEntry::addComponent + * @covers \Minerva\MenuBuilder::getEntries */ public function test_inserting_an_entry() { $menu = new MenuBuilder(); @@ -58,9 +58,9 @@ } /** - * @covers \MobileFrontend\MenuBuilder::insert - * @covers \MobileFrontend\MenuEntry::addComponent - * @covers \MobileFrontend\MenuBuilder::getEntries + * @covers \Minerva\MenuBuilder::insert + * @covers \MobileFrontend\Minerva\MenuEntry::addComponent + * @covers \Minerva\MenuBuilder::getEntries */ public function test_inserting_an_entry_after_another() { $menu = new MenuBuilder(); @@ -110,8 +110,8 @@ /** * @expectedException \DomainException * @expectedExceptionMessage The "home" entry doesn't exist. - * @covers \MobileFrontend\MenuBuilder::insertAfter - * @covers \MobileFrontend\MenuEntry::addComponent + * @covers \Minerva\MenuBuilder::insertAfter + * @covers \MobileFrontend\Minerva\MenuEntry::addComponent */ public function test_inserting_an_entry_after_that_doesnt_exist() { $menu = new MenuBuilder(); @@ -126,7 +126,7 @@ /** * @expectedException \DomainException * @expectedExceptionMessage The "home" entry already exists. - * @covers \MobileFrontend\MenuBuilder::insert + * @covers \Minerva\MenuBuilder::insert */ public function test_inserting_an_entry_with_an_existing_name() { $menu = new MenuBuilder(); @@ -137,7 +137,7 @@ /** * @expectedException \DomainException * @expectedExceptionMessage The "home" entry already exists. - * @covers \MobileFrontend\MenuBuilder::insert + * @covers \Minerva\MenuBuilder::insert */ public function test_inserting_an_entry_with_an_existing_name_after() { $menu = new MenuBuilder(); @@ -146,9 +146,9 @@ } /** - * @covers \MobileFrontend\MenuBuilder::insert - * @covers \MobileFrontend\MenuEntry::addComponent - * @covers \MobileFrontend\MenuBuilder::getEntries + * @covers \Minerva\MenuBuilder::insert + * @covers \MobileFrontend\Minerva\MenuEntry::addComponent + * @covers \Minerva\MenuBuilder::getEntries */ public function test_inserting_an_entry_with_multiple_components() { $authLoginComponent = [ @@ -191,9 +191,9 @@ } /** - * @covers \MobileFrontend\MenuBuilder::insert - * @covers \MobileFrontend\MenuEntry::addComponent - * @covers \MobileFrontend\MenuBuilder::getEntries + * @covers \Minerva\MenuBuilder::insert + * @covers \MobileFrontend\Minerva\MenuEntry::addComponent + * @covers \Minerva\MenuBuilder::getEntries */ public function test_inserting_a_javascript_only_entry() { $menu = new MenuBuilder(); -- To view, visit https://gerrit.wikimedia.org/r/354710 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I695909d7ce81a7b2ca29d905650f5b09cc14337a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits