r104477 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r104476‎ | r104477 | r104478 >
Date:20:09, 28 November 2011
Author:seanheavey
Status:deferred
Tags:
Comment:
Dropped in markup for option 2, option 3 coming by cob.
Modified paths:
  • /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/jquery.articleFeedbackv5.css
@@ -406,12 +406,13 @@
407407 }
408408 /*---===<<< Sean's Version 5 Styles >>>===---*/
409409 .clear {
410 - display: block;
411 - height: 0;
412 - overflow: hidden;
413 - clear: both;
414 - float: none;
415 - width: 100%;
 410+ display: block !important;
 411+ height: 0 !important;
 412+ overflow: hidden !important;
 413+ clear: both !important;
 414+ float: none !important;
 415+ width: 100% !important;
 416+ border: none !important;
416417 }
417418 /* tooltip styling. by default the element to be styled is .tooltip */
418419 .articleFeedbackv5-panel .title-wrap {
@@ -550,3 +551,61 @@
551552 color: #fff;
552553 text-shadow: 1px 1px 1px #000;
553554 }
 555+/*** Option 2 ***/
 556+.tags ul li {
 557+ color: #666;
 558+ list-style: none;
 559+ float: left;
 560+ margin: 0 0 0 10px;
 561+ line-height: 28px;
 562+ height: 28px;
 563+ padding: 0 8px;
 564+ background: #e6e6e6;
 565+ border: 1px solid #d6d6d6;
 566+ -moz-border-radius: 5px;
 567+ -webkit-border-radius: 5px;
 568+ border-radius: 5px; /* future proofing */
 569+ -khtml-border-radius: 5px; /* for old Konqueror browsers */
 570+}
 571+.tags ul li:first-child {
 572+ margin: 0;
 573+}
 574+.tags ul li:hover, .tags ul li.active {
 575+ background: #fff;
 576+ border-color: #ccc;
 577+ color: #000;
 578+}
 579+.tags ul li input {
 580+ display: none;
 581+}
 582+.tags ul li label {
 583+ padding: 0 0 0 8px;
 584+}
 585+.tags ul li .articleFeedbackv5-bucket2-suggestion-label {
 586+ background: url(images/bg-tag-suggestion-off.png) no-repeat 0 center;
 587+}
 588+.tags ul li .articleFeedbackv5-bucket2-question-label {
 589+ background: url(images/bg-tag-question-off.png) no-repeat 0 center;
 590+}
 591+.tags ul li .articleFeedbackv5-bucket2-problem-label {
 592+ background: url(images/bg-tag-problem-off.png) no-repeat 0 center;
 593+}
 594+.tags ul li .articleFeedbackv5-bucket2-praise-label {
 595+ background: url(images/bg-tag-praise-off.png) no-repeat 0 center;
 596+}
 597+.tags ul li:hover .articleFeedbackv5-bucket2-suggestion-label,
 598+.tags ul li.active .articleFeedbackv5-bucket2-suggestion-label {
 599+ background: url(images/bg-tag-suggestion-on.png) no-repeat 0 center;
 600+}
 601+.tags ul li:hover .articleFeedbackv5-bucket2-question-label,
 602+.tags ul li.active .articleFeedbackv5-bucket2-question-label {
 603+ background: url(images/bg-tag-question-on.png) no-repeat 0 center;
 604+}
 605+.tags ul li:hover .articleFeedbackv5-bucket2-problem-label,
 606+.tags ul li.active .articleFeedbackv5-bucket2-problem-label {
 607+ background: url(images/bg-tag-problem-on.png) no-repeat 0 center;
 608+}
 609+.tags ul li:hover .articleFeedbackv5-bucket2-praise-label,
 610+.tags ul li.active .articleFeedbackv5-bucket2-praise-label {
 611+ background: url(images/bg-tag-praise-on.png) no-repeat 0 center;
 612+}
