https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114674
Revision: 114674
Author: kaldari
Date: 2012-04-02 23:29:19 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
revising the styling of the filter dropdown and tweaking some other styling
Modified Paths:
--------------
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
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listItem.css
trunk/extensions/PageTriage/modules/ext.pageTriage.views/images/dialog_pokey_north.png
Modified: trunk/extensions/PageTriage/SpecialPageTriage.php
===================================================================
--- trunk/extensions/PageTriage/SpecialPageTriage.php 2012-04-02 23:25:33 UTC
(rev 114673)
+++ trunk/extensions/PageTriage/SpecialPageTriage.php 2012-04-02 23:29:19 UTC
(rev 114674)
@@ -62,13 +62,16 @@
// This will hold the HTML for the triage interface
$triageInterface = '';
- $triageInterface .= "<div id='mwe-pt-list-control-nav'
class='mwe-pt-navigation-bar mwe-pt-control-gradient'></div>";
+ $triageInterface .= "<div id='mwe-pt-list-control-nav'
class='mwe-pt-navigation-bar mwe-pt-control-gradient'>";
+ $triageInterface .= "<div
id='mwe-pt-list-control-nav-content'></div>";
+ $triageInterface .= "</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 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.
+ // Syntax documentation can be found at
http://documentcloud.github.com/underscore/#template.
$triageInterface .= <<<HTML
<!-- individual list item template -->
<script type="text/template"
id="listItemTemplate">
@@ -162,50 +165,66 @@
<span
id="mwe-pt-dropdown-arrow">▸</span>
<!--<span
class="mwe-pt-dropdown-open">▾</span>-->
</b>
+ <div
id="mwe-pt-control-dropdown" class="mwe-pt-control-gradient shadow">
+ <div
id="mwe-pt-control-dropdown-pokey"></div>
+ <form>
+ <div
class="mwe-pt-control-section">
+ <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>
+ </div>
+ <div
class="mwe-pt-control-section">
+ <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">
+
<%
+
var wgFormattedNamespaces = mw.config.get(
'wgFormattedNamespaces' );
+
var nsOptions = '';
+
for ( var key in wgFormattedNamespaces ) {
+
if ( wgFormattedNamespaces[key] == '' ) {
+
nsOptions += String('<option value="' +
String(key) + '">Article</option>');
+
} else {
+
nsOptions += String('<option value="' +
String(key) + '">' + wgFormattedNamespaces[key] + '</option>');
+
}
+
}
+
print(nsOptions);
+
%>
+
</select>
+ </div>
+ </div>
+ <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" /> <%= 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>
+ <div
class="mwe-pt-control-buttons">
+ <div
id="mwe-pt-filter-set-button" class="mwe-pt-filter-set-button
ui-button-green"></div>
+ </div>
+ </div>
+ </form>
+ </div>
</span>
<span
class="mwe-pt-control-label-right"><b><%= gM( 'pagetriage-viewing' ) %></b>
Sort Controls</span>
- <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">
- <%
- var
wgFormattedNamespaces = mw.config.get( 'wgFormattedNamespaces' );
- var
nsOptions = '';
- for (
var key in wgFormattedNamespaces ) {
-
nsOptions += String('<option value=' + String(key) + '>' +
wgFormattedNamespaces[key] + '</option>');
- }
-
print(nsOptions);
- %>
- </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">
- <div
id="mwe-pt-filter-set-button" class="mwe-pt-filter-set-button
ui-button-green"><%= gM( 'pagetriage-filter-set-button' ) %></div>
- </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-04-02 23:25:33 UTC (rev 114673)
+++
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.css
2012-04-02 23:29:19 UTC (rev 114674)
@@ -1,9 +1,11 @@
.mwe-pt-navigation-bar {
- padding-top: 0.5em;
- padding-bottom: 0.5em;
border: 1px solid #ccc;
}
+#mwe-pt-list-control-nav-content {
+ padding: 0.5em 1em;
+}
+
.sticky #mwe-pt-list-control-nav {
position: fixed;
top: 0;
@@ -12,37 +14,48 @@
z-index: 1;
}
-.mwe-pt-control-label {
- padding-left: 1em;
+.mwe-pt-control-section {
+ margin-top: 0.4em;
}
.mwe-pt-control-label-right {
float: right;
- padding-right: 1em;
}
-.mwe-pt-control-dropdown {
- visibility: hidden;
- width: 250px
- height: ;
+.mwe-pt-control-options {
+ margin-left: 1em;
+ margin-right: 0.5em;
+ white-space: nowrap;
}
+.mwe-pt-control-buttons {
+ margin: 0.2em 0em 0em -0.4em;
+}
+
#mwe-pt-control-dropdown {
position: absolute;
z-index: 50;
- left: 5em;
+ top: 23px;
+ left: 48px;
visibility: hidden;
+ border: 1px solid #aaa;
+ padding: 0.5em 1em 0.2em 1em;
}
+#mwe-pt-control-dropdown-pokey {
+ /* @embed */
+ background-image: url('images/dialog_pokey_north.png');
+ background-repeat: no-repeat;
+ width: 21px;
+ height: 11px;
+ position: absolute;
+ z-index: 51;
+ top: -11px;
+ left: 5px;
+}
+
#mwe-pt-filter-dropdown-control {
color: #0645AD;
-}
-
-span:hover #mwe-pt-filter-dropdown-control {
- /* TODO: make this actually work */
cursor: pointer;
+ position: relative;
}
-
-.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-04-02 23:25:33 UTC (rev 114673)
+++
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.js
2012-04-02 23:29:19 UTC (rev 114674)
@@ -46,14 +46,22 @@
render: function() {
_this = this;
// render and return the template. fill with the
current model.
- $( "#mwe-pt-list-control-nav").html( this.template( ) );
+ $( "#mwe-pt-list-control-nav-content").html(
this.template( ) );
+
+ // align the filter dropdown box with the dropdown
control widget
+ var newLeft = $( '#mwe-pt-filter-dropdown-control'
).width() - 20;
+ $( "#mwe-pt-control-dropdown" ).css({left: newLeft});
//
// now that the template's been inserted, set up some
events for controlling it
//
// make a button
- $( ".mwe-pt-filter-set-button" ).button().click(
function( e ) {
+ $( ".mwe-pt-filter-set-button" ).button( {
+ label: mw.msg( 'pagetriage-filter-set-button' ),
+ icons: { secondary:'ui-icon-triangle-1-e' }
+ } );
+ $( ".mwe-pt-filter-set-button" ).click( function( e ) {
_this.filterSet();
e.stopPropagation();
} );
Modified:
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listItem.css
===================================================================
---
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listItem.css
2012-04-02 23:25:33 UTC (rev 114673)
+++
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listItem.css
2012-04-02 23:29:19 UTC (rev 114674)
@@ -1,10 +1,10 @@
.mwe-pt-info-pane-even {
- background-color: #efefef;
+ background-color: white;
}
.mwe-pt-info-pane-odd {
- background-color: white;
+ background-color: #f1f1f1;
}
.mwe-pt-info-pane {
Modified:
trunk/extensions/PageTriage/modules/ext.pageTriage.views/images/dialog_pokey_north.png
===================================================================
(Binary files differ)
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
