Revert r39503, 39507 "(bug 14468) Lines in classic RecentChanges and Watchlist now...

These alternating background colors are imho not very attractive, and make the display busy and confusing, rather than easier to read.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f251348..3a87809 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -88,8 +88,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   Show/Hide logged in users, Show/Hide anonymous, Invert namespace selection
 * Added hook 'UserrightsChangeableGroups' to allow modification of what
   groups may be added or removed via the Special:UserRights interface.
-* (bug 14468) Lines in classic RecentChanges and Watchlist have alternating
-  background colours based on classes "odd" and "even".
 * (bug 14187) In Special:Userlogin the buttons "Log in" and "E-mail new
   password" now have classes "mw-loginbutton" and "mw-mailmypasswordbutton".
 * HTML entities like   now work (are not escaped) in edit summaries.

diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index d7f5bf7..bad9445 100644 (file)
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -306,7 +306,7 @@ class OldChangesList extends ChangesList {
        /**
         * Format a line using the old system (aka without any javascript).
         */
-       public function recentChangesLine( &$rc, $watched = false, $linenumber = NULL ) {
+       public function recentChangesLine( &$rc, $watched = false ) {
                global $wgContLang, $wgRCShowChangedSize, $wgUser;
 
                $fname = 'ChangesList::recentChangesLineOld';
@@ -321,17 +321,7 @@ class OldChangesList extends ChangesList {
 
                $this->insertDateHeader($s,$rc_timestamp);
 
-               // use even/odd class only if linenumber is given (feature from bug 14468)
-               if( $linenumber ) {
-                       if( $linenumber & 1 ) {
-                               $s .= '<li class="odd">';
-                       }
-                       else {
-                               $s .= '<li class="even">';
-                       }
-               } else {
-                       $s .= '<li>';
-               }
+               $s .= '<li>';
 
                // Moved pages
                if( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index fca0d7b..c78a772 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1382,7 +1382,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '166';
+$wgStyleVersion = '165';
 
 
 # Server-side caching:

diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index fc09a4d..4f43c8e 100644 (file)
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -378,7 +378,7 @@ class SpecialRecentChanges extends SpecialPage {
                                        }
                                        $rc->numberofWatchingusers = $watcherCache[$obj->rc_namespace][$obj->rc_title];
                                }
-                               $s .= $list->recentChangesLine( $rc, !empty( $obj->wl_user ), $counter );
+                               $s .= $list->recentChangesLine( $rc, !empty( $obj->wl_user ) );
                                --$limit;
                        }
                }

diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index e8386ed..3e729f2 100644 (file)
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -342,7 +342,7 @@ function wfSpecialWatchlist( $par ) {
                        $rc->numberofWatchingusers = 0;
                }
 
-               $s .= $list->recentChangesLine( $rc, $updated, $counter );
+               $s .= $list->recentChangesLine( $rc, $updated );
        }
        $s .= $list->endRecentChangesList();
 

diff --git a/skins/common/shared.css b/skins/common/shared.css
index 17a9b2a..d42fc1c 100644 (file)
--- a/skins/common/shared.css
+++ b/skins/common/shared.css
@@ -247,8 +247,3 @@ h4.mw-specialpagesgroup {
 #shared-image-dup, #shared-image-conflict {
        font-style: italic;
 }
-
-/* Alternating background colours on Watchlist and RecentChanges */
-li.odd {
-       background-color: #e8e8e8
-}