\ No newline at end of file
Index: trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
@@ -417,46 +417,55 @@
418418 // The overall template
419419 var block_tpl = '\
420420 <form>\
421 - <div class="title-wrap">\
422 - <h2 class="articleFeedbackv5-title"><html:msg key="bucket2-title" /></h2>\
423 - <a class="articleFeedbackv5-tooltip-trigger"></a>\
424 - <div class="articleFeedbackv5-tooltip">\
425 - <div class="tooltip-top"></div>\
426 - <div class="tooltip-repeat">\
427 - <h3><html:msg key="bucket2-tooltip-title" /></h3>\
428 - <p><html:msg key="bucket2-tooltip-info" /></p>\
429 - <p><a target="_blank" href="http://www.mediawiki.org/wiki/Article_feedback/Version_5"><html:msg key="bucket2-tooltip-linktext" /></a></p>\
 421+ <div class="title-wrap">\
 422+ <h2 class="articleFeedbackv5-title">\
 423+ <html:msg key="bucket2-title" />\
 424+ </h2>\
 425+ <a class="articleFeedbackv5-tooltip-trigger"></a>\
 426+ <div class="articleFeedbackv5-tooltip">\
 427+ <div class="tooltip-top"></div>\
 428+ <div class="tooltip-repeat">\
 429+ <h3>\
 430+ <html:msg key="bucket2-tooltip-title" />\
 431+ </h3>\
 432+ <p>\
 433+ <html:msg key="bucket2-tooltip-info" />\
 434+ </p>\
 435+ <p><a target="_blank" href="http://www.mediawiki.org/wiki/Article_feedback/Version_5">\
 436+ <html:msg key="bucket2-tooltip-linktext" />\
 437+ </a></p>\
 438+ </div>\
 439+ <div class="tooltip-bottom"></div>\
430440 </div>\
431 - <div class="tooltip-bottom"></div>\
 441+ <div class="clear"></div>\
432442 </div>\
433 - <div class="clear"></div>\
434 - </div>\
435 - <div class="form-row articleFeedbackv5-bucket2-toggle">\
436 - <p class="instructions-left"><html:msg key="bucket2-question-toggle" /></p>\
437 - <div class="buttons">\
438 - <div class="form-item" rel="yes" id="articleFeedbackv5-bucket2-toggle-wrapper-yes">\
439 - <label for="articleFeedbackv5-bucket2-toggle-yes"><html:msg key="bucket2-toggle-found-yes-full" /></label>\
440 - <span class="articleFeedbackv5-button-placeholder"><html:msg key="bucket2-toggle-found-yes" value="yes" /></span>\
441 - <input type="radio" name="toggle" id="articleFeedbackv5-bucket2-toggle-yes" class="query-button" value="yes" />\
 443+ <div>\
 444+ <p class="instructions-left">\
 445+ <html:msg key="bucket2-question-toggle" />\
 446+ </p>\
 447+ <div class="tags">\
 448+ <ul>\
 449+ <li class="active"><span class="tag-selector"></span><label class="articleFeedbackv5-bucket2-suggestion-label" for="articleFeedbackv5-bucket2-suggestion">Suggestion</label><input name="articleFeedbackv5-bucket2-tag" type="radio" id="articleFeedbackv5-bucket2-suggestion"><span class="clear"></span></li>\
 450+ <li><span class="tag-selector"></span><label class="articleFeedbackv5-bucket2-question-label" for="articleFeedbackv5-bucket2-question">Question</label><input name="articleFeedbackv5-bucket2-tag" type="radio" id="articleFeedbackv5-bucket2-question"><span class="clear"></span></li>\
 451+ <li><span class="tag-selector"></span><label class="articleFeedbackv5-bucket2-problem-label" for="articleFeedbackv5-bucket2-problem">Problem</label><input name="articleFeedbackv5-bucket2-tag" type="radio" id="articleFeedbackv5-bucket2-problem"><span class="clear"></span></li>\
 452+ <li><span class="tag-selector"></span><label class="articleFeedbackv5-bucket2-praise-label" for="articleFeedbackv5-bucket2-praise">Praise</label><input name="articleFeedbackv5-bucket2-tag" type="radio" id="articleFeedbackv5-bucket2-praise"><span class="clear"></span></li>\
 453+ <li class="clear"></li>\
 454+ </ul>\
 455+ <div class="clear"></div>\
442456 </div>\
443 - <div class="form-item" rel="no" id="articleFeedbackv5-bucket2-toggle-wrapper-no">\
444 - <label for="articleFeedbackv5-bucket2-toggle-no"><html:msg key="bucket2-toggle-found-no-full" /></label>\
445 - <span class="articleFeedbackv5-button-placeholder"><html:msg key="bucket2-toggle-found-no" /></span>\
446 - <input type="radio" name="toggle" id="articleFeedbackv5-bucket2-toggle-no" class="query-button last" value="no" />\
447 - </div>\
448457 <div class="clear"></div>\
449458 </div>\
 459+ <div class="articleFeedbackv5-comment">\
 460+ <textarea id="find-feedback" class="feedback-text" name="comment"></textarea>\
 461+ </div>\
 462+ <div class="articleFeedbackv5-disclosure">\
 463+ <p class="articlefeedbackv5-shared-on-feedback"></p>\
 464+ <p class="articlefeedbackv5-transparency-terms"></p>\
 465+ </div>\
 466+ <button class="articleFeedbackv5-submit" type="submit" disabled="disabled">\
 467+ <html:msg key="bucket2-form-submit" />\
 468+ </button>\
450469 <div class="clear"></div>\
451 - </div>\
452 - <div class="articleFeedbackv5-comment">\
453 - <textarea id="find-feedback" class="feedback-text" name="comment"></textarea>\
454 - </div>\
455 - <div class="articleFeedbackv5-disclosure">\
456 - <p class="articlefeedbackv5-shared-on-feedback"></p>\
457 - <p class="articlefeedbackv5-transparency-terms"></p>\
458 - </div>\
459 - <button class="articleFeedbackv5-submit" type="submit" disabled="disabled"><html:msg key="bucket2-form-submit" /></button>\
460 - <div class="clear"></div>\
461470 </form>\
462471 ';
463472 // Start up the block to return

Status & tagging log