From 1724d03e803820279c3b64e72b8aa39f971cb0cd Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Mon, 6 Feb 2017 17:27:04 +0200 Subject: [PATCH 01/11] Skins: Mention what skin cppreference2 is based on --- skins/Cppreference2.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/skins/Cppreference2.php b/skins/Cppreference2.php index 4dad82928..a325931a5 100644 --- a/skins/Cppreference2.php +++ b/skins/Cppreference2.php @@ -1,5 +1,7 @@ Date: Mon, 6 Feb 2017 17:27:05 +0200 Subject: [PATCH 02/11] Skins: Replace spaces with tabs to minimize diff with stock skin --- skins/Cppreference2.php | 406 ++++++++++++++++++++-------------------- 1 file changed, 203 insertions(+), 203 deletions(-) diff --git a/skins/Cppreference2.php b/skins/Cppreference2.php index a325931a5..c99224977 100644 --- a/skins/Cppreference2.php +++ b/skins/Cppreference2.php @@ -134,208 +134,208 @@ public function execute() { // Output HTML Page $this->html( 'headelement' ); - global $Cppreference2SkinRootLink; - $root_link = '/'; - if (isset($Cppreference2SkinRootLink)) { - $root_link = htmlspecialchars($Cppreference2SkinRootLink); - } + global $Cppreference2SkinRootLink; + $root_link = '/'; + if (isset($Cppreference2SkinRootLink)) { + $root_link = htmlspecialchars($Cppreference2SkinRootLink); + } ?> - -
-
-
-
- -
- -
- renderNavigation( 'PERSONAL' ); ?> -
- -
-
-
-
-
- renderNavigation( array( 'NAMESPACES', 'VARIANTS' ) ); ?> -
-
- renderNavigation( array( 'VIEWS', 'ACTIONS' ) ); ?> -
-
-
-
- - -
-
- - - data['sitenotice'] ): ?> - -
html( 'sitenotice' ) ?>
- - - -

html( 'title' ) ?>

- - -
- data['isarticle'] ): ?> - -
msg( 'tagline' ) ?>
- - - -
html( 'userlangattributes' ) ?>>html( 'subtitle' ) ?>
- - data['undelete'] ): ?> - -
html( 'undelete' ) ?>
- - - data['newtalk'] ): ?> - -
html( 'newtalk' ) ?>
- - - - html( 'bodycontent' ) ?> - - data['printfooter'] ): ?> - -
- html( 'printfooter' ); ?> -
- - - data['catlinks'] ): ?> - - html( 'catlinks' ); ?> - - - data['dataAfterContent'] ): ?> - - html( 'dataAfterContent' ); ?> - - -
- - html( 'debughtml' ); ?> - -
- -
-
- - - - - printTrail(); ?> + +
+
+
+
+ +
+ +
+ renderNavigation( 'PERSONAL' ); ?> +
+ +
+
+
+
+
+ renderNavigation( array( 'NAMESPACES', 'VARIANTS' ) ); ?> +
+
+ renderNavigation( array( 'VIEWS', 'ACTIONS' ) ); ?> +
+
+
+
+ + +
+
+ + + data['sitenotice'] ): ?> + +
html( 'sitenotice' ) ?>
+ + + +

html( 'title' ) ?>

+ + +
+ data['isarticle'] ): ?> + +
msg( 'tagline' ) ?>
+ + + +
html( 'userlangattributes' ) ?>>html( 'subtitle' ) ?>
+ + data['undelete'] ): ?> + +
html( 'undelete' ) ?>
+ + + data['newtalk'] ): ?> + +
html( 'newtalk' ) ?>
+ + + + html( 'bodycontent' ) ?> + + data['printfooter'] ): ?> + +
+ html( 'printfooter' ); ?> +
+ + + data['catlinks'] ): ?> + + html( 'catlinks' ); ?> + + + data['dataAfterContent'] ): ?> + + html( 'dataAfterContent' ); ?> + + +
+ + html( 'debughtml' ); ?> + +
+ +
+
+ + + + + printTrail(); ?> getToolbox(); - - $msg = 'toolbox'; - $msg_obj = wfMessage( $msg ); - $message = htmlspecialchars($msg_obj->exists() ? $msg_obj->text() : $msg); - - ?> -
-
- -
+ private function renderToolbox() + { + $name = 'tb'; + + $content = $this->getToolbox(); + + $msg = 'toolbox'; + $msg_obj = wfMessage( $msg ); + $message = htmlspecialchars($msg_obj->exists() ? $msg_obj->text() : $msg); + + ?> +
+
+ +
data['sidebar']['navigation']; - - $msg = 'navigation'; - $msg_obj = wfMessage( $msg ); - $message = htmlspecialchars($msg_obj->exists() ? $msg_obj->text() : $msg); - - ?> -
-
- -
+ } + + private function renderBottomNavigation() + { + $content = $this->data['sidebar']['navigation']; + + $msg = 'navigation'; + $msg_obj = wfMessage( $msg ); + $message = htmlspecialchars($msg_obj->exists() ? $msg_obj->text() : $msg); + + ?> +
+
+ +
data['language_urls']; - - $msg = 'otherlanguages'; - $msg_obj = wfMessage( $msg ); - $message = htmlspecialchars($msg_obj->exists() ? $msg_obj->text() : $msg); - - ?> -
-
-
    - $val ): - echo $this->makeListItem( $key, $val ); - endforeach; ?> -
