Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/64084
Change subject: (bug 42837) AFT uses dangerously generic class names like
'buttons'
......................................................................
(bug 42837) AFT uses dangerously generic class names like 'buttons'
The @deprecated's are lines preserved to make sure things don't break when page
output and CSS/JSS caches aren't in sync
Bug: 42837
Change-Id: I634bdc4f9857a899e670227e5828399caf8c4ade
---
M ArticleFeedbackv5.render.php
M SpecialArticleFeedbackv5.php
M SpecialArticleFeedbackv5Watchlist.php
M modules/ext.articleFeedbackv5/ext.articleFeedbackv5.dashboard.css
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
8 files changed, 139 insertions(+), 113 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5
refs/changes/84/64084/1
diff --git a/ArticleFeedbackv5.render.php b/ArticleFeedbackv5.render.php
index d3dcd6e..989a6de 100644
--- a/ArticleFeedbackv5.render.php
+++ b/ArticleFeedbackv5.render.php
@@ -671,7 +671,8 @@
$aclass .= '
articleFeedbackv5-has-abuse-flags';
}
if ( $record->aft_flag >=
$wgArticleFeedbackv5AbusiveThreshold ) {
- $aclass .= ' abusive';
+ $aclass .= ' abusive'; /** @deprecated
*/
+ $aclass .= ' articleFeedbackv5-abusive';
}
$abuseStats =
@@ -754,7 +755,7 @@
$abuseLink . $abuseStats
) .
$ownPost .
- Html::element( 'div', array( 'class' => 'clear'
) )
+ Html::element( 'div', array( 'class' => 'clear
articleFeedbackv5-clear' ) ) /** @deprecated: get rid of the non-prefixed clear
*/
);
}
diff --git a/SpecialArticleFeedbackv5.php b/SpecialArticleFeedbackv5.php
index a3b62ef..3fe3378 100644
--- a/SpecialArticleFeedbackv5.php
+++ b/SpecialArticleFeedbackv5.php
@@ -331,8 +331,7 @@
)
)->text()
) .
- $this->buildSummary() .
- Html::element( 'div', array( 'class' => 'float-clear' )
);
+ $this->buildSummary();
}
/**
@@ -396,10 +395,12 @@
if ( $this->pageId ) {
$found = ArticleFeedbackv5Model::getCountFound(
$this->pageId ) / ( $totalCount ?: 1 ) * 100;
if ( $found ) {
- $class = $found >= 50 ? 'positive' : 'negative';
+ $class = $found >= 50 ?
'articleFeedbackv5-positive' : 'articleFeedbackv5-negative';
+ $class .= $found >= 50 ? ' positive' : '
negative'; /** @deprecated */
+
$span = Html::rawElement(
'span',
- array( 'class' => "stat-marker $class"
),
+ array( 'class' => "stat-marker
articleFeedbackv5-stat-marker $class" ), /** @deprecated: get rid of the
non-prefixed stat-marker */
$this->msg( 'percent', round( $found )
)->escaped()
);
@@ -548,7 +549,7 @@
),
$this->msg(
'articlefeedbackv5-special-refresh' )->text()
) .
- Html::element( 'div', array( 'class' => 'clear'
) )
+ Html::element( 'div', array( 'class' => 'clear
articleFeedbackv5-clear' ) ) /** @deprecated: get rid of the non-prefixed clear
*/
) .
$centralPageLink;
}
@@ -565,16 +566,20 @@
foreach ( array( 'featured', 'unreviewed' ) as $filter ) {
$count = ArticleFeedbackv5Model::getCount( $filter,
$this->pageId );
- // Give grep a chance to find the usages:
- // articlefeedbackv5-special-filter-featured,
articlefeedbackv5-special-filter-unreviewed
+ $class = 'articleFeedbackv5-filter-link';
+ $class .= ( $this->startingFilter == $filter ? '
articleFeedbackv5-filter-active' : '' );
+ $class .= ( $this->startingFilter == $filter ? '
filter-active' : '' ); /** @deprecated */
+
$filterLabels[$filter] =
Html::rawElement(
'a',
array(
'href' => '#',
'id' =>
"articleFeedbackv5-special-filter-$filter",
- 'class' =>
'articleFeedbackv5-filter-link' . ( $this->startingFilter == $filter ? '
filter-active' : '' )
+ 'class' => $class
),
+ // Give grep a chance to find the
usages:
+ //
articlefeedbackv5-special-filter-featured,
articlefeedbackv5-special-filter-unreviewed
$this->msg(
"articlefeedbackv5-special-filter-$filter", $count )->escaped()
);
}
diff --git a/SpecialArticleFeedbackv5Watchlist.php
b/SpecialArticleFeedbackv5Watchlist.php
index 9cbf3ad..9d2be43 100644
--- a/SpecialArticleFeedbackv5Watchlist.php
+++ b/SpecialArticleFeedbackv5Watchlist.php
@@ -104,16 +104,20 @@
// filter to be displayed as link
$filterLabels = array();
foreach ( array( 'featured', 'unreviewed' ) as $filter ) {
- // Give grep a chance to find the usages:
- // articlefeedbackv5-special-filter-featured,
articlefeedbackv5-special-filter-unreviewed
+ $class = 'articleFeedbackv5-filter-link';
+ $class .= ( $this->startingFilter == $filter ? '
articleFeedbackv5-filter-active' : '' );
+ $class .= ( $this->startingFilter == $filter ? '
filter-active' : '' ); /** @deprecated */
+
$filterLabels[$filter] =
Html::rawElement(
'a',
array(
'href' => '#',
'id' =>
"articleFeedbackv5-special-filter-$filter",
- 'class' =>
'articleFeedbackv5-filter-link' . ( $this->startingFilter == $filter ? '
filter-active' : '' )
+ 'class' => $class
),
+ // Give grep a chance to find the
usages:
+ //
articlefeedbackv5-special-filter-featured,
articlefeedbackv5-special-filter-unreviewed
$this->msg(
"articlefeedbackv5-special-filter-$filter-watchlist" )->escaped()
);
}
diff --git a/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.dashboard.css
b/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.dashboard.css
index 6164f2e..89fd687 100644
--- a/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.dashboard.css
+++ b/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.dashboard.css
@@ -1,14 +1,5 @@
/*----- SPECIAL PAGE ------*/
-/* Utility classes */
-.float-clear {
- clear: both;
- height: 0;
-}
-.float-clear:after {
- clear: both;
-}
-
/** Adjustments **/
#bodyContent h2 {
clear: both;
@@ -73,17 +64,20 @@
margin: 15px 0 5px 0;
line-height: 28px;
}
-#articleFeedbackv5-percent-found-wrap .stat-marker {
+#articleFeedbackv5-percent-found-wrap .stat-marker, /** @deprecated */
+#articleFeedbackv5-percent-found-wrap .articleFeedbackv5-stat-marker {
font-weight: bold;
padding: 11px 0 8px 40px;
}
-#articleFeedbackv5-percent-found-wrap .positive {
+#articleFeedbackv5-percent-found-wrap .positive, /** @deprecated */
+#articleFeedbackv5-percent-found-wrap .articleFeedbackv5-positive {
/* @embed */
background-image: url(images/large-positive.png);
background-repeat: no-repeat;
background-position: left;
}
-#articleFeedbackv5-percent-found-wrap .negative {
+#articleFeedbackv5-percent-found-wrap .negative, /** @deprecated */
+#articleFeedbackv5-percent-found-wrap .articleFeedbackv5-negative {
/* @embed */
background-image: url(images/large-negative.png);
background-repeat: no-repeat;
@@ -140,14 +134,22 @@
margin-right: 10px;
font-weight: bold;
}
-.filter-active, .filter-active:hover,
.articleFeedbackv5-filter-link.filter-active:hover {
+.filter-active, /** @deprecated */
+.filter-active:hover, /** @deprecated */
+.filter-link.articleFeedbackv5-filter-active:hover, /** @deprecated */
+.articleFeedbackv5-filter-active,
+.articleFeedbackv5-filter-active:hover,
+.articleFeedbackv5-filter-link.articleFeedbackv5-filter-active:hover {
font-weight: bold;
/* @embed */
background-image: url(images/bg-feedbackpage-header-on.png);
background-position: bottom left;
background-repeat: repeat-x;
}
-.filter-active, .filter-active:visited {
+.filter-active, /** @deprecated */
+.filter-active:visited, /** @deprecated */
+.articleFeedbackv5-filter-active,
+.articleFeedbackv5-filter-active:visited {
color: #000;
}
#articleFeedbackv5-select-wrapper,
@@ -157,7 +159,8 @@
padding: 0 5px;
}
#articleFeedbackv5-select-wrapper:hover,
-#articleFeedbackv5-select-wrapper.filter-active {
+#articleFeedbackv5-select-wrapper.filter-active, /** @deprecated */
+#articleFeedbackv5-select-wrapper.articleFeedbackv5-filter-active {
/* @embed */
background-image: url(images/bg-feedbackpage-header-on.png);
background-position: bottom left;
@@ -168,6 +171,8 @@
margin-right: 0px;
color: #444444;
}
+.filter-active #articleFeedbackv5-filter-select, /** @deprecated */
+.filter-active #articleFeedbackv5-sort-select, /** @deprecated */
.filter-active #articleFeedbackv5-filter-select,
.filter-active #articleFeedbackv5-sort-select {
color: black;
diff --git a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css
index 76f50a5..ff459ec 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css
@@ -435,7 +435,8 @@
/*---===<<< Sean's Version 5 Styles >>>===---*/
-.clear {
+.clear /** @deprecated */
+.articleFeedbackv5-clear {
display: block !important;
height: 0 !important;
overflow: hidden !important;
@@ -480,35 +481,35 @@
color: #000;
}
-.articleFeedbackv5-tooltip .tooltip-top {
+.articleFeedbackv5-tooltip .articleFeedbackv5-tooltip-top {
/* @embed */
background: url(images/bg-tooltip-top.png);
height: 11px;
}
-.articleFeedbackv5-tooltip .tooltip-repeat {
+.articleFeedbackv5-tooltip .articleFeedbackv5-tooltip-repeat {
/* @embed */
background: url(images/bg-tooltip.png) repeat-y;
padding: 0 20px 1px;
margin: 0;
}
-.articleFeedbackv5-tooltip .tooltip-repeat h3 {
+.articleFeedbackv5-tooltip .articleFeedbackv5-tooltip-repeat h3 {
float: left;
}
-.articleFeedbackv5-tooltip .tooltip-repeat .articleFeedbackv5-tooltip-close {
+.articleFeedbackv5-tooltip .articleFeedbackv5-tooltip-repeat
.articleFeedbackv5-tooltip-close {
float: right;
cursor: pointer;
margin: -5px -5px 0 0;
font-size: 1.5em;
}
-.articleFeedbackv5-tooltip .tooltip-repeat
.articleFeedbackv5-tooltip-close:hover {
+.articleFeedbackv5-tooltip .articleFeedbackv5-tooltip-repeat
.articleFeedbackv5-tooltip-close:hover {
text-decoration: underline;
}
-.articleFeedbackv5-tooltip .tooltip-bottom {
+.articleFeedbackv5-tooltip .articleFeedbackv5-tooltip-bottom {
/* @embed */
background: url(images/bg-tooltip-bottom.png);
height: 26px;
@@ -539,11 +540,11 @@
padding-bottom: 0.17em;
}
-.articleFeedbackv5-ui .form-row {
+.articleFeedbackv5-ui .articleFeedbackv5-form-row {
margin: 0 0 15px;
}
-.articleFeedbackv5-ui .instructions-left {
+.articleFeedbackv5-ui .articleFeedbackv5-instructions-left {
float:left;
margin: 0 15px 0 0;
font-size: 1.2em;
@@ -556,21 +557,21 @@
margin-bottom: 0;
}
-.articleFeedbackv5-ui .buttons .form-item {
+.articleFeedbackv5-ui .articleFeedbackv5-buttons .articleFeedbackv5-form-item {
float: left;
margin: 0 15px 0 0;
}
-.articleFeedbackv5-ui .buttons .form-item:hover {
+.articleFeedbackv5-ui .articleFeedbackv5-buttons
.articleFeedbackv5-form-item:hover {
float: left;
}
-.articleFeedbackv5-ui .buttons label,
-.articleFeedbackv5-ui .buttons input {
+.articleFeedbackv5-ui .articleFeedbackv5-buttons label,
+.articleFeedbackv5-ui .articleFeedbackv5-buttons input {
display: none;
}
-.articleFeedbackv5-ui .buttons .articleFeedbackv5-button-placeholder {
+.articleFeedbackv5-ui .articleFeedbackv5-buttons
.articleFeedbackv5-button-placeholder {
display: inline-block;
height: 22px !important;
line-height: 22px;
@@ -592,7 +593,7 @@
box-shadow: -2px 2px 1px #999;
}
-.articleFeedbackv5-ui .feedback-text {
+.articleFeedbackv5-ui .articleFeedbackv5-feedback-text {
background: #fff;
border: 1px solid #000;
width: 660px;
@@ -602,7 +603,7 @@
font-family: sans-serif !important;
}
-.articleFeedbackv5-ui .feedback-text.inactive {
+.articleFeedbackv5-ui
.articleFeedbackv5-feedback-text.articleFeedbackv5-inactive {
color: #999;
}
@@ -663,11 +664,11 @@
font-size: 1em;
font-weight: bold;
}
-.articleFeedbackv5-option-4 .sub-header {
+.articleFeedbackv5-option-4 .articleFeedbackv5-sub-header {
font-size: 1.1em;
margin: 0 0 15px;
}
-.articleFeedbackv5-option-4 .instructions-left {
+.articleFeedbackv5-option-4 .articleFeedbackv5-instructions-left {
font-size: 1em;
margin: 0 0 15px;
}
diff --git a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
index cd03c7f..41d37e1 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
@@ -209,14 +209,14 @@
<div class="articleFeedbackv5-ui">\
<div
class="articleFeedbackv5-tooltip-wrap">\
<div
class="articleFeedbackv5-tooltip">\
- <div
class="tooltip-top"></div>\
- <div
class="tooltip-repeat">\
+ <div
class="articleFeedbackv5-tooltip-top"></div>\
+ <div
class="articleFeedbackv5-tooltip-repeat">\
<h3><html:msg key="help-tooltip-title" /></h3><span
class="articleFeedbackv5-tooltip-close">×</span>\
- <div
class="clear"></div>\
+ <div
class="articleFeedbackv5-clear"></div>\
<p
class="articleFeedbackv5-tooltip-info"><html:msg key="help-tooltip-info" /></p>\
<p><a
target="_blank" class="articleFeedbackv5-tooltip-link"><html:msg
key="help-tooltip-linktext" /> >></a></p>\
</div>\
- <div
class="tooltip-bottom"></div>\
+ <div
class="articleFeedbackv5-tooltip-bottom"></div>\
</div>\
</div>\
<div
class="articleFeedbackv5-ui-inner"></div>\
@@ -241,7 +241,7 @@
</div>\
',
- clear: '<div class="clear"></div>',
+ clear: '<div class="articleFeedbackv5-clear"></div>',
disableFlyover: '\
<div>\
@@ -304,31 +304,31 @@
block: '\
<form>\
<div
class="articleFeedbackv5-top-error"></div>\
- <div class="form-row
articleFeedbackv5-bucket1-toggle">\
- <p
class="instructions-left"><html:msg key="bucket1-question-toggle" /></p>\
- <div class="buttons">\
- <div
class="form-item" data-value="yes"
id="articleFeedbackv5-bucket1-toggle-wrapper-yes">\
+ <div
class="articleFeedbackv5-form-row articleFeedbackv5-bucket1-toggle">\
+ <p
class="articleFeedbackv5-instructions-left"><html:msg
key="bucket1-question-toggle" /></p>\
+ <div
class="articleFeedbackv5-buttons">\
+ <div
class="articleFeedbackv5-form-item" data-value="yes"
id="articleFeedbackv5-bucket1-toggle-wrapper-yes">\
<label
for="articleFeedbackv5-bucket1-toggle-yes"><html:msg
key="bucket1-toggle-found-yes-full" /></label>\
<a
href="#" class="articleFeedbackv5-button-placeholder"><html:msg
key="bucket1-toggle-found-yes" value="yes" /></a>\
- <input
type="radio" name="toggle" id="articleFeedbackv5-bucket1-toggle-yes"
class="query-button" value="yes" />\
+ <input
type="radio" name="toggle" id="articleFeedbackv5-bucket1-toggle-yes"
class="articleFeedbackv5-query-button" value="yes" />\
</div>\
- <div
class="form-item" data-value="no"
id="articleFeedbackv5-bucket1-toggle-wrapper-no">\
+ <div
class="articleFeedbackv5-form-item" data-value="no"
id="articleFeedbackv5-bucket1-toggle-wrapper-no">\
<label
for="articleFeedbackv5-bucket1-toggle-no"><html:msg
key="bucket1-toggle-found-no-full" /></label>\
<a
href="#" class="articleFeedbackv5-button-placeholder"><html:msg
key="bucket1-toggle-found-no" /></a>\
- <input
type="radio" name="toggle" id="articleFeedbackv5-bucket1-toggle-no"
class="query-button last" value="no" />\
+ <input
type="radio" name="toggle" id="articleFeedbackv5-bucket1-toggle-no"
class="articleFeedbackv5-query-button last" value="no" />\
</div>\
- <div
class="clear"></div>\
+ <div
class="articleFeedbackv5-clear"></div>\
</div>\
- <div
class="clear"></div>\
+ <div
class="articleFeedbackv5-clear"></div>\
</div>\
<div
class="articleFeedbackv5-comment">\
- <textarea
id="articleFeedbackv5-find-feedback" class="feedback-text"
name="comment"></textarea>\
+ <textarea
id="articleFeedbackv5-find-feedback" class="articleFeedbackv5-feedback-text"
name="comment"></textarea>\
</div>\
<div
class="articleFeedbackv5-disclosure">\
<p
class="articlefeedbackv5-help-transparency-terms"></p>\
</div>\
<button
class="articleFeedbackv5-submit" type="submit" disabled="disabled"
id="articleFeedbackv5-submit-bttn"><html:msg key="bucket1-form-submit"
/></button>\
- <div class="clear"></div>\
+ <div
class="articleFeedbackv5-clear"></div>\
</form>\
'
@@ -417,7 +417,7 @@
.focus( function () {
if ( $( this ).val() ==
$.articleFeedbackv5.currentBucket().currentDefaultText ) {
$( this ).val( '' );
- $( this ).removeClass(
'inactive' );
+ $( this ).removeClass(
'articleFeedbackv5-inactive' );
}
} )
.keyup ( function () {
@@ -435,7 +435,7 @@
}
if ( $( this ).val() == '' ) {
$( this ).val( def_msg
);
- $( this ).addClass(
'inactive' );
+ $( this ).addClass(
'articleFeedbackv5-inactive' );
} else {
$.articleFeedbackv5.enableSubmission( true );
}
@@ -517,16 +517,16 @@
*/
editable: '\
<div id="articleFeedbackv5-bucket4">\
- <div class="form-row
articleFeedbackv5-bucket4-toggle">\
- <p
class="sub-header"><strong><html:msg key="bucket4-subhead" /></strong></p>\
- <p
class="instructions-left"><html:msg key="bucket4-teaser-line1" /><br />\
+ <div
class="articleFeedbackv5-form-row articleFeedbackv5-bucket4-toggle">\
+ <p
class="articleFeedbackv5-sub-header"><strong><html:msg key="bucket4-subhead"
/></strong></p>\
+ <p
class="articleFeedbackv5-instructions-left"><html:msg
key="bucket4-teaser-line1" /><br />\
<html:msg
key="bucket4-teaser-line2" /></p>\
</div>\
<div
class="articleFeedbackv5-disclosure">\
<p><a
class="articleFeedbackv5-learn-to-edit" target="_blank"><html:msg
key="bucket4-learn-to-edit" /> »</a></p>\
</div>\
<a
class="articleFeedbackv5-cta-button"
id="articleFeedbackv5-submit-bttn"><html:msg key="bucket4-form-submit" /></a>\
- <div class="clear"></div>\
+ <div
class="articleFeedbackv5-clear"></div>\
</div>\
',
@@ -536,15 +536,15 @@
*/
noneditable: '\
<div id="articleFeedbackv5-bucket4">\
- <div class="form-row
articleFeedbackv5-bucket4-toggle">\
- <p
class="instructions-left"><html:msg key="bucket4-noedit-teaser-line1" /><br />\
+ <div
class="articleFeedbackv5-form-row articleFeedbackv5-bucket4-toggle">\
+ <p
class="articleFeedbackv5-instructions-left"><html:msg
key="bucket4-noedit-teaser-line1" /><br />\
<html:msg
key="bucket4-noedit-teaser-line2" /></p>\
</div>\
<div
class="articleFeedbackv5-disclosure">\
<p> </p>\
</div>\
<a
class="articleFeedbackv5-cta-button"
id="articleFeedbackv5-submit-bttn"><html:msg key="bucket4-noedit-form-submit"
/></a>\
- <div class="clear"></div>\
+ <div
class="articleFeedbackv5-clear"></div>\
</div>\
'
@@ -644,32 +644,32 @@
block: '\
<form>\
<div
class="articleFeedbackv5-top-error"></div>\
- <div class="form-row
articleFeedbackv5-bucket6-toggle">\
- <p
class="instructions-left"><html:msg key="bucket6-question-toggle" /></p>\
- <div class="buttons">\
- <div
class="form-item" data-value="yes"
id="articleFeedbackv5-bucket6-toggle-wrapper-yes">\
+ <div
class="articleFeedbackv5-form-row articleFeedbackv5-bucket6-toggle">\
+ <p
class="articleFeedbackv5-instructions-left"><html:msg
key="bucket6-question-toggle" /></p>\
+ <div
class="articleFeedbackv5-buttons">\
+ <div
class="articleFeedbackv5-form-item" data-value="yes"
id="articleFeedbackv5-bucket6-toggle-wrapper-yes">\
<label
for="articleFeedbackv5-bucket6-toggle-yes"><html:msg
key="bucket6-toggle-found-yes-full" /></label>\
<a
href="#" class="articleFeedbackv5-button-placeholder"><html:msg
key="bucket6-toggle-found-yes" value="yes" /></a>\
- <input
type="radio" name="toggle" id="articleFeedbackv5-bucket6-toggle-yes"
class="query-button" value="yes" />\
+ <input
type="radio" name="toggle" id="articleFeedbackv5-bucket6-toggle-yes"
class="articleFeedbackv5-query-button" value="yes" />\
</div>\
- <div
class="form-item" data-value="no"
id="articleFeedbackv5-bucket6-toggle-wrapper-no">\
+ <div
class="articleFeedbackv5-form-item" data-value="no"
id="articleFeedbackv5-bucket6-toggle-wrapper-no">\
<label
for="articleFeedbackv5-bucket6-toggle-no"><html:msg
key="bucket6-toggle-found-no-full" /></label>\
<a
href="#" class="articleFeedbackv5-button-placeholder"><html:msg
key="bucket6-toggle-found-no" /></a>\
- <input
type="radio" name="toggle" id="articleFeedbackv5-bucket6-toggle-no"
class="query-button last" value="no" />\
+ <input
type="radio" name="toggle" id="articleFeedbackv5-bucket6-toggle-no"
class="articleFeedbackv5-query-button last" value="no" />\
</div>\
- <div
class="clear"></div>\
+ <div
class="articleFeedbackv5-clear"></div>\
</div>\
- <div
class="clear"></div>\
+ <div
class="articleFeedbackv5-clear"></div>\
</div>\
<div
class="articleFeedbackv5-comment">\
<p
id="articlefeedbackv5-feedback-countdown"></p>\
- <textarea
id="articleFeedbackv5-find-feedback" class="feedback-text"
name="comment"></textarea>\
+ <textarea
id="articleFeedbackv5-find-feedback" class="articleFeedbackv5-feedback-text"
name="comment"></textarea>\
</div>\
<div
class="articleFeedbackv5-disclosure">\
<p
class="articlefeedbackv5-help-transparency-terms"></p>\
</div>\
<button
class="articleFeedbackv5-submit" type="submit" disabled="disabled"
id="articleFeedbackv5-submit-bttn"><html:msg key="bucket6-form-submit"
/></button>\
- <div class="clear"></div>\
+ <div
class="articleFeedbackv5-clear"></div>\
</form>\
'
@@ -847,7 +847,7 @@
* Display step 1
*/
displayStep1: function ( $block ) {
- var $step1 = $( '.form-row', $block );
+ var $step1 = $( '.articleFeedbackv5-form-row',
$block );
var $step2 = $( '.articleFeedbackv5-comment,
.articleFeedbackv5-disclosure, .articleFeedbackv5-submit', $block );
// hide comment, disclosure & submit first
(should only show after clicking Y/N)
@@ -868,7 +868,7 @@
* Display step 2
*/
displayStep2: function ( $block ) {
- var $step1 = $( '.form-row', $block );
+ var $step1 = $( '.articleFeedbackv5-form-row',
$block );
var $step2 = $( '.articleFeedbackv5-comment,
.articleFeedbackv5-disclosure, .articleFeedbackv5-submit', $block );
// show comment, disclosure & submit; hide Y/N
buttons
@@ -988,14 +988,14 @@
* The template for the whole block
*/
block: '\
- <div class="clear"></div>\
+ <div
class="articleFeedbackv5-clear"></div>\
<div
class="articleFeedbackv5-confirmation-panel">\
<div
class="articleFeedbackv5-panel-leftContent">\
<h3
class="articleFeedbackv5-confirmation-title"><html:msg
key="cta1-confirmation-title" /></h3>\
<p
class="articleFeedbackv5-confirmation-wikipediaWorks"><html:msg
key="cta1-confirmation-call" /></p>\
</div>\
<a href="&action=edit"
class="articleFeedbackv5-cta-button"><html:msg key="cta1-edit-linktext" /></a>\
- <div class="clear"></div>\
+ <div
class="articleFeedbackv5-clear"></div>\
</div>\
'
@@ -1066,14 +1066,14 @@
* The template for the whole block
*/
block: '\
- <div class="clear"></div>\
+ <div
class="articleFeedbackv5-clear"></div>\
<div
class="articleFeedbackv5-confirmation-panel">\
<div
class="articleFeedbackv5-panel-leftContent">\
<h3
class="articleFeedbackv5-confirmation-title"><html:msg
key="cta2-confirmation-title" /></h3>\
<p
class="articleFeedbackv5-confirmation-wikipediaWorks"><html:msg
key="cta2-confirmation-call" /></p>\
</div>\
<a href="&action=edit"
class="articleFeedbackv5-cta-button"><html:msg key="cta2-button-text" /></a>\
- <div class="clear"></div>\
+ <div
class="articleFeedbackv5-clear"></div>\
</div>\
'
@@ -1145,14 +1145,14 @@
* The template for the whole block
*/
block: '\
- <div class="clear"></div>\
+ <div
class="articleFeedbackv5-clear"></div>\
<div
class="articleFeedbackv5-confirmation-panel">\
<div
class="articleFeedbackv5-panel-leftContent">\
<h3
class="articleFeedbackv5-confirmation-title"><html:msg
key="cta3-confirmation-title" /></h3>\
<p
class="articleFeedbackv5-confirmation-call"><html:msg
key="cta3-confirmation-call" /></p>\
</div>\
<a href="#"
class="articleFeedbackv5-cta-button" target="_blank"><html:msg
key="cta3-button-text" /></a>\
- <div class="clear"></div>\
+ <div
class="articleFeedbackv5-clear"></div>\
</div>\
'
@@ -1274,7 +1274,7 @@
* The template for the whole block
*/
block: '\
- <div class="clear"></div>\
+ <div
class="articleFeedbackv5-clear"></div>\
<div
class="articleFeedbackv5-confirmation-panel">\
<div
class="articleFeedbackv5-panel-leftContent">\
<h3
class="articleFeedbackv5-confirmation-title"><html:msg
key="cta4-confirmation-title" /></h3>\
@@ -1286,7 +1286,7 @@
<a href="#"
class="articleFeedbackv5-cta-button-login
articleFeedbackv5-panel-buttons-child"><html:msg key="cta4-button-text-login"
/></a>\
<!-- <a href="#"
class="articleFeedbackv5-cta-button-later
articleFeedbackv5-panel-buttons-child"><html:msg key="cta4-button-text-later"
/></a> -->\
</div>\
- <div class="clear"></div>\
+ <div
class="articleFeedbackv5-clear"></div>\
</div>\
'
},
@@ -1408,14 +1408,14 @@
* The template for the whole block
*/
block: '\
- <div class="clear"></div>\
+ <div
class="articleFeedbackv5-clear"></div>\
<div
class="articleFeedbackv5-confirmation-panel">\
<div
class="articleFeedbackv5-panel-leftContent">\
<h3
class="articleFeedbackv5-confirmation-title"><html:msg
key="cta5-confirmation-title" /></h3>\
<p
class="articleFeedbackv5-confirmation-wikipediaWorks"><html:msg
key="cta5-confirmation-call" /></p>\
</div>\
<a href="#"
class="articleFeedbackv5-cta-button"><html:msg key="cta5-button-text" /></a>\
- <div class="clear"></div>\
+ <div
class="articleFeedbackv5-clear"></div>\
</div>\
'
@@ -1490,14 +1490,14 @@
* The template for the whole block
*/
block: '\
- <div class="clear"></div>\
+ <div
class="articleFeedbackv5-clear"></div>\
<div
class="articleFeedbackv5-confirmation-panel">\
<div
class="articleFeedbackv5-panel-leftContent">\
<h3
class="articleFeedbackv5-confirmation-title"><html:msg
key="cta6-confirmation-title" /></h3>\
<p
class="articleFeedbackv5-confirmation-wikipediaWorks"><html:msg
key="cta6-confirmation-call" /></p>\
</div>\
<a href="#"
class="articleFeedbackv5-cta-button"><html:msg key="cta6-button-text" /></a>\
- <div class="clear"></div>\
+ <div
class="articleFeedbackv5-clear"></div>\
</div>\
'
diff --git
a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
index 856f185..846ae19 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
@@ -168,17 +168,17 @@
/* @embed */
background: url(images/thumbdwn_hover.png) left no-repeat;
}
-.articleFeedbackv5-comment-foot-helpful
.articleFeedbackv5-helpful-link.helpful-active,
-.articleFeedbackv5-comment-foot-helpful
.articleFeedbackv5-helpful-link.helpful-active:hover,
-.articleFeedbackv5-comment-foot-helpful
.articleFeedbackv5-undo-helpful-link.helpful-active,
-.articleFeedbackv5-comment-foot-helpful
.articleFeedbackv5-undo-helpful-link.helpful-active:hover {
+.articleFeedbackv5-comment-foot-helpful
.articleFeedbackv5-helpful-link.articleFeedbackv5-helpful-active,
+.articleFeedbackv5-comment-foot-helpful
.articleFeedbackv5-helpful-link.articleFeedbackv5-helpful-active:hover,
+.articleFeedbackv5-comment-foot-helpful
.articleFeedbackv5-undo-helpful-link.articleFeedbackv5-helpful-active,
+.articleFeedbackv5-comment-foot-helpful
.articleFeedbackv5-undo-helpful-link.articleFeedbackv5-helpful-active:hover {
/* @embed */
background: url(images/thumbup_active.png) left no-repeat;
}
-.articleFeedbackv5-comment-foot-helpful
.articleFeedbackv5-unhelpful-link.helpful-active,
-.articleFeedbackv5-comment-foot-helpful
.articleFeedbackv5-unhelpful-link.helpful-active:hover,
-.articleFeedbackv5-comment-foot-helpful
.articleFeedbackv5-undo-unhelpful-link.helpful-active,
-.articleFeedbackv5-comment-foot-helpful
.articleFeedbackv5-undo-unhelpful-link.helpful-active:hover {
+.articleFeedbackv5-comment-foot-helpful
.articleFeedbackv5-unhelpful-link.articleFeedbackv5-helpful-active,
+.articleFeedbackv5-comment-foot-helpful
.articleFeedbackv5-unhelpful-link.articleFeedbackv5-helpful-active:hover,
+.articleFeedbackv5-comment-foot-helpful
.articleFeedbackv5-undo-unhelpful-link.articleFeedbackv5-helpful-active,
+.articleFeedbackv5-comment-foot-helpful
.articleFeedbackv5-undo-unhelpful-link.articleFeedbackv5-helpful-active:hover {
/* @embed */
background: url(images/thumbdwn_active.png) left no-repeat;
}
@@ -223,7 +223,8 @@
color: #888;
display: none;
}
-.articleFeedbackv5-abuse-count.abusive {
+.articleFeedbackv5-abuse-count.abusive, /** @deprecated */
+.articleFeedbackv5-abuse-count.articleFeedbackv5-abusive {
color: #832831;
}
.articleFeedbackv5-abuse-count.articleFeedbackv5-has-abuse-flags {
@@ -900,7 +901,8 @@
line-height: 1.5em;
}
-.clear {
+.clear, /** @deprecated */
+.articleFeedbackv5-clear {
display: block !important;
height: 0 !important;
overflow: hidden !important;
diff --git
a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
index 70e6eda..f02fd00 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
@@ -128,7 +128,7 @@
<div class="articleFeedbackv5-flyover-footer">\
<a id="articleFeedbackv5-noteflyover-submit"
class="articleFeedbackv5-flyover-button" href="#"></a>\
<a class="articleFeedbackv5-flyover-help"
id="articleFeedbackv5-noteflyover-help" href="#"></a>\
- <div class="clear"></div>\
+ <div class="articleFeedbackv5-clear"></div>\
</div>\
</form>';
@@ -513,14 +513,22 @@
$.articleFeedbackv5special.userType );
// update filter in select (if present) & text-links (if any)
- $( '#articleFeedbackv5-select-wrapper' ).removeClass(
'filter-active' );
- $( '.articleFeedbackv5-filter-link' ).removeClass(
'filter-active' );
+ $( '#articleFeedbackv5-select-wrapper' )
+ .removeClass( 'filter-active' ) /** @deprecated */
+ .removeClass( 'articleFeedbackv5-filter-active' );
+ $( '.articleFeedbackv5-filter-link' )
+ .removeClass( 'filter-active' ) /** @deprecated */
+ .removeClass( 'articleFeedbackv5-filter-active' );
if ( $( '#articleFeedbackv5-filter-select option[value=' + id +
']' ).length > 0 ) {
- $( '#articleFeedbackv5-select-wrapper' ).addClass(
'filter-active' );
+ $( '#articleFeedbackv5-select-wrapper' )
+ .addClass( 'filter-active' ) /** @deprecated */
+ .addClass( 'articleFeedbackv5-filter-active' );
} else {
$( '#articleFeedbackv5-filter-select' ).val( '' );
}
- $( '#articleFeedbackv5-special-filter-' + id).addClass(
'filter-active' );
+ $( '#articleFeedbackv5-special-filter-' + id)
+ .addClass( 'filter-active' ) /** @deprecated */
+ .addClass( 'articleFeedbackv5-filter-active' );
};
// }}}
@@ -1045,11 +1053,11 @@
*/
if ( $.articleFeedbackv5special.getActivityFlag( id, 'helpful'
) ) {
$( '#articleFeedbackv5-helpful-link-' + id )
- .addClass( 'helpful-active' )
+ .addClass( 'articleFeedbackv5-helpful-active' )
.data( 'action', 'undo-helpful' );
} else if ( $.articleFeedbackv5special.getActivityFlag( id,
'unhelpful' ) ) {
$( '#articleFeedbackv5-unhelpful-link-' + id )
- .addClass( 'helpful-active' )
+ .addClass( 'articleFeedbackv5-helpful-active' )
.data( 'action', 'undo-unhelpful' );
}
--
To view, visit https://gerrit.wikimedia.org/r/64084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I634bdc4f9857a899e670227e5828399caf8c4ade
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
