https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114859
Revision: 114859
Author: kaldari
Date: 2012-04-11 23:02:49 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
adding support for error messages; adding error message for when no articles
are retrieved
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.list/ext.pageTriage.listView.css
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listView.js
Modified: trunk/extensions/PageTriage/PageTriage.i18n.php
===================================================================
--- trunk/extensions/PageTriage/PageTriage.i18n.php 2012-04-11 22:34:36 UTC
(rev 114858)
+++ trunk/extensions/PageTriage/PageTriage.i18n.php 2012-04-11 23:02:49 UTC
(rev 114859)
@@ -73,7 +73,7 @@
'pagetriage-filter-stat-non-autoconfirmed' => 'New editors',
'pagetriage-filter-stat-blocked' => 'Blocked users',
'pagetriage-filter-stat-username' => 'Username: $1',
-
+ 'pagetriage-no-pages' => 'No pages match your criteria.',
);
/**
@@ -139,5 +139,5 @@
'pagetriage-filter-stat-non-autoconfirmed' => 'Status display component
for articles by non-autoconfirmed editors',
'pagetriage-filter-stat-blocked' => 'Status display component for
articles by blocked users',
'pagetriage-filter-stat-username' => 'Status display component for
filter by username. $1 is the username.',
-
+ 'pagetriage-no-pages' => 'Message to display when no pages were
retrieved',
);
Modified: trunk/extensions/PageTriage/PageTriage.php
===================================================================
--- trunk/extensions/PageTriage/PageTriage.php 2012-04-11 22:34:36 UTC (rev
114858)
+++ trunk/extensions/PageTriage/PageTriage.php 2012-04-11 23:02:49 UTC (rev
114859)
@@ -280,6 +280,7 @@
'pagetriage-filter-stat-blocked',
'pagetriage-filter-stat-username',
'pagetriage-filter-all',
+ 'pagetriage-no-pages',
)
);
Modified: trunk/extensions/PageTriage/SpecialPageTriage.php
===================================================================
--- trunk/extensions/PageTriage/SpecialPageTriage.php 2012-04-11 22:34:36 UTC
(rev 114858)
+++ trunk/extensions/PageTriage/SpecialPageTriage.php 2012-04-11 23:02:49 UTC
(rev 114859)
@@ -69,6 +69,7 @@
// 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-errors'
style='display: none;'></div>";
$triageInterface .= "<div id='mwe-pt-list-more' style='display:
none;'>";
$triageInterface .= "<a href='#'
id='mwe-pt-list-more-link'>".wfMessage( 'pagetriage-more' )."</a>";
$triageInterface .= "</div>";
Modified:
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listView.css
===================================================================
---
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listView.css
2012-04-11 22:34:36 UTC (rev 114858)
+++
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listView.css
2012-04-11 23:02:49 UTC (rev 114859)
@@ -10,7 +10,7 @@
background-color: #E8F2F8;
margin: 0;
padding: 0.4em;
- border: 1px solid #ccc;
+ border: 1px solid #CCC;
border-top: none;
min-height: 21px;
}
@@ -19,3 +19,12 @@
cursor: pointer;
}
+#mwe-pt-list-errors {
+ color: #C00;
+ font-size: 17px;
+ line-height: 20px;
+ margin: 0;
+ padding: 0.4em;
+ border: 1px solid #CCC;
+ border-top: none;
+}
Modified:
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listView.js
===================================================================
---
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listView.js
2012-04-11 22:34:36 UTC (rev 114858)
+++
trunk/extensions/PageTriage/modules/ext.pageTriage.views.list/ext.pageTriage.listView.js
2012-04-11 23:02:49 UTC (rev 114859)
@@ -145,20 +145,32 @@
// new articles
$( '#mwe-pt-list-view' ).empty();
- // load the new articles
- articles.forEach( this.addOne, this );
- $( '#mwe-pt-list-stats-nav' ).css( 'border-top', 'none'
);
-
- // if there are more articles that can be loaded, set
up loading machanism
- if ( articles.moreToLoad ) {
- if ( mw.config.get(
'wgPageTriageInfiniteScrolling' ) ) {
- this.initializeInfiniteScrolling();
- } else {
- // Show 'More' link
- $( '#mwe-pt-list-more' ).show();
+ // remove any error messages and hide the div that
contains them
+ $( '#mwe-pt-list-errors' ).empty();
+ $( '#mwe-pt-list-errors' ).hide();
+
+ // hide the 'More' div if it is visible
+ $( '#mwe-pt-list-more' ).hide();
+
+ if ( articles.length ) {
+ // load the new articles
+ articles.forEach( this.addOne, this );
+ $( '#mwe-pt-list-stats-nav' ).css(
'border-top', 'none' );
+
+ // if there are more articles that can be
loaded, set up loading machanism
+ if ( articles.moreToLoad ) {
+ if ( mw.config.get(
'wgPageTriageInfiniteScrolling' ) ) {
+
this.initializeInfiniteScrolling();
+ } else {
+ // Show 'More' link
+ $( '#mwe-pt-list-more' ).show();
+ }
}
+
} else {
- $( '#mwe-pt-list-more' ).hide();
+ // show an error message
+ $( '#mwe-pt-list-errors' ).html( mw.msg(
'pagetriage-no-pages' ) );
+ $( '#mwe-pt-list-errors' ).show();
}
$.waypoints( 'refresh' );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
