Skip to content

Commit

Permalink
Merge "Use tabs consistently in .mustache files"
Browse files Browse the repository at this point in the history
  • Loading branch information
jenkins-bot authored and Gerrit Code Review committed Jan 18, 2023
2 parents 5115739 + 7323d6a commit ed40489
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 60 deletions.
14 changes: 7 additions & 7 deletions includes/templates/BeforeContent.mustache
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{{!-
Page Precontent - Placed below the page toolbar on all pages.
Contains the indicators (if the language button is beside the title)
qnd tagline, which is only rendered on article page.
Page Precontent - Placed below the page toolbar on all pages.
Contains the indicators (if the language button is beside the title)
qnd tagline, which is only rendered on article page.
}}
<div class="vector-body-before-content">
{{#is-language-in-content-top}}
{{>Indicators}}
{{/is-language-in-content-top}}
{{#is-language-in-content-top}}
{{>Indicators}}
{{/is-language-in-content-top}}

{{#is-article}}<div id="siteSub" class="noprint">{{msg-tagline}}</div>{{/is-article}}
{{#is-article}}<div id="siteSub" class="noprint">{{msg-tagline}}</div>{{/is-article}}
</div>
6 changes: 3 additions & 3 deletions includes/templates/IconLink.mustache
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<a data-mw="interface"
href="{{href}}"
{{{html-attributes}}}>{{!
}}{{#icon}}<span class="mw-ui-icon mw-ui-icon-{{.}} mw-ui-icon-wikimedia-{{.}}"></span>{{/icon}}<span>{{text}}</span>{{!
href="{{href}}"
{{{html-attributes}}}>{{!
}}{{#icon}}<span class="mw-ui-icon mw-ui-icon-{{.}} mw-ui-icon-wikimedia-{{.}}"></span>{{/icon}}<span>{{text}}</span>{{!
}}</a>
16 changes: 8 additions & 8 deletions includes/templates/LanguageDropdown.mustache
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{{! Use `.mw-portlet-lang` to target styles at this element}}
{{>Dropdown/Open}}
{{#is-language-selector-empty}}
<div class="mw-portlet-empty-language-selector-body">
{{msg-empty-language-selector-body}}
</div>
{{/is-language-selector-empty}}
{{^is-language-selector-empty}}
{{>MenuContents}}
{{/is-language-selector-empty}}
{{#is-language-selector-empty}}
<div class="mw-portlet-empty-language-selector-body">
{{msg-empty-language-selector-body}}
</div>
{{/is-language-selector-empty}}
{{^is-language-selector-empty}}
{{>MenuContents}}
{{/is-language-selector-empty}}
{{>Dropdown/Close}}
32 changes: 16 additions & 16 deletions includes/templates/MainMenu.mustache
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{{! Use `.vector-main-menu` to target styles at this element}}
{{>PinnableElement/Open}}
{{^is-page-tools-enabled}}
{{#data-portlets-first}}{{>MainMenuGroup}}{{/data-portlets-first}}
{{#data-main-menu-action}}{{>MainMenuAction}}{{/data-main-menu-action}}
{{#array-portlets-rest}}{{>MainMenuGroup}}{{/array-portlets-rest}}
{{^is-language-in-content}}
{{#data-languages}}{{>MainMenuGroup}}{{/data-languages}}
{{/is-language-in-content}}
{{! T295555 Add language switch alert message. }}
{{#data-vector-language-switch-alert}}{{>MainMenuAction}}{{/data-vector-language-switch-alert}}
{{#data-portlets-first}}{{>MainMenuGroup}}{{/data-portlets-first}}
{{#data-main-menu-action}}{{>MainMenuAction}}{{/data-main-menu-action}}
{{#array-portlets-rest}}{{>MainMenuGroup}}{{/array-portlets-rest}}
{{^is-language-in-content}}
{{#data-languages}}{{>MainMenuGroup}}{{/data-languages}}
{{/is-language-in-content}}
{{! T295555 Add language switch alert message. }}
{{#data-vector-language-switch-alert}}{{>MainMenuAction}}{{/data-vector-language-switch-alert}}
{{/is-page-tools-enabled}}

{{#is-page-tools-enabled}}
{{#data-portlets-first}}{{>Menu}}{{/data-portlets-first}}
{{#data-main-menu-action}}{{>MainMenuAction}}{{/data-main-menu-action}}
{{#array-portlets-rest}}{{>Menu}}{{/array-portlets-rest}}
{{^is-language-in-content}}
{{#data-languages}}{{>Menu}}{{/data-languages}}
{{/is-language-in-content}}
{{! T295555 Add language switch alert message. }}
{{#data-vector-language-switch-alert}}{{>MainMenuAction}}{{/data-vector-language-switch-alert}}
{{#data-portlets-first}}{{>Menu}}{{/data-portlets-first}}
{{#data-main-menu-action}}{{>MainMenuAction}}{{/data-main-menu-action}}
{{#array-portlets-rest}}{{>Menu}}{{/array-portlets-rest}}
{{^is-language-in-content}}
{{#data-languages}}{{>Menu}}{{/data-languages}}
{{/is-language-in-content}}
{{! T295555 Add language switch alert message. }}
{{#data-vector-language-switch-alert}}{{>MainMenuAction}}{{/data-vector-language-switch-alert}}
{{/is-page-tools-enabled}}
{{>PinnableElement/Close}}
10 changes: 5 additions & 5 deletions includes/templates/MenuContents.mustache
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="vector-menu-content">
{{{html-before-portal}}}
<ul class="vector-menu-content-list">{{!
}}{{#data-items}}{{>MenuListItem}}{{/data-items}}{{!
}}{{{html-items}}}</ul>
{{{html-after-portal}}}
{{{html-before-portal}}}
<ul class="vector-menu-content-list">{{!
}}{{#data-items}}{{>MenuListItem}}{{/data-items}}{{!
}}{{{html-items}}}</ul>
{{{html-after-portal}}}
</div>
20 changes: 10 additions & 10 deletions includes/templates/PageTitlebar.mustache
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{!-
Page titlebar - Main <H1> title for all pages, with either the indicators or language selector.
When language button is visible, indicators are placed in the BeforeContent.mustache template instead.
Page titlebar - Main <H1> title for all pages, with either the indicators or language selector.
When language button is visible, indicators are placed in the BeforeContent.mustache template instead.
}}
<header class="mw-body-header vector-page-titlebar{{#is-title-blank}} vector-page-titlebar-blank{{/is-title-blank}}">
{{! Checkbox hack used by collapsed TOC on narrow viewports for no JS users }}
Expand All @@ -26,15 +26,15 @@
{{>Dropdown/Close}}
{{/data-page-titlebar-toc-dropdown}}

{{{html-title-heading}}}
{{{html-title-heading}}}

{{#is-language-in-content-top}}
{{#data-lang-btn}}
{{>LanguageDropdown}}
{{/data-lang-btn}}
{{/is-language-in-content-top}}
{{#data-lang-btn}}
{{>LanguageDropdown}}
{{/data-lang-btn}}
{{/is-language-in-content-top}}

{{^is-language-in-content-top}}
{{>Indicators}}
{{/is-language-in-content-top}}
{{^is-language-in-content-top}}
{{>Indicators}}
{{/is-language-in-content-top}}
</header>
4 changes: 2 additions & 2 deletions includes/templates/skin.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
MenuDefinition data-portlets.data-actions
object data-search-box. See SearchBox.mustache for documentation.
boolean is-main-menu-visible For users that want to see the sidebar on initial render, this should be
true.
true.
string msg-vector-action-toggle-sidebar The label used by the sidebar button.
string msg-vector-main-menu-tooltip The title attribute for the main menu icon.
object data-main-menu. See MainMenu.mustache for documentation.
Expand Down Expand Up @@ -54,7 +54,7 @@
<div id="bodyContent" class="vector-body" aria-labelledby="firstHeading" data-mw-ve-target-container>
{{>BeforeContent}}
{{! the #contentSub element is currently used by editors, do not hide or remove it
until https://phabricator.wikimedia.org/T316830 has been addressed}}
until https://phabricator.wikimedia.org/T316830 has been addressed}}
<div id="contentSub"{{{html-user-language-attributes}}}>{{{html-subtitle}}}</div>
{{#html-undelete-link}}<div id="contentSub2">{{{.}}}</div>{{/html-undelete-link}}
{{{html-user-message}}}
Expand Down
18 changes: 9 additions & 9 deletions tests/jest/__snapshots__/userLinks.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ exports[`UserLinks renders 1`] = `
Toggle sidebar
</div>
<div class=\\"vector-menu-content\\">
<ul class=\\"vector-menu-content-list\\">
<ul class=\\"vector-menu-content-list\\">
<li id=\\"ca-uls\\" class=\\"user-links-collapsible-item mw-list-item active\\"><a href=\\"#\\" class=\\"uls-trigger mw-ui-button mw-ui-quiet\\"><span class=\\"mw-ui-icon mw-ui-icon-wikimedia-language\\"></span> <span>English</span></a></li>
<li id=\\"pt-userpage-2\\" class=\\"user-links-collapsible-item mw-list-item\\"><a href=\\"/wiki/User:Admin\\" class=\\"mw-ui-button mw-ui-quiet\\" title=\\"Your user page [⌃⌥.]\\" accesskey=\\".\\"><span>Admin</span></a></li>
<li id=\\"pt-notifications-alert\\" class=\\"mw-list-item\\"><a href=\\"/wiki/Special:Notifications\\" class=\\"mw-echo-notifications-badge mw-echo-notification-badge-nojs oo-ui-icon-bell mw-echo-notifications-badge-all-read\\" data-counter-num=\\"0\\" data-counter-text=\\"0\\" title=\\"Your alerts\\"><span>Alerts (0)</span></a></li>
<li id=\\"pt-notifications-notice\\" class=\\"mw-list-item\\"><a href=\\"/wiki/Special:Notifications\\" class=\\"mw-echo-notifications-badge mw-echo-notification-badge-nojs oo-ui-icon-tray mw-echo-notifications-badge-all-read\\" data-counter-num=\\"0\\" data-counter-text=\\"0\\" title=\\"Your notices\\"><span>Notices (0)</span></a></li>
<li id=\\"pt-watchlist-2\\" class=\\"user-links-collapsible-item mw-list-item\\"><a href=\\"/wiki/Special:Watchlist\\" class=\\"mw-ui-button mw-ui-quiet mw-ui-icon mw-ui-icon-element mw-ui-icon-watchlist mw-ui-icon-wikimedia-watchlist\\" title=\\"A list of pages you are monitoring for changes [⌃⌥l]\\" accesskey=\\"l\\"><span>Watchlist</span></a></li>
</ul>
</div>
</div>
<div id=\\"p-personal\\" class=\\"vector-menu vector-dropdown vector-menu-dropdown mw-portlet mw-portlet-personal vector-user-menu vector-user-menu-logged-in vector-menu-dropdown\\">
Expand All @@ -26,8 +26,8 @@ exports[`UserLinks renders 1`] = `
<div class=\\"vector-menu-content\\">
<div class=\\"vector-menu-content\\">
<ul class=\\"vector-menu-content-list\\">
<ul class=\\"vector-menu-content-list\\">
<li id=\\"pt-userpage\\" class=\\"user-links-collapsible-item mw-list-item\\"><a class=\\"mw-ui-icon mw-ui-icon-before mw-ui-icon-userAvatar mw-ui-icon-wikimedia-userAvatar\\" href=\\"/wiki/User:Admin\\" title=\\"Your user page [.]\\" accesskey=\\".\\"><span>Admin</span></a></li>
<li id=\\"pt-mytalk\\" class=\\"mw-list-item\\"><a class=\\"mw-ui-icon mw-ui-icon-before mw-ui-icon-userTalk mw-ui-icon-wikimedia-userTalk\\" href=\\"/wiki/User_talk:Admin\\" title=\\"Your talk page [n]\\" accesskey=\\"n\\"><span>Talk</span></a></li>
<li id=\\"pt-sandbox\\" class=\\"new mw-list-item\\"><a class=\\"mw-ui-icon mw-ui-icon-before mw-ui-icon-sandbox mw-ui-icon-wikimedia-sandbox\\" href=\\"/w/index.php?title=User:Admin/sandbox&amp;action=edit&amp;redlink=1\\" title=\\"Your sandbox (page does not exist)\\"><span>Sandbox</span></a></li>
Expand All @@ -38,13 +38,13 @@ exports[`UserLinks renders 1`] = `
<li id=\\"pt-mycontris\\" class=\\"mw-list-item\\"><a class=\\"mw-ui-icon mw-ui-icon-before mw-ui-icon-userContributions mw-ui-icon-wikimedia-userContributions\\" href=\\"/wiki/Special:Contributions/Admin\\" title=\\"A list of your contributions [y]\\" accesskey=\\"y\\"><span>Contributions</span></a></li>
<li id=\\"pt-custom\\" class=\\"mw-list-item mw-list-item-js\\">Gadget added item</li>
</ul>
</div>
<div class=\\"vector-menu-content\\">
<ul class=\\"vector-menu-content-list\\"><li class=\\"vector-user-menu-logout\\" id=\\"pt-logout\\"><a data-mw=\\"interface\\" href=\\"/logout\\"><span>Log out</span></a>
<ul class=\\"vector-menu-content-list\\"><li class=\\"vector-user-menu-logout\\" id=\\"pt-logout\\"><a data-mw=\\"interface\\" href=\\"/logout\\"><span>Log out</span></a>
</li></ul>
</div>
</div>
</div></nav>
Expand Down

0 comments on commit ed40489

Please sign in to comment.