| Index: branches/wmf/1.18wmf1/extensions/ContributionReporting/FundraiserStatistics.css |
| — | — | @@ -1,103 +0,0 @@ |
| 2 | | -div#configholder { |
| 3 | | - position: absolute; |
| 4 | | - top: 22px; |
| 5 | | - right: 0; |
| 6 | | - z-index: 200; |
| 7 | | - width: 180px; |
| 8 | | - border: 1px solid silver; |
| 9 | | - background-color: white; |
| 10 | | - padding: 2px 5px 5px 5px; |
| 11 | | - display: none; |
| 12 | | -} |
| 13 | | -div#configtoggle { |
| 14 | | - position: absolute; |
| 15 | | - top: 0; |
| 16 | | - right: 0; |
| 17 | | - z-index: 199; |
| 18 | | - height: 17px; |
| 19 | | - border: 1px solid silver; |
| 20 | | - background-color: white; |
| 21 | | - padding: 2px 5px 2px 0px; |
| 22 | | - cursor: pointer; |
| 23 | | -} |
| 24 | | -div#configtoggle a, div#configtoggle a:visited { |
| 25 | | - background-image: url("arrow.png"); |
| 26 | | - background-position: 0px -3px; |
| 27 | | - background-repeat: no-repeat; |
| 28 | | - padding-left: 16px; |
| 29 | | - outline: 0; |
| 30 | | -} |
| 31 | | - |
| 32 | | -.fundraiserstats-view-box { |
| 33 | | - border: solid 1px silver; |
| 34 | | -} |
| 35 | | -.fundraiserstats-view-box h3 { |
| 36 | | - margin-top: 0; |
| 37 | | - padding-top: 0; |
| 38 | | -} |
| 39 | | -.fundraiserstats-today { |
| 40 | | - position: absolute; |
| 41 | | - width: 6px; |
| 42 | | - height: 6px; |
| 43 | | - background-color: black; |
| 44 | | - margin-top: 3px; |
| 45 | | - margin-left: -1px; |
| 46 | | -} |
| 47 | | -.fundraiserstats-bar { |
| 48 | | - width: 2px; |
| 49 | | -} |
| 50 | | -.fundraiserstats-bar-2007 { |
| 51 | | - background-color: #AAAAFF; |
| 52 | | - border: outset 1px #AAAAFF; |
| 53 | | -} |
| 54 | | -.fundraiserstats-bar-2008 { |
| 55 | | - background-color: #AAFFAA; |
| 56 | | - border: outset 1px #AAFFAA; |
| 57 | | -} |
| 58 | | -.fundraiserstats-bar-2009 { |
| 59 | | - background-color: #FFAAAA; |
| 60 | | - border: outset 1px #FFAAAA; |
| 61 | | -} |
| 62 | | -.fundraiserstats-bar-2010 { |
| 63 | | - background-color: #a0e8ff; |
| 64 | | - border: outset 1px #a0e8ff; |
| 65 | | -} |
| 66 | | -.fundraiserstats-bar-2011 { |
| 67 | | - background-color: #ffd617; |
| 68 | | - border: outset 1px #ffd617; |
| 69 | | -} |
| 70 | | -.fundraiserstats-bar-space { |
| 71 | | - width: 3px; |
| 72 | | -} |
| 73 | | -.fundraiserstats-chart { |
| 74 | | - padding: 10px; |
| 75 | | - border-left: solid 1px silver; |
| 76 | | - border-right: solid 1px silver; |
| 77 | | -} |
| 78 | | -.fundraiserstats-chart-tabs { |
| 79 | | - border-bottom: solid 1px silver; |
| 80 | | - height: 24px; |
| 81 | | -} |
| 82 | | -.fundraiserstats-chart-tab-normal { |
| 83 | | - padding-left: 6px; |
| 84 | | - padding-right: 6px; |
| 85 | | - border: solid 1px silver; |
| 86 | | - float: left; |
| 87 | | - line-height: 23px; |
| 88 | | - height: 23px; |
| 89 | | - margin-right: 6px; |
| 90 | | - cursor: pointer; |
| 91 | | - font-weight: bold; |
| 92 | | -} |
| 93 | | -.fundraiserstats-chart-tab-current { |
| 94 | | - padding-left: 6px; |
| 95 | | - padding-right: 6px; |
| 96 | | - border: solid 1px silver; |
| 97 | | - border-bottom-color: white; |
| 98 | | - float: left; |
| 99 | | - line-height: 23px; |
| 100 | | - height: 23px; |
| 101 | | - margin-right: 6px; |
| 102 | | - cursor: pointer; |
| 103 | | - font-weight: bold; |
| 104 | | -} |
| Index: branches/wmf/1.18wmf1/extensions/ContributionReporting/FundraiserStatistics.js |
| — | — | @@ -1,51 +0,0 @@ |
| 2 | | -/* JavaScript */ |
| 3 | | - |
| 4 | | -$j( document ).ready( function() { |
| 5 | | - |
| 6 | | - var currentViewID = 'fundraiserstats-view-box-0'; |
| 7 | | - function replaceView( newLayerID ) { |
| 8 | | - var currentLayer = document.getElementById( currentViewID ); |
| 9 | | - var newLayer = document.getElementById( newLayerID ); |
| 10 | | - currentLayer.style.display = 'none'; |
| 11 | | - newLayer.style.display = 'block'; |
| 12 | | - currentViewID = newLayerID; |
| 13 | | - } |
| 14 | | - |
| 15 | | - var currentChartID = 'fundraiserstats-chart-totals'; |
| 16 | | - function replaceChart( newLayerID ) { |
| 17 | | - var currentLayer = document.getElementById( currentChartID ); |
| 18 | | - var currentTab = document.getElementById( currentChartID + '-tab' ); |
| 19 | | - var newLayer = document.getElementById( newLayerID ); |
| 20 | | - var newTab = document.getElementById( newLayerID + '-tab' ); |
| 21 | | - currentLayer.style.display = 'none'; |
| 22 | | - currentTab.setAttribute( 'class', 'fundraiserstats-chart-tab-normal' ); |
| 23 | | - newLayer.style.display = 'block'; |
| 24 | | - newTab.setAttribute( 'class', 'fundraiserstats-chart-tab-current' ); |
| 25 | | - currentChartID = newLayerID; |
| 26 | | - } |
| 27 | | - |
| 28 | | - $j( '.fundraiserstats-bar' ).hover( function() { |
| 29 | | - replaceView( $j(this).attr( 'rel' ) ) |
| 30 | | - } ); |
| 31 | | - $j( '.fundraiserstats-chart-tab' ).click( function() { |
| 32 | | - replaceChart( $j(this).attr( 'rel' ) ) |
| 33 | | - } ); |
| 34 | | - $j( '.fundraiserstats-current' ).each( function() { |
| 35 | | - replaceView( $j(this).attr( 'rel' ) ) |
| 36 | | - } ); |
| 37 | | - $j( '#configholder .yeartoggle' ).click( function() { |
| 38 | | - $j('.fundraiserstats-'+$j(this).attr( 'id' )).toggle(); |
| 39 | | - } ); |
| 40 | | - $j( '#configtoggle' ).click( function() { |
| 41 | | - $j('#configholder').toggle(); |
| 42 | | - if ($j( '#configtoggle a' ).css( 'background-position' ) == '0px -18px') { |
| 43 | | - $j( '#configtoggle a' ).css( 'background-position', '0px -3px' ); |
| 44 | | - } else { |
| 45 | | - $j( '#configtoggle a' ).css( 'background-position','0px -18px' ); |
| 46 | | - } |
| 47 | | - } ); |
| 48 | | - $j( '#timezone' ).change( function() { |
| 49 | | - $j('#configform').submit(); |
| 50 | | - } ); |
| 51 | | - |
| 52 | | -} ); |
| Index: branches/wmf/1.18wmf1/extensions/ContributionReporting/arrow.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = image/png |
| Index: branches/wmf/1.18wmf1/extensions/ContributionReporting/ContributionReporting.php |
| — | — | @@ -43,7 +43,9 @@ |
| 44 | 44 | $wgAutoloadClasses['SpecialContributionTrackingStatistics'] = $dir . 'ContributionTrackingStatistics_body.php'; |
| 45 | 45 | $wgAutoloadClasses['SpecialDailyTotal'] = $dir . 'DailyTotal_body.php'; |
| 46 | 46 | $wgAutoloadClasses['SpecialYearlyTotal'] = $dir . 'YearlyTotal_body.php'; |
| | 47 | +$wgAutoloadClasses['DisabledNotice'] = $dir . 'DisabledNotice_body.php'; |
| 47 | 48 | |
| | 49 | +/* |
| 48 | 50 | $wgSpecialPages['ContributionHistory'] = 'ContributionHistory'; |
| 49 | 51 | $wgSpecialPages['ContributionTotal'] = 'ContributionTotal'; |
| 50 | 52 | $wgSpecialPages['ContributionStatistics'] = 'SpecialContributionStatistics'; |
| — | — | @@ -51,14 +53,24 @@ |
| 52 | 54 | $wgSpecialPages['ContributionTrackingStatistics'] = 'SpecialContributionTrackingStatistics'; |
| 53 | 55 | $wgSpecialPages['DailyTotal'] = 'SpecialDailyTotal'; |
| 54 | 56 | $wgSpecialPages['YearlyTotal'] = 'SpecialYearlyTotal'; |
| | 57 | +*/ |
| | 58 | + |
| | 59 | +// Temporarily redirect all pages to DisabledNotice |
| | 60 | +$wgSpecialPages['DisabledNotice'] = 'DisabledNotice'; |
| | 61 | +$wgSpecialPages['ContributionHistory'] = 'DisabledNotice'; |
| | 62 | +$wgSpecialPages['ContributionTotal'] = 'DisabledNotice'; |
| | 63 | +$wgSpecialPages['ContributionStatistics'] = 'DisabledNotice'; |
| | 64 | +$wgSpecialPages['FundraiserStatistics'] = 'DisabledNotice'; |
| | 65 | +$wgSpecialPages['ContributionTrackingStatistics'] = 'DisabledNotice'; |
| | 66 | +$wgSpecialPages['DailyTotal'] = 'DisabledNotice'; |
| | 67 | +$wgSpecialPages['YearlyTotal'] = 'DisabledNotice'; |
| | 68 | + |
| 55 | 69 | $wgSpecialPageGroups['ContributionHistory'] = 'contribution'; |
| 56 | 70 | $wgSpecialPageGroups['ContributionTotal'] = 'contribution'; |
| 57 | 71 | $wgSpecialPageGroups['ContributionStatistics'] = 'contribution'; |
| 58 | 72 | $wgSpecialPageGroups['FundraiserStatistics'] = 'contribution'; |
| 59 | 73 | $wgSpecialPageGroups['ContributionTrackingStatistics'] = 'contribution'; |
| 60 | 74 | |
| 61 | | - |
| 62 | | - |
| 63 | 75 | // Shortcut to this extension directory |
| 64 | 76 | $dir = dirname( __FILE__ ) . '/'; |
| 65 | 77 | |
| — | — | @@ -110,23 +122,52 @@ |
| 111 | 123 | // Cache timeout for fundraiser statistics, in seconds |
| 112 | 124 | $egFundraiserStatisticsCacheTimeout = 900; // 15 minutes |
| 113 | 125 | |
| 114 | | - |
| 115 | 126 | $wgContributionTrackingStatisticsViewWeeks = 3; |
| 116 | 127 | |
| | 128 | +$commonModuleInfo = array( |
| | 129 | + 'localBasePath' => dirname( __FILE__ ) . '/modules', |
| | 130 | + 'remoteExtPath' => 'ContributionReporting/modules', |
| | 131 | +); |
| | 132 | + |
| | 133 | +$wgResourceModules['ext.fundraiserstatistics.table'] = array( |
| | 134 | + 'styles' => 'ext.fundraiserstatistics.table.css', |
| | 135 | +) + $commonModuleInfo; |
| | 136 | + |
| | 137 | +$wgResourceModules['ext.fundraiserstatistics'] = array( |
| | 138 | + 'scripts' => 'ext.fundraiserstatistics.edit.js', |
| | 139 | + 'styles' => 'ext.fundraiserstatistics.css', |
| | 140 | +) + $commonModuleInfo; |
| | 141 | + |
| | 142 | +$wgResourceModules['ext.disablednotice'] = array( |
| | 143 | + 'styles' => 'ext.disablednotice.css', |
| | 144 | +) + $commonModuleInfo; |
| | 145 | + |
| 117 | 146 | $wgHooks['ParserFirstCallInit'][] = 'efContributionReportingSetup'; |
| 118 | 147 | $wgHooks['LanguageGetMagic'][] = 'efContributionReportingTotal_Magic'; |
| 119 | 148 | |
| | 149 | +/** |
| | 150 | + * @param $parser Parser |
| | 151 | + * @return bool |
| | 152 | + */ |
| 120 | 153 | function efContributionReportingSetup( $parser ) { |
| 121 | 154 | $parser->setFunctionHook( 'contributiontotal', 'efContributionReportingTotal_Render' ); |
| 122 | 155 | return true; |
| 123 | 156 | } |
| 124 | 157 | |
| | 158 | +/** |
| | 159 | + * @param $magicWords array |
| | 160 | + * @param $langCode string |
| | 161 | + * @return bool |
| | 162 | + */ |
| 125 | 163 | function efContributionReportingTotal_Magic( &$magicWords, $langCode ) { |
| 126 | 164 | $magicWords['contributiontotal'] = array( 0, 'contributiontotal' ); |
| 127 | 165 | return true; |
| 128 | 166 | } |
| 129 | 167 | |
| 130 | 168 | // Automatically use a local or special database connection |
| | 169 | +/** |
| | 170 | + * @return DatabaseMysql |
| | 171 | + */ |
| 131 | 172 | function efContributionReportingConnection() { |
| 132 | 173 | global $wgContributionReportingDBserver, $wgContributionReportingDBname; |
| 133 | 174 | global $wgContributionReportingDBuser, $wgContributionReportingDBpassword; |
| — | — | @@ -145,6 +186,9 @@ |
| 146 | 187 | return $db; |
| 147 | 188 | } |
| 148 | 189 | |
| | 190 | +/** |
| | 191 | + * @return DatabaseMysql |
| | 192 | + */ |
| 149 | 193 | function efContributionTrackingConnection() { |
| 150 | 194 | global $wgContributionTrackingDBserver, $wgContributionTrackingDBname; |
| 151 | 195 | global $wgContributionTrackingDBuser, $wgContributionTrackingDBpassword; |
| — | — | @@ -163,9 +207,13 @@ |
| 164 | 208 | return $db; |
| 165 | 209 | } |
| 166 | 210 | |
| | 211 | +/** |
| | 212 | + * @param $start |
| | 213 | + * @param $fudgeFactor |
| | 214 | + * @return string |
| | 215 | + */ |
| 167 | 216 | function efContributionReportingTotal( $start, $fudgeFactor ) { |
| 168 | 217 | $db = efContributionReportingConnection(); |
| 169 | | - #$db = wfGetDB( DB_MASTER ); |
| 170 | 218 | |
| 171 | 219 | $sql = 'SELECT ROUND( SUM(converted_amount) ) AS ttl FROM public_reporting'; |
| 172 | 220 | |
| — | — | @@ -185,6 +233,9 @@ |
| 186 | 234 | return $output; |
| 187 | 235 | } |
| 188 | 236 | |
| | 237 | +/** |
| | 238 | + * @return string |
| | 239 | + */ |
| 189 | 240 | function efContributionReportingTotal_Render() { |
| 190 | 241 | $args = func_get_args(); |
| 191 | 242 | array_shift( $args ); |
| — | — | @@ -193,8 +244,9 @@ |
| 194 | 245 | $start = false; |
| 195 | 246 | |
| 196 | 247 | foreach( $args as $arg ) { |
| 197 | | - if ( strpos($arg,'=') === false ) |
| | 248 | + if ( strpos($arg,'=') === false ) { |
| 198 | 249 | continue; |
| | 250 | + } |
| 199 | 251 | |
| 200 | 252 | list($key,$value) = explode( '=', trim($arg), 2 ); |
| 201 | 253 | |
| Property changes on: branches/wmf/1.18wmf1/extensions/ContributionReporting/ContributionReporting.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 202 | 254 | Merged /trunk/extensions/ContributionReporting/ContributionReporting.php:r104370,104372,104424-104425,104428,104478,104481,104515 |
| Index: branches/wmf/1.18wmf1/extensions/ContributionReporting/ContributionTrackingStatistics_body.php |
| — | — | @@ -205,7 +205,12 @@ |
| 206 | 206 | |
| 207 | 207 | /* Query Functions */ |
| 208 | 208 | |
| 209 | | - // Totals for today |
| | 209 | + /** |
| | 210 | + * Totals for today |
| | 211 | + * |
| | 212 | + * @param $timestamp string |
| | 213 | + * @return array |
| | 214 | + */ |
| 210 | 215 | public function getDayTotals( $timestamp = 0 ) { |
| 211 | 216 | $range = array(); |
| 212 | 217 | $end_format = 'Ymd235959'; |
| — | — | @@ -250,15 +255,21 @@ |
| 251 | 256 | |
| 252 | 257 | ); |
| 253 | 258 | |
| | 259 | + $result = array(); |
| 254 | 260 | foreach ( $res as $row ) { |
| 255 | | - foreach( $row as $key => $value ) { |
| | 261 | + foreach( $row as $value ) { |
| 256 | 262 | $result[] = $value; |
| 257 | 263 | } |
| 258 | 264 | } |
| 259 | 265 | return $result; |
| 260 | 266 | } |
| 261 | 267 | |
| 262 | | - // Given a day figure out what its week bounds are |
| | 268 | + /** |
| | 269 | + * Given a day figure out what its week bounds are |
| | 270 | + * |
| | 271 | + * @param $day |
| | 272 | + * @return array |
| | 273 | + */ |
| 263 | 274 | public function weekRange( $day ) { |
| 264 | 275 | $day = wfTimestamp( TS_UNIX, $day ); |
| 265 | 276 | $start = ( date( 'w', $day ) == 0) ? $day : strtotime('last sunday', $day ); // Use current Sunday |
| Property changes on: branches/wmf/1.18wmf1/extensions/ContributionReporting/ContributionTrackingStatistics_body.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 266 | 277 | Merged /trunk/extensions/ContributionReporting/ContributionTrackingStatistics_body.php:r104370,104372,104424-104425,104428,104478,104481,104515 |
| Index: branches/wmf/1.18wmf1/extensions/ContributionReporting/FundraiserStatistics_body.php |
| — | — | @@ -15,7 +15,7 @@ |
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | public function execute( $sub ) { |
| 19 | | - global $wgRequest, $wgOut, $wgUser, $wgLang, $wgScriptPath, $egFundraiserStatisticsFundraisers; |
| | 19 | + global $wgRequest, $wgOut, $wgLang, $wgScriptPath, $egFundraiserStatisticsFundraisers; |
| 20 | 20 | |
| 21 | 21 | $showYear = array(); |
| 22 | 22 | foreach ( $egFundraiserStatisticsFundraisers as $fundraiser ) { |
| — | — | @@ -81,14 +81,7 @@ |
| 82 | 82 | /* Setup */ |
| 83 | 83 | |
| 84 | 84 | $this->setHeaders(); |
| 85 | | - $wgOut->addScriptFile( $wgScriptPath . '/extensions/ContributionReporting/FundraiserStatistics.js' ); |
| 86 | | - $wgOut->addLink( |
| 87 | | - array( |
| 88 | | - 'rel' => 'stylesheet', |
| 89 | | - 'type' => 'text/css', |
| 90 | | - 'href' => $wgScriptPath . '/extensions/ContributionReporting/FundraiserStatistics.css', |
| 91 | | - ) |
| 92 | | - ); |
| | 85 | + $wgOut->addModules( 'ext.fundraiserstatistics' ); |
| 93 | 86 | |
| 94 | 87 | /* Display */ |
| 95 | 88 | |
| — | — | @@ -249,7 +242,7 @@ |
| 250 | 243 | Xml::tags( |
| 251 | 244 | 'table', |
| 252 | 245 | array( 'cellpadding' => 0, 'cellspacing' => 0, 'border' => 0 ), |
| 253 | | - Xml::tags( 'tr', null, implode( $chart['data'] ) ) |
| | 246 | + Xml::tags( 'tr', null, implode( $chart['data'] ) ) // FIXME: Missing parameter to implode |
| 254 | 247 | ) |
| 255 | 248 | ); |
| 256 | 249 | $first = false; |
| — | — | @@ -299,7 +292,7 @@ |
| 300 | 293 | 'max(converted_amount)', |
| 301 | 294 | ), |
| 302 | 295 | $conditions, |
| 303 | | - __METHOD__, |
| | 296 | + __METHOD__ . '-dailyTotals', |
| 304 | 297 | array( |
| 305 | 298 | 'ORDER BY' => 'received', |
| 306 | 299 | 'GROUP BY' => "DATE_FORMAT(CONVERT_TZ(FROM_UNIXTIME(received),'+00:00','$this->timezone'),'%Y-%m-%d')" |
| — | — | @@ -307,7 +300,7 @@ |
| 308 | 301 | ); |
| 309 | 302 | $result = array(); |
| 310 | 303 | $ytd = 0; |
| 311 | | - while ( $row = $dbr->fetchRow( $select ) ) { |
| | 304 | + foreach( $select as $row ) { |
| 312 | 305 | $row[] = $ytd += $row[1]; // YTD |
| 313 | 306 | $result[] = $row; |
| 314 | 307 | } |
| — | — | @@ -316,7 +309,7 @@ |
| 317 | 310 | $result = $dbr->selectField( 'public_reporting', |
| 318 | 311 | array( 'sum(converted_amount) as sum' ), |
| 319 | 312 | $conditions, |
| 320 | | - __METHOD__, |
| | 313 | + __METHOD__ . '-dailyTotalMax', |
| 321 | 314 | array( |
| 322 | 315 | 'ORDER BY' => 'sum DESC', |
| 323 | 316 | 'GROUP BY' => "DATE_FORMAT(CONVERT_TZ(FROM_UNIXTIME(received),'+00:00','$this->timezone'),'%Y-%m-%d')" |
| — | — | @@ -327,14 +320,14 @@ |
| 328 | 321 | $result = $dbr->selectField( 'public_reporting', |
| 329 | 322 | array( 'sum(converted_amount) as sum' ), |
| 330 | 323 | $conditions, |
| 331 | | - __METHOD__ |
| | 324 | + __METHOD__ . '-yearlyTotalMax' |
| 332 | 325 | ); |
| 333 | 326 | break; |
| 334 | 327 | case 'contributionsMax': |
| 335 | 328 | $result = $dbr->selectField( 'public_reporting', |
| 336 | 329 | array( 'count(converted_amount) as sum' ), |
| 337 | 330 | $conditions, |
| 338 | | - __METHOD__, |
| | 331 | + __METHOD__ . '-contributionsMax', |
| 339 | 332 | array( |
| 340 | 333 | 'ORDER BY' => 'sum DESC', |
| 341 | 334 | 'GROUP BY' => "DATE_FORMAT(CONVERT_TZ(FROM_UNIXTIME(received),'+00:00','$this->timezone'),'%Y-%m-%d')" |
| — | — | @@ -345,7 +338,7 @@ |
| 346 | 339 | $result = $dbr->selectField( 'public_reporting', |
| 347 | 340 | array( 'avg(converted_amount) as sum' ), |
| 348 | 341 | $conditions, |
| 349 | | - __METHOD__, |
| | 342 | + __METHOD__ . '-averagesMax', |
| 350 | 343 | array( |
| 351 | 344 | 'ORDER BY' => 'sum DESC', |
| 352 | 345 | 'GROUP BY' => "DATE_FORMAT(CONVERT_TZ(FROM_UNIXTIME(received),'+00:00','$this->timezone'),'%Y-%m-%d')" |
| — | — | @@ -356,7 +349,7 @@ |
| 357 | 350 | $result = $dbr->selectField( 'public_reporting', |
| 358 | 351 | array( 'max(converted_amount) as sum' ), |
| 359 | 352 | $conditions, |
| 360 | | - __METHOD__, |
| | 353 | + __METHOD__ . '-maximumsMax', |
| 361 | 354 | array( |
| 362 | 355 | 'ORDER BY' => 'sum DESC', |
| 363 | 356 | 'GROUP BY' => "DATE_FORMAT(CONVERT_TZ(FROM_UNIXTIME(received),'+00:00','$this->timezone'),'%Y-%m-%d')" |
| — | — | @@ -371,6 +364,10 @@ |
| 372 | 365 | return null; |
| 373 | 366 | } |
| 374 | 367 | |
| | 368 | + /** |
| | 369 | + * @param $values |
| | 370 | + * @return string |
| | 371 | + */ |
| 375 | 372 | private function dropDownList ( $values ) { |
| 376 | 373 | $dropDown = ''; |
| 377 | 374 | foreach ( $values as $value ) { |
| Property changes on: branches/wmf/1.18wmf1/extensions/ContributionReporting/FundraiserStatistics_body.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 378 | 375 | Merged /trunk/extensions/ContributionReporting/FundraiserStatistics_body.php:r104370,104372,104424-104425,104428,104478,104481,104515 |
| Index: branches/wmf/1.18wmf1/extensions/ContributionReporting/ContributionHistory_body.php |
| — | — | @@ -11,7 +11,6 @@ |
| 12 | 12 | $wgOut->redirect( SpecialPage::getTitleFor( 'FundraiserStatistics' )->getFullURL() ); |
| 13 | 13 | return; |
| 14 | 14 | |
| 15 | | - |
| 16 | 15 | if ( !preg_match( '/^[a-z-]+$/', $language ) ) { |
| 17 | 16 | $language = 'en'; |
| 18 | 17 | } |
| — | — | @@ -25,11 +24,7 @@ |
| 26 | 25 | |
| 27 | 26 | $db = efContributionReportingConnection(); |
| 28 | 27 | |
| 29 | | - $output = '<style type="text/css">'; |
| 30 | | - $output .= 'td.left {padding-right: 10px;}'; |
| 31 | | - $output .= 'td.right {padding-left: 10px; text-align: right;}'; |
| 32 | | - $output .= 'td.alt {background-color: #DDDDDD;}'; |
| 33 | | - $output .= '</style>'; |
| | 28 | + $wgOut->addModules( 'ext.fundraiserstatistics.table' ); |
| 34 | 29 | |
| 35 | 30 | // Paging controls |
| 36 | 31 | $newer = $db->selectField( 'public_reporting', 'received', |
| — | — | @@ -65,14 +60,14 @@ |
| 66 | 61 | array( |
| 67 | 62 | 'href' => $title->getFullURL( 'offset=' . $newer ), |
| 68 | 63 | ), |
| 69 | | - $this->msg( 'contrib-hist-previous' ) |
| | 64 | + $this->chMsg( 'contrib-hist-previous' ) |
| 70 | 65 | ); |
| 71 | 66 | } |
| 72 | 67 | $pagingLinks[] = Xml::element( 'a', |
| 73 | 68 | array( |
| 74 | 69 | 'href' => $title->getFullURL( 'offset=' . $older ), |
| 75 | 70 | ), |
| 76 | | - $this->msg( 'contrib-hist-next' ) |
| | 71 | + $this->chMsg( 'contrib-hist-next' ) |
| 77 | 72 | ); |
| 78 | 73 | $pagingDiv = Xml::openElement( 'div', |
| 79 | 74 | array( 'align' => 'right', 'style' => 'padding-bottom:20px' ) ) . |
| — | — | @@ -82,9 +77,9 @@ |
| 83 | 78 | |
| 84 | 79 | $output .= '<table style="width: 100%">'; |
| 85 | 80 | $output .= '<tr>'; |
| 86 | | - $output .= '<th width="60%">' . $this->msg( 'contrib-hist-name' ) . '</th>'; |
| 87 | | - $output .= '<th width="25%">' . $this->msg( 'contrib-hist-date' ) . '</th>'; |
| 88 | | - $output .= '<th width="15%" align="right">' . $this->msg( 'contrib-hist-amount' ) . '</th>'; |
| | 81 | + $output .= '<th width="60%">' . $this->chMsg( 'contrib-hist-name' ) . '</th>'; |
| | 82 | + $output .= '<th width="25%">' . $this->chMsg( 'contrib-hist-date' ) . '</th>'; |
| | 83 | + $output .= '<th width="15%" align="right">' . $this->chMsg( 'contrib-hist-amount' ) . '</th>'; |
| 89 | 84 | $output .= '</tr>'; |
| 90 | 85 | |
| 91 | 86 | if ( $offset == null ) { |
| — | — | @@ -142,19 +137,19 @@ |
| 143 | 138 | |
| 144 | 139 | header( 'Cache-Control: max-age=300,s-maxage=300' ); |
| 145 | 140 | $wgOut->addWikiText( '{{2009/Donate-header/' . $language . '}}' ); |
| 146 | | - $wgOut->addHTML( '<h1>' . $this->msg( 'contrib-hist-header' ) . '</h1>' ); |
| | 141 | + $wgOut->addHTML( '<h1>' . $this->chMsg( 'contrib-hist-header' ) . '</h1>' ); |
| 147 | 142 | $wgOut->addWikiText( '<strong>{{2008/Contribution history introduction/' . $language . '}}</strong>' ); |
| 148 | 143 | $wgOut->addHTML( $output ); |
| 149 | 144 | } |
| 150 | 145 | |
| 151 | | - function msg( $key ) { |
| | 146 | + function chMsg( $key ) { |
| 152 | 147 | return wfMsgExt( $key, array( 'escape', 'language' => $this->lang ) ); |
| 153 | 148 | } |
| 154 | 149 | |
| 155 | 150 | function formatName( $row ) { |
| 156 | 151 | $name = htmlspecialchars( $row['name'] ); |
| 157 | 152 | if( !$name ) { |
| 158 | | - $name = $this->msg( 'contrib-hist-anonymous' ); |
| | 153 | + $name = $this->chMsg( 'contrib-hist-anonymous' ); |
| 159 | 154 | } |
| 160 | 155 | $name = '<strong>' . $name . '</strong>'; |
| 161 | 156 | |
| Property changes on: branches/wmf/1.18wmf1/extensions/ContributionReporting/ContributionHistory_body.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 162 | 157 | Merged /trunk/extensions/ContributionReporting/ContributionHistory_body.php:r104247-104248,104362,104370,104372,104424-104425,104428,104478,104481,104515 |
| Index: branches/wmf/1.18wmf1/extensions/ContributionReporting/modules/ext.disablednotice.css |
| — | — | @@ -0,0 +1,10 @@ |
| | 2 | +div#cr-disablednotice { |
| | 3 | + font-size: 1.2em; |
| | 4 | + line-height: 1.3em; |
| | 5 | + background-image: url("warning-icon.png"); |
| | 6 | + background-repeat: no-repeat; |
| | 7 | + background-position: 1.1em 50%; |
| | 8 | + background-color: #ffffd9; |
| | 9 | + border: 1px solid orange; |
| | 10 | + padding: 1.1em 1em 1em 4em; |
| | 11 | +} |
| Index: branches/wmf/1.18wmf1/extensions/ContributionReporting/modules/ext.fundraiserstatistics.css |
| — | — | @@ -0,0 +1,103 @@ |
| | 2 | +div#configholder { |
| | 3 | + position: absolute; |
| | 4 | + top: 22px; |
| | 5 | + right: 0; |
| | 6 | + z-index: 200; |
| | 7 | + width: 180px; |
| | 8 | + border: 1px solid silver; |
| | 9 | + background-color: white; |
| | 10 | + padding: 2px 5px 5px 5px; |
| | 11 | + display: none; |
| | 12 | +} |
| | 13 | +div#configtoggle { |
| | 14 | + position: absolute; |
| | 15 | + top: 0; |
| | 16 | + right: 0; |
| | 17 | + z-index: 199; |
| | 18 | + height: 17px; |
| | 19 | + border: 1px solid silver; |
| | 20 | + background-color: white; |
| | 21 | + padding: 2px 5px 2px 0px; |
| | 22 | + cursor: pointer; |
| | 23 | +} |
| | 24 | +div#configtoggle a, div#configtoggle a:visited { |
| | 25 | + background-image: url("arrow.png"); |
| | 26 | + background-position: 0px -3px; |
| | 27 | + background-repeat: no-repeat; |
| | 28 | + padding-left: 16px; |
| | 29 | + outline: 0; |
| | 30 | +} |
| | 31 | + |
| | 32 | +.fundraiserstats-view-box { |
| | 33 | + border: solid 1px silver; |
| | 34 | +} |
| | 35 | +.fundraiserstats-view-box h3 { |
| | 36 | + margin-top: 0; |
| | 37 | + padding-top: 0; |
| | 38 | +} |
| | 39 | +.fundraiserstats-today { |
| | 40 | + position: absolute; |
| | 41 | + width: 6px; |
| | 42 | + height: 6px; |
| | 43 | + background-color: black; |
| | 44 | + margin-top: 3px; |
| | 45 | + margin-left: -1px; |
| | 46 | +} |
| | 47 | +.fundraiserstats-bar { |
| | 48 | + width: 2px; |
| | 49 | +} |
| | 50 | +.fundraiserstats-bar-2007 { |
| | 51 | + background-color: #AAAAFF; |
| | 52 | + border: outset 1px #AAAAFF; |
| | 53 | +} |
| | 54 | +.fundraiserstats-bar-2008 { |
| | 55 | + background-color: #AAFFAA; |
| | 56 | + border: outset 1px #AAFFAA; |
| | 57 | +} |
| | 58 | +.fundraiserstats-bar-2009 { |
| | 59 | + background-color: #FFAAAA; |
| | 60 | + border: outset 1px #FFAAAA; |
| | 61 | +} |
| | 62 | +.fundraiserstats-bar-2010 { |
| | 63 | + background-color: #a0e8ff; |
| | 64 | + border: outset 1px #a0e8ff; |
| | 65 | +} |
| | 66 | +.fundraiserstats-bar-2011 { |
| | 67 | + background-color: #ffd617; |
| | 68 | + border: outset 1px #ffd617; |
| | 69 | +} |
| | 70 | +.fundraiserstats-bar-space { |
| | 71 | + width: 3px; |
| | 72 | +} |
| | 73 | +.fundraiserstats-chart { |
| | 74 | + padding: 10px; |
| | 75 | + border-left: solid 1px silver; |
| | 76 | + border-right: solid 1px silver; |
| | 77 | +} |
| | 78 | +.fundraiserstats-chart-tabs { |
| | 79 | + border-bottom: solid 1px silver; |
| | 80 | + height: 24px; |
| | 81 | +} |
| | 82 | +.fundraiserstats-chart-tab-normal { |
| | 83 | + padding-left: 6px; |
| | 84 | + padding-right: 6px; |
| | 85 | + border: solid 1px silver; |
| | 86 | + float: left; |
| | 87 | + line-height: 23px; |
| | 88 | + height: 23px; |
| | 89 | + margin-right: 6px; |
| | 90 | + cursor: pointer; |
| | 91 | + font-weight: bold; |
| | 92 | +} |
| | 93 | +.fundraiserstats-chart-tab-current { |
| | 94 | + padding-left: 6px; |
| | 95 | + padding-right: 6px; |
| | 96 | + border: solid 1px silver; |
| | 97 | + border-bottom-color: white; |
| | 98 | + float: left; |
| | 99 | + line-height: 23px; |
| | 100 | + height: 23px; |
| | 101 | + margin-right: 6px; |
| | 102 | + cursor: pointer; |
| | 103 | + font-weight: bold; |
| | 104 | +} |
| Property changes on: branches/wmf/1.18wmf1/extensions/ContributionReporting/modules/ext.fundraiserstatistics.css |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 105 | + native |
| Index: branches/wmf/1.18wmf1/extensions/ContributionReporting/modules/ext.fundraiserstatistics.js |
| — | — | @@ -0,0 +1,51 @@ |
| | 2 | +/* JavaScript */ |
| | 3 | + |
| | 4 | +$j( document ).ready( function() { |
| | 5 | + |
| | 6 | + var currentViewID = 'fundraiserstats-view-box-0'; |
| | 7 | + function replaceView( newLayerID ) { |
| | 8 | + var currentLayer = document.getElementById( currentViewID ); |
| | 9 | + var newLayer = document.getElementById( newLayerID ); |
| | 10 | + currentLayer.style.display = 'none'; |
| | 11 | + newLayer.style.display = 'block'; |
| | 12 | + currentViewID = newLayerID; |
| | 13 | + } |
| | 14 | + |
| | 15 | + var currentChartID = 'fundraiserstats-chart-totals'; |
| | 16 | + function replaceChart( newLayerID ) { |
| | 17 | + var currentLayer = document.getElementById( currentChartID ); |
| | 18 | + var currentTab = document.getElementById( currentChartID + '-tab' ); |
| | 19 | + var newLayer = document.getElementById( newLayerID ); |
| | 20 | + var newTab = document.getElementById( newLayerID + '-tab' ); |
| | 21 | + currentLayer.style.display = 'none'; |
| | 22 | + currentTab.setAttribute( 'class', 'fundraiserstats-chart-tab-normal' ); |
| | 23 | + newLayer.style.display = 'block'; |
| | 24 | + newTab.setAttribute( 'class', 'fundraiserstats-chart-tab-current' ); |
| | 25 | + currentChartID = newLayerID; |
| | 26 | + } |
| | 27 | + |
| | 28 | + $j( '.fundraiserstats-bar' ).hover( function() { |
| | 29 | + replaceView( $j(this).attr( 'rel' ) ) |
| | 30 | + } ); |
| | 31 | + $j( '.fundraiserstats-chart-tab' ).click( function() { |
| | 32 | + replaceChart( $j(this).attr( 'rel' ) ) |
| | 33 | + } ); |
| | 34 | + $j( '.fundraiserstats-current' ).each( function() { |
| | 35 | + replaceView( $j(this).attr( 'rel' ) ) |
| | 36 | + } ); |
| | 37 | + $j( '#configholder .yeartoggle' ).click( function() { |
| | 38 | + $j('.fundraiserstats-'+$j(this).attr( 'id' )).toggle(); |
| | 39 | + } ); |
| | 40 | + $j( '#configtoggle' ).click( function() { |
| | 41 | + $j('#configholder').toggle(); |
| | 42 | + if ($j( '#configtoggle a' ).css( 'background-position' ) == '0px -18px') { |
| | 43 | + $j( '#configtoggle a' ).css( 'background-position', '0px -3px' ); |
| | 44 | + } else { |
| | 45 | + $j( '#configtoggle a' ).css( 'background-position','0px -18px' ); |
| | 46 | + } |
| | 47 | + } ); |
| | 48 | + $j( '#timezone' ).change( function() { |
| | 49 | + $j('#configform').submit(); |
| | 50 | + } ); |
| | 51 | + |
| | 52 | +} ); |
| Property changes on: branches/wmf/1.18wmf1/extensions/ContributionReporting/modules/ext.fundraiserstatistics.js |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 53 | + native |
| Index: branches/wmf/1.18wmf1/extensions/ContributionReporting/modules/ext.fundraiserstatistics.table.css |
| — | — | @@ -0,0 +1,10 @@ |
| | 2 | +td.left { |
| | 3 | + padding-right: 10px |
| | 4 | +} |
| | 5 | +td.right { |
| | 6 | + padding-left: 10px; |
| | 7 | + text-align: right; |
| | 8 | +} |
| | 9 | +td.alt { |
| | 10 | + background-color: #DDDDDD; |
| | 11 | +} |
| \ No newline at end of file |
| Property changes on: branches/wmf/1.18wmf1/extensions/ContributionReporting/modules/ext.fundraiserstatistics.table.css |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 12 | + native |
| Index: branches/wmf/1.18wmf1/extensions/ContributionReporting/modules/arrow.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = image/png |
| Property changes on: branches/wmf/1.18wmf1/extensions/ContributionReporting/modules/arrow.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2 | 13 | + image/png |
| Index: branches/wmf/1.18wmf1/extensions/ContributionReporting/modules/warning-icon.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: branches/wmf/1.18wmf1/extensions/ContributionReporting/modules/warning-icon.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 3 | 14 | + application/octet-stream |
| Index: branches/wmf/1.18wmf1/extensions/ContributionReporting/DailyTotal_body.php |
| — | — | @@ -8,8 +8,8 @@ |
| 9 | 9 | |
| 10 | 10 | class SpecialDailyTotal extends IncludableSpecialPage { |
| 11 | 11 | |
| 12 | | - protected $sharedMaxAge = 300; // Cache for 5 minutes on the server side |
| 13 | | - protected $maxAge = 300; // Cache for 5 minutes on the client side |
| | 12 | + protected $sharedMaxAge = 600; // Cache for 10 minutes on the server side |
| | 13 | + protected $maxAge = 600; // Cache for 10 minutes on the client side |
| 14 | 14 | |
| 15 | 15 | /* Functions */ |
| 16 | 16 | |
| — | — | @@ -102,10 +102,14 @@ |
| 103 | 103 | return $cache; |
| 104 | 104 | } |
| 105 | 105 | |
| | 106 | + // We're only interested in donations from the past 2 days at most |
| | 107 | + $recentTime = time() - 60 * 60 * 48; |
| | 108 | + |
| 106 | 109 | // Use database |
| 107 | 110 | $dbr = efContributionReportingConnection(); |
| 108 | 111 | #$dbr = wfGetDB( DB_MASTER ); |
| 109 | 112 | $conditions = array( |
| | 113 | + 'received > ' . $recentTime, |
| 110 | 114 | 'converted_amount >= ' . $egFundraiserStatisticsMinimum, |
| 111 | 115 | 'converted_amount <= ' . $egFundraiserStatisticsMaximum, |
| 112 | 116 | "DATE_FORMAT(CONVERT_TZ(FROM_UNIXTIME(received),'+00:00','$timeZoneOffset'),'%Y-%m-%d') = '$start'" |
| — | — | @@ -116,10 +120,7 @@ |
| 117 | 121 | 'sum(converted_amount)' |
| 118 | 122 | ), |
| 119 | 123 | $conditions, |
| 120 | | - __METHOD__, |
| 121 | | - array( |
| 122 | | - 'ORDER BY' => 'received' |
| 123 | | - ) |
| | 124 | + __METHOD__ |
| 124 | 125 | ); |
| 125 | 126 | $row = $dbr->fetchRow( $select ); |
| 126 | 127 | $total = $row['sum(converted_amount)']; |
| — | — | @@ -134,4 +135,8 @@ |
| 135 | 136 | header( "Content-type: $wgJsMimeType; charset=utf-8" ); |
| 136 | 137 | header( "Cache-Control: public, s-maxage=$this->sharedMaxAge, max-age=$this->maxAge" ); |
| 137 | 138 | } |
| | 139 | + |
| | 140 | + public function isListed(){ |
| | 141 | + return false; |
| | 142 | + } |
| 138 | 143 | } |
| Index: branches/wmf/1.18wmf1/extensions/ContributionReporting/DisabledNotice_body.php |
| — | — | @@ -0,0 +1,36 @@ |
| | 2 | +<?php |
| | 3 | +/** |
| | 4 | + * Special Page for Contribution statistics extension |
| | 5 | + * |
| | 6 | + * @file |
| | 7 | + * @ingroup Extensions |
| | 8 | + */ |
| | 9 | + |
| | 10 | +class DisabledNotice extends SpecialPage { |
| | 11 | + |
| | 12 | + /* Functions */ |
| | 13 | + |
| | 14 | + public function __construct() { |
| | 15 | + parent::__construct( 'DisabledNotice' ); |
| | 16 | + } |
| | 17 | + |
| | 18 | + public function execute( $sub ) { |
| | 19 | + global $wgOut, $wgScriptPath; |
| | 20 | + |
| | 21 | + /* Setup */ |
| | 22 | + |
| | 23 | + $this->setHeaders(); |
| | 24 | + $wgOut->addModules( 'ext.disablednotice' ); |
| | 25 | + |
| | 26 | + /* Display */ |
| | 27 | + |
| | 28 | + $wgOut->addWikiMsg( 'contribstats-header' ); |
| | 29 | + |
| | 30 | + $wgOut->addHTML( Xml::openElement( 'div', array( 'id' => 'cr-disablednotice' ) ) ); |
| | 31 | + $wgOut->addWikiMsg( 'disablednotice-disabled' ); |
| | 32 | + $wgOut->addHTML( Xml::closeElement( 'div' ) ); |
| | 33 | + |
| | 34 | + $wgOut->addWikiMsg( 'contribstats-footer' ); |
| | 35 | + } |
| | 36 | + |
| | 37 | +} |
| Index: branches/wmf/1.18wmf1/extensions/ContributionReporting/YearlyTotal_body.php |
| — | — | @@ -74,4 +74,8 @@ |
| 75 | 75 | header( "Content-type: $wgJsMimeType; charset=utf-8" ); |
| 76 | 76 | header( "Cache-Control: public, s-maxage=$this->sharedMaxAge, max-age=$this->maxAge" ); |
| 77 | 77 | } |
| | 78 | + |
| | 79 | + public function isListed(){ |
| | 80 | + return false; |
| | 81 | + } |
| 78 | 82 | } |
| Index: branches/wmf/1.18wmf1/extensions/ContributionReporting/ContributionReporting.i18n.php |
| — | — | @@ -15,17 +15,22 @@ |
| 16 | 16 | // ContributionReporting and ContributionTotal |
| 17 | 17 | 'contributionreporting-desc' => 'Live reporting on the Wikimedia fundraiser', |
| 18 | 18 | 'contributiontotal' => 'Contribution total', |
| | 19 | + |
| | 20 | + 'contribstats-header' => '', |
| | 21 | + 'contribstats-footer' => '', |
| | 22 | + |
| | 23 | + // DisabledNotice |
| | 24 | + 'disablednotice' => 'Contribution reporting', |
| | 25 | + 'disablednotice-disabled' => 'This page has been temporarily disabled. Please try again later.', |
| | 26 | + |
| | 27 | + // ContributionHistory |
| 19 | 28 | 'contributionhistory' => 'Contribution history', |
| 20 | | - |
| 21 | 29 | 'contrib-hist-header' => 'Donor comments from around the world', |
| 22 | | - |
| 23 | 30 | 'contrib-hist-name' => 'Name', |
| 24 | 31 | 'contrib-hist-date' => 'Time and date', |
| 25 | 32 | 'contrib-hist-amount' => 'Amount', |
| 26 | | - |
| 27 | 33 | 'contrib-hist-next' => 'Earlier donations', |
| 28 | 34 | 'contrib-hist-previous' => 'Newer donations', |
| 29 | | - |
| 30 | 35 | 'contrib-hist-anonymous' => 'Anonymous', |
| 31 | 36 | |
| 32 | 37 | // ContributionStatistics |
| — | — | @@ -53,8 +58,6 @@ |
| 54 | 59 | 'contribstats-value-under' => 'Under $1', |
| 55 | 60 | 'contribstats-value-from' => 'From $1 - $2', |
| 56 | 61 | 'contribstats-value-over' => 'Over $1', |
| 57 | | - 'contribstats-header' => '', |
| 58 | | - 'contribstats-footer' => '', |
| 59 | 62 | |
| 60 | 63 | // Tracking Statistics |
| 61 | 64 | 'contributiontrackingstatistics' => 'Contribution tracking statistics', |
| — | — | @@ -120,21 +123,21 @@ |
| 121 | 124 | 'contrib-hist-name' => '{{Identical|Name}}', |
| 122 | 125 | 'contrib-hist-date' => '{{Identical|Date}}', |
| 123 | 126 | 'contrib-hist-amount' => '{{Identical|Amount}}', |
| 124 | | - 'contributionstatistics' => 'Title on the contribution report for <nowiki>[[Special:ContributionStatistics]]</nowiki>. |
| | 127 | + 'contributionstatistics' => 'Title on the contribution report for <nowiki>[[Special:ContributionStatistics]]</nowiki>. |
| 125 | 128 | You may see an example in context at http://wikimediafoundation.org/wiki/Special:ContributionStatistics', |
| 126 | 129 | 'contribstats-desc' => '{{desc}}', |
| 127 | 130 | 'contribstats-currency-range-totals' => '* $1 is a start date |
| 128 | 131 | * $2 is an end date', |
| 129 | | - 'contribstats-contribution-breakdown' => 'Title on the contribution report for <nowiki>[[</nowiki>Special:ContributionStatistics<nowiki>]]</nowiki>. |
| | 132 | + 'contribstats-contribution-breakdown' => 'Title on the contribution report for <nowiki>[[</nowiki>Special:ContributionStatistics<nowiki>]]</nowiki>. |
| 130 | 133 | You may see an example in context at http://wikimediafoundation.org/wiki/Special:ContributionStatistics', |
| 131 | | - 'contribstats-day' => '"Day" on the contribution report for <nowiki>[[</nowiki>Special:ContributionStatistics<nowiki>]]</nowiki>. |
| | 134 | + 'contribstats-day' => '"Day" on the contribution report for <nowiki>[[</nowiki>Special:ContributionStatistics<nowiki>]]</nowiki>. |
| 132 | 135 | You may see an example in context at http://wikimediafoundation.org/wiki/Special:ContributionStatistics |
| 133 | 136 | {{Identical|Day}}', |
| 134 | | - 'contribstats-month' => '"Month" on the contribution report for <nowiki>[[</nowiki>Special:ContributionStatistics<nowiki>]]</nowiki>. |
| | 137 | + 'contribstats-month' => '"Month" on the contribution report for <nowiki>[[</nowiki>Special:ContributionStatistics<nowiki>]]</nowiki>. |
| 135 | 138 | You may see an example in context at http://wikimediafoundation.org/wiki/Special:ContributionStatistics |
| 136 | 139 | {{Identical|Month}}', |
| 137 | 140 | 'contribstats-currency' => '{{Identical|Currency}}', |
| 138 | | - 'contribstats-contributions' => 'The number of contributions (donations) on a report for <nowiki>[[</nowiki>Special:ContributionStatistics<nowiki>]]</nowiki>. |
| | 141 | + 'contribstats-contributions' => 'The number of contributions (donations) on a report for <nowiki>[[</nowiki>Special:ContributionStatistics<nowiki>]]</nowiki>. |
| 139 | 142 | You may see an example in context at http://wikimediafoundation.org/wiki/Special:ContributionStatistics', |
| 140 | 143 | 'contribstats-day-totals' => 'The day for which the contribution statistics are being displayed.', |
| 141 | 144 | 'contribstats-conversion' => 'Click conversion rate, see [[:wikipedia:Conversion rate|Wikipedia article]].', |
| — | — | @@ -3125,7 +3128,7 @@ |
| 3126 | 3129 | 'contributionreporting-desc' => '위키미디어 모금 현황', |
| 3127 | 3130 | 'contributiontotal' => '기부 총액', |
| 3128 | 3131 | 'contributionhistory' => '기부 역사', |
| 3129 | | - 'contrib-hist-header' => '전세계 기부자들의 실시간 한 마디', |
| | 3132 | + 'contrib-hist-header' => '전세계 기부자들의 한 마디', |
| 3130 | 3133 | 'contrib-hist-name' => '이름', |
| 3131 | 3134 | 'contrib-hist-date' => '날짜와 시각', |
| 3132 | 3135 | 'contrib-hist-amount' => '금액', |
| — | — | @@ -3188,6 +3191,7 @@ |
| 3189 | 3192 | 'fundraiserstats-tab-averages' => '평균 (USD)', |
| 3190 | 3193 | 'fundraiserstats-tab-maximums' => '최댓값 (USD)', |
| 3191 | 3194 | 'fundraiserstats-tab-ytd' => '연간 누계 (USD)', |
| | 3195 | + 'fundraiserstats-time-zone' => '시간대:', |
| 3192 | 3196 | ); |
| 3193 | 3197 | |
| 3194 | 3198 | /** Colognian (Ripoarisch) |
| — | — | @@ -5123,7 +5127,7 @@ |
| 5124 | 5128 | 'fundraiserstats-utc' => '(према UTC-у)', |
| 5125 | 5129 | ); |
| 5126 | 5130 | |
| 5127 | | -/** Serbian Latin ekavian (Srpski (latinica)) |
| | 5131 | +/** Serbian (Latin script) (Srpski (latinica)) |
| 5128 | 5132 | * @author Michaello |
| 5129 | 5133 | */ |
| 5130 | 5134 | $messages['sr-el'] = array( |
| — | — | @@ -5357,7 +5361,7 @@ |
| 5358 | 5362 | 'fundraiserstats-date' => 'Tempu', |
| 5359 | 5363 | ); |
| 5360 | 5364 | |
| 5361 | | -/** Tajik (Cyrillic) (Тоҷикӣ (Cyrillic)) |
| | 5365 | +/** Tajik (Cyrillic script) (Тоҷикӣ) |
| 5362 | 5366 | * @author Ibrahim |
| 5363 | 5367 | */ |
| 5364 | 5368 | $messages['tg-cyrl'] = array( |
| — | — | @@ -5397,7 +5401,7 @@ |
| 5398 | 5402 | 'fundraiserstats-tab-maximums' => 'Ҳаддиаксар (USD)', |
| 5399 | 5403 | ); |
| 5400 | 5404 | |
| 5401 | | -/** Tajik (Latin) (Тоҷикӣ (Latin)) |
| | 5405 | +/** Tajik (Latin script) (tojikī) |
| 5402 | 5406 | * @author Liangent |
| 5403 | 5407 | */ |
| 5404 | 5408 | $messages['tg-latn'] = array( |
| — | — | @@ -5718,7 +5722,7 @@ |
| 5719 | 5723 | 'fundraiserstats-tab-ytd' => 'Bugüne kadarki (USD)', |
| 5720 | 5724 | ); |
| 5721 | 5725 | |
| 5722 | | -/** Tatar (Cyrillic) (Татарча/Tatarça (Cyrillic)) |
| | 5726 | +/** Tatar (Cyrillic script) (Татарча) |
| 5723 | 5727 | * @author Ильнар |
| 5724 | 5728 | */ |
| 5725 | 5729 | $messages['tt-cyrl'] = array( |
| Property changes on: branches/wmf/1.18wmf1/extensions/ContributionReporting/ContributionReporting.i18n.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 5726 | 5730 | Merged /trunk/extensions/ContributionReporting/ContributionReporting.i18n.php:r104062,104247-104248,104362,104370,104372,104424-104425,104428,104478,104481,104515 |
| Index: branches/wmf/1.18wmf1/extensions/ContributionReporting/ContributionStatistics_body.php |
| — | — | @@ -275,6 +275,10 @@ |
| 276 | 276 | |
| 277 | 277 | /* Query Functions */ |
| 278 | 278 | |
| | 279 | + /** |
| | 280 | + * @param $limit int |
| | 281 | + * @return array |
| | 282 | + */ |
| 279 | 283 | public function getDailyTotals( $limit = 30 ) { |
| 280 | 284 | // Get connection |
| 281 | 285 | $dbr = efContributionReportingConnection(); |
| — | — | @@ -370,6 +374,9 @@ |
| 371 | 375 | return $totals; |
| 372 | 376 | } |
| 373 | 377 | |
| | 378 | + /** |
| | 379 | + * @return array |
| | 380 | + */ |
| 374 | 381 | public function getCurrencyTotals() { |
| 375 | 382 | // Get connection |
| 376 | 383 | $dbr = efContributionReportingConnection(); |
| — | — | @@ -499,6 +506,10 @@ |
| 500 | 507 | ); |
| 501 | 508 | } |
| 502 | 509 | |
| | 510 | + /** |
| | 511 | + * @param $dbr DatabaseBase |
| | 512 | + * @return array |
| | 513 | + */ |
| 503 | 514 | protected function dateConds( $dbr ) { |
| 504 | 515 | return |
| 505 | 516 | array( |
| Property changes on: branches/wmf/1.18wmf1/extensions/ContributionReporting/ContributionStatistics_body.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 506 | 517 | Merged /trunk/extensions/ContributionReporting/ContributionStatistics_body.php:r104370,104372,104424-104425,104428,104478,104481,104515 |
| Property changes on: branches/wmf/1.18wmf1/extensions/ContributionReporting |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 507 | 518 | Merged /trunk/extensions/ContributionReporting:r104062,104247-104248,104362,104370,104372,104424-104425,104428,104478,104481,104515 |