r105021 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r105020‎ | r105021 | r105022 >
Date:22:59, 2 December 2011
Author:seanheavey
Status:resolved (Comments)
Tags:
Comment:
changes for trac #18, #28 and partial work on #20
Modified paths:
  • /trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/images/star-new-down.png (modified) (history)
  • /trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/images/star-new-hover.png (modified) (history)
  • /trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/images/star-new.png (modified) (history)
  • /trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css (modified) (history)
  • /trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js (modified) (history)

Diff [purge]

Index: trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/images/star-new-down.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/images/star-new-hover.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/images/star-new.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css
——@@ -201,7 +201,7 @@
202202
203203 #mw-articlefeedbackv5 .articleFeedbackv5-rating-label.articleFeedbackv5-rating-label-full {
204204 /* @embed */
205 - background-image: url(images/star-full.png) !important;
 205+ background-image: url(images/star-full.png);
206206 }
207207
208208 #mw-articlefeedbackv5 .articleFeedbackv5-expired .articleFeedbackv5-rating-label.articleFeedbackv5-rating-label-full {
——@@ -446,7 +446,7 @@
447447 .articleFeedbackv5-tooltip {
448448 position: absolute;
449449 z-index: 15;
450 - top: -185px;
 450+ top: -165px;
451451 right: -105px;
452452 font-size: 12px;
453453 width: 234px;
——@@ -464,6 +464,20 @@
465465 margin: 0;
466466 }
467467
 468+.articleFeedbackv5-tooltip .tooltip-repeat h3 {
 469+ float: left;
 470+}
 471+
 472+.articleFeedbackv5-tooltip .tooltip-repeat .articleFeedbackv5-tooltip-close {
 473+ float: right;
 474+ cursor: pointer;
 475+ margin: -5px -5px 0 0;
 476+}
 477+
 478+.articleFeedbackv5-tooltip .tooltip-repeat .articleFeedbackv5-tooltip-close:hover {
 479+ text-decoration: underline;
 480+}
 481+
