Werdna has submitted this change and it was merged.
Change subject: MediaWikify further
......................................................................
MediaWikify further
* Add content actions and personal URLs.
* Still to come: Namespaces and extra actions
Change-Id: I2de650f18dff3f84b7c9adda5d792be9fb6c01cf
---
M resources/skin.less
M templates/Skin.php
M templates/Skin.template
M templates/sidebar.template
4 files changed, 52 insertions(+), 0 deletions(-)
Approvals:
Werdna: Verified; Looks good to me, approved
diff --git a/resources/skin.less b/resources/skin.less
index 415c4e2..70e037b 100644
--- a/resources/skin.less
+++ b/resources/skin.less
@@ -2,4 +2,12 @@
#contentSub, #siteSub {
display: none;
}
+}
+
+.content-actions {
+ font-size: 0.5em;
+
+ a {
+ margin-left: 0.75em;
+ }
}
\ No newline at end of file
diff --git a/templates/Skin.php b/templates/Skin.php
index 9168e33..eee95a2 100644
--- a/templates/Skin.php
+++ b/templates/Skin.php
@@ -198,6 +198,15 @@
'.$cx['funcs']['sec']($cx, $cx['funcs']['v']($cx, $in,
array('sidebar','navigation')), $in, true, function($cx, $in) {return '
<li id="'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('id')),
ENT_QUOTES, 'UTF-8').'">
<a href="'.htmlentities((string)$cx['funcs']['v']($cx,
$in, array('href')), ENT_QUOTES,
'UTF-8').'">'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('text')),
ENT_QUOTES, 'UTF-8').'</a>
</li>
+';}).' </ul>
+ <h3>
+ <span class="glyphicon glyphicon-user"></span>
+'.(($cx['funcs']['ifvar']($cx, $cx['funcs']['v']($cx, $in,
array('loggedin')))) ? ' Logged in
+ ' : '
+ Not logged in
+').' </h3>
+ <ul>
+'.$cx['funcs']['sec']($cx, $cx['funcs']['v']($cx, $in,
array('personal_urls')), $in, true, function($cx, $in) {return '
<li><a href="'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('href')),
ENT_QUOTES, 'UTF-8').'" class="'.htmlentities((string)$cx['funcs']['v']($cx,
$in, array('class')), ENT_QUOTES,
'UTF-8').'">'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('text')),
ENT_QUOTES, 'UTF-8').'</a></li>
';}).' </ul>'.' </div>
<div id="site-wrap">
@@ -230,6 +239,16 @@
<div class="container">
<h1 class="firstHeading" id="firstHeading">
<span dir="auto">'.$cx['funcs']['v']($cx, $in,
array('title')).'</span>
+ <span class="content-actions">
+'.$cx['funcs']['sec']($cx, $cx['funcs']['v']($cx, $in,
array('content_navigation','views')), $in, true, function($cx, $in) {return '
<a
+
href="'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('href')),
ENT_QUOTES, 'UTF-8').'"
+
class="'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('class')),
ENT_QUOTES, 'UTF-8').'"
+
'.(($cx['funcs']['ifvar']($cx, $cx['funcs']['v']($cx, $in, array('rel')))) ?
'rel="'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('rel')),
ENT_QUOTES, 'UTF-8').'"' : '').'
+
'.(($cx['funcs']['ifvar']($cx, $cx['funcs']['v']($cx, $in, array('id')))) ?
'id="'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('id')),
ENT_QUOTES, 'UTF-8').'"' : '').'
+ >
+
'.htmlentities((string)$cx['funcs']['v']($cx, $in, array('text')), ENT_QUOTES,
'UTF-8').'
+ </a>
+';}).' </span>
</h1>
'.(($cx['funcs']['ifvar']($cx, $cx['funcs']['v']($cx, $in,
array('isarticle')))) ? ' <div
id="siteSub">'.$cx['funcs']['ch']($cx, 'msg', array(array('tagline'),array()),
'enc').'</div>
' : '').' <div id="contentSub" '.$cx['funcs']['v']($cx,
$in, array('userlangattributes')).'>
diff --git a/templates/Skin.template b/templates/Skin.template
index 54db488..f4d6bf3 100755
--- a/templates/Skin.template
+++ b/templates/Skin.template
@@ -34,6 +34,18 @@
<div class="container">
<h1 class="firstHeading" id="firstHeading">
<span dir="auto">{{{title}}}</span>
+ <span class="content-actions">
+ {{#each content_navigation.views}}
+ <a
+ href="{{href}}"
+ class="{{class}}"
+ {{#if
rel}}rel="{{rel}}"{{/if}}
+ {{#if
id}}id="{{id}}"{{/if}}
+ >
+ {{text}}
+ </a>
+ {{/each}}
+ </span>
</h1>
{{#if isarticle}}
<div id="siteSub">{{msg "tagline"}}</div>
diff --git a/templates/sidebar.template b/templates/sidebar.template
index 5cb9a14..5370cf2 100644
--- a/templates/sidebar.template
+++ b/templates/sidebar.template
@@ -5,4 +5,17 @@
<a href="{{href}}">{{text}}</a>
</li>
{{/each}}
+</ul>
+<h3>
+ <span class="glyphicon glyphicon-user"></span>
+ {{#if loggedin}}
+ Logged in
+ {{else}}
+ Not logged in
+ {{/if}}
+</h3>
+<ul>
+{{#each personal_urls}}
+ <li><a href="{{href}}" class="{{class}}">{{text}}</a></li>
+{{/each}}
</ul>
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/186122
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2de650f18dff3f84b7c9adda5d792be9fb6c01cf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/LivingStyleGuide
Gerrit-Branch: master
Gerrit-Owner: Werdna <agarr...@wikimedia.org>
Gerrit-Reviewer: Werdna <agarr...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
