https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113860
Revision: 113860
Author: emsmith
Date: 2012-03-14 21:31:59 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
Reverse merged revision(s) 111548 from
trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php: Remove the floating
tab close button (Request of Fabrice)
Modified Paths:
--------------
trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php
trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php
trunk/extensions/ArticleFeedbackv5/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.css
trunk/extensions/ArticleFeedbackv5/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.js
Modified: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php
2012-03-14 21:30:26 UTC (rev 113859)
+++ trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php
2012-03-14 21:31:59 UTC (rev 113860)
@@ -342,7 +342,6 @@
$wgArticleFeedbackv5Options,
$wgArticleFeedbackv5LinkBuckets,
$wgArticleFeedbackv5Namespaces,
- $wgArticleFeedbackv5DropLinkCookieExpires,
$wgArticleFeedbackv5LearnToEdit,
$wgArticleFeedbackv5SurveyUrls;
$vars['wgArticleFeedbackv5SMaxage'] =
$wgArticleFeedbackv5SMaxage;
@@ -357,7 +356,6 @@
$vars['wgArticleFeedbackv5Options'] =
$wgArticleFeedbackv5Options;
$vars['wgArticleFeedbackv5LinkBuckets'] =
$wgArticleFeedbackv5LinkBuckets;
$vars['wgArticleFeedbackv5Namespaces'] =
$wgArticleFeedbackv5Namespaces;
- $vars['wgArticleFeedbackv5DropLinkCookieExpires'] =
$wgArticleFeedbackv5DropLinkCookieExpires;
$vars['wgArticleFeedbackv5LearnToEdit'] =
$wgArticleFeedbackv5LearnToEdit;
$vars['wgArticleFeedbackv5WhatsThisPage'] = wfMsgForContent(
'articlefeedbackv5-bucket5-form-panel-explanation-link' );
$vars['wgArticleFeedbackv5TermsPage'] = wfMsgForContent(
'articlefeedbackv5-transparency-terms-url' );
Modified: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php 2012-03-14
21:30:26 UTC (rev 113859)
+++ trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php 2012-03-14
21:31:59 UTC (rev 113860)
@@ -208,14 +208,6 @@
$wgArticleFeedbackv5AbuseFiltering = false;
/**
- * If someone clicks the close button on a the floating link, wait this long
- * (in days) before showing it to them again.
- *
- * @var int
- */
-$wgArticleFeedbackv5DropLinkCookieExpires = 1;
-
-/**
* The full URL for a discussion page about the Article Feedback Dashboard
*
* Since the dashboard is powered by a SpecialPage, we cannot rel on the
built-in
@@ -328,4 +320,4 @@
$wgLogActions['articlefeedbackv5/request'] = 'articlefeedbackv5-log-request';
$wgLogActions['articlefeedbackv5/unrequest'] =
'articlefeedbackv5-log-unrequest';
$wgLogActions['articlefeedbackv5/flag'] = 'articlefeedbackv5-log-flag';
-$wgLogActions['articlefeedbackv5/unflag'] = 'articlefeedbackv5-log-unflag';
+$wgLogActions['articlefeedbackv5/unflag'] = 'articlefeedbackv5-log-unflag';
\ No newline at end of file
Modified:
trunk/extensions/ArticleFeedbackv5/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.css
===================================================================
---
trunk/extensions/ArticleFeedbackv5/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.css
2012-03-14 21:30:26 UTC (rev 113859)
+++
trunk/extensions/ArticleFeedbackv5/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.css
2012-03-14 21:31:59 UTC (rev 113860)
@@ -76,8 +76,9 @@
border: none;
border-top: 1px solid gray;
border-left: 1px solid gray;
+ color: #000;
background-color: #d0e1f4;
- min-width: 130px;
+ min-width: 105px;
right: 0;
display: block;
margin: 0;
@@ -86,13 +87,7 @@
position: absolute;
z-index: 999;
}
-.articleFeedbackv5-bottomrighttablink a {
- color: #000;
-}
-.articleFeedbackv5-bottomrighttablink a:hover {
+.articleFeedbackv5-bottomrighttablink:hover {
text-decoration: none;
}
-.articleFeedbackv5-bottomrighttabclose {
- z-index: 999;
-}
Modified:
trunk/extensions/ArticleFeedbackv5/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.js
===================================================================
---
trunk/extensions/ArticleFeedbackv5/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.js
2012-03-14 21:30:26 UTC (rev 113859)
+++
trunk/extensions/ArticleFeedbackv5/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.js
2012-03-14 21:31:59 UTC (rev 113860)
@@ -48,27 +48,12 @@
$aftDiv.articleFeedbackv5( 'toggleModal', $link );
};
-// Drop link event
-var dropFeedbackLink = function ( $wrapper, linkId ) {
- $wrapper.remove();
- var expireTime = mw.config.get(
'wgArticleFeedbackv5DropLinkCookieExpires' );
- $.cookie(
- $aftDiv.articleFeedbackv5( 'prefix', 'drop-link' ),
- 'true',
- { 'expires': expireTime, 'path': '/' }
- );
- var tracking_id = $aftDiv.articleFeedbackv5( 'bucketName' ) +
- '-trigger' + linkId + '-drop';
- $aftDiv.articleFeedbackv5( 'trackClick', tracking_id );
-};
-
// Bucketing
var linkBucket = function () {
// Find out which link bucket they go in:
// 1. Display buckets 0 or 5? Always no link.
// 2. Requested in query string (debug only)
- // 3. Turned off via cookie?
- // 4. Random bucketing
+ // 3. Random bucketing
var displayBucket = $aftDiv.articleFeedbackv5( 'getBucketId' );
if ( '5' == displayBucket || '0' == displayBucket ) {
return '-';
@@ -82,9 +67,6 @@
if ( $aftDiv.articleFeedbackv5( 'inDebug' ) && requested in
knownBuckets ) {
return requested;
}
- if ( $.cookie( $aftDiv.articleFeedbackv5( 'prefix', 'drop-link' ) ) ===
'true' ) {
- return '-';
- }
return mw.user.bucket( 'ext.articleFeedbackv5-links', cfg );
}();
if ( $aftDiv.articleFeedbackv5( 'inDebug' ) ) {
@@ -94,7 +76,7 @@
// A: After the site tagline (below the article title)
if ( 'A' == linkBucket ) {
var $sub = $( '<a href="#mw-articleFeedbackv5"
id="articleFeedbackv5-sitesublink"></a>' )
- .data( 'linkId', linkBucket )
+ .data( 'linkId', 'A' )
.text( mw.msg( 'articlefeedbackv5-sitesub-linktext' ) )
.click( function ( e ) {
e.preventDefault();
@@ -118,7 +100,7 @@
// B: Below the titlebar on the right
if ( 'B' == linkBucket ) {
var $tlk = $( '<a href="#mw-articleFeedbackv5"
id="articleFeedbackv5-titlebarlink"></a>' )
- .data( 'linkId', linkBucket )
+ .data( 'linkId', 'B' )
.text( mw.msg( 'articlefeedbackv5-titlebar-linktext' ) )
.click( function ( e ) {
e.preventDefault();
@@ -140,7 +122,7 @@
</div>\
</div>' );
$fixedTab.find( '#articleFeedbackv5-fixedtablink' )
- .data( 'linkId', linkBucket )
+ .data( 'linkId', 'C' )
.attr( 'title', mw.msg( 'articlefeedbackv5-fixedtab-linktext' )
)
.click( function( e ) {
e.preventDefault();
@@ -155,24 +137,16 @@
var $bottomRightTab = $( '\
<div id="articleFeedbackv5-bottomrighttab"
class="articleFeedbackv5-bottomrighttab">\
<div id="articleFeedbackv5-bottomrighttabbox"
class="articleFeedbackv5-bottomrighttabbox">\
- <div
class="articleFeedbackv5-bottomrighttablink">\
- <a href="#mw-articleFeedbackv5"
id="articleFeedbackv5-bottomrighttablink"></a>\
- <a href="#"
id="articleFeedbackv5-bottmrighttabclose"
class="articleFeedbackv5-bottomrighttabclose"><span>X</span></a>\
- </div>\
+ <a href="#mw-articleFeedbackv5"
id="articleFeedbackv5-bottomrighttablink"
class="articleFeedbackv5-bottomrighttablink"></a>\
</div>\
</div>' );
$bottomRightTab.find( '#articleFeedbackv5-bottomrighttablink' )
- .data( 'linkId', linkBucket )
+ .data( 'linkId', 'D' )
.text( mw.msg( 'articlefeedbackv5-bottomrighttab-linktext' ) )
.click( function( e ) {
e.preventDefault();
clickFeedbackLink( $( e.target ) );
} );
- $bottomRightTab.find( '#articleFeedbackv5-bottmrighttabclose' )
- .click( function( e ) {
- e.preventDefault();
- dropFeedbackLink( $( e.target ).parents(
'#articleFeedbackv5-bottomrighttab' ), linkBucket );
- } );
$bottomRightTab.insertBefore( $aftDiv );
$aftDiv.articleFeedbackv5( 'addToRemovalQueue', $bottomRightTab );
}
@@ -191,7 +165,7 @@
var $wrp = $( '<span
class="articleFeedbackv5-sectionlink-wrap"></span>' )
.html( ' [<a href="#mw-articlefeedbackv5"
class="articleFeedbackv5-sectionlink"></a>]' );
$wrp.find( 'a.articleFeedbackv5-sectionlink' )
- .data( 'linkId', linkBucket )
+ .data( 'linkId', 'H' )
.text( mw.msg( 'articlefeedbackv5-section-linktext' ) )
.click( function ( e ) {
e.preventDefault();
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