468482 .articleFeedbackv5-tooltip .tooltip-bottom {
469483 background: url(images/bg-tooltip-bottom.png);
470484 height: 26px;
——@@ -512,7 +526,7 @@
513527 .articleFeedbackv5-ui .buttons .articleFeedbackv5-button-placeholder {
514528 display: inline-block;
515529 height: 19px;
516 - line-height: 19px;
 530+ line-height: 22px;
517531 font-size: .9em;
518532 min-width: 34px;
519533 padding: 0 8px;
——@@ -569,13 +583,14 @@
570584 font-size: 0.75em;
571585 }
572586
573 -.articleFeedbackv5-ui .articleFeedbackv5-submit {
 587+.articleFeedbackv5-ui .articleFeedbackv5-submit,
 588+.articleFeedbackv5-ui .articleFeedbackv5-edit-cta-link {
574589 float: left;
575 - height: 30px;
 590+ height: 29px;
576591 width: auto;
577592 text-align: center;
578593 padding: 0 6px;
579 - background: url(images/bg-submit-disable.png) repeat-x !important;
 594+ background: url(images/bg-submit.png) repeat-x !important;
580595 margin: 10px 30px 0 0 !important;
581596 border: none !important;
582597 -moz-border-radius: 3px;
——@@ -587,7 +602,12 @@
588603 box-shadow: -2px 2px 1px #999;
589604 }
590605
591 -.articleFeedbackv5-ui .articleFeedbackv5-submit span {
 606+.articleFeedbackv5-ui .articleFeedbackv5-submit {
 607+ float: left;
 608+}
 609+
 610+.articleFeedbackv5-ui .articleFeedbackv5-submit span,
 611+.articleFeedbackv5-ui .articleFeedbackv5-edit-cta-link span{
592612 font-size: 14px;
593613 font-weight: bold;
594614 display: inline-block;
——@@ -596,6 +616,7 @@
597617 color: #fff;
598618 /*text-shadow: 1px 1px 1px #000;*/
599619 padding: 1px 30px 0 0;
 620+ margin: 5px 0 0;
600621 background: url(images/bg-submit-icon.png) right center no-repeat;
601622 }
602623
——@@ -728,7 +749,7 @@
729750 }
730751
731752 .articleFeedbackv5-dialog.ui-dialog .articleFeedbackv5-tooltip-trigger {
732 - margin-right: 20px;
 753+ margin-right: 10px;
733754 }
734755
735756 .articleFeedbackv5-dialog.ui-dialog .articleFeedbackv5-tooltip {
——@@ -745,11 +766,12 @@
746767 border: none !important;
747768 }
748769 .ui-dialog .ui-dialog-titlebar-close {
749 -position: absolute;
750 -right: .75em;
751 -top: 50%;
752 -width: 19px;
753 -margin: -10px 0 0 0;
 770+ float: right;
 771+position: static !important;
 772+right: auto !important;
 773+top: auto !important;
 774+width: 23px !important;
 775+margin: 0 !important;
754776 padding: 0 !important;
755777 height: auto !important;
756778 }
Index: trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
——@@ -164,9 +164,10 @@
165165 <div class="articleFeedbackv5-tooltip">\
166166 <div class="tooltip-top"></div>\
167167 <div class="tooltip-repeat">\
168 - <h3><html:msg key="help-tooltip-title" /></h3>\
 168+ <h3><html:msg key="help-tooltip-title" /></h3><span class="articleFeedbackv5-tooltip-close">X</span>\
 169+ <div class="clear"></div>\
169170 <p><html:msg key="help-tooltip-info" /></p>\
170 - <p><a target="_blank" href="http://www.mediawiki.org/wiki/Article_feedback/Version_5"><html:msg key="help-tooltip-linktext" />&nbsp;&gt;&gt;</a></p>\
 171+ <p><a target="_blank" href="http://en.wikipedia.org/wiki/Wikipedia:Article_Feedback_Tool/Version_5"><html:msg key="help-tooltip-linktext" />&nbsp;&gt;&gt;</a></p>\
171172 </div>\
172173 <div class="tooltip-bottom"></div>\
173174 </div>\
——@@ -1784,9 +1785,17 @@
17851786 * The template for the whole block
17861787 */
17871788 block: '\
1788 - <div>\
1789 - <p>Eventually this will have a pretty button and some nice messages. For now, though...</p>\
1790 - <p><a href="" class="articleFeedbackv5-edit-cta-link">EDIT THIS PAGE</a></p>\
 1789+ <div class="articleFeedbackv5-confirmation-panel>\
 1790+ <div class="articleFeedbackv5-panel-leftContent">\
 1791+ <div class="articleFeedbackv5-confirmation-text">\
 1792+ <span class=articleFeedbackv5-confirmation-thanks">[Thanks!]</span><span class="articleFeedbackv5-confirmation-follow-up">[Your feedback has been saved.]</span>\
 1793+ </div>\
 1794+ <h3 class="articleFeedbackv5-confirmation-title">Did you know that you can edit this page?</h3>\
 1795+ <p class="articleFeedbackv5-confirmation-wikipediaWorks">[Wikipedia works because anyone can edit its articles. Go ahead, give it a try. Be bold!]</p>\
 1796+ <p class="articleFeedbackv5-confirmation-learnHow"><a target="_blank" href="#">[Learn how to edit] &raquo;</a></p>\
 1797+ </div>\
 1798+ <a href="&amp;action=edit" class="articleFeedbackv5-edit-cta-link"><span class="ui-button-text">[Edit this page]</span></a>\
 1799+ <div class="clear"></div>\
17911800 </div>\
17921801 '
17931802
——@@ -2070,6 +2079,9 @@
20712080 $wrapper.find( '.articleFeedbackv5-tooltip-trigger' ).click( function () {
20722081 $.articleFeedbackv5.$holder.find( '.articleFeedbackv5-tooltip' ).toggle();
20732082 } );
 2083+ $wrapper.find( '.articleFeedbackv5-tooltip-close' ).click( function () {
 2084+ $.articleFeedbackv5.$holder.find( '.articleFeedbackv5-tooltip' ).toggle();
 2085+ } );
20742086
20752087 // Localize
20762088 $wrapper.localize( { 'prefix': 'articlefeedbackv5-' } );

Comments

#Comment by Johnduhart (talk | contribs)   23:39, 2 December 2011 
+					<div class="articleFeedbackv5-confirmation-panel>\
+						<div class="articleFeedbackv5-panel-leftContent">\
+							<div class="articleFeedbackv5-confirmation-text">\
+								<span class=articleFeedbackv5-confirmation-thanks">[Thanks!]</span><span class="articleFeedbackv5-confirmation-follow-up">[Your feedback has been saved.]</span>\
+							</div>\
+							<h3 class="articleFeedbackv5-confirmation-title">Did you know that you can edit this page?</h3>\
+							<p class="articleFeedbackv5-confirmation-wikipediaWorks">[Wikipedia works because anyone can edit its articles. Go ahead, give it a try. Be bold!]</p>\
+							<p class="articleFeedbackv5-confirmation-learnHow"><a target="_blank" href="#">[Learn how to edit] »</a></p>\
+						</div>\
+						<a href="&action=edit" class="articleFeedbackv5-edit-cta-link"><span class="ui-button-text">[Edit this page]</span></a>\
+						<div class="clear"></div>\
 					</div>\
 					'

Needs to be localized.

Status & tagging log