Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/288134
Change subject: Hygiene: Clear up heading/header confusion ...................................................................... Hygiene: Clear up heading/header confusion We use the word `header` in the Skin classes but this is different from the header for the skin itself. We also have a mustache file that is not being used for any purpose so lets delete it. Change-Id: Icf794c9b8dd7638c3d053b24df986a52dc1445ca --- M includes/skins/SkinMinerva.php M includes/skins/SkinMinervaBeta.php D includes/skins/header.mustache 3 files changed, 5 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/34/288134/1 diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php index 96d5ba1..e23830e 100644 --- a/includes/skins/SkinMinerva.php +++ b/includes/skins/SkinMinerva.php @@ -607,10 +607,10 @@ } /** - * Returns the HTML representing the header. + * Returns the HTML representing the heading. * @returns {String} html for header */ - protected function getHeaderHtml() { + protected function getHeadingHtml() { $html = ''; if ( $this->isUserPage ) { // The heading is just the username without namespace @@ -675,7 +675,7 @@ $tpl->set( 'historyLink', $this->getHistoryLink( $title ) ); } } - $tpl->set( 'headinghtml', $this->getHeaderHtml() ); + $tpl->set( 'headinghtml', $this->getHeadingHtml() ); // set defaults if ( !isset( $tpl->data['postbodytext'] ) ) { diff --git a/includes/skins/SkinMinervaBeta.php b/includes/skins/SkinMinervaBeta.php index 89c2ee0..fd25a9b 100644 --- a/includes/skins/SkinMinervaBeta.php +++ b/includes/skins/SkinMinervaBeta.php @@ -15,8 +15,8 @@ protected $shouldSecondaryActionsIncludeLanguageBtn = false; /** @inheritdoc **/ - protected function getHeaderHtml() { - $html = parent::getHeaderHtml(); + protected function getHeadingHtml() { + $html = parent::getHeadingHtml(); if ( !$this->isUserPage ) { $vars = $this->getSkinConfigVariables(); $description = $vars['wgMFDescription']; diff --git a/includes/skins/header.mustache b/includes/skins/header.mustache deleted file mode 100644 index 0ea85a9..0000000 --- a/includes/skins/header.mustache +++ /dev/null @@ -1,9 +0,0 @@ -<div> - <a class="{{mobileMenuClass}} main-menu-button" href="{{mobileMenuLink}}">{{mobileMenuTitle}}</a> -</div> -<div class="header-title"> - <a href="{{mobileMenuLink}}" class="main-menu-button">{{{siteName}}}</a> -</div> -<div> - {{{secondaryButton}}} -</div> -- To view, visit https://gerrit.wikimedia.org/r/288134 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf794c9b8dd7638c3d053b24df986a52dc1445ca 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