https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114616
Revision: 114616
Author: raindrift
Date: 2012-03-29 22:11:00 +0000 (Thu, 29 Mar 2012)
Log Message:
-----------
added the filter form, not hooked up to anything yet.
forgot to checkin the parts of the gradient in SpecialPageTriage... oops.
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-03-29 21:30:34 UTC
(rev 114615)
+++ trunk/extensions/PageTriage/PageTriage.i18n.php 2012-03-29 22:11:00 UTC
(rev 114616)
@@ -36,6 +36,20 @@
'pagetriage-article-count' => 'There are currently $1 $2 articles',
'pagetriage-viewing' => 'Viewing',
'pagetriage-triage' => 'Triage',
+ 'pagetriage-filter-show-heading' => 'Show Only:',
+ 'pagetriage-filter-triaged-edits' => 'Triaged Articles',
+ 'pagetriage-filter-nominated-for-deletion' => 'Nominated for Deletion',
+ 'pagetriage-filter-bot-edits' => 'Articles by Bots',
+ 'pagetriage-filter-redirects' => 'Redirects',
+ 'pagetriage-filter-namespace-heading' => 'In Namespace:',
+ 'pagetriage-filter-user-heading' => '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 non-Autoconfirmed
users',
+ 'pagetriage-filter-blocked' => 'Are by blocked users',
+ 'pagetriage-filter-set-button' => 'Set Filters',
);
/**
@@ -64,5 +78,18 @@
'pagetriage-filter-list-prompt' => 'Prompt to choose filters for the
list view',
'pagetriage-article-count' => 'A description of the number of articles
in the list. $1 is the count, $2 is the type (for example, "untriaged")',
'pagetriage-viewing' => 'Label for the sort-order buttons
(oldest/newest)',
-
+ 'pagetriage-filter-show-heading' => 'Prompt for the first set of
checkboxes in the filter menu',
+ 'pagetriage-filter-triaged-edits' => 'Checkbox text for triaged
articles',
+ 'pagetriage-filter-nominated-for-deletion' => 'Checkbox text for
articles nominated for deletion',
+ 'pagetriage-filter-bot-edits' => 'Checkbox text for articles by bots',
+ 'pagetriage-filter-redirects' => 'Checkbox text for redirect articles',
+ 'pagetriage-filter-namespace-heading' => 'Prompt for the namespace to
display',
+ 'pagetriage-filter-user-heading' => 'Prompt for the user to find
articles by',
+ 'pagetriage-filter-tag-heading' => 'Prompt to find articles with a
given tag',
+ 'pagetriage-filter-second-show-heading' => 'Prompt for the second set
of checkboxes in the filter menu',
+ 'pagetriage-filter-no-categories' => 'Checkbox text for articles with
no categories',
+ '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-set-button' => 'Button text for the set filter
button',
);
Modified: trunk/extensions/PageTriage/PageTriage.php
===================================================================
--- trunk/extensions/PageTriage/PageTriage.php 2012-03-29 21:30:34 UTC (rev
114615)
+++ trunk/extensions/PageTriage/PageTriage.php 2012-03-29 22:11:00 UTC (rev
114616)
@@ -167,11 +167,6 @@
)
);
-/*$wgResourceModules['ext.pageTriage.core'] = $ptResourceTemplate + array(
- 'scripts' => 'ext.pageTriage.core/ext.pageTriage.core.js'
-);
-*/
-
$wgResourceModules['ext.pageTriage.models'] = $ptResourceTemplate + array(
'dependencies' => array(
'mediawiki.Title',
@@ -196,6 +191,7 @@
'ext.pageTriage.views/ext.pageTriage.listView.js'
),
'styles' => array(
+ 'ext.pageTriage.views/ext.pageTriage.css', // stuff that's
shared across all views
'ext.pageTriage.views/ext.pageTriage.listItem.css',
'ext.pageTriage.views/ext.pageTriage.listControlNav.css',
'ext.pageTriage.views/ext.pageTriage.listStatsNav.css'
@@ -221,7 +217,22 @@
'pagetriage-filter-list-prompt',
'pagetriage-article-count',
'pagetriage-viewing',
- 'pagetriage-triage'
+ 'pagetriage-triage',
+ 'pagetriage-show-only',
+ 'pagetriage-filter-show-heading',
+ 'pagetriage-filter-triaged-edits',
+ 'pagetriage-filter-nominated-for-deletion',
+ 'pagetriage-filter-bot-edits',
+ 'pagetriage-filter-redirects',
+ 'pagetriage-filter-namespace-heading',
+ 'pagetriage-filter-user-heading',
+ 'pagetriage-filter-tag-heading',
+ 'pagetriage-filter-second-show-heading',
+ 'pagetriage-filter-no-categories',
+ 'pagetriage-filter-orphan',
+ 'pagetriage-filter-non-autoconfirmed',
+ 'pagetriage-filter-blocked',
+ 'pagetriage-filter-set-button',
)
);
Modified: trunk/extensions/PageTriage/SpecialPageTriage.php
===================================================================
--- trunk/extensions/PageTriage/SpecialPageTriage.php 2012-03-29 21:30:34 UTC
(rev 114615)
+++ trunk/extensions/PageTriage/SpecialPageTriage.php 2012-03-29 22:11:00 UTC
(rev 114616)
@@ -62,10 +62,10 @@
// This will hold the HTML for the triage interface
$triageInterface = '';
- $triageInterface .= "<div id='mwe-pt-list-control-nav'
class='mwe-pt-navigation-bar'></div>";
+ $triageInterface .= "<div id='mwe-pt-list-control-nav'
class='mwe-pt-navigation-bar mwe-pt-control-gradient'></div>";
// TODO: this should load with a spinner instead of "please
wait"
$triageInterface .= "<div id='mwe-pt-list-view'>Please
wait...</div>";
- $triageInterface .= "<div id='mwe-pt-list-stats-nav'
class='mwe-pt-navigation-bar'></div>";
+ $triageInterface .= "<div id='mwe-pt-list-stats-nav'
class='mwe-pt-navigation-bar mwe-pt-control-gradient'></div>";
// These are the templates that backbone/underscore render on
the client.
// It would be awesome if they lived in separate files, but we
need to figure out how to make RL do that for us.
@@ -164,9 +164,41 @@
</b>
</span>
<span
class="mwe-pt-control-label-right"><b><%= gM( 'pagetriage-viewing' ) %></b>
Sort Controls</span>
- <div id="mwe-pt-control-dropdown">
- foo bar
+ <div id="mwe-pt-control-dropdown"
class="mwe-pt-control-gradient shadow">
+ <form>
+ <span
class="mwe-pt-control-label"><b><%= gM( 'pagetriage-filter-show-heading' )
%></b></span>
+ <div
class="mwe-pt-control-options">
+ <input type="checkbox"
/> <%= gM( 'pagetriage-filter-triaged-edits' ) %> <br/>
+ <input type="checkbox"
/> <%= gM( 'pagetriage-filter-nominated-for-deletion' ) %> <br/>
+ <input type="checkbox"
/> <%= gM( 'pagetriage-filter-bot-edits' ) %> <br/>
+ <input type="checkbox"
/> <%= gM( 'pagetriage-filter-redirects' ) %> <br/>
+ </div>
+ <span
class="mwe-pt-control-label"><b><%= gM( 'pagetriage-filter-namespace-heading' )
%></b></span>
+ <div
class="mwe-pt-control-options">
+ <select
id="mwe-pt-filter-namespace">
+
<option>(namespaces)</option>
+ </select>
+ </div>
+ <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>
+ <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>
+ <span
class="mwe-pt-control-label"><b><%= gM( 'pagetriage-filter-second-show-heading'
) %></b></span>
+ <div
class="mwe-pt-control-options">
+ <input type="checkbox"
/> <%= gM( 'pagetriage-filter-no-categories' ) %> <br/>
+ <input type="checkbox"
/> <%= gM( 'pagetriage-filter-orphan' ) %> <br/>
+ <input type="checkbox"
/> <%= gM( 'pagetriage-filter-non-autoconfirmed' ) %> <br/>
+ <input type="checkbox"
/> <%= gM( 'pagetriage-filter-blocked' ) %> <br/>
+ </div>
+ <div
class="mwe-pt-control-options">
+ <a
class="mwe-pt-filter-set-button ui-button-green"></a>
+ </div>
</div>
+ </form>
</script>
<script type="text/template"
id="listStatsNavTemplate">
Modified:
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.css
===================================================================
---
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.css
2012-03-29 21:30:34 UTC (rev 114615)
+++
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.css
2012-03-29 22:11:00 UTC (rev 114616)
@@ -42,3 +42,7 @@
/* TODO: make this actually work */
cursor: pointer;
}
+
+.mwe-pt-control-options {
+ margin-left: 2em;
+}
Modified:
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.js
===================================================================
---
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.js
2012-03-29 21:30:34 UTC (rev 114615)
+++
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.js
2012-03-29 22:11:00 UTC (rev 114616)
@@ -39,7 +39,14 @@
_this = this;
// render and return the template. fill with the
current model.
$( "#mwe-pt-list-control-nav").html( this.template() );
+
+ // make a button
+ $( ".mwe-pt-filter-set-button" ).button( {
+ label: mw.msg( 'pagetriage-filter-set-button' )
+ ' ▸'
+ });
+
+
// now that the template's been inserted, set up some
events for controlling it
// the filter dropdown menu control
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
