https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113916
Revision: 113916
Author: yonishostak
Date: 2012-03-15 14:22:25 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
AFTv5: sync commit, readded i18n msgs etc.
Modified Paths:
--------------
trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php
trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php
trunk/extensions/ArticleFeedbackv5/bin/find_needed_i18n_keys.php
trunk/extensions/ArticleFeedbackv5/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.js
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
Modified: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php
2012-03-15 14:19:58 UTC (rev 113915)
+++ trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php
2012-03-15 14:22:25 UTC (rev 113916)
@@ -146,6 +146,14 @@
'articlefeedbackv5-transparency-terms',
'articlefeedbackv5-transparency-terms-linktext',
'parentheses',
+ 'articlefeedbackv5-link-close-caption',
+ 'articlefeedbackv5-link-close-text1',
+ 'articlefeedbackv5-link-close-linktext',
+ 'articlefeedbackv5-link-close-linkurl',
+ 'articlefeedbackv5-link-close-text2',
+ 'articlefeedbackv5-link-cllse-text3',
+ 'articlefeedbackv5-link-close-submit',
+ 'articlefeedbackv5-link-close-cancel',
),
'dependencies' => array(
'jquery.appear',
Modified: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
2012-03-15 14:19:58 UTC (rev 113915)
+++ trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
2012-03-15 14:22:25 UTC (rev 113916)
@@ -419,6 +419,16 @@
testing on the English Encyclopedia and that the feedback page has not been
publicized to the community for this testing period.',
+ /* Front-end: feedback link close button */
+ 'articlefeedbackv5-link-close-caption' => 'Remove Article Feedback?',
+ 'articlefeedbackv5-link-close-text1' => 'To remove this widget, go to',
+ 'articlefeedbackv5-link-close-linktext' => '"My Preferences >
Appearances"',
+ 'articlefeedbackv5-link-close-linkurl' => '#',
+ 'articlefeedbackv5-link-close-text2' => 'then check this box:',
+ 'articlefeedbackv5-link-cllse-text3' => '"Don\'t show the Article
Feedback widget."',
+ 'articlefeedbackv5-link-close-submit' => 'Remove',
+ 'articlefeedbackv5-link-close-cancel' => 'Cancel',
+
);
/** Message documentation (Message documentation)
@@ -692,6 +702,17 @@
* <code>$2</code> – Page name of item with feedback requiring oversight.
* <code>$3</code> – URL directly to feedback location
* <code>$4</code> – The help link.',
+
+ /* Front-end: feedback link close button */
+ 'articlefeedbackv5-link-close-caption' => 'Remove article feedback
tipsy - caption',
+ 'articlefeedbackv5-link-close-text1' => 'Remove article feedback tipsy
- text line 1',
+ 'articlefeedbackv5-link-close-linktext' => 'Remove article feedback
tipsy - text for close link',
+ 'articlefeedbackv5-link-close-linkurl' => 'Remove article feedback
tipsy - URL for close link (also used for confirm button link URL)',
+ 'articlefeedbackv5-link-close-text2' => 'Remove article feedback tipsy
- text line 2',
+ 'articlefeedbackv5-link-cllse-text3' => 'Remove article feedback tipsy
- text line 3',
+ 'articlefeedbackv5-link-close-submit' => 'Remove article feedback tipsy
- confirm button text',
+ 'articlefeedbackv5-link-close-cancel' => 'Remove article feedback tipsy
- cancel link text',
+
);
/** Afrikaans (Afrikaans)
Modified: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php 2012-03-15
14:19:58 UTC (rev 113915)
+++ trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php 2012-03-15
14:22:25 UTC (rev 113916)
@@ -81,9 +81,9 @@
// placed in a bucket.
'buckets' => array(
'zero' => 0,
- 'one' => 34,
- 'two' => 33,
- 'three' => 33,
+ 'one' => 100,
+ 'two' => 0,
+ 'three' => 0,
'four' => 0,
'five' => 0,
),
@@ -140,7 +140,7 @@
// B: Below the titlebar on the right
// C: Button fixed to right side
// D: Button fixed to bottom right
- // E: Button fixed to bottom center
+ // E: Button fixed to bottom right, design D2
// F: Button fixed to left side
// G: Button below logo
// H: Link on each section bar
@@ -149,8 +149,8 @@
'A' => 0,
'B' => 0,
'C' => 0,
- 'D' => 100,
- 'E' => 0,
+ 'D' => 0,
+ 'E' => 100,
'F' => 0,
'G' => 0,
'H' => 0,
Modified: trunk/extensions/ArticleFeedbackv5/bin/find_needed_i18n_keys.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/bin/find_needed_i18n_keys.php
2012-03-15 14:19:58 UTC (rev 113915)
+++ trunk/extensions/ArticleFeedbackv5/bin/find_needed_i18n_keys.php
2012-03-15 14:22:25 UTC (rev 113916)
@@ -8,11 +8,8 @@
include dirname(__FILE__) . '/../ArticleFeedbackv5.i18n.php';
-$en_keys = array_keys($messages['en']);
-$qqq_keys = array_keys($messages['qqq']);
-
-$needed_keys = array_diff($en_keys, $qqq_keys);
-
-foreach($needed_keys as $name) {
- echo "$name\n";
-}
\ No newline at end of file
+foreach( array_keys($messages['en']) as $needle ) {
+ if( !array_key_exists($needle, $messages['qqq']) ) {
+ echo "'$needle' => '',\n";
+ }
+}
Modified:
trunk/extensions/ArticleFeedbackv5/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.js
===================================================================
---
trunk/extensions/ArticleFeedbackv5/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.js
2012-03-15 14:19:58 UTC (rev 113915)
+++
trunk/extensions/ArticleFeedbackv5/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.js
2012-03-15 14:22:25 UTC (rev 113916)
@@ -6,6 +6,23 @@
/* Load at the bottom of the article */
var $aftDiv = $( '<div id="mw-articlefeedbackv5"></div>' ).articleFeedbackv5();
+var closeAftTipsyHtml = '\
+ <div class="articlefeedbackv5-flyover-header">\
+ <h3 id="articlefeedbackv5-noteflyover-caption">' + mw.msg(
'articlefeedbackv5-link-close-caption' ) + '</h3>\
+ <a id="articlefeedbackv5-noteflyover-close" href="#"></a>\
+ </div>\
+ <div class="articlefeedbackv5-form-flyover">\
+ <div>' + mw.msg( 'articlefeedbackv5-link-close-text1' ) +
'</div>\
+ <a href="' + mw.msg( 'articlefeedbackv5-link-close-linkurl' ) +
'">' + mw.msg( 'articlefeedbackv5-link-close-linktext' ) + '</a>\
+ <div>' + mw.msg( 'articlefeedbackv5-link-close-text2' ) +
'</div>\
+ <div>' + mw.msg( 'articlefeedbackv5-link-close-text3' ) +
'</div>\
+ <div class="articlefeedbackv5-flyover-footer">\
+ <a id="articlefeedbackv5-noteflyover-submit"
class="articlefeedbackv5-flyover-button" href="#">CLOSE</a>\
+ <a id="articlefeedbackv5-noteflyover-cancel"
href="#">CANCEL</a>\
+ <a class="articlefeedbackv5-flyover-help"
id="articlefeedbackv5-noteflyover-help" href="#">[?]</a>\
+ </div>\
+ </div>';
+
// Put on bottom of article before #catlinks (if it exists)
// Except in legacy skins, which have #catlinks above the article but inside
content-div.
var legacyskins = [ 'standard', 'cologneblue', 'nostalgia' ];
@@ -148,11 +165,56 @@
clickFeedbackLink( $( e.target ) );
} );
$bottomRightTab.insertBefore( $aftDiv );
+
$aftDiv.articleFeedbackv5( 'addToRemovalQueue', $bottomRightTab );
}
-// E: Button fixed to bottom center
-// NOT IMPLEMENTED
+// E: Same as D, with other colors
+if ( 'E' == linkBucket ) {
+ 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">X</a>\
+ </div>\
+ </div>\
+ </div>' );
+ $bottomRightTab.find( '#articleFeedbackv5-bottomrighttablink' )
+ .data( 'linkId', linkBucket )
+ .text( mw.msg( 'articlefeedbackv5-bottomrighttab-linktext' ) )
+ .click( function( e ) {
+ e.preventDefault();
+ clickFeedbackLink( $( e.target ) );
+ } );
+ $bottomRightTab.find( '#articleFeedbackv5-bottmrighttabclose' )
+ .tipsy( {
+ delayIn: 0, // delay before
showing tooltip (ms)
+ delayOut: 0, // delay before hiding
tooltip (ms)
+ fade: false, // fade tooltips in/out?
+ fallback: '', // fallback text to use
when no tooltip text
+ gravity: 'se', // gravity
+ html: true, // is tooltip
content HTML?
+ live: false, // use live event
support?
+ offset: 10, // pixel offset
of tooltip from element
+ opacity: 1.0, // opacity of tooltip
+ trigger: 'manual', // how tooltip is
triggered - hover | focus | manual
+ title: function() {
+ return closeAftTipsyHtml;
+ }
+ } );
+ $bottomRightTab.find( '#articleFeedbackv5-bottmrighttabclose' )
+ .click( function( e ) {
+ e.preventDefault();
+ //dropFeedbackLink( $( e.target ).parents(
'#articleFeedbackv5-bottomrighttab' ), linkBucket );
+ $( e.target ).tipsy( 'show' );
+ } );
+ $bottomRightTab.insertBefore( $aftDiv );
+
+ // Setup close tipsy
+
+ $aftDiv.articleFeedbackv5( 'addToRemovalQueue', $bottomRightTab );
+}
// F: Button fixed to left side
// NOT IMPLEMENTED
Modified:
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css
===================================================================
---
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css
2012-03-15 14:19:58 UTC (rev 113915)
+++
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css
2012-03-15 14:22:25 UTC (rev 113916)
@@ -1034,3 +1034,61 @@
border-radius: 0;
}
+/* Tipsy */
+tipsy {
+ padding: 5px 5px 11px 5px;
+}
+.tipsy-inner {
+ padding: 0;
+ border-color: #888;
+ max-width: 40em;
+ -moz-box-shadow: 2px 2px 1px #999;
+ -webkit-box-shadow: 2px 2px 1px #999;
+ box-shadow: 2px 2px 1px #999;
+ margin-bottom: 5px;
+ font-size: 0.9em;
+}
+.tipsy-se .tipsy-arrow {
+ /* @embed */
+ background-image: url(images/tipsy-flyover.png);
+ width: 23px;
+ height: 11px;
+ margin-top: -11px;
+}
+.articlefeedbackv5-flyover-header {
+ background-color: #d2e5f7;
+ padding: 5px 10px 8px 10px;
+ -moz-border-radius: 3px 3px 0 0;
+ -webkit-border-radius: 3px 3px 0 0;
+ border-radius: 3px 3px 0 0;
+ -khtml-border-radius: 3px 3px 0 0;
+ width: 200px;
+}
+.articlefeedbackv5-flyover-header h3 {
+ font-size: 1.0em;
+}
+.articlefeedbackv5-flyover-footer {
+ padding: 10px 10px 15px 10px;
+ width: 100%;
+}
+#articlefeedbackv5-noteflyover-close {
+ display: block;
+ position: absolute;
+ top: 0;
+ right: 15px;
+ margin-top: 15px;
+ width: 16px;
+ height: 16px;
+ /* @embed */
+ background-image: url(images/bg-close-off.png);
+ background-repeat: no-repeat;
+ background-position: left top;
+ background-size: 16px 16px;
+}
+#articlefeedbackv5-noteflyover-close:hover {
+ /* @embed */
+ background-image: url(images/bg-close-hov.png);
+}
+div.articlefeedbackv5-form-flyover {
+ padding: 10px 20px 10px 10px;
+}
Modified:
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
===================================================================
---
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
2012-03-15 14:19:58 UTC (rev 113915)
+++
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
2012-03-15 14:22:25 UTC (rev 113916)
@@ -200,7 +200,7 @@
',
clear: '<div class="clear"></div>'
-
+
};
// }}}
@@ -2177,7 +2177,7 @@
// Track init at 1%
if ( Math.random() * 100 < 1 ) {
$.articleFeedbackv5.trackClick(
$.articleFeedbackv5.bucketName() + '-init' );
- }
+ }
};
// }}}
Modified:
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
===================================================================
---
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
2012-03-15 14:19:58 UTC (rev 113915)
+++
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
2012-03-15 14:22:25 UTC (rev 113916)
@@ -501,19 +501,22 @@
// }}}
// {{{ maskPost
$.articleFeedbackv5special.maskPost = function( $row, $type ) {
- var $screen = $( $.articleFeedbackv5special.maskHtmlTemplate )
- .addClass( 'articleFeedbackv5-post-screen' )
+ var $screen = $row.find( '.articleFeedbackv5-post-screen' );
+ if( 0 == $screen.length ) {
+ $screen = $(
$.articleFeedbackv5special.maskHtmlTemplate );
+ $screen.find( '.articleFeedbackv5-mask-text' )
+ .text( mw.msg( 'articlefeedbackv5-mask-text' )
);
+ $screen.find( '.articleFeedbackv5-mask-postid' )
+ .text( mw.msg(
'articlefeedbackv5-mask-postnumber', $row.attr( 'rel' ) ) );
+ $row.prepend( $screen );
+ }
+ $screen
.height( $row.innerHeight() )
.click( function( e ) {
$( e.target ).closest(
'.articleFeedbackv5-post-screen' ).remove();
} );
$screen.find( '.articleFeedbackv5-mask-text-wrapper')
.css( 'top', $screen.innerHeight() / 2 - 12 );
- $screen.find( '.articleFeedbackv5-mask-text' )
- .text( mw.msg( 'articlefeedbackv5-mask-text-' + $type )
);
- $screen.find( '.articleFeedbackv5-mask-postid' )
- .text( mw.msg( 'articlefeedbackv5-mask-postnumber',
$row.attr( 'rel' ) ) );
- $row.prepend( $screen );
}
// }}}
// {{{ markDeleted
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
