[MediaWiki-commits] [Gerrit] mediawiki...GreyStuff[master]: Fix stuff I broke, also changes
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/344807 )
Change subject: Fix stuff I broke, also changes
..
Fix stuff I broke, also changes
* Some more consistent naming, classes and ids
* Changed private functions to protected
* Half-arsed formatting for echo
* Made search better
* ...
Change-Id: I889f2dbb15d0a9f601d5210dd13f95c24d9a9adf
---
M GreyStuffTemplate.php
M resources/main.less
M resources/screen-full.less
M resources/screen-mobile.less
4 files changed, 93 insertions(+), 30 deletions(-)
Approvals:
jenkins-bot: Verified
Isarra: Looks good to me, approved
diff --git a/GreyStuffTemplate.php b/GreyStuffTemplate.php
index 8f05b25..bf8fc6b 100644
--- a/GreyStuffTemplate.php
+++ b/GreyStuffTemplate.php
@@ -18,13 +18,7 @@
*/
class GreyStuffTemplate extends BaseTemplate {
- /**
-* Template filter callback for GreyStuff skin.
-* 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.
-*/
- function execute() {
+ public function execute() {
// Apparently not set by default?
$this->data['pageLanguage'] =
$this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode();
@@ -91,7 +85,7 @@
$this->clear() .
- Html::rawElement( 'div', [ 'id' =>
'bodyContent', 'class' => 'mw-body' ],
+ Html::rawElement( 'div', [ 'id' =>
'bodyContent', 'class' => 'mw-body-content' ],
Html::rawElement( 'div', [ 'id' =>
'siteSub' ], $this->getMsg( 'tagline' ) ) .
$this->get( 'bodytext' ) .
$this->clear()
@@ -135,7 +129,7 @@
*
* @return string html
*/
- private function getPortlet( $name, $content, $dropdown = false, $msg =
null ) {
+ protected function getPortlet( $name, $content, $dropdown = false, $msg
= null ) {
if ( $msg === null ) {
$msg = $name;
} elseif ( is_array( $msg ) ) {
@@ -185,7 +179,7 @@
$dropdown ? 'dropdown' : ''
] ],
$contentText .
- $this->renderAfterPortlet( $name )
+ $this->getAfterPortlet( $name )
)
);
@@ -197,7 +191,7 @@
*
* @return string html
*/
- private function getMainNavigation() {
+ protected function getMainNavigation() {
$html = '';
$sidebar = $this->getSidebar();
@@ -256,7 +250,7 @@
*
* @return string html
*/
- private function getBanner() {
+ protected function getBanner() {
$html = Html::rawElement( 'div', [ 'class' => 'p-logo', 'role'
=> 'banner' ],
Html::element( 'a', array_merge( [
'class' => 'mw-wiki-logo',
@@ -290,8 +284,22 @@
*
* @return string html
*/
- private function getPersonalNavigation() {
+ protected function getPersonalNavigation() {
$user = $this->getSkin()->getUser();
+ $personalTools = $this->getPersonalTools();
+
+ $html = '';
+ $extraTools = [];
+
+ // Remove Echo badges
+ if ( isset( $personalTools['notifications-alert'] ) ) {
+ $extraTools['notifications-alert'] =
$personalTools['notifications-alert'];
+ unset( $personalTools['notifications-alert'] );
+ }
+ if ( isset( $personalTools['notifications-notice'] ) ) {
+ $extraTools['notifications-notice'] =
$personalTools['notifications-notice'];
+ unset( $personalTools['notifications-notice'] );
+ }
if ( $user->isLoggedIn() ) {
$headerMsg = [ 'greystuff-loggedinas', $user->getName()
];
@@ -299,7 +307,8 @@
$headerMsg = 'greystuff-notloggedin';
}
- $personalTools = $this->getPersonalTools();
+ $html .= Html::openElement( 'div', [ 'id' =>
'p-personal-container' ] );
+
if ( isset( $personalTools['userpage'] ) ) {
$personalTools['userpage']['links'][0]['text'] =
$this->getMsg( 'greystuff-userpage' );
}
@@ -307,7 +316,25 @@
$personalTools['mytalk']['links'][0]['text'] =
$this->getMsg( 'greystuff-talkpage' );
}
- return $this->getPortlet(
[MediaWiki-commits] [Gerrit] mediawiki...GreyStuff[master]: Fix stuff I broke, also changes
Isarra has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/344807 )
Change subject: Fix stuff I broke, also changes
..
Fix stuff I broke, also changes
I'm real specific shut up.
Change-Id: I889f2dbb15d0a9f601d5210dd13f95c24d9a9adf
---
M GreyStuffTemplate.php
M resources/main.less
M resources/screen-full.less
M resources/screen-mobile.less
4 files changed, 93 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/GreyStuff
refs/changes/07/344807/1
diff --git a/GreyStuffTemplate.php b/GreyStuffTemplate.php
index 8f05b25..bf8fc6b 100644
--- a/GreyStuffTemplate.php
+++ b/GreyStuffTemplate.php
@@ -18,13 +18,7 @@
*/
class GreyStuffTemplate extends BaseTemplate {
- /**
-* Template filter callback for GreyStuff skin.
-* 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.
-*/
- function execute() {
+ public function execute() {
// Apparently not set by default?
$this->data['pageLanguage'] =
$this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode();
@@ -91,7 +85,7 @@
$this->clear() .
- Html::rawElement( 'div', [ 'id' =>
'bodyContent', 'class' => 'mw-body' ],
+ Html::rawElement( 'div', [ 'id' =>
'bodyContent', 'class' => 'mw-body-content' ],
Html::rawElement( 'div', [ 'id' =>
'siteSub' ], $this->getMsg( 'tagline' ) ) .
$this->get( 'bodytext' ) .
$this->clear()
@@ -135,7 +129,7 @@
*
* @return string html
*/
- private function getPortlet( $name, $content, $dropdown = false, $msg =
null ) {
+ protected function getPortlet( $name, $content, $dropdown = false, $msg
= null ) {
if ( $msg === null ) {
$msg = $name;
} elseif ( is_array( $msg ) ) {
@@ -185,7 +179,7 @@
$dropdown ? 'dropdown' : ''
] ],
$contentText .
- $this->renderAfterPortlet( $name )
+ $this->getAfterPortlet( $name )
)
);
@@ -197,7 +191,7 @@
*
* @return string html
*/
- private function getMainNavigation() {
+ protected function getMainNavigation() {
$html = '';
$sidebar = $this->getSidebar();
@@ -256,7 +250,7 @@
*
* @return string html
*/
- private function getBanner() {
+ protected function getBanner() {
$html = Html::rawElement( 'div', [ 'class' => 'p-logo', 'role'
=> 'banner' ],
Html::element( 'a', array_merge( [
'class' => 'mw-wiki-logo',
@@ -290,8 +284,22 @@
*
* @return string html
*/
- private function getPersonalNavigation() {
+ protected function getPersonalNavigation() {
$user = $this->getSkin()->getUser();
+ $personalTools = $this->getPersonalTools();
+
+ $html = '';
+ $extraTools = [];
+
+ // Remove Echo badges
+ if ( isset( $personalTools['notifications-alert'] ) ) {
+ $extraTools['notifications-alert'] =
$personalTools['notifications-alert'];
+ unset( $personalTools['notifications-alert'] );
+ }
+ if ( isset( $personalTools['notifications-notice'] ) ) {
+ $extraTools['notifications-notice'] =
$personalTools['notifications-notice'];
+ unset( $personalTools['notifications-notice'] );
+ }
if ( $user->isLoggedIn() ) {
$headerMsg = [ 'greystuff-loggedinas', $user->getName()
];
@@ -299,7 +307,8 @@
$headerMsg = 'greystuff-notloggedin';
}
- $personalTools = $this->getPersonalTools();
+ $html .= Html::openElement( 'div', [ 'id' =>
'p-personal-container' ] );
+
if ( isset( $personalTools['userpage'] ) ) {
$personalTools['userpage']['links'][0]['text'] =
$this->getMsg( 'greystuff-userpage' );
}
@@ -307,7 +316,25 @@
$personalTools['mytalk']['links'][0]['text'] =
$this->getMsg( 'greystuff-talkpage' );
}
- return $this->getPortlet( 'personal',
$this->getPersonalTools(), true, $headerMsg );
+ // Re-add Echo badges
+ if (
