r111596 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r111595‎ | r111596 | r111597 >
Date:23:29, 15 February 2012
Author:yonishostak
Status:resolved (Comments)
Tags:
Comment:
AFTv5: activity feature - another sync-up commit
Modified paths:
  • /trunk/extensions/ArticleFeedbackv5/api/ApiViewActivityArticleFeedbackv5.php (modified) (history)
  • /trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css (modified) (history)

Diff [purge]

Index: trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
@@ -451,10 +451,12 @@
452452 }
453453 #articlefeedbackv5-noteflyover-close {
454454 display: block;
455 - float: right;
 455+ position: absolute;
 456+ top: 0;
 457+ right: 25px;
 458+ margin-top: 14px;
456459 width: 16px;
457460 height: 16px;
458 - margin-top: -20px;
459461 /* @embed */
460462 background-image: url(images/bg-close-off.png);
461463 background-repeat: no-repeat;
@@ -467,11 +469,12 @@
468470 }
469471 #articlefeedbackv5-noteflyover-helpbutton {
470472 display: block;
471 - float: right;
 473+ position: absolute;
 474+ top: 0;
 475+ right: 50px;
 476+ margin-top: 13px;
472477 width: 20px;
473478 height: 20px;
474 - margin-top: -18px;
475 - margin-right: 30px;
476479 /* @embed */
477480 background-image: url(images/bg-tooltip-trigger.png);
478481 background-repeat: no-repeat;
@@ -516,10 +519,25 @@
517520 height: 360px;
518521 }
519522 .articleFeedbackv5-activity-pane {
520 - height: 60px;
 523+ height: 70px;
521524 }
522525 .articleFeedbackv5-activity-log-items {
523 - height: 280px;
 526+ height: 290px;
524527 overflow: auto;
525 - padding: 10px;
526528 }
 529+.articleFeedbackv5-activity-count {
 530+ background-color: #ddd;
 531+ padding: 3px 10px 3px 10px;
 532+}
 533+.articleFeedbackv5-activity-item {
 534+ padding: 5px 10px;
 535+ color: #555;
 536+}
 537+.articleFeedbackv5-activity-item a {
 538+ font-weight: bold;
 539+}
 540+.articleFeedbackv5-activity-item .articleFeedbackv5-activity-item-action {
 541+ font-weight: bold;
 542+ color: red;
 543+ padding: 0 5px;
 544+}
Index: trunk/extensions/ArticleFeedbackv5/api/ApiViewActivityArticleFeedbackv5.php
@@ -128,16 +128,18 @@
129129
130130 // $user $did_something_on $date
131131 $html .= $this->getUserLink($item->log_user, $item->log_user_text)
132 - . Html::element( 'div', array(),
 132+ . Html::element( 'span', array(
 133+ 'class' => 'articleFeedbackv5-activity-item-action'
 134+ ),
133135 wfMessage( 'articlefeedbackv5-activity-' . $item->log_action,
134136 array())->text() )
135137 . $wgLang->timeanddate( $item->log_timestamp );
136138
137139 // optional: <div class="articleFeedbackv5-activity-notes">$notes</div>
138140 if (!empty($item->log_comment)) {
139 - $html .= Html::element( 'div',
 141+ $html .= Html::element( 'span',
140142 array('class' => 'articlefeedbackv5-activity-notes'),
141 - $item->log_comment);
 143+ ': ' . $item->log_comment);
142144 }
143145
144146 // </div> for class="articleFeedbackv5-activity-item"

Follow-up revisions

RevisionCommit summaryAuthorDate
r113159bug 34090 - follow up to rr111472 part 4 and follow up to r111596 (same issue...emsmith17:37, 6 March 2012

Comments

#Comment by Catrope (talk | contribs)   19:51, 1 March 2012
- $item->log_comment);
+ ': ' . $item->log_comment);

This part of the code was already lego, but the colon makes it worse. You should create a message with something like $1 $2: $3 and stick other stuff in there (if it's HTML that's fine, just use rawParams).

Marking fixme for the lego, OK otherwise.

#Comment by Elizabeth M Smith (talk | contribs)   17:40, 6 March 2012

fixed in 113159

Status & tagging log