-
+ } + + private function renderLanguages() + { + $content = $this->data['language_urls']; + + $msg = 'otherlanguages'; + $msg_obj = wfMessage( $msg ); + $message = htmlspecialchars($msg_obj->exists() ? $msg_obj->text() : $msg); + + ?> +
+
+
    + $val ): + echo $this->makeListItem( $key, $val ); + endforeach; ?> +
+
data['language_urls'] ) { $this->renderLanguages(); } - foreach( $this->getFooterLinks() as $category => $links ): ?> - - - getFooterIcons("icononly"); - if ( count( $footericons ) > 0 ): ?> - - -
-
+ } + + private function renderFooter() + { + if ( $this->data['language_urls'] ) { $this->renderLanguages(); } + foreach( $this->getFooterLinks() as $category => $links ): ?> + + + getFooterIcons("icononly"); + if ( count( $footericons ) > 0 ): ?> + + +
+
getPersonalTools(); - $item = reset($tools); - $key = key($tools); - array_shift($tools); + $tools = $this->getPersonalTools(); + $item = reset($tools); + $key = key($tools); + array_shift($tools); - echo $this->makeListItem( $key, $item, array( 'tag' => 'span' ) ); - if ( count( $tools ) > 0 ) { + echo $this->makeListItem( $key, $item, array( 'tag' => 'span' ) ); + if ( count( $tools ) > 0 ) { ?>
- html( 'userlangattributes' ) ?>> - $item ) { - echo $this->makeListItem( $key, $item ); - } ?> - -
+ html( 'userlangattributes' ) ?>> + $item ) { + echo $this->makeListItem( $key, $item ); + } ?> + +
Date: Mon, 6 Feb 2017 17:27:06 +0200 Subject: [PATCH 03/11] Skins: Apply changes to base skin from 1.18 to 1.19 --- skins/Cppreference2.php | 66 +++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 36 deletions(-) diff --git a/skins/Cppreference2.php b/skins/Cppreference2.php index c99224977..70777017e 100644 --- a/skins/Cppreference2.php +++ b/skins/Cppreference2.php @@ -1,6 +1,6 @@ getFuzzyBool( 'debug' ) ? '' : '.min'; + $min = $this->getRequest()->getFuzzyBool( 'debug' ) ? '' : '.min'; $out->addHeadItem( 'csshover', '
-
+
data['sitenotice'] ): ?> @@ -179,7 +169,9 @@ public function execute() { -

html( 'title' ) ?>

+

+ html( 'title' ) ?> +

@@ -326,7 +318,7 @@ private function renderFooter() $footerIcons ): ?> @@ -340,16 +332,18 @@ private function renderFooter() /** * Render one or more navigations elements by name, automatically reveresed * when UI is in RTL mode + * + * @param $elements array */ private function renderNavigation( $elements ) { - global $wgVectorUseSimpleSearch, $wgVectorShowVariantName, $wgUser, $wgLang; + global $wgVectorUseSimpleSearch; // If only one element was given, wrap it in an array, allowing more // flexible arguments if ( !is_array( $elements ) ) { $elements = array( $elements ); // If there's a series of elements, reverse them when in RTL mode - } elseif ( $wgLang->isRTL() ) { + } elseif ( $this->data['rtl'] ) { $elements = array_reverse( $elements ); } // Render elements @@ -371,15 +365,13 @@ private function renderNavigation( $elements ) { case 'VARIANTS': ?>
- -

- data['variant_urls'] as $link ): ?> - - - - -

- +

+ data['variant_urls'] as $link ): ?> + + + + +

