https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114589
Revision: 114589
Author: raindrift
Date: 2012-03-28 23:34:25 +0000 (Wed, 28 Mar 2012)
Log Message:
-----------
added labels to the top nav, updated layout, made it actually be the right width
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.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-28 23:18:38 UTC
(rev 114588)
+++ trunk/extensions/PageTriage/PageTriage.i18n.php 2012-03-28 23:34:25 UTC
(rev 114589)
@@ -31,6 +31,10 @@
'pagetriage-creation-dateformat' => 'HH:mm, d MMMM yyyy',
'pagetriage-user-creation-dateformat' => 'yyyy-MM-dd',
'pagetriage-special-contributions' => 'Special:Contributions',
+ 'pagetriage-showing' => 'Showing',
+ 'pagetriage-filter-list-prompt' => 'Filter List',
+ 'pagetriage-article-count' => 'There are currently $1 $2 articles',
+ 'pagetriage-viewing' => 'Viewing',
);
/**
@@ -55,4 +59,9 @@
'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',
+ 'pagetriage-showing' => 'The label for which filters are being shown',
+ '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)',
+
);
Modified: trunk/extensions/PageTriage/PageTriage.php
===================================================================
--- trunk/extensions/PageTriage/PageTriage.php 2012-03-28 23:18:38 UTC (rev
114588)
+++ trunk/extensions/PageTriage/PageTriage.php 2012-03-28 23:34:25 UTC (rev
114589)
@@ -215,6 +215,10 @@
'pagetriage-creation-dateformat',
'pagetriage-user-creation-dateformat',
'pagetriage-special-contributions',
+ 'pagetriage-showing',
+ 'pagetriage-filter-list-prompt',
+ 'pagetriage-article-count',
+ 'pagetriage-viewing',
)
);
Modified: trunk/extensions/PageTriage/SpecialPageTriage.php
===================================================================
--- trunk/extensions/PageTriage/SpecialPageTriage.php 2012-03-28 23:18:38 UTC
(rev 114588)
+++ trunk/extensions/PageTriage/SpecialPageTriage.php 2012-03-28 23:34:25 UTC
(rev 114589)
@@ -158,9 +158,10 @@
</script>
<script type="text/template"
id="listControlNavTemplate">
- control navbar<br>
- has some controls<br>
- in it<br>
+ <span
class="mwe-pt-control-label"><b><%= gM( 'pagetriage-showing' ) %></b> some
things</span>
+ <span
class="mwe-pt-control-label-right"><%= gM( 'pagetriage-article-count', 100,
'untriaged' ) %></span><br/>
+ <span
class="mwe-pt-control-label"><b><%= gM( 'pagetriage-filter-list-prompt' ) %>
▸</b></span><!-- ▾ is the down arrow -->
+ <span
class="mwe-pt-control-label-right"><b><%= gM( 'pagetriage-viewing' ) %></b>
Sort Controls</span>
</script>
<script type="text/template"
id="listStatsNavTemplate">
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-28 23:18:38 UTC (rev 114588)
+++
trunk/extensions/PageTriage/modules/ext.pageTriage.models/ext.pageTriage.article.js
2012-03-28 23:34:25 UTC (rev 114589)
@@ -31,7 +31,7 @@
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 ) );
}
- article.set( 'title_url',
mw.util.wikiUrlencode( article.get( 'title' ) ) )
+ article.set( 'title_url',
mw.util.wikiUrlencode( article.get( 'title' ) ) );
}
} ),
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-28 23:18:38 UTC (rev 114588)
+++
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.css
2012-03-28 23:34:25 UTC (rev 114589)
@@ -1,12 +1,22 @@
.mwe-pt-navigation-bar {
width: 100%;
background-color: #e6f0f6;
- font-weight: bold;
+ padding-top: 0.5em;
+ padding-bottom: 0.5em;
}
.sticky #mwe-pt-list-control-nav {
position: fixed;
top: 0;
left: 160px;
- padding-left: 16px;
+ margin-left: 16px;
}
+
+.mwe-pt-control-label {
+ padding-left: 1em;
+}
+
+.mwe-pt-control-label-right {
+ float: right;
+ padding-right: 1em;
+}
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-28 23:18:38 UTC (rev 114588)
+++
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.js
2012-03-28 23:34:25 UTC (rev 114589)
@@ -5,21 +5,39 @@
tagName: "div",
template: _.template( $( "#listControlNavTemplate" ).html() ),
- // listen for changes to the model and re-render.
initialize: function() {
- $('.top').addClass('hidden');
- $.waypoints.settings.scrollThrottle = 30;
-
$('#mwe-pt-list-control-nav').waypoint(function(event, direction) {
- $(this).parent().toggleClass('sticky',
direction === "down");
- event.stopPropagation();
- });
+ // make a floating top navbar
+ // TODO: there's a bump when the control div detaches
from the page.
+ // fill some element under it to make it scroll
smoothly
+ $( '.top' ).addClass( 'hidden' );
+ $.waypoints.settings.scrollThrottle = 30;
+ var _this = this;
+ $( '#mwe-pt-list-control-nav' ).waypoint( function(
event, direction ) {
+ $( this ).parent().toggleClass( 'sticky',
direction === "down" );
+ _this.resize();
+ event.stopPropagation();
+ });
+
+ // do things that need doing on window resize
+ var resizeTimer;
+ $( window ).resize( function() {
+ clearTimeout(resizeTimer);
+ resizeTimer = setTimeout(this.resize, 100);
+ });
},
render: function() {
// insert the template into the document. fill with
the current model.
this.$el.html( this.template( ) );
return this;
- }
+ },
+
+ resize: function() {
+ // set the width of the floating bar when the window
resizes, if it's floating.
+ // the left nav is 176 pixels
+ // the right margin is 16 pixels
+ $( '#mwe-pt-list-control-nav' ).css( 'width',
$(window).width() - 176 - 16 + "px" );
+ }
} );
} );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
