Pastakhov has uploaded a new change for review.
https://gerrit.wikimedia.org/r/246461
Change subject: Add missed items to Skin.mustache
......................................................................
Add missed items to Skin.mustache
Add missed {{{sitenotice}}}, {{{prebodyhtml}}}, {{{catlinks}}}
and {{{dataAfterContent}}}.
Make HTML from page status indicators and show it as {{{html_indicators}}}.
Does not show header <h1> if {{{title}}} is empty.
Bug: T114463
Change-Id: Icc7fcc4f2af65513b384bf8cb2f6fe055da4b0db
---
M src/BlueprintSkinTemplate.php
M templates/Skin.mustache
2 files changed, 23 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Blueprint
refs/changes/61/246461/1
diff --git a/src/BlueprintSkinTemplate.php b/src/BlueprintSkinTemplate.php
index dcb667f..3394ede 100644
--- a/src/BlueprintSkinTemplate.php
+++ b/src/BlueprintSkinTemplate.php
@@ -5,6 +5,19 @@
$this->data['debughtml'] = MWDebug::getDebugHTML(
$this->getSkin()->getContext() );
$this->data['left_nav_sections'] = $this->getLeftNav();
$this->data['username'] =
$this->data['personal_urls']['userpage'];
+ // Make HTML from page status indicators, the copy from
BaseTemplate::getIndicators()
+ $tmp = "<div class=\"mw-indicators\">\n";
+ foreach ( $this->data['indicators'] as $id => $content ) {
+ $tmp .= Html::rawElement(
+ 'div',
+ array(
+ 'id' => Sanitizer::escapeId(
"mw-indicator-$id" ),
+ 'class' => 'mw-indicator',
+ ),
+ $content
+ ) . "\n";
+ }
+ $this->data['html_indicators'] = $tmp . "</div>\n";
$templateParser = new TemplateParser( __DIR__ . '/../templates'
);
try {
diff --git a/templates/Skin.mustache b/templates/Skin.mustache
index eb8eba2..62cd262 100644
--- a/templates/Skin.mustache
+++ b/templates/Skin.mustache
@@ -38,9 +38,14 @@
</nav>
<div class="container" id="content">
- <h1 class="firstHeading" id="firstHeading">
- {{{title}}}
- </h1>
+ {{{sitenotice}}}
+ {{{html_indicators}}}
+ {{#if title}}
+ <h1 class="firstHeading" id="firstHeading">
+ {{{title}}}
+ </h1>
+ {{/if}}
+ {{{prebodyhtml}}}
{{#if isarticle}}
<div id="siteSub">{{msg "tagline"}}</div>
{{/if}}
@@ -56,6 +61,8 @@
<div class="mw-body-content" id="bodyContent">
{{{bodytext}}}
</div>
+ {{{catlinks}}}
+ {{{dataAfterContent}}}
</div>
{{{debughtml}}}
--
To view, visit https://gerrit.wikimedia.org/r/246461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc7fcc4f2af65513b384bf8cb2f6fe055da4b0db
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Blueprint
Gerrit-Branch: master
Gerrit-Owner: Pastakhov <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
