Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227212
Change subject: Clean up Apex skin
..
Clean up Apex skin
* Cleans up code in apex skin to match some of vector which this skin is
* based on.
Includes two new configs to enable or disable watch icon and the search
bar with an icon instead of button.
Adds two missing files.
Add search icon in svg format too.
Convert css to less
Add some svg images
Fixes login and create account was hidden with this patch it is un hidden.
Updated the personal menu so when your logged out it shows The name as
guest which should fix login in and creating account issue.
Change-Id: I9aca5319ee9bee1e069fa7f0ce83c70e1a381c7a
---
M ApexTemplate.php
M SkinApex.php
A csshover.htc
A csshover.min.htc
A hooks.txt
A i18n/de.json
M i18n/en.json
A i18n/es.json
A i18n/ksh.json
A i18n/lb.json
A i18n/mk.json
A i18n/my.json
A i18n/pl.json
M i18n/qqq.json
A i18n/ro.json
A i18n/ru.json
A i18n/shn.json
A i18n/vi.json
A i18n/zh-hans.json
A images/bullet-icon.png
A images/bullet-icon.svg
R images/menu-hover.png
R images/menu.png
R images/nav-hover.png
R images/nav.png
R images/search-ltr.png
A images/search-ltr.svg
A images/search-rtl.png
A images/search-rtl.svg
R images/talk.png
R images/toc-hover.png
R images/toc.png
A images/unwatch-icon-hl.png
A images/unwatch-icon-hl.svg
A images/unwatch-icon.png
A images/unwatch-icon.svg
A images/user-icon.png
A images/user-icon.svg
R images/user.png
A images/watch-icon-hl.png
A images/watch-icon-hl.svg
A images/watch-icon-loading.png
A images/watch-icon-loading.svg
A images/watch-icon.png
A images/watch-icon.svg
D resources/images/icons/watch-loading.gif
D resources/images/icons/watch.png
R resources/screen-narrow.less
R resources/screen-wide.less
R resources/screen.less
M skin.json
51 files changed, 1,128 insertions(+), 290 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/apex
refs/changes/12/227212/1
diff --git a/ApexTemplate.php b/ApexTemplate.php
index 23b673c..48faf0e 100644
--- a/ApexTemplate.php
+++ b/ApexTemplate.php
@@ -14,12 +14,18 @@
public function execute() {
global $wgSitename, $wgApexLogo, $wgStylePath;
+ $skin = $this-getSkin();
+
// Build additional attributes for navigation urls
$nav = $this-data['content_navigation'];
- $mode = $this-getSkin()-getUser()-isWatched(
$this-getSkin()-getRelevantTitle() ) ?
- 'unwatch' : 'watch';
+
+ $mode = $this-getSkin()-getUser()-isWatched(
$this-getSkin()-getRelevantTitle() )
+ ? 'unwatch'
+ : 'watch';
+
if ( isset( $nav['actions'][$mode] ) ) {
$nav['views'][$mode] = $nav['actions'][$mode];
+ $nav['views'][$mode]['class'] = rtrim( 'icon ' .
$nav['views'][$mode]['class'], ' ' );
$nav['views'][$mode]['primary'] = true;
unset( $nav['actions'][$mode] );
}
@@ -69,55 +75,136 @@
$this-data['personal_urls'] =
array_reverse( $this-data['personal_urls'] );
}
+
+ $this-data['pageLanguage'] =
+
$this-getSkin()-getTitle()-getPageViewLanguage()-getHtmlCode();
+
+
+ // User name (or Guest) to be displayed at the top right (on
LTR
+ // interfaces) portion of the skin
+ $user = $skin-getUser();
+ if ( !$user-isLoggedIn() ) {
+ $userNameTop = $skin-msg( 'apex-guest' )-text();
+ } else {
+ $userNameTop = htmlspecialchars( $user-getName(),
ENT_QUOTES );
+ }
+
// Output HTML Page
$this-html( 'headelement' );
-?
+ ?
div class=apex-content-wrapper
- div id=content class=mw-body
+ div id=content class=mw-body role=main
a id=top/a
- div id=mw-js-message
style=display:none;?php $this-html( 'userlangattributes' ) ?/div
- ?php if ( $this-data['sitenotice'] ): ?
- div id=siteNotice?php $this-html(
'sitenotice' ) ?/div
- ?php endif; ?
- h1 id=firstHeading
class=firstHeading?php $this-html( 'title' ) ?/h1
- div id=bodyContent
- ?php if ( $this-data['isarticle'] ):
?
- div id=siteSub?php $this-msg(
'tagline' ) ?/div
- ?php endif; ?
- div id=contentSub?php $this-html(
'userlangattributes' ) ??php
