wikimedia/mediawiki-skins-MinervaNeue
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/MinervaNeue synced 2024-12-18 08:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minerva uses desktop footer for license

Browse source 
After this change, in desktop Minerva the copyright
text in the footer should match desktop Minerva.

In mobile Minerva the copyright text in the footer
is shortened and doesn't contain terms of use.
It should match Vector mobile
?useskin=vector&useformat=mobile

Depends-On: I3473908e08f643b4c60aafc470dd124516955323
Change-Id: I2895975aaa1d09d228f80aff74381e88034a0137
Bug: T289401
This commit is contained in:
jdlrobson 2021-10-26 16:05:37 -07:00 committed by Jdlrobson
parent de81ac6c03
commit 1f2b7dff15
4 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
includes/Skins/MinervaTemplate.php
View file

@ -62,12 +62,6 @@ class MinervaTemplate extends BaseTemplate {
'headinghtml' => $data['headinghtml'] ?? '', 'headinghtml' => $data['headinghtml'] ?? '',
'postheadinghtml' => $data['postheadinghtml'] ?? '', 'postheadinghtml' => $data['postheadinghtml'] ?? '',
'userMenuHTML' => $data['userMenuHTML'], 'userMenuHTML' => $data['userMenuHTML'],
// Note mobile-license is only available on the mobile skin. It is outputted as part of
// footer-info on desktop hence the conditional check.
'html-minerva-license' => ExtensionRegistry::getInstance()->isLoaded( 'MobileFrontend' ) ?
MobileFrontendSkinHooks::getLicenseText( $this->getSkin() ) : '',
'isBeta' => $skinOptions->get( SkinOptions::BETA_MODE ), 'isBeta' => $skinOptions->get( SkinOptions::BETA_MODE ),
]; ];
} }

1
includes/Skins/footer.mustache
View file

@ -7,7 +7,6 @@
<div class="post-content footer-content"> <div class="post-content footer-content">
{{{html-after-content}}} {{{html-after-content}}}
<div class="minerva-footer-logo">{{>Logo}}</div> <div class="minerva-footer-logo">{{>Logo}}</div>
<div class="license">{{{html-minerva-license}}}</div>
{{#data-info}}{{>footerItemList}}{{/data-info}} {{#data-info}}{{>footerItemList}}{{/data-info}}
{{#data-places}}{{>footerItemList}}{{/data-places}} {{#data-places}}{{>footerItemList}}{{/data-places}}
</div> </div>

8
resources/skins.minerva.base.styles/ui.less
View file

@ -57,6 +57,14 @@ main {
display: none; display: none;
} }
// Override rule in MobileFrontend to show copyright.
// FIXME: This can be removed when I0bfc7f977cdaf5ce8873103346c64121d704b86c
// is merged.
// stylelint-disable-next-line selector-max-id
#footer-info-copyright {
display: block;
}
// One selector for JavaScript overlays // One selector for JavaScript overlays
// One selector for server side rendered HTML // One selector for server side rendered HTML
// FIXME: The header code should be refactored to use flex box, // FIXME: The header code should be refactored to use flex box,

12
stories/footer.stories.js
View file

@ -11,8 +11,18 @@ export default {
const FOOTER_TEMPLATE_DATA = { const FOOTER_TEMPLATE_DATA = {
'msg-mobile-frontend-sitename': 'Site title OR Logo', 'msg-mobile-frontend-sitename': 'Site title OR Logo',
'html-minerva-license': 'Content is available under <a rel="nofollow" href="#">Reading Web 3.0 License</a> unless otherwise noted.',
'html-after-content': placeholder( 'Extensions can add here e.g. Related Articles.' ), 'html-after-content': placeholder( 'Extensions can add here e.g. Related Articles.' ),
'data-info': [
{
id: 'info',
'array-items': [
{
id: 'copyright',
html: 'Content is available under <a rel="nofollow" href="#">Reading Web 3.0 License</a> unless otherwise noted.'
}
]
}
],
'data-places': [ 'data-places': [
{ {
id: 'places', id: 'places',