diff --git a/includes/VectorTemplate.php b/includes/VectorTemplate.php index ca386056e..722b9060a 100644 --- a/includes/VectorTemplate.php +++ b/includes/VectorTemplate.php @@ -175,29 +175,27 @@ class VectorTemplate extends BaseTemplate { 'html-hook-vector-before-footer' => $htmlHookVectorBeforeFooter, 'array-footer-rows' => $this->getTemplateFooterRows(), ], - 'data-navigation' => [ - 'html-navigation-heading' => $this->getMsg( 'navigation-heading' ), - 'data-personal-menu' => $this->buildPersonalProps(), - 'data-namespace-tabs' => $this->buildNamespacesProps(), - 'data-variants' => $this->buildVariantsProps(), - 'data-page-actions' => $this->buildViewsProps(), - 'data-page-actions-more' => $this->buildActionsProps(), - 'data-search-box' => $this->buildSearchProps(), - 'data-sidebar' => [ - 'html-logo-attributes' => Xml::expandAttributes( - Linker::tooltipAndAccesskeyAttribs( 'p-logo' ) + [ - 'class' => 'mw-wiki-logo', - 'href' => Skin::makeMainPageUrl(), - ] - ) - ] + $this->buildSidebarProps( $this->get( 'sidebar', [] ) ), - ], + 'html-navigation-heading' => $this->getMsg( 'navigation-heading' ), + 'data-personal-menu' => $this->buildPersonalProps(), + 'data-namespace-tabs' => $this->buildNamespacesProps(), + 'data-variants' => $this->buildVariantsProps(), + 'data-page-actions' => $this->buildViewsProps(), + 'data-page-actions-more' => $this->buildActionsProps(), + 'data-search-box' => $this->buildSearchProps(), + 'data-sidebar' => [ + 'html-logo-attributes' => Xml::expandAttributes( + Linker::tooltipAndAccesskeyAttribs( 'p-logo' ) + [ + 'class' => 'mw-wiki-logo', + 'href' => Skin::makeMainPageUrl(), + ] + ) + ] + $this->buildSidebarProps( $this->get( 'sidebar', [] ) ), ]; // The following logic is unqiue to Vector (not used by legacy Vector) and // is planned to be moved in a follow-up patch. if ( !$this->isLegacy && $this->getSkin()->getUser()->isLoggedIn() ) { - $commonSkinData['data-navigation']['data-sidebar']['data-emphasized-sidebar-action'] = [ + $commonSkinData['data-sidebar']['data-emphasized-sidebar-action'] = [ 'href' => SpecialPage::getTitleFor( 'Preferences', false, diff --git a/includes/templates/Navigation.mustache b/includes/templates/Navigation.mustache deleted file mode 100644 index 9cdbe8881..000000000 --- a/includes/templates/Navigation.mustache +++ /dev/null @@ -1,41 +0,0 @@ -{{! - string html-navigation-heading heading for entire navigation that is - usually hidden to screen readers - object data-personal-menu See PersonalMenu.mustache for documentation. - object data-namespace-tabs. See VectorTabs.mustache for documentation. - object data-variants. See VectorMenu.mustache for documentation. - object data-page-actions. See VectorTabs.mustache for documentation. - object data-page-actions-more. See VectorMenu.mustache for documentation. - object data-search-box. See SearchBox.mustache for documentation. - object data-sidebar. See Sidebar.mustache for documentation. -}} -
diff --git a/includes/templates/index.mustache b/includes/templates/index.mustache index 4093f3cde..ac3d2188e 100644 --- a/includes/templates/index.mustache +++ b/includes/templates/index.mustache @@ -20,7 +20,15 @@ string html-catlinks string html-debuglog string html-dataAfterContent - object data-navigation for navigation template partial. see Navigation.mustache for documentation. + string html-navigation-heading heading for entire navigation that is + usually hidden to screen readers + object data-personal-menu See PersonalMenu.mustache for documentation. + object data-namespace-tabs. See VectorTabs.mustache for documentation. + object data-variants. See VectorMenu.mustache for documentation. + object data-page-actions. See VectorTabs.mustache for documentation. + object data-page-actions-more. See VectorMenu.mustache for documentation. + object data-search-box. See SearchBox.mustache for documentation. + object data-sidebar. See Sidebar.mustache for documentation. object data-footer for footer template partial. see Footer.mustache for documentation. string html-printtail HTML to render at the end of the page contained necessary script tags for ResourceLoader terminated with `