| Index: trunk/extensions/ArticleFeedbackv5/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.css |
| — | — | @@ -76,8 +76,9 @@ |
| 77 | 77 | border: none; |
| 78 | 78 | border-top: 1px solid gray; |
| 79 | 79 | border-left: 1px solid gray; |
| | 80 | + color: #000; |
| 80 | 81 | background-color: #d0e1f4; |
| 81 | | - min-width: 130px; |
| | 82 | + min-width: 105px; |
| 82 | 83 | right: 0; |
| 83 | 84 | display: block; |
| 84 | 85 | margin: 0; |
| — | — | @@ -86,13 +87,7 @@ |
| 87 | 88 | position: absolute; |
| 88 | 89 | z-index: 999; |
| 89 | 90 | } |
| 90 | | -.articleFeedbackv5-bottomrighttablink a { |
| 91 | | - color: #000; |
| 92 | | -} |
| 93 | | -.articleFeedbackv5-bottomrighttablink a:hover { |
| | 91 | +.articleFeedbackv5-bottomrighttablink:hover { |
| 94 | 92 | text-decoration: none; |
| 95 | 93 | } |
| 96 | | -.articleFeedbackv5-bottomrighttabclose { |
| 97 | | - z-index: 999; |
| 98 | | -} |
| 99 | 94 | |
| Index: trunk/extensions/ArticleFeedbackv5/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.js |
| — | — | @@ -48,27 +48,12 @@ |
| 49 | 49 | $aftDiv.articleFeedbackv5( 'toggleModal', $link ); |
| 50 | 50 | }; |
| 51 | 51 | |
| 52 | | -// Drop link event |
| 53 | | -var dropFeedbackLink = function ( $wrapper, linkId ) { |
| 54 | | - $wrapper.remove(); |
| 55 | | - var expireTime = mw.config.get( 'wgArticleFeedbackv5DropLinkCookieExpires' ); |
| 56 | | - $.cookie( |
| 57 | | - $aftDiv.articleFeedbackv5( 'prefix', 'drop-link' ), |
| 58 | | - 'true', |
| 59 | | - { 'expires': expireTime, 'path': '/' } |
| 60 | | - ); |
| 61 | | - var tracking_id = $aftDiv.articleFeedbackv5( 'bucketName' ) + |
| 62 | | - '-trigger' + linkId + '-drop'; |
| 63 | | - $aftDiv.articleFeedbackv5( 'trackClick', tracking_id ); |
| 64 | | -}; |
| 65 | | - |
| 66 | 52 | // Bucketing |
| 67 | 53 | var linkBucket = function () { |
| 68 | 54 | // Find out which link bucket they go in: |
| 69 | 55 | // 1. Display buckets 0 or 5? Always no link. |
| 70 | 56 | // 2. Requested in query string (debug only) |
| 71 | | - // 3. Turned off via cookie? |
| 72 | | - // 4. Random bucketing |
| | 57 | + // 3. Random bucketing |
| 73 | 58 | var displayBucket = $aftDiv.articleFeedbackv5( 'getBucketId' ); |
| 74 | 59 | if ( '5' == displayBucket || '0' == displayBucket ) { |
| 75 | 60 | return '-'; |
| — | — | @@ -82,9 +67,6 @@ |
| 83 | 68 | if ( $aftDiv.articleFeedbackv5( 'inDebug' ) && requested in knownBuckets ) { |
| 84 | 69 | return requested; |
| 85 | 70 | } |
| 86 | | - if ( $.cookie( $aftDiv.articleFeedbackv5( 'prefix', 'drop-link' ) ) === 'true' ) { |
| 87 | | - return '-'; |
| 88 | | - } |
| 89 | 71 | return mw.user.bucket( 'ext.articleFeedbackv5-links', cfg ); |
| 90 | 72 | }(); |
| 91 | 73 | if ( $aftDiv.articleFeedbackv5( 'inDebug' ) ) { |
| — | — | @@ -94,7 +76,7 @@ |
| 95 | 77 | // A: After the site tagline (below the article title) |
| 96 | 78 | if ( 'A' == linkBucket ) { |
| 97 | 79 | var $sub = $( '<a href="#mw-articleFeedbackv5" id="articleFeedbackv5-sitesublink"></a>' ) |
| 98 | | - .data( 'linkId', linkBucket ) |
| | 80 | + .data( 'linkId', 'A' ) |
| 99 | 81 | .text( mw.msg( 'articlefeedbackv5-sitesub-linktext' ) ) |
| 100 | 82 | .click( function ( e ) { |
| 101 | 83 | e.preventDefault(); |
| — | — | @@ -118,7 +100,7 @@ |
| 119 | 101 | // B: Below the titlebar on the right |
| 120 | 102 | if ( 'B' == linkBucket ) { |
| 121 | 103 | var $tlk = $( '<a href="#mw-articleFeedbackv5" id="articleFeedbackv5-titlebarlink"></a>' ) |
| 122 | | - .data( 'linkId', linkBucket ) |
| | 104 | + .data( 'linkId', 'B' ) |
| 123 | 105 | .text( mw.msg( 'articlefeedbackv5-titlebar-linktext' ) ) |
| 124 | 106 | .click( function ( e ) { |
| 125 | 107 | e.preventDefault(); |
| — | — | @@ -140,7 +122,7 @@ |
| 141 | 123 | </div>\ |
| 142 | 124 | </div>' ); |
| 143 | 125 | $fixedTab.find( '#articleFeedbackv5-fixedtablink' ) |
| 144 | | - .data( 'linkId', linkBucket ) |
| | 126 | + .data( 'linkId', 'C' ) |
| 145 | 127 | .attr( 'title', mw.msg( 'articlefeedbackv5-fixedtab-linktext' ) ) |
| 146 | 128 | .click( function( e ) { |
| 147 | 129 | e.preventDefault(); |
| — | — | @@ -155,24 +137,16 @@ |
| 156 | 138 | var $bottomRightTab = $( '\ |
| 157 | 139 | <div id="articleFeedbackv5-bottomrighttab" class="articleFeedbackv5-bottomrighttab">\ |
| 158 | 140 | <div id="articleFeedbackv5-bottomrighttabbox" class="articleFeedbackv5-bottomrighttabbox">\ |
| 159 | | - <div class="articleFeedbackv5-bottomrighttablink">\ |
| 160 | | - <a href="#mw-articleFeedbackv5" id="articleFeedbackv5-bottomrighttablink"></a>\ |
| 161 | | - <a href="#" id="articleFeedbackv5-bottmrighttabclose" class="articleFeedbackv5-bottomrighttabclose"><span>X</span></a>\ |
| 162 | | - </div>\ |
| | 141 | + <a href="#mw-articleFeedbackv5" id="articleFeedbackv5-bottomrighttablink" class="articleFeedbackv5-bottomrighttablink"></a>\ |
| 163 | 142 | </div>\ |
| 164 | 143 | </div>' ); |
| 165 | 144 | $bottomRightTab.find( '#articleFeedbackv5-bottomrighttablink' ) |
| 166 | | - .data( 'linkId', linkBucket ) |
| | 145 | + .data( 'linkId', 'D' ) |
| 167 | 146 | .text( mw.msg( 'articlefeedbackv5-bottomrighttab-linktext' ) ) |
| 168 | 147 | .click( function( e ) { |
| 169 | 148 | e.preventDefault(); |
| 170 | 149 | clickFeedbackLink( $( e.target ) ); |
| 171 | 150 | } ); |
| 172 | | - $bottomRightTab.find( '#articleFeedbackv5-bottmrighttabclose' ) |
| 173 | | - .click( function( e ) { |
| 174 | | - e.preventDefault(); |
| 175 | | - dropFeedbackLink( $( e.target ).parents( '#articleFeedbackv5-bottomrighttab' ), linkBucket ); |
| 176 | | - } ); |
| 177 | 151 | $bottomRightTab.insertBefore( $aftDiv ); |
| 178 | 152 | $aftDiv.articleFeedbackv5( 'addToRemovalQueue', $bottomRightTab ); |
| 179 | 153 | } |
| — | — | @@ -191,7 +165,7 @@ |
| 192 | 166 | var $wrp = $( '<span class="articleFeedbackv5-sectionlink-wrap"></span>' ) |
| 193 | 167 | .html( ' [<a href="#mw-articlefeedbackv5" class="articleFeedbackv5-sectionlink"></a>]' ); |
| 194 | 168 | $wrp.find( 'a.articleFeedbackv5-sectionlink' ) |
| 195 | | - .data( 'linkId', linkBucket ) |
| | 169 | + .data( 'linkId', 'H' ) |
| 196 | 170 | .text( mw.msg( 'articlefeedbackv5-section-linktext' ) ) |
| 197 | 171 | .click( function ( e ) { |
| 198 | 172 | e.preventDefault(); |
| Index: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php |
| — | — | @@ -208,14 +208,6 @@ |
| 209 | 209 | $wgArticleFeedbackv5AbuseFiltering = false; |
| 210 | 210 | |
| 211 | 211 | /** |
| 212 | | - * If someone clicks the close button on a the floating link, wait this long |
| 213 | | - * (in days) before showing it to them again. |
| 214 | | - * |
| 215 | | - * @var int |
| 216 | | - */ |
| 217 | | -$wgArticleFeedbackv5DropLinkCookieExpires = 1; |
| 218 | | - |
| 219 | | -/** |
| 220 | 212 | * The full URL for a discussion page about the Article Feedback Dashboard |
| 221 | 213 | * |
| 222 | 214 | * Since the dashboard is powered by a SpecialPage, we cannot rel on the built-in |
| — | — | @@ -328,4 +320,4 @@ |
| 329 | 321 | $wgLogActions['articlefeedbackv5/request'] = 'articlefeedbackv5-log-request'; |
| 330 | 322 | $wgLogActions['articlefeedbackv5/unrequest'] = 'articlefeedbackv5-log-unrequest'; |
| 331 | 323 | $wgLogActions['articlefeedbackv5/flag'] = 'articlefeedbackv5-log-flag'; |
| 332 | | -$wgLogActions['articlefeedbackv5/unflag'] = 'articlefeedbackv5-log-unflag'; |
| | 324 | +$wgLogActions['articlefeedbackv5/unflag'] = 'articlefeedbackv5-log-unflag'; |
| \ No newline at end of file |
| Index: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php |
| — | — | @@ -342,7 +342,6 @@ |
| 343 | 343 | $wgArticleFeedbackv5Options, |
| 344 | 344 | $wgArticleFeedbackv5LinkBuckets, |
| 345 | 345 | $wgArticleFeedbackv5Namespaces, |
| 346 | | - $wgArticleFeedbackv5DropLinkCookieExpires, |
| 347 | 346 | $wgArticleFeedbackv5LearnToEdit, |
| 348 | 347 | $wgArticleFeedbackv5SurveyUrls; |
| 349 | 348 | $vars['wgArticleFeedbackv5SMaxage'] = $wgArticleFeedbackv5SMaxage; |
| — | — | @@ -357,7 +356,6 @@ |
| 358 | 357 | $vars['wgArticleFeedbackv5Options'] = $wgArticleFeedbackv5Options; |
| 359 | 358 | $vars['wgArticleFeedbackv5LinkBuckets'] = $wgArticleFeedbackv5LinkBuckets; |
| 360 | 359 | $vars['wgArticleFeedbackv5Namespaces'] = $wgArticleFeedbackv5Namespaces; |
| 361 | | - $vars['wgArticleFeedbackv5DropLinkCookieExpires'] = $wgArticleFeedbackv5DropLinkCookieExpires; |
| 362 | 360 | $vars['wgArticleFeedbackv5LearnToEdit'] = $wgArticleFeedbackv5LearnToEdit; |
| 363 | 361 | $vars['wgArticleFeedbackv5WhatsThisPage'] = wfMsgForContent( 'articlefeedbackv5-bucket5-form-panel-explanation-link' ); |
| 364 | 362 | $vars['wgArticleFeedbackv5TermsPage'] = wfMsgForContent( 'articlefeedbackv5-transparency-terms-url' ); |