https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114694
Revision: 114694
Author: raindrift
Date: 2012-04-04 01:19:19 +0000 (Wed, 04 Apr 2012)
Log Message:
-----------
added the beginning of the filter status display.
Modified Paths:
--------------
trunk/extensions/PageTriage/PageTriage.i18n.php
trunk/extensions/PageTriage/PageTriage.php
trunk/extensions/PageTriage/SpecialPageTriage.php
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.js
Modified: trunk/extensions/PageTriage/PageTriage.i18n.php
===================================================================
--- trunk/extensions/PageTriage/PageTriage.i18n.php 2012-04-04 01:05:19 UTC
(rev 114693)
+++ trunk/extensions/PageTriage/PageTriage.i18n.php 2012-04-04 01:19:19 UTC
(rev 114694)
@@ -56,6 +56,7 @@
'pagetriage-filter-ns-article' => 'Article',
'pagetriage-filter-ns-all' => 'All',
'pagetriage-more' => 'More',
+ 'pagetriage-filter-stat-namespace' => 'Namespace: $1',
);
/**
@@ -104,4 +105,5 @@
'pagetriage-filter-ns-article' => 'The name of the main article
namespace, for the namespace filter select list',
'pagetriage-filter-ns-all' => 'For the namespace filter select list,
text indicating that all namespaces will be selected',
'pagetriage-more' => 'Text for a link that loads more articles into
list',
+ 'pagetriage-filter-stat-namespace' => 'Status display for the namespace
filter. $1 is the name of the namespace.',
);
Modified: trunk/extensions/PageTriage/PageTriage.php
===================================================================
--- trunk/extensions/PageTriage/PageTriage.php 2012-04-04 01:05:19 UTC (rev
114693)
+++ trunk/extensions/PageTriage/PageTriage.php 2012-04-04 01:19:19 UTC (rev
114694)
@@ -245,6 +245,7 @@
'pagetriage-filter-ns-article',
'pagetriage-filter-ns-all',
'pagetriage-more',
+ 'pagetriage-filter-stat-namespace',
)
);
Modified: trunk/extensions/PageTriage/SpecialPageTriage.php
===================================================================
--- trunk/extensions/PageTriage/SpecialPageTriage.php 2012-04-04 01:05:19 UTC
(rev 114693)
+++ trunk/extensions/PageTriage/SpecialPageTriage.php 2012-04-04 01:19:19 UTC
(rev 114694)
@@ -164,7 +164,7 @@
<!-- top nav template -->
<script type="text/template"
id="listControlNavTemplate">
- <span
class="mwe-pt-control-label"><b><%= gM( 'pagetriage-showing' ) %></b> some
things</span>
+ <span
class="mwe-pt-control-label"><b><%= gM( 'pagetriage-showing' ) %></b> <%=
filterStatus %></span>
<span
class="mwe-pt-control-label-right" id="mwe-pt-control-stats"></span><br/>
<span
id="mwe-pt-filter-dropdown-control" class="mwe-pt-control-label">
<b>
Modified:
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.js
===================================================================
---
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.js
2012-04-04 01:05:19 UTC (rev 114693)
+++
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.js
2012-04-04 01:19:19 UTC (rev 114694)
@@ -5,6 +5,7 @@
tagName: "div",
template: _.template( $( "#listControlNavTemplate" ).html() ),
filterMenuVisible: 0,
+ filterStatus: 'All',
initialize: function( options ) {
var _this = this;
@@ -35,12 +36,15 @@
// fill in the counter when the stats view gets
loaded.
$( "#mwe-pt-control-stats" ).html( gM(
'pagetriage-article-count', stats.get('ptr_untriaged_article_count') ) );
} );
+
+ // update the filter display on load.
+ this.menuSync();
},
render: function() {
var _this = this;
// render and return the template. fill with the
current model.
- $( "#mwe-pt-list-control-nav-content").html(
this.template( ) );
+ $( "#mwe-pt-list-control-nav-content").html(
this.template( { filterStatus: this.filterStatus } ) );
// align the filter dropdown box with the dropdown
control widget
var newLeft = $( '#mwe-pt-filter-dropdown-control'
).width() - 20;
@@ -156,16 +160,27 @@
// persist the limit parameter
apiParams['limit'] = this.model.getParam('limit');
-
+
this.model.setParams( apiParams );
this.model.fetch();
+
+ this.menuSync(); // make sure the menu is now
up-to-date.
this.render();
},
// sync the menu with the contents of the filters
- menuSync: function() {
+ menuSync: function() {
+ var newFilterStatus = [];
+
$( '#mwe-pt-filter-namespace' ).val(
this.model.getParam( 'namespace' ) );
+
+ // update the status display
+ if( this.model.getParam( 'namespace' ) > -1 ) { //
still true for ns 0
+ newFilterStatus.push( gM(
'pagetriage-filter-stat-namespace', this.model.getParam( 'namespace' ) ) );
+ }
+ // TODO: update the status for everything else.
+
$( '#mwe-pt-filter-triaged-edits' ).prop( 'checked',
this.model.getParam( 'showtriaged' )=="1"?true:false );
// api doesn't support this?
//$( '#mwe-pt-filter-nominated-for-deletion' ).prop(
'checked', this.model.getParam('')=="1"?true:false );
@@ -182,7 +197,7 @@
$( '#mwe-pt-filter-non-autoconfirmed' ).prop(
'checked', this.model.getParam( 'non_autoconfirmed_users' )=="1"?true:false );
$( '#mwe-pt-filter-blocked' ).prop( 'checked',
this.model.getParam( 'blocked_users' )=="1"?true:false );
-
+ this.filterStatus = newFilterStatus.join('.');
}
} );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
