jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/333918 )

Change subject: Random coding style tweaks + documentation clarification
......................................................................


Random coding style tweaks + documentation clarification

Change-Id: I3d7946507bd489edf248c201877fab580875ed68
---
M MonoBookTemplate.php
1 file changed, 15 insertions(+), 17 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/MonoBookTemplate.php b/MonoBookTemplate.php
index a1bda6e..58453ac 100644
--- a/MonoBookTemplate.php
+++ b/MonoBookTemplate.php
@@ -101,8 +101,7 @@
                                        <!-- end content -->
                                        <?php
                                        if ( $this->data['dataAfterContent'] ) {
-                                               $this->html( 'dataAfterContent'
-                                               );
+                                               $this->html( 'dataAfterContent' 
);
                                        }
                                        ?>
                                        <div class="visualClear"></div>
@@ -122,8 +121,8 @@
                                                $personalTools = 
$this->getPersonalTools();
 
                                                if ( array_key_exists( 'uls', 
$personalTools ) ) {
-                                                       echo 
$this->makeListItem( 'uls', $personalTools[ 'uls' ] );
-                                                       unset( $personalTools[ 
'uls' ] );
+                                                       echo 
$this->makeListItem( 'uls', $personalTools['uls'] );
+                                                       unset( 
$personalTools['uls'] );
                                                }
 
                                                if ( 
!$this->getSkin()->getUser()->isLoggedIn() &&
@@ -132,7 +131,6 @@
                                                        echo Html::rawElement( 
'li', array(
                                                                'id' => 
'pt-anonuserpage'
                                                        ), $this->getMsg( 
'notloggedin' )->escaped() );
-
                                                }
 
                                                foreach ( $personalTools as 
$key => $item ) { ?>
@@ -160,8 +158,8 @@
                </div><!-- end of the left (by default at least) column -->
                <div class="visualClear"></div>
                <?php
-               $validFooterIcons = $this->getFooterIcons( "icononly" );
-               $validFooterLinks = $this->getFooterLinks( "flat" ); // 
Additional footer links
+               $validFooterIcons = $this->getFooterIcons( 'icononly' );
+               $validFooterLinks = $this->getFooterLinks( 'flat' ); // 
Additional footer links
 
                if ( count( $validFooterIcons ) + count( $validFooterLinks ) > 
0 ) {
                        ?>
@@ -254,20 +252,20 @@
 
                        <div id="searchBody" class="pBody">
                                <form action="<?php $this->text( 'wgScript' ) 
?>" id="searchform">
-                                       <input type='hidden' name="title" 
value="<?php $this->text( 'searchtitle' ) ?>"/>
-                                       <?php echo $this->makeSearchInput( 
array( "id" => "searchInput" ) ); ?>
+                                       <input type="hidden" name="title" 
value="<?php $this->text( 'searchtitle' ) ?>"/>
+                                       <?php echo $this->makeSearchInput( 
array( 'id' => 'searchInput' ) ); ?>
 
                                        <?php
                                        echo $this->makeSearchButton(
-                                               "go",
-                                               array( "id" => 
"searchGoButton", "class" => "searchButton" )
+                                               'go',
+                                               array( 'id' => 
'searchGoButton', 'class' => 'searchButton' )
                                        );
 
                                        if ( $this->config->get( 
'UseTwoButtonsSearchForm' ) ) {
                                                ?>&#160;
                                                <?php echo 
$this->makeSearchButton(
-                                                       "fulltext",
-                                                       array( "id" => 
"mw-searchButton", "class" => "searchButton" )
+                                                       'fulltext',
+                                                       array( 'id' => 
'mw-searchButton', 'class' => 'searchButton' )
                                                );
                                        } else {
                                                ?>
@@ -286,7 +284,7 @@
        }
 
        /**
-        * Prints the cactions bar.
+        * Prints the content actions (cactions) bar.
         * Shared between MonoBook and Modern
         */
        function cactions() {
@@ -342,8 +340,8 @@
 
                                <div class="pBody">
                                        <ul>
-                                               <?php foreach ( 
$this->data['language_urls'] as $key => $langlink ) { ?>
-                                                       <?php echo 
$this->makeListItem( $key, $langlink ); ?>
+                                               <?php foreach ( 
$this->data['language_urls'] as $key => $langLink ) { ?>
+                                                       <?php echo 
$this->makeListItem( $key, $langLink ); ?>
 
                                                <?php
 }
@@ -378,7 +376,7 @@
                ?>
 
                <h3><?php echo htmlspecialchars( $msgObj->exists() ? 
$msgObj->text() : $bar ); ?></h3>
-               <div class='pBody'>
+               <div class="pBody">
                        <?php
                        if ( is_array( $cont ) ) {
                                ?>

-- 
To view, visit https://gerrit.wikimedia.org/r/333918
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3d7946507bd489edf248c201877fab580875ed68
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MonoBook
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix <j...@countervandalism.net>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to