| Index: branches/REL1_18/extensions/CodeReview/CodeReview.php |
| — | — | @@ -166,7 +166,8 @@ |
| 167 | 167 | $wgResourceModules['ext.codereview.overview'] = array( |
| 168 | 168 | 'scripts' => 'ext.codereview.overview.js', |
| 169 | 169 | 'styles' => 'ext.codereview.overview.css', |
| 170 | | - 'dependencies' => 'jquery.tipsy' |
| | 170 | + 'dependencies' => 'jquery.tipsy', |
| | 171 | + 'messages' => array( 'codereview-overview-title', 'codereview-overview-desc' ), |
| 171 | 172 | ) + $commonModuleInfo; |
| 172 | 173 | |
| 173 | 174 | // If you are running a closed svn, fill the following two lines with the username and password |
| Index: branches/REL1_18/extensions/CodeReview/CodeReview.i18n.php |
| — | — | @@ -141,6 +141,9 @@ |
| 142 | 142 | |
| 143 | 143 | 'codereview-reply-link' => 'reply', |
| 144 | 144 | |
| | 145 | + 'codereview-overview-title' => 'Overview', |
| | 146 | + 'codereview-overview-desc' => 'Show a graphical overview of this list', |
| | 147 | + |
| 145 | 148 | 'codereview-email-subj' => '[$1 $2]: New comment added', |
| 146 | 149 | 'codereview-email-body' => 'User "$1" posted a comment on $3. |
| 147 | 150 | |
| Index: branches/REL1_18/extensions/CodeReview/modules/ext.codereview.overview.css |
| — | — | @@ -3,7 +3,7 @@ |
| 4 | 4 | padding: 2px; |
| 5 | 5 | min-width: 300px; |
| 6 | 6 | } |
| 7 | | -#overviewmap #overviewpop { |
| | 7 | +#overviewpop { |
| 8 | 8 | padding: 3px; |
| 9 | 9 | border: 1px solid black; |
| 10 | 10 | position: absolute; |
| — | — | @@ -32,42 +32,6 @@ |
| 33 | 33 | clear: both; |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | | -/** Revision statuses **/ |
| 37 | | -.box-status-new { |
| 38 | | - background: #ffffc0 !important; |
| 39 | | -} |
| 40 | | -.box-status-new:hover { |
| 41 | | - background: #dfdfa0 !important; |
| 42 | | -} |
| 43 | | -.box-status-fixme { |
| 44 | | - background: #ff9999 !important; |
| 45 | | -} |
| 46 | | -.box-status-fixme:hover { |
| 47 | | - background: #df0000 !important; |
| 48 | | -} |
| 49 | | -.box-status-resolved { |
| 50 | | - background: #b0eeb0 !important; |
| 51 | | -} |
| 52 | | -.box-status-resolved:hover { |
| 53 | | - background: #80ff80 !important; |
| 54 | | -} |
| 55 | | -.box-status-reverted { |
| 56 | | - background: #bbddee !important; |
| 57 | | -} |
| 58 | | -.box-status-reverted:hover { |
| 59 | | - background: #66bbff !important; |
| 60 | | -} |
| 61 | | -.box-status-deferred { |
| 62 | | - background: #dddddd !important; |
| 63 | | -} |
| 64 | | -.box-status-deferred:hover { |
| 65 | | - background: #aaaaaa !important; |
| 66 | | -} |
| 67 | | - |
| 68 | | -.box-live-live { |
| 69 | | - border: 1px solid #00ff00 !important; |
| 70 | | -} |
| 71 | | - |
| 72 | 36 | table.TablePager tr:target { |
| 73 | 37 | font-weight: bold; |
| 74 | 38 | } |
| Index: branches/REL1_18/extensions/CodeReview/modules/ext.codereview.overview.js |
| — | — | @@ -15,11 +15,9 @@ |
| 16 | 16 | mw.util.addPortletLink( |
| 17 | 17 | portlet, |
| 18 | 18 | '#', |
| 19 | | - 'Overview', |
| | 19 | + mw.msg( 'codereview-overview-title' ), |
| 20 | 20 | 'ca-scapmap', |
| 21 | | - 'Show a graphical overview of this list.', |
| 22 | | - '1', |
| 23 | | - '' // Nextnode, needs to be defined but we actually don't care |
| | 21 | + mw.msg( 'codereview-overview-desc' ) |
| 24 | 22 | ); |
| 25 | 23 | } |
| 26 | 24 | |
| — | — | @@ -41,17 +39,15 @@ |
| 42 | 40 | var vpath = $( '#path' ).val(); |
| 43 | 41 | var totals = {}; |
| 44 | 42 | $tr.each( function( i ){ |
| 45 | | - var live = 'notlive'; |
| 46 | 43 | var status = false; |
| 47 | 44 | |
| 48 | | - var trc = $(this).attr( 'class' ).split(' '); |
| 49 | | - if( !trc.length ) { |
| | 45 | + var trc = $(this).attr( 'class' ); |
| | 46 | + if( !trc || !trc.length ) { |
| 50 | 47 | return; |
| | 48 | + } else { |
| | 49 | + trc = trc.split( ' ' ); |
| 51 | 50 | } |
| 52 | 51 | for( var j = 0; j < trc.length; j++ ) { |
| 53 | | - // WMF doesn't use live/not live ATM |
| 54 | | - // if( /mw\-codereview\-(not|)live/.test( trc[j] ) ) |
| 55 | | - // live = trc[j].substring( 14 ); |
| 56 | 52 | if( trc[j].substring( 0, 21 ) == 'mw-codereview-status-' ) { |
| 57 | 53 | status = trc[j].substring( 21 ); |
| 58 | 54 | } |
| — | — | @@ -60,7 +56,7 @@ |
| 61 | 57 | |
| 62 | 58 | var statusname = $td.filter( '.TablePager_col_cr_status' ).text(); |
| 63 | 59 | |
| 64 | | - if( !statusname || !status || !live ) { |
| | 60 | + if( !statusname || !status ) { |
| 65 | 61 | return; |
| 66 | 62 | } |
| 67 | 63 | |
| — | — | @@ -79,23 +75,17 @@ |
| 80 | 76 | } |
| 81 | 77 | overviewPopupData[i]['path'] = path; |
| 82 | 78 | |
| 83 | | - //overviewPopupData[i]['live'] = live; |
| 84 | 79 | if( !totals[statusname] ) { |
| 85 | 80 | totals[statusname] = 0; |
| 86 | 81 | } |
| 87 | | - //if( !totals[live] ) { |
| 88 | | - // totals[live] = 0; |
| 89 | | - //} |
| 90 | 82 | totals[statusname]++; |
| 91 | | - //totals[live]++; |
| 92 | 83 | |
| 93 | 84 | $(this).attr( 'id', 'TablePager-row-' + rev ); |
| 94 | 85 | |
| 95 | 86 | $td.filter( '.TablePager_col_selectforchange' ) |
| 96 | 87 | .append( $( '<a href="#box-' + i + '" class="overview-backlink">^</a>' ) ); |
| 97 | 88 | |
| 98 | | - var $box = $( '<a href="#TablePager-row-' + rev + '" class="box-status-' + status + '" id="box-' + i + '"> </a>' ); |
| 99 | | - // $box.append( document.createTextNode( live ) ); |
| | 89 | + var $box = $( '<a href="#TablePager-row-' + rev + '" class="mw-codereview-status-' + status + '" id="box-' + i + '"> </a>' ); |
| 100 | 90 | $( '#overviewmap' ).append( $box ); |
| 101 | 91 | }); |
| 102 | 92 | |
| — | — | @@ -131,8 +121,7 @@ |
| 132 | 122 | '</span> (<span id="overviewpop-status">' + overviewPopupData[id]['status'] + '</span>)</div>' + |
| 133 | 123 | '<div>Number of notes: <span id="overviewpop-notes">' + overviewPopupData[id]['notes'] + '</span></div>' + |
| 134 | 124 | '<div>Path: <span id="overviewpop-path">' + overviewPopupData[id]['path'] + '</span></div>' + |
| 135 | | - '<div>Author: r<span id="overviewpop-author">' + overviewPopupData[id]['author'] + '</span></div>' + |
| 136 | | - //'<div>Live: <span id="overviewpop-live">' + overviewPopupData[id]['live'] + '</span></div>' + |
| | 125 | + '<div>Author: <span id="overviewpop-author">' + overviewPopupData[id]['author'] + '</span></div>' + |
| 137 | 126 | '</div>') |
| 138 | 127 | $el.attr( 'title', $popup.html() ); |
| 139 | 128 | $el.data( 'codeTooltip', true ); |
| Property changes on: branches/REL1_18/extensions/CodeReview |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 140 | 129 | Merged /trunk/extensions/CodeReview:r90889-90891,90893 |