wikimedia/mediawiki-skins-Vector
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/Vector.git synced 2024-09-23 10:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Templates: Reorganize pinned containers

Browse source 
The UnpinnedContainer and PinnedContainer are versions of the
same component but with different states. Recognize them by
organizing them in the same subfolder. Update all existing usages.

Bug: T317900
Change-Id: I2c25937190997764fa23e0b581be5538ba4d06de
This commit is contained in:
Jon Robson 2022-12-09 15:32:43 -08:00
parent 81348a659c
commit a786cfe09b
10 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/templates/ColumnEnd.mustache
View file

@ -1,9 +1,9 @@
<div class="vector-column-end">
<nav class="vector-page-tools-landmark" aria-label="{{msg-tooltip-p-cactions}}">
{{#data-page-tools}}
{{>PinnedContainer/Open}}
{{>PinnableContainer/Pinned/Open}}
{{#is-pinned}}{{>PageTools}}{{/is-pinned}}
{{>PinnedContainer/Close}}
{{>PinnableContainer/Close}}
{{/data-page-tools}}
</nav>
</div>

4
includes/templates/PageTitlebar.mustache
View file

@ -20,8 +20,8 @@
{{! TOC is moved into this dropdown from the sidebar in stickyHeader.js. }}
{{#data-page-titlebar-toc}}
{{>Dropdown/Open}}
{{>UnpinnedContainer/Open}}
{{>UnpinnedContainer/Close}}
{{>PinnableContainer/Unpinned/Open}}
{{>PinnableContainer/Close}}
{{>Dropdown/Close}}
{{/data-page-titlebar-toc}}
{{/data-toc}}

4
includes/templates/PageToolbar.mustache
View file

@ -15,9 +15,9 @@
<nav class="vector-page-tools-landmark" aria-label="{{msg-tooltip-p-cactions}}">
{{#is-page-tools-enabled}}{{#data-page-tools}}
{{>Dropdown/Open}}
{{>UnpinnedContainer/Open}}
{{>PinnableContainer/Unpinned/Open}}
{{^is-pinned}}{{>PageTools}}{{/is-pinned}}
{{>UnpinnedContainer/Close}}
{{>PinnableContainer/Close}}
{{>Dropdown/Close}}
{{/data-page-tools}}{{/is-page-tools-enabled}}
{{^is-page-tools-enabled}}{{#data-actions}}{{>LegacyMoreMenu}}{{/data-actions}}{{/is-page-tools-enabled}}

0
includes/templates/PinnedContainer/Close.mustache → includes/templates/PinnableContainer/Close.mustache
View file

0
includes/templates/PinnedContainer/Open.mustache → includes/templates/PinnableContainer/Pinned/Open.mustache
View file

0
includes/templates/UnpinnedContainer/Open.mustache → includes/templates/PinnableContainer/Unpinned/Open.mustache
View file

4
includes/templates/StickyHeader.mustache
View file

@ -23,8 +23,8 @@
{{! TOC is moved into this dropdown from the sidebar in stickyHeader.js. }}
{{#data-sticky-header-toc}}
{{>Dropdown/Open}}
{{>UnpinnedContainer/Open}}
{{>UnpinnedContainer/Close}}
{{>PinnableContainer/Unpinned/Open}}
{{>PinnableContainer/Close}}
{{>Dropdown/Close}}
{{/data-sticky-header-toc}}
</div>

4
includes/templates/TableOfContentsContainer.mustache
View file

@ -1,8 +1,8 @@
<div class="mw-table-of-contents-container">
{{! T313060 Additional container div needed to prevent the sticky element from being siblings with the footer }}
{{#data-toc}}
{{>PinnedContainer/Open}}
{{>PinnableContainer/Pinned/Open}}
{{#is-pinned}}{{>TableOfContents}}{{/is-pinned}}
{{>PinnedContainer/Close}}
{{>PinnableContainer/Close}}
{{/data-toc}}
</div>

1
includes/templates/UnpinnedContainer/Close.mustache
View file

@ -1 +0,0 @@
</div>

14
tests/jest/userLinksData.js
View file

@ -4,10 +4,9 @@ const menuContents = fs.readFileSync( 'includes/templates/MenuContents.mustache'
const userLinksTemplate = fs.readFileSync( 'includes/templates/UserLinks.mustache', 'utf8' );
const dropdownOpenTemplate = fs.readFileSync( 'includes/templates/Dropdown/Open.mustache', 'utf8' );
const dropdownCloseTemplate = fs.readFileSync( 'includes/templates/Dropdown/Close.mustache', 'utf8' );
const pinnedContainerOpenTemplate = fs.readFileSync( 'includes/templates/PinnedContainer/Open.mustache', 'utf8' );
const pinnedContainerCloseTemplate = fs.readFileSync( 'includes/templates/PinnedContainer/Close.mustache', 'utf8' );
const unpinnedContainerOpenTemplate = fs.readFileSync( 'includes/templates/UnpinnedContainer/Open.mustache', 'utf8' );
const unpinnedContainerCloseTemplate = fs.readFileSync( 'includes/templates/UnpinnedContainer/Close.mustache', 'utf8' );
const pinnedContainerOpenTemplate = fs.readFileSync( 'includes/templates/PinnableContainer/Pinned/Open.mustache', 'utf8' );
const pinnedContainerCloseTemplate = fs.readFileSync( 'includes/templates/PinnableContainer/Close.mustache', 'utf8' );
const unpinnedContainerOpenTemplate = fs.readFileSync( 'includes/templates/PinnableContainer/Unpinned/Open.mustache', 'utf8' );
const pinnableElementOpenTemplate = fs.readFileSync( 'includes/templates/PinnableElement/Open.mustache', 'utf8' );
const pinnableElementCloseTemplate = fs.readFileSync( 'includes/templates/PinnableElement/Close.mustache', 'utf8' );
const pinnableHeaderTemplate = fs.readFileSync( 'includes/templates/PinnableHeader.mustache', 'utf8' );
@ -48,10 +47,9 @@ const templateData = {
const dropdownPartials = {
'Dropdown/Open': dropdownOpenTemplate,
'Dropdown/Close': dropdownCloseTemplate,
'PinnedContainer/Open': pinnedContainerOpenTemplate,
'PinnedContainer/Close': pinnedContainerCloseTemplate,
'UnpinnedContainer/Open': unpinnedContainerOpenTemplate,
'UnpinnedContainer/Close': unpinnedContainerCloseTemplate,
'PinnableContainer/Pinned/Open': pinnedContainerOpenTemplate,
'PinnableContainer/Close': pinnedContainerCloseTemplate,
'PinnableContainer/Unpinned/Open': unpinnedContainerOpenTemplate,
'PinnableElement/Open': pinnableElementOpenTemplate,
'PinnableElement/Close': pinnableElementCloseTemplate,
PinnableHeader: pinnableHeaderTemplate,