https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114557
Revision: 114557 Author: catrope Date: 2012-03-28 16:56:53 +0000 (Wed, 28 Mar 2012) Log Message: ----------- 1.19wmf1: Apply changes from Gerrit: https://gerrit.wikimedia.org/r/#change,3420 https://gerrit.wikimedia.org/r/#change,3421 https://gerrit.wikimedia.org/r/#change,3422 https://gerrit.wikimedia.org/r/#change,3501 https://gerrit.wikimedia.org/r/#change,3817 https://gerrit.wikimedia.org/r/#change,3818 https://gerrit.wikimedia.org/r/#change,3819 Modified Paths: -------------- branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js Modified: branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php =================================================================== --- branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php 2012-03-28 14:20:22 UTC (rev 114556) +++ branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php 2012-03-28 16:56:53 UTC (rev 114557) @@ -397,6 +397,7 @@ $tracking = $request->getVal( 'articleFeedbackv5_click_tracking' ); $bucketId = $request->getVal( 'articleFeedbackv5_bucket_id' ); $ctaId = $request->getVal( 'articleFeedbackv5_cta_id' ); + $flinkId = $request->getVal( 'articleFeedbackv5_f_link_id' ); $location = $request->getVal( 'articleFeedbackv5_location' ); $token = $request->getVal( 'articleFeedbackv5_ct_token' ); $ctEvent = $request->getVal( 'articleFeedbackv5_ct_event' ); @@ -404,6 +405,7 @@ $editPage->editFormTextAfterContent .= Html::hidden( 'articleFeedbackv5_click_tracking', $tracking ); $editPage->editFormTextAfterContent .= Html::hidden( 'articleFeedbackv5_bucket_id', $bucketId ); $editPage->editFormTextAfterContent .= Html::hidden( 'articleFeedbackv5_cta_id', $ctaId ); + $editPage->editFormTextAfterContent .= Html::hidden( 'articleFeedbackv5_f_link_id', $flinkId ); $editPage->editFormTextAfterContent .= Html::hidden( 'articleFeedbackv5_location', $location ); $editPage->editFormTextAfterContent .= Html::hidden( 'articleFeedbackv5_ct_token', $token ); $editPage->editFormTextAfterContent .= Html::hidden( 'articleFeedbackv5_ct_event', $ctEvent ); @@ -469,6 +471,7 @@ $version = $wgArticleFeedbackv5Tracking['version']; $bucketId = $request->getVal( 'articleFeedbackv5_bucket_id' ); $ctaId = $request->getVal( 'articleFeedbackv5_cta_id' ); + $flinkId = $request->getVal( 'articleFeedbackv5_f_link_id' ); $location = $request->getVal( 'articleFeedbackv5_location' ); $token = $request->getVal( 'articleFeedbackv5_ct_token' ); $ctEvent = $request->getVal( 'articleFeedbackv5_ct_event' ); @@ -477,7 +480,7 @@ $trackingId = $ctEvent . '-' . $event; } else { $trackingId = 'ext.articleFeedbackv5@' . $version - . '-option' . $bucketId + . '-option' . $bucketId . $flinkId . '-cta_' . ( isset( $ctas[$ctaId] ) ? $ctas[$ctaId] : 'unknown' ) . '-' . $event . '-' . $location; Modified: branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php =================================================================== --- branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php 2012-03-28 14:20:22 UTC (rev 114556) +++ branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php 2012-03-28 16:56:53 UTC (rev 114557) @@ -90,7 +90,7 @@ // This version number is added to all tracking event names, so that // changes in the software don't corrupt the data being collected. Bump // this when you want to start a new "experiment". - 'version' => 0, + 'version' => 1, // Let users be tracked for a month, and then rebucket them, allowing some // churn. 'expires' => 30, @@ -113,7 +113,7 @@ ), // This version number is added to all tracking event names, so that changes in the software // don't corrupt the data being collected. Bump this when you want to start a new "experiment". - 'version' => 0, + 'version' => 1, // Let users be tracked for a month, and then rebucket them, allowing some churn 'expires' => 30, // Track the event of users being bucketed - so we can be sure the odds @@ -135,7 +135,7 @@ // Bucket settings for links to the feedback form $wgArticleFeedbackv5LinkBuckets = array( // Users can fall into one of several buckets for links. These are: - // -: No link; user must scroll to the bottom of the page + // X: No link; user must scroll to the bottom of the page // A: After the site tagline (below the article title) // B: Below the titlebar on the right // C: Button fixed to right side @@ -145,7 +145,7 @@ // G: Button below logo // H: Link on each section bar 'buckets' => array( - '-' => 33, + 'X' => 33, 'A' => 33, 'B' => 0, 'C' => 0, @@ -158,7 +158,7 @@ // This version number is added to all tracking event names, so that // changes in the software don't corrupt the data being collected. Bump // this when you want to start a new "experiment". - 'version' => 2, + 'version' => 3, // Let users be tracked for a month, and then rebucket them, allowing some // churn. 'expires' => 30, Modified: branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css =================================================================== --- branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css 2012-03-28 14:20:22 UTC (rev 114556) +++ branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css 2012-03-28 16:56:53 UTC (rev 114557) @@ -612,7 +612,7 @@ border: 1px solid #000; width: 518px; height: 42px; - padding: 10px; + padding: 5px; font-size: 1.1em; font-family: sans-serif !important; color: #999; @@ -1100,8 +1100,9 @@ margin: 0; right: 0; bottom: 0; - height: 27px; + height: 30px; width: 141px; + font-size: 1.125em; } .articleFeedbackv5-bottomrighttabbox { position: relative; @@ -1122,18 +1123,19 @@ text-align: center; position: absolute; z-index: 999; + white-space: nowrap; } .articleFeedbackv5-bottomrighttablink:hover { text-decoration: none; } .articleFeedbackv5-bottomrighttablink a { color: #fff; + margin-bottom: -3px; } .articleFeedbackv5-bottomrighttablink a:hover { text-decoration: none; } .articleFeedbackv5-bottomrighttablink.articleFeedbackv5-closeable { - white-space: nowrap; padding-right: 10px; } @@ -1219,15 +1221,6 @@ .articleFeedbackv5-trigger-link-holder.articleFeedbackv5-tipsy-active .articleFeedbackv5-close-trigger-link { visibility: visible; } -.articleFeedbackv5-trigger-link-holder .articleFeedbackv5-close-trigger-link { - /* @embed */ - background: url(images/bg-close-hov.png) no-repeat; - background-size: 16px 16px; - display: inline-block; - width: 16px; - height: 16px; - vertical-align: middle; -} .articleFeedbackv5-trigger-link-holder.articleFeedbackv5-trigger-link-holder-E .articleFeedbackv5-close-trigger-link { /* @embed */ Modified: branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js =================================================================== --- branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js 2012-03-28 14:20:22 UTC (rev 114556) +++ branches/wmf/1.19wmf1/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js 2012-03-28 16:56:53 UTC (rev 114557) @@ -2217,7 +2217,7 @@ closeable: '\ <span>\ <a href="#mw-articleFeedbackv5" id="articleFeedbackv5-sitesublink"></a>\ - <a href="#" class="articleFeedbackv5-close-trigger-link"></a>\ + <a href="#" class="articleFeedbackv5-close-trigger-link">[X]</a>\ </span>\ ' @@ -3069,6 +3069,7 @@ params.articleFeedbackv5_ct_token = $.cookie( 'clicktracking-session' ); params.articleFeedbackv5_bucket_id = $.articleFeedbackv5.bucketId; params.articleFeedbackv5_cta_id = $.articleFeedbackv5.ctaId; + params.articleFeedbackv5_f_link_id = $.articleFeedbackv5.floatingLinkId; params.articleFeedbackv5_link_id = $.articleFeedbackv5.submittedLinkId; params.articleFeedbackv5_location = $.articleFeedbackv5.inDialog ? 'overlay' : 'bottom'; } @@ -3735,7 +3736,7 @@ * @param int linkId the link ID */ $.articleFeedbackv5.setLinkId = function ( linkId ) { - $.articleFeedbackv5.linkId = linkId; + $.articleFeedbackv5.submittedLinkId = linkId; }; // }}} @@ -3824,7 +3825,7 @@ $.articleFeedbackv5.trackClick( $.articleFeedbackv5.bucketName() + '-' + $.articleFeedbackv5.ctaName() + '-close-overlay' ); } - $.articleFeedbackv5.setLinkId( '0' ); + $.articleFeedbackv5.setLinkId( 'X' ); $.articleFeedbackv5.$dialog.find( '.articleFeedbackv5-tooltip' ).hide(); $inner = $.articleFeedbackv5.$dialog.find( '.articleFeedbackv5-ui' ).detach(); $.articleFeedbackv5.$holder.find( '.articleFeedbackv5-buffer' ).append( $inner ); _______________________________________________ MediaWiki-CVS mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
