Merge "Improve styleability of RecentChanges form"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 18 Sep 2014 13:19:53 +0000 (13:19 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 18 Sep 2014 13:19:53 +0000 (13:19 +0000)
1  2 
includes/specials/SpecialRecentchanges.php

@@@ -595,9 -595,9 +595,9 @@@ class SpecialRecentChanges extends Chan
                }
  
                # Look up
 -              $c = new Categoryfinder;
 -              $c->seed( $articles, $cats, $opts['categories_any'] ? 'OR' : 'AND' );
 -              $match = $c->run();
 +              $catFind = new CategoryFinder;
 +              $catFind->seed( $articles, $cats, $opts['categories_any'] ? 'OR' : 'AND' );
 +              $match = $catFind->run();
  
                # Filter
                $newrows = array();
  
                        $link = $this->makeOptionsLink( $linkMessage->text(),
                                array( $key => 1 - $options[$key] ), $nondefaults );
-                       $links[] = $this->msg( $msg )->rawParams( $link )->escaped();
+                       $links[] = "<span class=\"$msg rcshowhideoption\">" . $this->msg( $msg )->rawParams( $link )->escaped() . '</span>';
                }
  
                // show from this onward link
                $now = $lang->userTimeAndDate( $timestamp, $user );
                $timenow = $lang->userTime( $timestamp, $user );
                $datenow = $lang->userDate( $timestamp, $user );
-               $rclinks = $this->msg( 'rclinks' )->rawParams( $cl, $dl, $lang->pipeList( $links ) )
-                       ->parse();
-               $rclistfrom = $this->makeOptionsLink(
+               $pipedLinks = '<span class="rcshowhide">' . $lang->pipeList( $links ) . '</span>';
+               $rclinks = '<span class="rclinks">' . $this->msg( 'rclinks' )->rawParams( $cl, $dl, $pipedLinks )
+                       ->parse() . '</span>';
+               $rclistfrom = '<span class="rclistfrom">' . $this->makeOptionsLink(
                        $this->msg( 'rclistfrom' )->rawParams( $now, $timenow, $datenow )->parse(),
                        array( 'from' => $timestamp ),
                        $nondefaults
-               );
+               ) . '</span>';
  
                return "{$note}$rclinks<br />$rclistfrom";
        }