From 72d2519c4d15f0a6322cb0d9028f16cf81df03b0 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Wed, 15 Aug 2012 17:32:49 +0200 Subject: [PATCH] Fix some issues pointed out by IDE. * Update .gitignore to ignore .idea. * Removed unused local variables. * use local context and Message class instead of deprecated wfMsg* methods. * Remove redundant px in CSS where possible. * Combine CSS statements where possible. * Replace b by strong. Change-Id: I9d5ed7b7ce585a1c101044254bcbdfc33d42afc1 --- .gitignore | 1 + UniversalLanguageSelector.hooks.php | 3 +-- data/LanguageNameSearch.php | 2 -- lib/jquery.uls/css/jquery.uls.css | 16 ++++++++-------- lib/jquery.uls/css/jquery.uls.lcd.css | 3 +-- resources/css/ext.languagesettings.css | 6 +++--- resources/css/ext.uls.css | 4 +--- resources/js/ext.uls.displaysettings.js | 2 +- 8 files changed, 16 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 98b092a9..c798be9c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ *~ *.kate-swp .*.swp +.idea diff --git a/UniversalLanguageSelector.hooks.php b/UniversalLanguageSelector.hooks.php index 5dd489f0..ca530614 100644 --- a/UniversalLanguageSelector.hooks.php +++ b/UniversalLanguageSelector.hooks.php @@ -53,7 +53,6 @@ class UniversalLanguageSelectorHooks { */ static function addTrigger( array &$personal_urls, &$title ) { global $wgLang; - $tabindex = 2; $personal_urls = array( 'uls'=> array( 'text' => $wgLang->getLanguageName( $wgLang->getCode() ), 'href' => '#', @@ -119,7 +118,7 @@ class UniversalLanguageSelectorHooks {
-

" . wfMsgHtml( 'uls-select-content-language' ) . "

+

" . $skin->msg( 'uls-select-content-language' )->escaped() . "

diff --git a/data/LanguageNameSearch.php b/data/LanguageNameSearch.php index b2e98c72..8d43f2bd 100644 --- a/data/LanguageNameSearch.php +++ b/data/LanguageNameSearch.php @@ -64,7 +64,6 @@ class LanguageNameSearch { * @return integer Code point of first letter of string */ static function getCodepoint( $str ) { - $unicode = array(); $values = array(); $lookingFor = 1; for ( $i = 0; $i < strlen( $str ); $i++ ) { @@ -104,7 +103,6 @@ class LanguageNameSearch { return 0; } $prevRow = range( 0, $length2 ); - $currentRow = array(); for ( $i = 0; $i < $length1; $i++ ) { $currentRow = array(); $currentRow[0] = $i + 1; diff --git a/lib/jquery.uls/css/jquery.uls.css b/lib/jquery.uls/css/jquery.uls.css index ea655b45..ab168346 100644 --- a/lib/jquery.uls/css/jquery.uls.css +++ b/lib/jquery.uls/css/jquery.uls.css @@ -43,7 +43,7 @@ font-size: 16pt; line-height: 1.5em; padding-left: 6px; - margin-top: 0px; + margin-top: 0; margin-bottom: 15px; border-bottom: none; color: #555; @@ -51,8 +51,8 @@ .uls-menu h3 { font-size: 14pt; line-height: 1.5em; - padding-left: 0px; - margin-top: 0px; + padding-left: 0; + margin-top: 0; margin-bottom: 10px; border-bottom: none; } @@ -66,8 +66,8 @@ /* @noflip */ float: left !important; cursor: pointer; - padding: 0px; - margin: 0px; + padding: 0; + margin: 0; height: 125px; border-bottom-color: #555; border-bottom-style: solid; @@ -102,7 +102,7 @@ #map-block { top: 1px; margin-right: 0; - padding-right: 0px; + padding-right: 0; float: right; overflow: hidden; } @@ -161,8 +161,8 @@ span#languagefilter-clear { .filterinput { position: absolute; - top: 0px; - left: 0px; + top: 0; + left: 0; font-size: 14px; height: 32px; padding: 6px; diff --git a/lib/jquery.uls/css/jquery.uls.lcd.css b/lib/jquery.uls/css/jquery.uls.lcd.css index d0874b9d..36369f7b 100644 --- a/lib/jquery.uls/css/jquery.uls.lcd.css +++ b/lib/jquery.uls/css/jquery.uls.lcd.css @@ -13,8 +13,7 @@ } .uls-language-block ul { - margin: 0px; - margin-bottom: 1.6em; + margin: 0px 0px 1.6em; } .uls-language-list ul li { font-weight: normal; diff --git a/resources/css/ext.languagesettings.css b/resources/css/ext.languagesettings.css index f0d4f5f0..2f53a222 100644 --- a/resources/css/ext.languagesettings.css +++ b/resources/css/ext.languagesettings.css @@ -24,7 +24,7 @@ font-size: 16pt; line-height: 1.5em; padding-left: 6px; - margin-top: 0px; + margin-top: 0; margin-bottom: 15px; border-bottom: none; color: #777; @@ -33,8 +33,8 @@ .uls-menu h3 { font-size: 14pt; line-height: 1.5em; - padding-left: 0px; - margin-top: 0px; + padding-left: 0; + margin-top: 0; margin-bottom: 10px; border-bottom: none; } diff --git a/resources/css/ext.uls.css b/resources/css/ext.uls.css index bbcdad59..b512283a 100644 --- a/resources/css/ext.uls.css +++ b/resources/css/ext.uls.css @@ -5,12 +5,10 @@ div#settings-block { div#display-settings-block { /* @embed */ - background: url('../images/display.png'); - background-repeat: no-repeat; + background: #F6F6F6 url('../images/display.png') no-repeat; background-size: 20px auto; padding-left: 25px; cursor: pointer; - background-color: #F6F6F6; } .settings-title { diff --git a/resources/js/ext.uls.displaysettings.js b/resources/js/ext.uls.displaysettings.js index 941bc771..71019e21 100644 --- a/resources/js/ext.uls.displaysettings.js +++ b/resources/js/ext.uls.displaysettings.js @@ -30,7 +30,7 @@ + '

Font Settings

' + '
' + ''