jenkins-bot has submitted this change and it was merged.
Change subject: Allow skins a mechanism to decide on placement of related pages
......................................................................
Allow skins a mechanism to decide on placement of related pages
* If a footer-content element is present prepend there
* If no footer-content element given wrap the component in a container that is
known to be compatible
with known skins - this has post-content class (for backwards compatiblity with
old Minerva skins) and a class to apply the correct margin to Vector
Bug: T141002
Change-Id: Iac11948f8f5fdaad45d51b905bb7494a84775710
---
M resources/ext.relatedArticles.readMore/index.js
M resources/ext.relatedArticles.readMore/readMore.default.less
M resources/ext.relatedArticles.readMore/readMore.minerva.less
3 files changed, 14 insertions(+), 4 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.relatedArticles.readMore/index.js
b/resources/ext.relatedArticles.readMore/index.js
index ac1c912..0e48143 100644
--- a/resources/ext.relatedArticles.readMore/index.js
+++ b/resources/ext.relatedArticles.readMore/index.js
@@ -44,11 +44,18 @@
cards = new CardListView( getCards( pages ) );
- $readMore = $( '<aside class="ra-read-more post-content
noprint"></aside>' )
+ $readMore = $( '<aside class="ra-read-more
noprint"></aside>' )
.append( $( '<h2></h2>' ).text( mw.msg(
'relatedarticles-read-more-heading' ) ) )
.append( cards.$el );
- $readMore.insertAfter( '#content' );
+ // If a skin has marked up a footer content area
prepend it there
+ if ( $( '.footer-content' ).length ) {
+ $readMore.prependTo( '.footer-content' );
+ } else {
+ $( '<div class="read-more-container
post-content" />' )
+ .append( $readMore )
+ .insertAfter( '#content' );
+ }
// the ReadMore code is ready
mw.track( 'ext.relatedArticles.logReady', { $readMore:
$readMore } );
diff --git a/resources/ext.relatedArticles.readMore/readMore.default.less
b/resources/ext.relatedArticles.readMore/readMore.default.less
index 795723e..2ad1342 100644
--- a/resources/ext.relatedArticles.readMore/readMore.default.less
+++ b/resources/ext.relatedArticles.readMore/readMore.default.less
@@ -5,8 +5,11 @@
}
}
-.ra-read-more {
+.read-more-container {
margin: 0 0 0 10em;
+}
+
+.ra-read-more {
padding: 1em;
.ext-cards-card-list {
diff --git a/resources/ext.relatedArticles.readMore/readMore.minerva.less
b/resources/ext.relatedArticles.readMore/readMore.minerva.less
index a11c195..e72504e 100644
--- a/resources/ext.relatedArticles.readMore/readMore.minerva.less
+++ b/resources/ext.relatedArticles.readMore/readMore.minerva.less
@@ -1,4 +1,4 @@
-.ra-read-more {
+.read-more-container {
margin-top: 35px;
}
--
To view, visit https://gerrit.wikimedia.org/r/305590
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iac11948f8f5fdaad45d51b905bb7494a84775710
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/RelatedArticles
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Bmansurov <bmansu...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Jhobs <jhob...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
