https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114752
Revision: 114752
Author: raindrift
Date: 2012-04-05 22:46:51 +0000 (Thu, 05 Apr 2012)
Log Message:
-----------
rearranged the filter control menu
removed abusefilter tags for now, they'll go back soon
removed some leftover debugging cruft
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.css
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-05 22:15:15 UTC
(rev 114751)
+++ trunk/extensions/PageTriage/PageTriage.i18n.php 2012-04-05 22:46:51 UTC
(rev 114752)
@@ -39,19 +39,20 @@
'pagetriage-newest' => 'Newest',
'pagetriage-oldest' => 'Oldest',
'pagetriage-triage' => 'Review',
- 'pagetriage-filter-show-heading' => 'Show Only:',
+ 'pagetriage-filter-show-heading' => 'Include:',
'pagetriage-filter-reviewed-edits' => 'Reviewed Articles',
'pagetriage-filter-nominated-for-deletion' => 'Nominated for Deletion',
- 'pagetriage-filter-bot-edits' => 'Articles by Bots',
+ 'pagetriage-filter-bot-edits' => 'Are by bots',
'pagetriage-filter-redirects' => 'Redirects',
'pagetriage-filter-namespace-heading' => 'In Namespace:',
- 'pagetriage-filter-user-heading' => 'By User:',
+ 'pagetriage-filter-user-heading' => 'Are by user:',
'pagetriage-filter-tag-heading' => 'With Tag:',
'pagetriage-filter-second-show-heading' => 'That:',
'pagetriage-filter-no-categories' => 'Have no categories',
'pagetriage-filter-orphan' => 'Are orphaned',
'pagetriage-filter-non-autoconfirmed' => 'Are by new editors',
'pagetriage-filter-blocked' => 'Are by blocked users',
+ 'pagetriage-filter-all' => 'Show all',
'pagetriage-filter-set-button' => 'Set Filters',
'pagetriage-stats-unreviewed-age' => '<span
class="mwe-pt-stats-label">Article Ages:</span> Average: $1, Oldest: $2',
'pagetriage-stats-less-than-a-day' => 'less than one day',
@@ -113,6 +114,7 @@
'pagetriage-filter-orphan' => 'Checkbox text for orphan articles',
'pagetriage-filter-non-autoconfirmed' => 'Checkbox text for articles by
non-Autoconfirmed users',
'pagetriage-filter-blocked' => 'Checkbox text for articles by blocked
users',
+ 'pagetriage-filter-all' => 'Radio button text for all items radio
button',
'pagetriage-filter-set-button' => 'Button text for the set filter
button',
'pagetriage-stats-unreviewed-age' => 'Navigation text displaying triage
stats, $1 and $2 are the ages of average and oldest articles respectively',
'pagetriage-stats-less-than-a-day' => 'show this message if the article
age is less than one day, part of variable $1 and $2 of
{{msg-pagetriage|pagetriage-stats-unreviewed-age}} ',
Modified: trunk/extensions/PageTriage/PageTriage.php
===================================================================
--- trunk/extensions/PageTriage/PageTriage.php 2012-04-05 22:15:15 UTC (rev
114751)
+++ trunk/extensions/PageTriage/PageTriage.php 2012-04-05 22:46:51 UTC (rev
114752)
@@ -260,6 +260,7 @@
'pagetriage-filter-stat-orphan',
'pagetriage-filter-stat-non-autoconfirmed',
'pagetriage-filter-stat-blocked',
+ 'pagetriage-filter-all',
)
);
Modified: trunk/extensions/PageTriage/SpecialPageTriage.php
===================================================================
--- trunk/extensions/PageTriage/SpecialPageTriage.php 2012-04-05 22:15:15 UTC
(rev 114751)
+++ trunk/extensions/PageTriage/SpecialPageTriage.php 2012-04-05 22:46:51 UTC
(rev 114752)
@@ -160,7 +160,6 @@
<div
class="mwe-pt-control-options">
<input type="checkbox" id="mwe-pt-filter-reviewed-edits" /> <%= gM(
'pagetriage-filter-reviewed-edits' ) %> <br/>
<input type="checkbox" id="mwe-pt-filter-nominated-for-deletion" /> <%= gM(
'pagetriage-filter-nominated-for-deletion' ) %> <br/>
-
<input type="checkbox" id="mwe-pt-filter-bot-edits" /> <%= gM(
'pagetriage-filter-bot-edits' ) %> <br/>
<input type="checkbox" id="mwe-pt-filter-redirects" /> <%= gM(
'pagetriage-filter-redirects' ) %> <br/>
</div>
</div>
@@ -184,25 +183,27 @@
</select>
</div>
</div>
+ <!--
abusefilter tags come later.
<div
class="mwe-pt-control-section">
- <span
class="mwe-pt-control-label"><b><%= gM( 'pagetriage-filter-user-heading' )
%></b></span>
- <div
class="mwe-pt-control-options">
-
<input type=text id="mwe-pt-filter-user" />
- </div>
- </div>
- <div
class="mwe-pt-control-section">
<span
class="mwe-pt-control-label"><b><%= gM( 'pagetriage-filter-tag-heading' )
%></b></span>
<div
class="mwe-pt-control-options">
<input type=text id="mwe-pt-filter-tag" />
</div>
</div>
+ -->
<div
class="mwe-pt-control-section">
<span
class="mwe-pt-control-label"><b><%= gM( 'pagetriage-filter-second-show-heading'
) %></b></span>
<div
class="mwe-pt-control-options">
-
<input type="checkbox" id="mwe-pt-filter-no-categories" /> <%= gM(
'pagetriage-filter-no-categories' ) %> <br/>
-
<input type="checkbox" id="mwe-pt-filter-orphan" /> <%= gM(
'pagetriage-filter-orphan' ) %> <br/>
-
<input type="checkbox" id="mwe-pt-filter-non-autoconfirmed" /> <%= gM(
'pagetriage-filter-non-autoconfirmed' ) %> <br/>
-
<input type="checkbox" id="mwe-pt-filter-blocked" /> <%= gM(
'pagetriage-filter-blocked' ) %> <br/>
+
<input type="radio" name="mwe-pt-filter-radio" id="mwe-pt-filter-all" /> <%=
gM( 'pagetriage-filter-all' ) %> <br/>
+
<input type="radio" name="mwe-pt-filter-radio" id="mwe-pt-filter-no-categories"
/> <%= gM( 'pagetriage-filter-no-categories' ) %> <br/>
+
<input type="radio" name="mwe-pt-filter-radio" id="mwe-pt-filter-orphan" /> <%=
gM( 'pagetriage-filter-orphan' ) %> <br/>
+
<input type="radio" name="mwe-pt-filter-radio"
id="mwe-pt-filter-non-autoconfirmed" /> <%= gM(
'pagetriage-filter-non-autoconfirmed' ) %> <br/>
+
<input type="radio" name="mwe-pt-filter-radio" id="mwe-pt-filter-blocked" />
<%= gM( 'pagetriage-filter-blocked' ) %> <br/>
+
<input type="radio" name="mwe-pt-filter-radio" id="mwe-pt-filter-bot-edits" />
<%= gM( 'pagetriage-filter-bot-edits' ) %> <br/>
+
<input type="radio" name="mwe-pt-filter-radio" id="mwe-pt-filter-user-selected"
/> <%= gM( 'pagetriage-filter-user-heading' ) %>
+
<div class="mwe-pt-control-options">
+
<span class="mwe-pt-filter-sub-input"><input type=text
id="mwe-pt-filter-username" /></span>
+
</div>
</div>
</div>
<div
class="mwe-pt-control-buttons">
Modified:
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.css
===================================================================
---
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.css
2012-04-05 22:15:15 UTC (rev 114751)
+++
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.css
2012-04-05 22:46:51 UTC (rev 114752)
@@ -59,3 +59,7 @@
cursor: pointer;
position: relative;
}
+
+.mwe-pt-filter-sub-input {
+ padding-left: 0.5em;
+}
\ No newline at end of file
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-05 22:15:15 UTC (rev 114751)
+++
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.js
2012-04-05 22:46:51 UTC (rev 114752)
@@ -65,14 +65,12 @@
icons: { secondary:'ui-icon-triangle-1-e' }
} );
$( ".mwe-pt-filter-set-button" ).click( function( e ) {
- console.log('set button clicked');
_this.filterSync();
_this.toggleFilterMenu();
e.stopPropagation();
} );
// the filter dropdown menu control
- console.log('click event set on body and menu');
$( '#mwe-pt-filter-dropdown-control' ).click( function(
e ) {
_this.toggleFilterMenu();
e.stopPropagation();
@@ -112,14 +110,12 @@
// close the menu when the user clicks away
$( 'body' ).click( 'click', function() {
- console.log('body clicked');
_this.toggleFilterMenu( 'close' );
} );
// this event "covers up" the body event, which
keeps the menu from closing when
// the user clicks inside.
$( '#mwe-pt-control-dropdown' ).click(
function( e ) {
- console.log('menu clicked');
e.stopPropagation();
} );
@@ -225,7 +221,12 @@
this.menuCheckboxUpdate( $(
'#mwe-pt-filter-non-autoconfirmed' ), 'non_autoconfirmed_users',
'pagetriage-filter-stat-non-autoconfirmed');
this.menuCheckboxUpdate( $( '#mwe-pt-filter-blocked' ),
'blocked_users', 'pagetriage-filter-stat-blocked');
- this.filterStatus = this.newFilterStatus.join(' ·
');
+ this.filterStatus = this.newFilterStatus.join(' ·
');
+
+ if( !
$("input[name=mwe-pt-filter-radio]:checked").val() ) {
+ // none of the radio buttons are selected.
pick the default.
+ $( '#mwe-pt-filter-all' ).prop( 'checked', true
);
+ }
},
menuCheckboxUpdate: function( $checkbox, param, message ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
