| Index: branches/wmf/1.16wmf4/extensions/ContributionReporting/FundraiserStatistics_body.php |
| — | — | @@ -93,8 +93,9 @@ |
| 94 | 94 | // HTML-time! |
| 95 | 95 | $view = 0; |
| 96 | 96 | $htmlViews = ''; |
| 97 | | - foreach ( $egFundraiserStatisticsFundraisers as $fundraiser ) { |
| | 97 | + foreach ( $egFundraiserStatisticsFundraisers as $fundraiserIndex => $fundraiser ) { |
| 98 | 98 | $days = $this->query( 'dailyTotals', $fundraiser['start'], $fundraiser['end'] ); |
| | 99 | + $mostRecentFundraiser = $fundraiserIndex == count( $egFundraiserStatisticsFundraisers ) - 1; |
| 99 | 100 | foreach ( $charts as $name => $chart ) { |
| 100 | 101 | $column = 0; |
| 101 | 102 | foreach( $days as $i => $day ) { |
| — | — | @@ -104,9 +105,12 @@ |
| 105 | 106 | $height = $chart['factor'] * $day[$chart['index']]; |
| 106 | 107 | $attributes = array( |
| 107 | 108 | 'style' => "height:{$height}px", |
| 108 | | - 'class' => "fundraiserstats-bar-{$fundraiser['id']}", |
| 109 | | - 'onMouseOver' => "replaceView( 'fundraiserstats-view-box-{$view}' )" |
| | 109 | + 'class' => "fundraiserstats-bar fundraiserstats-bar-{$fundraiser['id']}", |
| | 110 | + 'rel' => "fundraiserstats-view-box-{$view}", |
| 110 | 111 | ); |
| | 112 | + if ( $mostRecentFundraiser && $i == count( $days ) -1 ) { |
| | 113 | + $attributes['class'] .= ' fundraiserstats-current'; |
| | 114 | + } |
| 111 | 115 | $charts[$name]['data'][$column] .= Xml::tags( |
| 112 | 116 | 'td', array( 'valign' => 'bottom' ), Xml::element( 'div', $attributes, '', false ) |
| 113 | 117 | ); |
| — | — | @@ -146,7 +150,7 @@ |
| 147 | 151 | Xml::tags( |
| 148 | 152 | 'h3', |
| 149 | 153 | array( 'style' => 'float:left;color:black;' ), |
| 150 | | - wfMsgExt( 'fundraiserstats-day', array( 'parseinline' ), $i + 1, $fundraiser['title'] ) |
| | 154 | + wfMsgExt( 'fundraiserstats-day', array( 'parseinline' ), $wgLang->formatNum( $i + 1 ), $fundraiser['title'] ) |
| 151 | 155 | ) . |
| 152 | 156 | Xml::element( 'div', array( 'style' => 'clear:both;' ), '', false ) |
| 153 | 157 | ) |
| — | — | @@ -170,8 +174,8 @@ |
| 171 | 175 | 'div', |
| 172 | 176 | array( |
| 173 | 177 | 'id' => "fundraiserstats-chart-{$chart}-tab", |
| 174 | | - 'class' => 'fundraiserstats-chart-tab-' . ( $first ? 'current' : 'normal' ), |
| 175 | | - 'onClick' => "replaceChart( 'fundraiserstats-chart-{$chart}' )" |
| | 178 | + 'class' => 'fundraiserstats-chart-tab fundraiserstats-chart-tab-' . ( $first ? 'current' : 'normal' ), |
| | 179 | + 'rel' => "fundraiserstats-chart-{$chart}" |
| 176 | 180 | ), |
| 177 | 181 | wfMsg( 'fundraiserstats-tab-' . $chart ) |
| 178 | 182 | ); |
| Property changes on: branches/wmf/1.16wmf4/extensions/ContributionReporting/FundraiserStatistics_body.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 179 | 183 | Merged /branches/wmf-deployment/extensions/ContributionReporting/FundraiserStatistics_body.php:r60970 |
| 180 | 184 | Merged /trunk/extensions/ContributionReporting/FundraiserStatistics_body.php:r64690-67673,76496,76558,76586,76596-78420 |
| 181 | 185 | Merged /trunk/phase3/extensions/ContributionReporting/FundraiserStatistics_body.php:r63545-63546,63549,63643,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,77555,77558-77560,77563-77565,77573 |