https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114542
Revision: 114542
Author: raindrift
Date: 2012-03-27 22:48:35 +0000 (Tue, 27 Mar 2012)
Log Message:
-----------
added links and date formatting
Modified Paths:
--------------
trunk/extensions/PageTriage/PageTriage.i18n.php
trunk/extensions/PageTriage/PageTriage.php
trunk/extensions/PageTriage/SpecialPageTriage.php
trunk/extensions/PageTriage/modules/ext.pageTriage.models/ext.pageTriage.article.js
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.articleListItem.css
Added Paths:
-----------
trunk/extensions/PageTriage/modules/external/datejs-mw.js
Modified: trunk/extensions/PageTriage/PageTriage.i18n.php
===================================================================
--- trunk/extensions/PageTriage/PageTriage.i18n.php 2012-03-27 21:23:47 UTC
(rev 114541)
+++ trunk/extensions/PageTriage/PageTriage.i18n.php 2012-03-27 22:48:35 UTC
(rev 114542)
@@ -23,11 +23,14 @@
'pagetriage-no-categories' => 'No categories',
'pagetriage-orphan' => 'Orphan',
'pagetriage-no-author' => 'No author information present',
- 'pagetriage-byline' => 'By $1',
+ 'pagetriage-byline' => 'By',
'pagetriage-editcount' => '$1 edits since $2',
'pagetriage-author-not-autoconfirmed' => 'Non-autoconfirmed',
'pagetriage-author-blocked' => 'Blocked',
'pagetriage-author-bot' => 'Bot',
+ 'pagetriage-creation-dateformat' => 'HH:mm, d MMMM yyyy',
+ 'pagetriage-user-creation-dateformat' => 'yyyy-MM-dd',
+ 'pagetriage-special-contributions' => 'Special:Contributions',
);
/**
@@ -44,11 +47,12 @@
'pagetriage-no-categories' => 'Label indicating an article with no
categories',
'pagetriage-orphan' => 'Label indicating an article has no external
links (orphan)',
'pagetriage-no-author' => 'Error message for missing article author
information',
- 'pagetriage-byline' => 'Text indicating the article author. $1 is the
author username',
+ 'pagetriage-byline' => 'Text indicating the article author (username
comes after). No $1 because the username is a hyperlink.',
'pagetriage-editcount' => 'Display of article author\'s editing
experience. $1 is total edit count, $2 is author\'s join date',
'pagetriage-author-not-autoconfirmed' => 'String indicating that the
author was not yet autoconfirmed when the article was last edited',
'pagetriage-author-blocked' => 'String indicating that the author was
blocked when the article was last edited',
'pagetriage-author-bot' => 'String indicating that the author is a bot',
-
-
+ 'pagetriage-creation-dateformat' => 'Format specifier for the article
creation date. Month and weekday names will be localized. For formats, see:
http://code.google.com/p/datejs/wiki/FormatSpecifiers',
+ 'pagetriage-user-creation-dateformat' => 'Format specifier for the
author\'s account creation date. Month and weekday names will be localized. For
formats, see: http://code.google.com/p/datejs/wiki/FormatSpecifiers',
+ 'pagetriage-special-contributions' => 'The name of
Special:Contributions on this wiki',
);
Modified: trunk/extensions/PageTriage/PageTriage.php
===================================================================
--- trunk/extensions/PageTriage/PageTriage.php 2012-03-27 21:23:47 UTC (rev
114541)
+++ trunk/extensions/PageTriage/PageTriage.php 2012-03-27 22:48:35 UTC (rev
114542)
@@ -120,7 +120,48 @@
'scripts' => array(
'external/underscore.js',
'external/backbone.js', // required for underscore
- 'external/date.js'
+ 'external/date.js',
+ 'external/datejs-mw.js'
+ ),
+ 'messages' => array(
+ 'sunday',
+ 'monday',
+ 'tuesday',
+ 'wedneday',
+ 'thursday',
+ 'friday',
+ 'saturday',
+ 'sun',
+ 'mon',
+ 'tue',
+ 'wed',
+ 'thu',
+ 'fri',
+ 'sat',
+ 'january',
+ 'february',
+ 'march',
+ 'april',
+ 'may-long',
+ 'june',
+ 'july',
+ 'august',
+ 'september',
+ 'october',
+ 'november',
+ 'december',
+ 'jan',
+ 'feb',
+ 'mar',
+ 'apr',
+ 'may',
+ 'jun',
+ 'jul',
+ 'aug',
+ 'sep',
+ 'oct',
+ 'nov',
+ 'dec'
)
);
@@ -131,6 +172,7 @@
$wgResourceModules['ext.pageTriage.models'] = $ptResourceTemplate + array(
'dependencies' => array(
+ 'mediawiki.Title',
'ext.pageTriage.external'
),
'scripts' => array(
@@ -164,7 +206,9 @@
'pagetriage-author-not-autoconfirmed',
'pagetriage-author-blocked',
'pagetriage-author-bot',
-
+ 'pagetriage-creation-dateformat',
+ 'pagetriage-user-creation-dateformat',
+ 'pagetriage-special-contributions',
)
);
Modified: trunk/extensions/PageTriage/SpecialPageTriage.php
===================================================================
--- trunk/extensions/PageTriage/SpecialPageTriage.php 2012-03-27 21:23:47 UTC
(rev 114541)
+++ trunk/extensions/PageTriage/SpecialPageTriage.php 2012-03-27 22:48:35 UTC
(rev 114542)
@@ -91,7 +91,7 @@
<div
class="mwe-pt-info-pane mwe-pt-info-pane-odd">
<% } %>
<div
class="mwe-pt-article">
- <span
class="mwe-pt-page-title"><a href="<%= partial_url %>"><%= title %></a></span>
+ <span
class="mwe-pt-page-title"><a href="<%= mw.util.wikiGetlink( title ) %>"><%=
title %></a></span>
<span
class="mwe-pt-histlink">
(<a
href="<%= mw.config.get("wgScriptPath") + "/index.php?title=" + partial_url +
"&action=history" %>"><%= gM( "pagetriage-hist" ) %></a>)
</span>
@@ -111,16 +111,20 @@
<% } %>
</span>
<span
class="mwe-pt-creation-date">
- <!--
TODO: format nicely, but remember to also make localizable... -->
- <%=
creation_date %>
+ <%=
creation_date_pretty %>
</span>
</div>
<div
class="mwe-pt-author">
<% if( typeof(
user_name ) != 'undefined' ) { %>
- <%= gM(
'pagetriage-byline', user_name ) %>
- <span
class="mwe-pt-talk-contribs">(talk · contribs)</span>
+ <%= gM(
'pagetriage-byline' ) %>
+ <a href="<%=
user_title.getUrl() %>"><%= user_name %></a>
+ <span
class="mwe-pt-talk-contribs">
+ (<a
href="<%= user_talk_title.getUrl() %>">talk</a>
+ ·
+ <a
href="<%= user_contribs_title.getUrl() %>">contribs</a>)
+ </span>
·
- <%= gM(
'pagetriage-editcount', user_editcount, user_creation_date ) %>
+ <%= gM(
'pagetriage-editcount', user_editcount, user_creation_date_pretty ) %>
<% if( user_bot
== "1" ) { %>
·
<%= gM(
'pagetriage-author-bot' ) %>
Modified:
trunk/extensions/PageTriage/modules/ext.pageTriage.models/ext.pageTriage.article.js
===================================================================
---
trunk/extensions/PageTriage/modules/ext.pageTriage.models/ext.pageTriage.article.js
2012-03-27 21:23:47 UTC (rev 114541)
+++
trunk/extensions/PageTriage/modules/ext.pageTriage.models/ext.pageTriage.article.js
2012-03-27 22:48:35 UTC (rev 114542)
@@ -5,6 +5,28 @@
title: 'Empty Article',
pageid: ''
},
+
+ initialize: function() {
+ this.bind( 'change', this.formatMetadata, this
);
+ },
+
+ formatMetadata: function ( article ) {
+ var creation_date_parsed = Date.parseExact(
article.get( 'creation_date' ), 'yyyyMMddHHmmss' );
+ article.set('creation_date_pretty',
creation_date_parsed.toString( gM( 'pagetriage-creation-dateformat' ) ) );
+
+ // sometimes user info isn't set, so check that
first.
+ if( article.get( 'user_creation_date' ) ) {
+ var user_creation_date_parsed =
Date.parseExact( article.get( 'user_creation_date' ), 'yyyyMMddHHmmss' );
+ article.set(
'user_creation_date_pretty', user_creation_date_parsed.toString( gM(
'pagetriage-user-creation-dateformat' ) ) );
+ }
+
+ var userName = article.get( 'user_name' );
+ if( userName ) {
+ article.set( 'user_title', new
mw.Title( userName, mw.config.get('wgNamespaceIds')['user'] ) );
+ article.set( 'user_talk_title', new
mw.Title( userName, mw.config.get('wgNamespaceIds')['user_talk'] ) );
+ article.set( 'user_contribs_title', new
mw.Title( gM( 'pagetriage-special-contributions' ) + '/' + userName ) );
+ }
+ }
} ),
};
Modified:
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.articleListItem.css
===================================================================
---
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.articleListItem.css
2012-03-27 21:23:47 UTC (rev 114541)
+++
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.articleListItem.css
2012-03-27 22:48:35 UTC (rev 114542)
@@ -52,6 +52,8 @@
.mwe-pt-creation-date {
float: right;
+ font-weight: bold;
+ font-size: 1em;
}
/* info about the article's author */
Added: trunk/extensions/PageTriage/modules/external/datejs-mw.js
===================================================================
--- trunk/extensions/PageTriage/modules/external/datejs-mw.js
(rev 0)
+++ trunk/extensions/PageTriage/modules/external/datejs-mw.js 2012-03-27
22:48:35 UTC (rev 114542)
@@ -0,0 +1,57 @@
+mw.loader.using( ['mediawiki.jqueryMsg'], function() {
+ // this is the start of a connector between Mediawiki's localization
and date.js.
+ // currently it adds messages necessary for proper date display, but
not for date parsing.
+ //
+ // note that shortestDayNames, firstLetterDayNames, AMDesignator and
PMDesignator aren't included,
+ // since Mediawiki doesn't currently use those.
+
+ Date.CultureInfo.dayNames = [
+ gM('sunday'),
+ gM('monday'),
+ gM('tuesday'),
+ gM('wednesday'),
+ gM('thursday'),
+ gM('friday'),
+ gM('saturday')
+ ];
+
+ Date.CultureInfo.abbreviatedDayNames = [
+ gM('sun'),
+ gM('mon'),
+ gM('tue'),
+ gM('wed'),
+ gM('thu'),
+ gM('fri'),
+ gM('sat')
+ ];
+
+ Date.CultureInfo.monthNames = [
+ gM('january'),
+ gM('february'),
+ gM('march'),
+ gM('april'),
+ gM('may-long'),
+ gM('june'),
+ gM('july'),
+ gM('august'),
+ gM('september'),
+ gM('october'),
+ gM('november'),
+ gM('december')
+ ];
+
+ Date.CultureInfo.abbreviatedMonthNames = [
+ gM('jan'),
+ gM('feb'),
+ gM('mar'),
+ gM('apr'),
+ gM('may'),
+ gM('jun'),
+ gM('jul'),
+ gM('aug'),
+ gM('sep'),
+ gM('oct'),
+ gM('nov'),
+ gM('dec')
+ ];
+} );
\ No newline at end of file
Property changes on: trunk/extensions/PageTriage/modules/external/datejs-mw.js
___________________________________________________________________
Added: svn:eol-style
+ native
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
