Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55597
Change subject: Merge "fix line break at activity log"
......................................................................
Merge "fix line break at activity log"
Change-Id: I8ae43bf1a5d0ad92f2093c83ee28de820401831b
---
M ArticleFeedbackv5.i18n.php
M ArticleFeedbackv5.render.php
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
4 files changed, 33 insertions(+), 68 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5
refs/changes/97/55597/1
diff --git a/ArticleFeedbackv5.i18n.php b/ArticleFeedbackv5.i18n.php
index 6b17acf..c180778 100644
--- a/ArticleFeedbackv5.i18n.php
+++ b/ArticleFeedbackv5.i18n.php
@@ -286,8 +286,7 @@
'articlefeedbackv5-page-disabled' => 'Article Feedback page not enabled
for this page.',
'articlefeedbackv5-no-feedback' => "There is no feedback for the filter
you selected. To change your filter, try one of the options above (e.g.:
'Featured' or 'Unreviewed').",
'articlefeedbackv5-invalid-feedback' => 'The requested feedback does
not exist.',
- 'articlefeedbackv5-viewactivity' => 'Read note',
- 'articlefeedbackv5-viewactivity-empty' => 'No reason given',
+ 'articlefeedbackv5-viewactivity' => 'View activity',
'articlefeedbackv5-mask-view-contents' => 'View contents',
'articlefeedbackv5-mask-text-inappropriate' => 'This post #$1
{{GENDER:$2|was marked as inappropriate by $2}} $3.',
'articlefeedbackv5-mask-text-autohide' => 'This post #$1
{{GENDER:$2|was autohidden by $2}} $3.',
@@ -1157,7 +1156,6 @@
'articlefeedbackv5-no-feedback' => 'A message to be displayed on the
article feedback page when there is no feedback yet for a certain filter.',
'articlefeedbackv5-invalid-feedback' => 'A message to be displayed on
the article feedback page when the requested feedback could not be found (does
not exist).',
'articlefeedbackv5-viewactivity' => 'Text for the link to see the log
of activity (e.g. mark as helpful, resolve, oversight, ...) taken towards
feedback',
- 'articlefeedbackv5-viewactivity-empty' => 'Text for the link to see the
log of activity (e.g. mark as helpful, resolve, oversight, ...) taken towards
feedback, when no comment was entered for the last action',
'articlefeedbackv5-mask-view-contents' => 'Pseudo-link to make it
obvious that clicking there will reveal the original feedback content',
'articlefeedbackv5-mask-text-inappropriate' => 'Text to be displayed on
the marked as inappropriate post mask. Parameters:
* $1 - The feedback post id
diff --git a/ArticleFeedbackv5.render.php b/ArticleFeedbackv5.render.php
index 313ddae..7f8f4af 100644
--- a/ArticleFeedbackv5.render.php
+++ b/ArticleFeedbackv5.render.php
@@ -985,44 +985,23 @@
}
}
-
- $activityLink = '';
- if (
- // there is a comment - display it
- $last->log_comment != '' ||
- // there is no comment, but it's out
own action and we'll have the possibility to add a comment
- ( $last->log_comment == '' &&
$last->log_user && $last->log_user == $wgUser->getId() )
- ) {
- $activityLink .=
- // link for activity log popup
+ $addNoteLink = '';
+ // if current user is the one who performed the
action, add a link to
+ // leave a note to clarify why the action was
performed
+ if ( $last->log_comment == '' &&
$last->log_user && $last->log_user == $wgUser->getId() ) {
+ $addNoteLink .=
Html::element(
'a',
array(
- 'id' =>
"articleFeedbackv5-activity-link-$record->aft_id",
- 'class' =>
'articleFeedbackv5-tipsy-link articleFeedbackv5-activity-link'.(
$last->log_comment ? '' : ' activity-empty' ), // tipsy for given data-action
will be loaded when clicked
+ 'id' =>
"articleFeedbackv5-note-link-$record->aft_id",
+ 'class' =>
'articleFeedbackv5-tipsy-link articleFeedbackv5-note-link', // tipsy for given
data-action will be loaded when clicked
+ 'title' =>
wfMessage( 'articlefeedbackv5-form-tooltip-note' )->text(),
'href' => '#',
- 'data-action'
=> 'activity',
+ 'data-action'
=> $last->log_action,
+ 'data-log-id'
=> $last->log_id,
),
- wfMessage(
"articlefeedbackv5-viewactivity".( $last->log_comment ? '' : '-empty' )
)->text()
+ wfMessage(
'articlefeedbackv5-form-note' )->text()
);
-
- // if current user is the one who
performed the action, add a link to
- // leave a note to clarify why the
action was performed
- if ( $last->log_comment == '' &&
$last->log_user && $last->log_user == $wgUser->getId() ) {
- $activityLink .=
- Html::element(
- 'a',
- array(
- 'id' =>
"articleFeedbackv5-note-link-$record->aft_id",
- 'class'
=> 'articleFeedbackv5-tipsy-link articleFeedbackv5-note-link', // tipsy for
given data-action will be loaded when clicked
- 'title'
=> wfMessage( 'articlefeedbackv5-form-tooltip-note' )->text(),
- 'href'
=> '#',
-
'data-action' => $last->log_action,
-
'data-log-id' => $last->log_id,
- ),
- wfMessage(
'articlefeedbackv5-form-note' )->text()
- );
- }
}
@@ -1046,17 +1025,30 @@
'div',
array( 'class' =>
"articleFeedbackv5-feedback-tools-details" ),
- // performer/action info
Html::rawElement(
'p',
array( 'class' =>
"articleFeedbackv5-activity-short-status" ),
+
+ // performer/action info
wfMessage(
"articlefeedbackv5-short-status-$last->log_action" )
->rawParams(
ArticleFeedbackv5Utils::getUserLink( $last->log_user, $last->log_user_text ) )
->parse()
) .
- // link to activity log
- $activityLink .
+ // link to add note
+ $addNoteLink .
+
+ // link for activity log popup
+ Html::element(
+ 'a',
+ array(
+ 'id' =>
"articleFeedbackv5-activity-link-$record->aft_id",
+ 'class' =>
'articleFeedbackv5-tipsy-link articleFeedbackv5-activity-link', // tipsy for
given data-action will be loaded when clicked
+ 'href' => '#',
+ 'data-action'
=> 'activity',
+ ),
+ wfMessage(
'articlefeedbackv5-viewactivity' )->text()
+ ) .
// tools (undo & possibly
oversight-related actions)
Html::rawElement(
diff --git
a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
index b171520..2a4d8ee 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
@@ -542,8 +542,7 @@
background-image: linear-gradient(transparent, transparent),
url(images/toolbox_undo.svg);
}
.articleFeedbackv5-feedback-tools li
a.articleFeedbackv5-request-link.inactive:before,
-.articleFeedbackv5-feedback-tools li
a.articleFeedbackv5-decline-link.inactive:before,
-.articleFeedbackv5-feedback-tools li
a.articleFeedbackv5-activity-link.inactive:before {
+.articleFeedbackv5-feedback-tools li
a.articleFeedbackv5-decline-link.inactive:before {
/* grayscale background image */
filter: url("data:image/svg+xml;utf8,<svg
xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix
type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0
0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale");
filter: grayscale(100%);
@@ -554,17 +553,17 @@
filter: gray;
}
.articleFeedbackv5-feedback-tools li a.articleFeedbackv5-request-link.inactive,
-.articleFeedbackv5-feedback-tools li a.articleFeedbackv5-decline-link.inactive,
-.articleFeedbackv5-feedback-tools li
a.articleFeedbackv5-activity-link.inactive {
+.articleFeedbackv5-feedback-tools li a.articleFeedbackv5-decline-link.inactive
{
color: #444;
cursor: default;
text-decoration: none;
}
-.articleFeedbackv5-feedback-tools a.articleFeedbackv5-activity-link {
+.articleFeedbackv5-feedback-tools a.articleFeedbackv5-note-link {
padding: 3px;
background-color: #E6E7E5;
border: 1px solid #D6D7D5;
+ margin-right: 10px;
}
.articleFeedbackv5-feedback-tools a.articleFeedbackv5-note-link {
@@ -572,7 +571,7 @@
}
.articleFeedbackv5-feedback-tools p.articleFeedbackv5-activity-short-status {
- color: #444;
+ color: #888;
}
/* Messages that it is not possible to flag own feedback */
@@ -652,24 +651,6 @@
#articleFeedbackv5-noteflyover-close:hover {
/* @embed */
background-image: url(images/bg-close-hov-16.png);
-}
-#articleFeedbackv5-noteflyover-helpbutton {
- display: block;
- position: absolute;
- top: 0;
- right: 50px;
- margin-top: 13px;
- width: 20px;
- height: 20px;
- /* @embed */
- background-image: url(images/bg-tooltip-trigger-20.png);
- background-repeat: no-repeat;
- background-position: left top;
- background-size: 20px 20px;
-}
-#articleFeedbackv5-noteflyover-helpbutton:hover {
- /* @embed */
- background-image: url(images/bg-tooltip-trigger-hov-20.png);
}
#articleFeedbackv5-noteflyover-description {
padding: 0 10px;
diff --git
a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
index 1147a70..0ea450e 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
@@ -785,11 +785,6 @@
// remove "add note"
link
$(
'#articleFeedbackv5-note-link-' + id ).remove();
- // change text to
reflect note has been entered
- $(
'#articleFeedbackv5-activity-link-' + id )
- .removeClass(
'activity-empty' )
- .text( mw.msg(
'articlefeedbackv5-viewactivity' ) );
-
// re-enable ajax
flagging
$.articleFeedbackv5special.listControls.disabled = false;
@@ -1688,7 +1683,6 @@
<div>\
<div
class="articleFeedbackv5-flyover-header">\
<h3
id="articleFeedbackv5-noteflyover-caption"><html:msg key="activity-pane-header"
/></h3>\
- <a
id="articleFeedbackv5-noteflyover-helpbutton" href="#"></a>\
<a
id="articleFeedbackv5-noteflyover-close" href="#"></a>\
</div>\
<div
id="articleFeedbackv5-activity-log"></div>\
--
To view, visit https://gerrit.wikimedia.org/r/55597
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ae43bf1a5d0ad92f2093c83ee28de820401831b
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
