jenkins-bot has submitted this change and it was merged.
Change subject: Browse tags, page secondary actions and last modified bar
outside #bodyContent
......................................................................
Browse tags, page secondary actions and last modified bar outside #bodyContent
Separate these from user generated content.
Also fixes an issue with browse tags which were not having the post-content
class
applied to them.
No cached page implications (verified with
`./dev-scripts/cachedpage.sh 8bf2e3270ab18c56f1a7e3a9446620ace72e4b1b
Selenium_language_test_page`)
Bug: T112341
Change-Id: Id072bb9ad391a7bdc9fa52f09427ee5cc78954fd
---
M includes/skins/MinervaTemplate.php
M resources/mobile.browse/tags.mustache
M resources/skins.minerva.base.styles/ui.less
3 files changed, 12 insertions(+), 6 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index 261d273..e5d435a 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -194,7 +194,10 @@
*/
protected function getSecondaryActionsHtml() {
$baseClass = MobileUI::buttonClass( '', 'button' );
- $html = Html::openElement( 'div', array( 'id' =>
'page-secondary-actions' ) );
+ $html = Html::openElement( 'div', array(
+ 'class' => 'post-content',
+ 'id' => 'page-secondary-actions'
+ ) );
foreach ( $this->getSecondaryActions() as $el ) {
if ( isset( $el['attributes']['class'] ) ) {
@@ -226,9 +229,6 @@
if ( isset( $data['subject-page'] ) ) {
echo $data['subject-page'];
}
- echo $this->getPostContentHtml( $data );
- echo $this->getSecondaryActionsHtml();
- echo $this->getHistoryLinkHtml( $data );
?>
</div>
<?php
@@ -274,7 +274,9 @@
* @return string
*/
protected function getPostContentHtml( $data ) {
- return $this->renderBrowseTags( $data );
+ return $this->renderBrowseTags( $data ) .
+ $this->getSecondaryActionsHtml() .
+ $this->getHistoryLinkHtml( $data );
}
/**
@@ -290,6 +292,7 @@
$this->renderPreContent( $data );
$this->renderContent( $data );
+ echo $this->getPostContentHtml( $data );
}
/**
diff --git a/resources/mobile.browse/tags.mustache
b/resources/mobile.browse/tags.mustache
index 248f375..93d75b1 100644
--- a/resources/mobile.browse/tags.mustache
+++ b/resources/mobile.browse/tags.mustache
@@ -1,7 +1,7 @@
{{! apparently this is needed, otherwise the #tags loop won't work }}
{{! FIXME: remove when https://phabricator.wikimedia.org/T101918 is resolved }}
{{#fixme}}{{/fixme}}
-<aside class="browse-tags">
+<aside class="browse-tags post-content">
<h4>{{headerMsg}}</h4>
<ul class="browse-tags-list">
{{#tags}}
diff --git a/resources/skins.minerva.base.styles/ui.less
b/resources/skins.minerva.base.styles/ui.less
index 6e593aa..0a397af 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -209,6 +209,9 @@
}
#page-secondary-actions {
+ // Clears floating on table of contents on stub pages.
+ clear: both;
+
a {
margin: 10px 2px 2px 0;
}
--
To view, visit https://gerrit.wikimedia.org/r/238347
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id072bb9ad391a7bdc9fa52f09427ee5cc78954fd
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Bmansurov <bmansu...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
