Jack Phoenix has uploaded a new change for review.
https://gerrit.wikimedia.org/r/232022
Change subject: Stuff. Lots of stuff.
......................................................................
Stuff. Lots of stuff.
Change-Id: I93b9e693cb85615b48ec852973f9890261e03b8e
---
M Mask.skin.php
M resources/main.css
M skin.json
3 files changed, 30 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Mask
refs/changes/22/232022/1
diff --git a/Mask.skin.php b/Mask.skin.php
index 7ac4c4d..bae1406 100644
--- a/Mask.skin.php
+++ b/Mask.skin.php
@@ -1,5 +1,4 @@
<?php
-
/**
* Mask skin stuff.
*
@@ -10,10 +9,6 @@
* @authors Whoever wrote monobook
* @date 2013
*/
-
-if ( !defined( 'MEDIAWIKI' ) ) {
- die( -1 );
-}
/**
* Inherit main code from SkinTemplate, set the CSS and template filter.
@@ -30,8 +25,8 @@
global $wgFontCSSLocation;
parent::setupSkinUserCss( $out );
- # Add css
- $out->addModuleStyles( array (
+ # Add CSS
+ $out->addModuleStyles( array(
'mediawiki.skinning.content.externallinks',
'skins.mask'
) );
@@ -49,14 +44,9 @@
* Takes an associative array of data set from a SkinTemplate-based
* class, and a wrapper for MediaWiki's localization database, and
* outputs a formatted page.
- *
- * @access private
*/
function execute() {
global $wgHostLink;
-
- // Suppress warnings to prevent notices about missing indexes
in $this->data
- wfSuppressWarnings();
$this->html( 'headelement' );
?><div id="globalWrapper">
@@ -68,7 +58,7 @@
'a',
array(
'href' =>
$this->data['nav_urls']['mainpage']['href'],
- 'style' =>
"background-image: url(" . $this->getLogoURL() . ");"
+ 'style' =>
'background-image: url(' . $this->getLogoURL() . ');'
)
+
Linker::tooltipAndAccesskeyAttribs( 'p-logo' )
);
@@ -156,7 +146,7 @@
$this->text( 'pageLanguage' );
?>"><?php $this->html( 'title' ) ?>
</span>:
- <?php $this->cactions(); ?>
+ <?php $this->cactions(); ?>
</div>
<div class="visualClear"></div>
</div>
@@ -191,7 +181,6 @@
$this->printTrail();
echo Html::closeElement( 'body' );
echo Html::closeElement( 'html' );
- wfRestoreWarnings();
} // end of execute() method
/*************************************************************************************************/
@@ -203,7 +192,7 @@
* Message parsing is limited to first 4 lines only for this skin.
*/
private function renderNavigation( $linksMessage, $blockId ) {
- $message = trim( wfMessage( $linksMessage )->text() );
+ $message = trim( wfMessage( $linksMessage )->text() );
$lines = array_slice( explode( "\n", $message ), 0, 4 );
$links = array();
foreach ( $lines as $line ) {
@@ -334,7 +323,11 @@
* @param $cont array|string
*/
function customBox( $bar, $cont ) {
- $portletAttribs = array( 'class' => 'generated-sidebar
portlet', 'id' => Sanitizer::escapeId( "p-$bar" ), 'role' => 'navigation' );
+ $portletAttribs = array(
+ 'class' => 'generated-sidebar portlet',
+ 'id' => Sanitizer::escapeId( "p-$bar" ),
+ 'role' => 'navigation'
+ );
$tooltip = Linker::titleAttrib( "p-$bar" );
if ( $tooltip !== false ) {
$portletAttribs['title'] = $tooltip;
@@ -344,8 +337,8 @@
?>
<h3><?php echo htmlspecialchars( $msgObj->exists() ?
$msgObj->text() : $bar ); ?></h3>
- <div class='pBody'>
- <?php if ( is_array( $cont ) ) { ?>
+ <div class="pBody">
+ <?php if ( is_array( $cont ) ) { ?>
<ul>
<?php
foreach ( $cont as $key => $val ) {
@@ -356,7 +349,7 @@
<?php
} else {
# allow raw HTML block to be defined by extensions
- print $cont;
+ echo $cont;
}
?>
</div>
@@ -366,12 +359,12 @@
/*************************************************************************************************/
/**
- * Get URL to the logo image, either a custom one
- * ([[File:Aurora-skin-logo.png]]) or a "sane default" if a custom logo
- * doesn't exist.
- *
- * @return String: logo image URL
- */
+ * Get URL to the logo image, either a custom one
+ * ([[File:Mask skin coin.png]]) or a "sane default" if a custom logo
+ * doesn't exist.
+ *
+ * @return string Logo image URL
+ */
function getLogoURL() {
global $wgStylePath;
diff --git a/resources/main.css b/resources/main.css
index c9d1d64..c4a4337 100755
--- a/resources/main.css
+++ b/resources/main.css
@@ -480,7 +480,7 @@
}
td.diff-deletedline .diffchange {
/* @embed */
- background: url('images/squiggle-green.png') repeat-x bottom;
+ background: url('images/squiggle-green.png') repeat-x bottom;
}
table.diff td {
padding: .2em .3em .1em;
diff --git a/skin.json b/skin.json
index 72626f9..5413a26 100644
--- a/skin.json
+++ b/skin.json
@@ -7,6 +7,7 @@
],
"url": "https://www.mediawiki.org/wiki/Skin:Mask";,
"descriptionmsg": "mask-desc",
+ "license-name": "GPL-2.0+",
"type": "skin",
"ValidSkinNames": {
"mask": "Mask"
@@ -17,18 +18,23 @@
]
},
"AutoloadClasses": {
- "SkinMask": "Mask.skin.php"
+ "SkinMask": "Mask.skin.php",
+ "MaskTemplate": "Mask.skin.php"
+ },
+ "ResourceFileModulePaths": {
+ "localBasePath": "",
+ "remoteSkinPath": "Mask"
},
"ResourceModules": {
"skins.mask": {
"styles": {
- "skins/Mask/resources/normalise.css": {
+ "resources/normalise.css": {
"media": "screen"
},
- "skins/Mask/resources/fonts.css": {
+ "resources/fonts.css": {
"media": "screen"
},
- "skins/Mask/resources/main.css": {
+ "resources/main.css": {
"media": "screen"
}
},
--
To view, visit https://gerrit.wikimedia.org/r/232022
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I93b9e693cb85615b48ec852973f9890261e03b8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Mask
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