msg( 'variants' ) ?>
html( 'userlangattributes' ) ?>> @@ -450,21 +442,23 @@ private function renderNavigation( $elements ) { From 08af6104aafdd8085ef24858f80d24d6f5077488 Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Mon, 6 Feb 2017 17:27:07 +0200 Subject: [PATCH 04/11] Skins: Apply changes to base skin from 1.19 to 1.20 --- skins/Cppreference2.php | 47 +++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/skins/Cppreference2.php b/skins/Cppreference2.php index 70777017e..193a296b2 100644 --- a/skins/Cppreference2.php +++ b/skins/Cppreference2.php @@ -5,6 +5,21 @@ * Vector - Modern version of MonoBook with fresh look and many usability * improvements. * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * http://www.gnu.org/copyleft/gpl.html + * * @todo document * @file * @ingroup Skins @@ -22,6 +37,8 @@ */ class SkinCppreference2 extends SkinTemplate { + protected static $bodyClasses = array( 'vector-animateLayout' ); + var $skinname = 'cppreference2', $stylename = 'cppreference2', $template = 'Cppreference2Template', $useHeadElement = true; @@ -56,6 +73,20 @@ function setupSkinUserCss( OutputPage $out ){ parent::setupSkinUserCss( $out ); $out->addModuleStyles( 'skins.cppreference2' ); } + + /** + * Adds classes to the body element. + * + * @param $out OutputPage object + * @param &$bodyAttrs Array of attributes that will be set on the body element + */ + function addToBodyAttributes( $out, &$bodyAttrs ) { + if ( isset( $bodyAttrs['class'] ) && strlen( $bodyAttrs['class'] ) > 0 ) { + $bodyAttrs['class'] .= ' ' . implode( ' ', static::$bodyClasses ); + } else { + $bodyAttrs['class'] = implode( ' ', static::$bodyClasses ); + } + } } /** @@ -76,7 +107,7 @@ public function execute() { $nav = $this->data['content_navigation']; if ( $wgVectorUseIconWatch ) { - $mode = $this->getSkin()->getTitle()->userIsWatching() ? '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'], ' ' ); @@ -169,9 +200,7 @@ public function execute() { -

- html( 'title' ) ?> -

+

html( 'title' ) ?>

@@ -335,7 +364,7 @@ private function renderFooter() * * @param $elements array */ - private function renderNavigation( $elements ) { + protected function renderNavigation( $elements ) { global $wgVectorUseSimpleSearch; // If only one element was given, wrap it in an array, allowing more @@ -374,9 +403,9 @@ private function renderNavigation( $elements ) {
msg( 'variants' ) ?>
- html( 'userlangattributes' ) ?>> +
    data['variant_urls'] as $link ): ?> - >> + >>
@@ -445,11 +474,11 @@ private function renderNavigation( $elements ) {
data['rtl'] ): ?> - makeSearchButton( 'image', array( 'id' => 'searchButton', 'src' => $this->getSkin()->getSkinStylePath( 'images/search-rtl.png' ) ) ); ?> + makeSearchButton( 'image', array( 'id' => 'searchButton', 'src' => $this->getSkin()->getSkinStylePath( 'images/search-rtl.png' ), 'width' => '12', 'height' => '13' ) ); ?> makeSearchInput( array( 'id' => 'searchInput', 'type' => 'text' ) ); ?> data['rtl'] ): ?> - makeSearchButton( 'image', array( 'id' => 'searchButton', 'src' => $this->getSkin()->getSkinStylePath( 'images/search-ltr.png' ) ) ); ?> + makeSearchButton( 'image', array( 'id' => 'searchButton', 'src' => $this->getSkin()->getSkinStylePath( 'images/search-ltr.png' ), 'width' => '12', 'height' => '13' ) ); ?>
From 3c3abd5d12402271b9f7006a51983eacf28ac5bc Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Mon, 6 Feb 2017 17:27:08 +0200 Subject: [PATCH 05/11] Skins: Apply changes to base skin from 1.20 to 1.21 --- skins/Cppreference2.php | 53 ++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/skins/Cppreference2.php b/skins/Cppreference2.php index 193a296b2..0b1f704e9 100644 --- a/skins/Cppreference2.php +++ b/skins/Cppreference2.php @@ -61,7 +61,7 @@ public function initPage( OutputPage $out ) { "/{$this->stylename}/csshover{$min}.htc\")}" ); - $out->addModuleScripts( 'skins.cppreference2' ); + $out->addModules( 'skins.cppreference2.js' ); } /** @@ -69,14 +69,14 @@ public function initPage( OutputPage $out ) { * fixes bug 22916 * @param $out OutputPage object */ - function setupSkinUserCss( OutputPage $out ){ + function setupSkinUserCss( OutputPage $out ) { parent::setupSkinUserCss( $out ); $out->addModuleStyles( 'skins.cppreference2' ); } /** * Adds classes to the body element. - * + * * @param $out OutputPage object * @param &$bodyAttrs Array of attributes that will be set on the body element */ @@ -191,7 +191,7 @@ public function execute() {
-
+
data['sitenotice'] ): ?> @@ -200,7 +200,10 @@ public function execute() { -

html( 'title' ) ?>

+

html( 'title' ) ?>

@@ -253,7 +256,7 @@ public function execute() {