Sophivorus has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/349964 )
Change subject: Update to latest MediaWiki
......................................................................
Update to latest MediaWiki
Also several minor improvements and fixes
Change-Id: Iaeb268fa878db9ce5c133c6249667b30af5ac5d2
---
M Poncho.css
M Poncho.js
M Poncho.php
M Poncho.phtml
D README.md
M i18n/en.json
M i18n/es.json
A i18n/qqq.json
M skin.json
9 files changed, 100 insertions(+), 136 deletions(-)
Approvals:
Sophivorus: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/Poncho.css b/Poncho.css
index 6d73166..888a56d 100644
--- a/Poncho.css
+++ b/Poncho.css
@@ -1,3 +1,6 @@
+/**
+ * Site-wide elements
+ */
body {
font-family: Arial;
font-size: 14px;
@@ -5,61 +8,50 @@
margin: 0;
padding: 0;
}
-
a {
color: blue;
text-decoration: none;
}
-
a:hover {
text-decoration: underline;
}
-
h2 {
margin: 1em 0 0.5em 0;
}
-
img {
max-width: 100%;
height: auto;
}
-
pre {
white-space: pre-wrap;
}
-
fieldset {
border: 1px solid #aaa;
margin: 1em 0;
}
+/**
+ * Specific elements
+ */
#mw-js-message {
display: none;
}
-
.mw-indicator {
float: right;
}
-/* Main */
-
-#main {
- margin-left: 10em;
-}
-
-/* Sidebar */
-
+/**
+ * Header and main menu
+ */
#header-wrapper {
background: #f9f9f9;
border-bottom: 1px solid #aaa;
}
-
#header {
margin: auto;
max-width: 1000px;
padding: 0 1em;
}
-
#logo {
background-size: contain;
display: inline-block;
@@ -68,30 +60,25 @@
width: 32px;
height: 32px;
}
-
#menu {
display: inline;
list-style: none;
margin: 0;
padding: 0;
}
-
#menu li {
display: inline;
position: relative;
}
-
#menu span {
display: inline-block;
padding: 15px 10px;
text-decoration: none;
}
-
#menu li:hover span {
background: #aaa;
cursor: default;
}
-
#menu .submenu {
background: #f9f9f9;
border: 1px solid #aaa;
@@ -104,11 +91,9 @@
word-spacing: nowrap;
z-index: 1;
}
-
#menu .submenu li {
display: block;
}
-
#menu .submenu a {
color: inherit;
cursor: pointer;
@@ -119,14 +104,14 @@
width: 100%;
}
-/* Search form */
-
+/**
+ * Search form
+ */
#search-form {
float: right;
padding: 7px 0;
position: relative;
}
-
#search-form button {
background: url( 'images/lens.png' );
background-size: contain;
@@ -138,12 +123,10 @@
width: 32px;
height: 32px;
}
-
#search-form button.active {
background-color: white;
border-color: #aaa;
}
-
#search-form input {
border: 1px solid #aaa;
border-right: none;
@@ -157,43 +140,19 @@
z-index: 1;
}
-/* Actions */
-
-#actions {
- display: block;
- font-size: small;
- font-weight: normal;
- list-style: none;
- margin: 50px 0;
- padding: 0;
-}
-
-#actions li {
- display: inline;
- margin: 0 5px;
- padding: 0;
-}
-
-#actions a {
- text-decoration: none;
-}
-
-#actions a:hover {
- text-decoration: underline;
-}
-
-/* Title */
-
+/**
+ * Title
+ */
#title {
}
-
#subtitle {
margin: 1em 0;
}
-/* Content */
-
+/**
+ * Content
+ */
#content {
line-height: 1.5;
margin: 0 auto;
@@ -201,24 +160,23 @@
overflow: hidden;
padding: 1em;
}
-
#mw-content-text ol {
margin: 0 0 0 20px;
padding: 0;
}
-
#mw-content-text ul {
margin: 0 0 0 20px;
padding: 0;
}
-
#mw-content-text pre {
background: #f9f9f9;
border: 1px solid #aaa;
padding: 20px;
}
-/* Table of contents */
+/**
+ * Table of contents
+ */
#mw-content-text #toc {
background: #f9f9f9;
border: 1px solid #aaa;
@@ -242,7 +200,9 @@
padding: 1em;
}
-/* Thumbs */
+/**
+ * Thumbnails
+ */
.thumb {
background: #f9f9f9;
border: 1px solid #aaa;
@@ -274,7 +234,9 @@
margin: 0;
}
-/* Edit section button */
+/**
+ * Edit section button
+ */
.mw-editsection {
font-size: small;
font-weight: normal;
@@ -284,8 +246,9 @@
display: none;
}
-/* Edit page */
-
+/**
+ * Edit page
+ */
#wpTextbox1 {
box-sizing: border-box;
width: 100%;
@@ -308,8 +271,9 @@
display: none;
}
-/* Categories */
-
+/**
+ * Categories
+ */
#catlinks {
background: #f9f9f9;
border: 1px solid #aaa;
@@ -317,38 +281,29 @@
margin: 50px 0;
padding: 1em;
}
-
#catlinks ul {
margin: 0;
}
-/* Footer */
-
-#facebook-image {
- display: none;
-}
-
-#footer-wrapper {
- background: black;
-}
-
+/**
+ * Footer
+ */
#footer {
+ border-top: 1px solid #aaa;
+ margin-top: 5em;
+ padding: 1em;
+}
+#footer-bottom {
margin: auto;
max-width: 1000px;
}
-
-#footer ul {
- margin: 0;
+.footer-icons {
+ float: right;
+}
+.footer-places {
padding: 0;
}
-
-#footer li {
- color: white;
+.footer-places li {
display: inline;
-}
-
-#footer a {
- color: white;
- display: inline-block;
- padding: 1em;
+ margin-right: 1em;
}
\ No newline at end of file
diff --git a/Poncho.js b/Poncho.js
index 390dc26..92f4bb9 100644
--- a/Poncho.js
+++ b/Poncho.js
@@ -3,11 +3,13 @@
init: function () {
poncho.bind();
+/*
// Push the footer to the bottom
var heightDiff = $( window ).height() - $( 'body' ).height();
if ( heightDiff > 0 ) {
- $( '#footer' ).css( 'margin-top', heightDiff + 50 );
+ $( '#footer' ).css( 'margin-top', heightDiff );
}
+*/
},
bind: function () {
diff --git a/Poncho.php b/Poncho.php
index 7971a0f..ae66002 100644
--- a/Poncho.php
+++ b/Poncho.php
@@ -3,24 +3,11 @@
class SkinPoncho extends SkinTemplate {
var $skinname = 'poncho',
- $stylename = 'Poncho',
- $template = 'PonchoTemplate',
- $useHeadElement = true;
-
- /**
- * @param $out OutputPage object
- */
- function setupSkinUserCss( OutputPage $out ) {
- parent::setupSkinUserCss( $out );
- $out->addModuleStyles( 'skins.poncho' );
- }
-
- function initPage( OutputPage $out ) {
- parent::initPage( $out );
- $out->addModules( 'skins.poncho' );
- }
+ $template = 'PonchoTemplate';
static function onBeforePageDisplay( OutputPage &$out, Skin &$skin ) {
+ $out->addModuleStyles( 'skins.poncho' );
+ $out->addModuleScripts( 'skins.poncho' );
$out->addMeta( 'viewport', 'width=device-width' );
}
}
@@ -29,8 +16,7 @@
/**
* Merge together the views, actions and variants
- * because distinguishing them is not relevant
- * Also remove the current action, per useless and confusing
+ * and remove the current action, per useless and confusing
*/
function getActions() {
global $mediaWiki;
@@ -44,12 +30,8 @@
return $actions;
}
- function getFooter() {
- return $this->getFooterLinks()['places'];
- }
-
/**
- * Outputs the entire contents of the page
+ * Output the page
*/
function execute() {
$Title = $this->getSkin()->getTitle();
diff --git a/Poncho.phtml b/Poncho.phtml
index dcc6832..acff265 100644
--- a/Poncho.phtml
+++ b/Poncho.phtml
@@ -7,11 +7,11 @@
<div id="header-wrapper">
<div id="header">
- <a id="logo" href="<?php echo htmlspecialchars(
$this->data['nav_urls']['mainpage']['href'] ); ?>" <?php echo
Xml::expandAttributes( Linker::tooltipAndAccesskeyAttribs( 'p-logo' ) ); ?>
style="background-image: url(<?php global $wgLogo; echo $wgLogo; ?>)"></a>
+ <a id="logo" href="<?= htmlspecialchars(
$this->data['nav_urls']['mainpage']['href'] ); ?>" <?= Xml::expandAttributes(
Linker::tooltipAndAccesskeyAttribs( 'p-logo' ) ); ?> style="background-image:
url(<?php global $wgLogo; echo $wgLogo; ?>)"></a>
<form id="search-form" action="<?php $this->text( 'wgScript' );
?>">
<button type="submit"></button>
- <?php echo $this->makeSearchInput( array( 'type' =>
'text', 'id' => 'search-field', 'placeholder' => 'Search...' ) ); ?>
+ <?php echo $this->makeSearchInput([ 'type' => 'text',
'id' => 'search-field', 'placeholder' => wfMessage( 'poncho-search' ) ]); ?>
<input type="hidden" name="title" value="<?php
$this->text( 'searchtitle' ) ?>" />
</form>
@@ -22,13 +22,19 @@
</ul>
</li>
- <li><span>Tools</span>
+ <li><span><?= wfMessage( 'poncho-tools' ); ?></span>
<ul class="submenu">
<?php foreach ( $this->getToolbox() as $key =>
$value ) echo $this->makeListItem( $key, $value ); ?>
</ul>
</li>
- <li><span>You</span>
+ <li><span><?= wfMessage( 'poncho-actions' ); ?></span>
+ <ul class="submenu">
+ <?php foreach ( $this->getActions() as $key =>
$value ) echo $this->makeListItem( $key, $value ); ?>
+ </ul>
+ </li>
+
+ <li><span><?= wfMessage( 'poncho-you' ); ?></span>
<ul class="submenu">
<?php foreach ( $this->getPersonalTools() as
$key => $value ) echo $this->makeListItem( $key, $value ); ?>
</ul>
@@ -42,7 +48,7 @@
<div id="content">
- <?php echo $this->getIndicators(); ?>
+ <?= $this->getIndicators(); ?>
<h1 id="title"><?php $this->html( 'title' ) ?></h1>
@@ -68,14 +74,14 @@
<?php $this->html( 'debughtml' ); ?>
- <ul id="actions">
- <?php foreach ( $this->getActions() as $key => $value ) echo
$this->makeListItem( $key, $value ); ?>
- </ul>
-
</div>
</div>
+<div id="footer">
+ <?= $this->getFooter(); ?>
+</div>
+
<?php $this->printTrail(); ?>
</body>
diff --git a/README.md b/README.md
deleted file mode 100644
index 081e927..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Poncho
-
-Responsive skin for MediaWiki.
\ No newline at end of file
diff --git a/i18n/en.json b/i18n/en.json
index 914858e..939d216 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,8 +1,13 @@
{
"@metadata": {
"authors": [
- "Felipe Schenone"
+ "Sophivorus"
]
},
- "poncho-desc": "Responsive skin."
+ "poncho-desc": "Responsive skin, compatible with mobile devices.",
+ "poncho-wiki": "Wiki",
+ "poncho-tools": "Tools",
+ "poncho-actions": "Actions",
+ "poncho-you": "You",
+ "poncho-search": "Search..."
}
diff --git a/i18n/es.json b/i18n/es.json
index 1f9a610..283707a 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -1,8 +1,13 @@
{
"@metadata": {
"authors": [
- "Felipe Schenone"
+ "Sophivorus"
]
},
- "poncho-desc": "Skin adaptable."
+ "poncho-desc": "Skin adaptable, compatible con dispositivos móbiles.",
+ "poncho-wiki": "Wiki",
+ "poncho-tools": "Herramientas",
+ "poncho-actions": "Acciones",
+ "poncho-you": "Tu",
+ "poncho-search": "Buscar..."
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 0000000..d12c47b
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,13 @@
+{
+ "@metadata": {
+ "authors": [
+ "Sophivorus"
+ ]
+ },
+ "poncho-desc":
"{{desc|name=Poncho|url=https://www.mediawiki.org/wiki/Skin:Poncho}}";,
+ "poncho-wiki": "Label for the navigation menu",
+ "poncho-tools": "Label for the tools menu",
+ "poncho-actions": "Label for the actions menu",
+ "poncho-you": "Label for the personal menu",
+ "poncho-search": "Placeholder for the search form"
+}
diff --git a/skin.json b/skin.json
index 7ef3141..f7f9028 100644
--- a/skin.json
+++ b/skin.json
@@ -1,11 +1,11 @@
{
"manifest_version": 1,
"name": "Poncho",
- "version": "1.0",
- "author": "[http://mediawiki.org/wiki/User:Felipe_Schenone Felipe
Schenone]",
- "description": "Responsive skin",
+ "version": "1.1",
+ "author": "[http://mediawiki.org/wiki/User:Sophivorus Sophivorus]",
"descriptionmsg": "poncho-desc",
"type": "skin",
+ "license-name": "GPL-3.0",
"MessagesDirs": {
"Poncho": [
"i18n"
@@ -19,7 +19,6 @@
},
"ResourceModules": {
"skins.poncho": {
- "position": "top",
"scripts": "Poncho.js",
"styles": "Poncho.css"
}
--
To view, visit https://gerrit.wikimedia.org/r/349964
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaeb268fa878db9ce5c133c6249667b30af5ac5d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Poncho
Gerrit-Branch: master
Gerrit-Owner: Sophivorus <[email protected]>
Gerrit-Reviewer: Sophivorus <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
