http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88575
Revision: 88575
Author: reedy
Date: 2011-05-22 13:43:30 +0000 (Sun, 22 May 2011)
Log Message:
-----------
Code tweaks, show filtering by tag
Improve comments
Modified Paths:
--------------
trunk/extensions/CodeReview/CodeReview.i18n.php
trunk/extensions/CodeReview/ui/CodeCommentsListView.php
trunk/extensions/CodeReview/ui/CodeRevisionListView.php
trunk/extensions/CodeReview/ui/CodeRevisionTagView.php
trunk/extensions/CodeReview/ui/CodeView.php
trunk/extensions/CodeReview/ui/WordCloud.php
Modified: trunk/extensions/CodeReview/CodeReview.i18n.php
===================================================================
--- trunk/extensions/CodeReview/CodeReview.i18n.php 2011-05-22 13:31:30 UTC
(rev 88574)
+++ trunk/extensions/CodeReview/CodeReview.i18n.php 2011-05-22 13:43:30 UTC
(rev 88575)
@@ -122,6 +122,7 @@
'code-pathsearch-filter' => 'Filter applied:',
'code-revfilter-cr_status' => 'Status = $1',
'code-revfilter-cr_author' => 'Author = $1',
+ 'code-revfilter-ct_tag' => 'Tag = $1',
'code-revfilter-clear' => 'Clear filter',
'code-rev-submit' => 'Save changes',
'code-rev-submit-accesskey' => 's',
Modified: trunk/extensions/CodeReview/ui/CodeCommentsListView.php
===================================================================
--- trunk/extensions/CodeReview/ui/CodeCommentsListView.php 2011-05-22
13:31:30 UTC (rev 88574)
+++ trunk/extensions/CodeReview/ui/CodeCommentsListView.php 2011-05-22
13:43:30 UTC (rev 88575)
@@ -1,6 +1,6 @@
<?php
-// Special:Code/MediaWiki
+// Special:Code/MediaWiki/comments
class CodeCommentsListView extends CodeView {
public $mRepo;
@@ -33,7 +33,7 @@
}
}
-// Pager for CodeRevisionListView
+// Pager for CodeCommentsListView
class CodeCommentsTablePager extends SvnTablePager {
function isFieldSortable( $field ) {
Modified: trunk/extensions/CodeReview/ui/CodeRevisionListView.php
===================================================================
--- trunk/extensions/CodeReview/ui/CodeRevisionListView.php 2011-05-22
13:31:30 UTC (rev 88574)
+++ trunk/extensions/CodeReview/ui/CodeRevisionListView.php 2011-05-22
13:43:30 UTC (rev 88575)
@@ -9,6 +9,11 @@
public $mPath, $batchForm;
/**
+ * @var
+ */
+ protected $filters = array();
+
+ /**
* @param $repo CodeRepository|String
*/
function __construct( $repo ) {
@@ -26,17 +31,16 @@
$this->mAuthor = $wgRequest->getText( 'author' );
$this->mStatus = $wgRequest->getText( 'status' );
- $filters = array();
if ( $this->mAuthor ) {
- $filters[] = wfMsg( 'code-revfilter-cr_author',
$this->mAuthor );
+ $this->filters[] = wfMsg( 'code-revfilter-cr_author',
$this->mAuthor );
}
if ( $this->mStatus ) {
- $filters[] = wfMsg( 'code-revfilter-cr_status',
$this->mStatus );
+ $this->filters[] = wfMsg( 'code-revfilter-cr_status',
$this->mStatus );
}
- if ( count( $filters) ) {
+ if ( count( $this->filters ) ) {
global $wgLang;
- $this->mAppliedFilter = $wgLang->listToText( $filters );
+ $this->mAppliedFilter = $wgLang->listToText(
$this->filters );
} else {
$this->mAppliedFilter = null;
}
@@ -362,7 +366,7 @@
SpecialPage::getTitleFor( 'Code',
$this->mRepo->getName() . '/' . $value ),
htmlspecialchars( $value ),
array(),
- $pathQuery
+ array()
);
case 'cr_status':
$options = $pathQuery;
Modified: trunk/extensions/CodeReview/ui/CodeRevisionTagView.php
===================================================================
--- trunk/extensions/CodeReview/ui/CodeRevisionTagView.php 2011-05-22
13:31:30 UTC (rev 88574)
+++ trunk/extensions/CodeReview/ui/CodeRevisionTagView.php 2011-05-22
13:43:30 UTC (rev 88575)
@@ -2,8 +2,12 @@
class CodeRevisionTagView extends CodeRevisionListView {
function __construct( $repo, $tag ) {
+ $this->mTag = $tag;
+
+ if ( $this->mTag ) {
+ $this->filters[] = wfMsg( 'code-revfilter-ct_tag',
$this->mTag );
+ }
parent::__construct( $repo );
- $this->mTag = $tag;
}
function getPager() {
Modified: trunk/extensions/CodeReview/ui/CodeView.php
===================================================================
--- trunk/extensions/CodeReview/ui/CodeView.php 2011-05-22 13:31:30 UTC (rev
88574)
+++ trunk/extensions/CodeReview/ui/CodeView.php 2011-05-22 13:43:30 UTC (rev
88575)
@@ -112,7 +112,7 @@
protected $mView;
/**
- * @param $view CodeView
+ * @param $view CodeView
*
*/
function __construct( $view ) {
Modified: trunk/extensions/CodeReview/ui/WordCloud.php
===================================================================
--- trunk/extensions/CodeReview/ui/WordCloud.php 2011-05-22 13:31:30 UTC
(rev 88574)
+++ trunk/extensions/CodeReview/ui/WordCloud.php 2011-05-22 13:43:30 UTC
(rev 88575)
@@ -86,7 +86,7 @@
*/
public function getCloudHtml() {
if( 0 === count( $this->wordsArray ) ) {
- return;
+ return '';
}
$this->shuffleCloud();
$max = max( $this->wordsArray );
@@ -98,10 +98,16 @@
}
return '<div class="mw-wordcloud">' . $return .
'</div>';
}
+ return '';
}
/**
* Default text callback for word display
+ *
+ * @param $word string
+ * @param $sizeRange
+ *
+ * @return string
*/
public function defaultTextCallback( $word, $sizeRange ) {
return Html::element( 'span', array(
@@ -128,6 +134,8 @@
/**
* Get the class range using a percentage
*
+ * @param $percent
+ *
* @return Int
*/
private function getClassFromPercent( $percent ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
