| Index: trunk/phase3/skins/monobook/main.css |
| — | — | @@ -1077,4 +1077,8 @@ |
| 1078 | 1078 | div.gallerytext { |
| 1079 | 1079 | font-size: 94%; |
| 1080 | 1080 | padding: 2px 4px; |
| 1081 | | -} |
| \ No newline at end of file |
| | 1081 | +} |
| | 1082 | + |
| | 1083 | +span.comment { |
| | 1084 | + font-style: italic; |
| | 1085 | +} |
| Index: trunk/phase3/skins/common/common.css |
| — | — | @@ -291,3 +291,6 @@ |
| 292 | 292 | padding: 2px 4px; |
| 293 | 293 | } |
| 294 | 294 | |
| | 295 | +span.comment { |
| | 296 | + font-style: italic; |
| | 297 | +} |
| Index: trunk/phase3/includes/Linker.php |
| — | — | @@ -780,11 +780,11 @@ |
| 781 | 781 | * @access public |
| 782 | 782 | */ |
| 783 | 783 | function commentBlock( $comment, $title = NULL ) { |
| 784 | | - if( $comment == '' ) { |
| | 784 | + if( $comment == '' || $comment == '*' ) { |
| 785 | 785 | return ''; |
| 786 | 786 | } else { |
| 787 | 787 | $formatted = $this->formatComment( $comment, $title ); |
| 788 | | - return " <em>($formatted)</em>"; |
| | 788 | + return " <span class='comment'>($formatted)</span>"; |
| 789 | 789 | } |
| 790 | 790 | } |
| 791 | 791 | |
| Index: trunk/phase3/includes/SpecialContributions.php |
| — | — | @@ -201,9 +201,7 @@ |
| 202 | 202 | } |
| 203 | 203 | $histlink='('.$sk->makeKnownLinkObj( $page, $messages['hist'], 'action=history' ) . ')'; |
| 204 | 204 | |
| 205 | | - if( $comment ) { |
| 206 | | - $comment = '<em>(' . $sk->formatComment( $comment, $page ) . ')</em> '; |
| 207 | | - } |
| | 205 | + $comment = $sk->commentBlock( $comment, $page ); |
| 208 | 206 | $d = $wgLang->timeanddate( $ts, true ); |
| 209 | 207 | |
| 210 | 208 | if ($isminor) { |
| — | — | @@ -217,32 +215,6 @@ |
| 218 | 216 | } |
| 219 | 217 | |
| 220 | 218 | /** |
| 221 | | - * |
| 222 | | - */ |
| 223 | | -function ucCountLink( $lim, $d ) { |
| 224 | | - global $wgUser, $wgContLang, $wgRequest; |
| 225 | | - |
| 226 | | - $target = $wgRequest->getText( 'target' ); |
| 227 | | - $sk = $wgUser->getSkin(); |
| 228 | | - $s = $sk->makeKnownLink( $wgContLang->specialPage( "Contributions" ), |
| 229 | | - "{$lim}", "target={$target}&days={$d}&limit={$lim}" ); |
| 230 | | - return $s; |
| 231 | | -} |
| 232 | | - |
| 233 | | -/** |
| 234 | | - * |
| 235 | | - */ |
| 236 | | -function ucDaysLink( $lim, $d ) { |
| 237 | | - global $wgUser, $wgContLang, $wgRequest; |
| 238 | | - |
| 239 | | - $target = $wgRequest->getText( 'target' ); |
| 240 | | - $sk = $wgUser->getSkin(); |
| 241 | | - $s = $sk->makeKnownLink( $wgContLang->specialPage( 'Contributions' ), |
| 242 | | - "{$d}", "target={$target}&days={$d}&limit={$lim}" ); |
| 243 | | - return $s; |
| 244 | | -} |
| 245 | | - |
| 246 | | -/** |
| 247 | 219 | * Generates a form used to restrict display of contributions |
| 248 | 220 | * to a specific namespace |
| 249 | 221 | * |
| Index: trunk/phase3/includes/ChangesList.php |
| — | — | @@ -105,9 +105,8 @@ |
| 106 | 106 | $r .= $rcObj->usertalklink ; |
| 107 | 107 | |
| 108 | 108 | # Comment |
| 109 | | - if ( $rc_comment != '' && $rc_type != RC_MOVE && $rc_type != RC_MOVE_OVER_REDIRECT ) { |
| 110 | | - $rc_comment=$this->skin->formatComment($rc_comment, $rcObj->getTitle()); |
| 111 | | - $r .= $wgContLang->emphasize( ' ('.$rc_comment.')' ); |
| | 109 | + if ( $rc_type != RC_MOVE && $rc_type != RC_MOVE_OVER_REDIRECT ) { |
| | 110 | + $r .= $this->skin->commentBlock( $rc_comment, $rcObj->getTitle() ); |
| 112 | 111 | } |
| 113 | 112 | |
| 114 | 113 | if ($rcObj->numberofWatchingusers > 0) { |
| — | — | @@ -263,10 +262,7 @@ |
| 264 | 263 | $r .= $rcObj->lastlink ; |
| 265 | 264 | $r .= ') . . '.$rcObj->userlink ; |
| 266 | 265 | $r .= $rcObj->usertalklink ; |
| 267 | | - if ( $rc_comment != '' ) { |
| 268 | | - $rc_comment=$this->skin->formatComment($rc_comment, $rcObj->getTitle()); |
| 269 | | - $r .= $wgContLang->emphasize( ' ('.$rc_comment.')' ) ; |
| 270 | | - } |
| | 266 | + $r .= $this->skin->commentBlock( $rc_comment, $rcObj->getTitle() ); |
| 271 | 267 | $r .= "<br />\n" ; |
| 272 | 268 | } |
| 273 | 269 | $r .= "</div>\n" ; |
| — | — | @@ -443,9 +439,8 @@ |
| 444 | 440 | if($userTalkLink) $s.=' ('.$userTalkLink.')'; |
| 445 | 441 | |
| 446 | 442 | # Add comment |
| 447 | | - if ( '' != $rc_comment && '*' != $rc_comment && $rc_type != RC_MOVE && $rc_type != RC_MOVE_OVER_REDIRECT ) { |
| 448 | | - $rc_comment = $this->skin->formatComment($rc_comment,$rc->getTitle()); |
| 449 | | - $s .= $wgContLang->emphasize(' (' . $rc_comment . ')'); |
| | 443 | + if ( $rc_type != RC_MOVE && $rc_type != RC_MOVE_OVER_REDIRECT ) { |
| | 444 | + $s .= $this->skin->commentBlock( $rc_comment, $rc->getTitle() ); |
| 450 | 445 | } |
| 451 | 446 | |
| 452 | 447 | if ($rc->numberofWatchingusers > 0) { |
| Index: trunk/phase3/includes/SpecialUndelete.php |
| — | — | @@ -413,8 +413,8 @@ |
| 414 | 414 | Title::makeTitle( NS_USER, $row->ar_user_text ), |
| 415 | 415 | $userLink ); |
| 416 | 416 | } |
| 417 | | - $comment = $sk->formatComment( $row->ar_comment ); |
| 418 | | - $wgOut->addHTML( "<li>$checkBox $pageLink . . $userLink (<i>$comment</i>)</li>\n" ); |
| | 417 | + $comment = $sk->commentBlock( $row->ar_comment ); |
| | 418 | + $wgOut->addHTML( "<li>$checkBox $pageLink . . $userLink $comment</li>\n" ); |
| 419 | 419 | |
| 420 | 420 | } |
| 421 | 421 | $revisions->free(); |
| Index: trunk/phase3/includes/SpecialNewpages.php |
| — | — | @@ -61,7 +61,6 @@ |
| 62 | 62 | $ut = $result->user_text; |
| 63 | 63 | |
| 64 | 64 | $length = wfMsg( "nbytes", $wgLang->formatNum( $result->length ) ); |
| 65 | | - $c = $skin->formatComment($result->comment ); |
| 66 | 65 | |
| 67 | 66 | if ( $u == 0 ) { # not by a logged-in user |
| 68 | 67 | $ul = $ut; |
| — | — | @@ -83,9 +82,7 @@ |
| 84 | 83 | |
| 85 | 84 | $s = "{$d} {$link} ({$length}) . . {$ul}"; |
| 86 | 85 | |
| 87 | | - if ( "" != $c && "*" != $c ) { |
| 88 | | - $s .= " <em>({$c})</em>"; |
| 89 | | - } |
| | 86 | + $s .= $skin->commentBlock( $result->comment ); |
| 90 | 87 | |
| 91 | 88 | return $s; |
| 92 | 89 | } |
| Index: trunk/phase3/includes/SpecialIpblocklist.php |
| — | — | @@ -171,10 +171,7 @@ |
| 172 | 172 | wfMsg( "unblocklink" ) . "</a>"; |
| 173 | 173 | $wgOut->addHTML( " ({$ublink})" ); |
| 174 | 174 | } |
| 175 | | - if ( "" != $block->mReason ) { |
| 176 | | - $wgOut->addHTML( " <em>(" . $sk->formatComment( $block->mReason ) . |
| 177 | | - ")</em>" ); |
| 178 | | - } |
| | 175 | + $wgOut->addHTML( $sk->commentBlock( $block->mReason ) ); |
| 179 | 176 | $wgOut->addHTML( "</li>\n" ); |
| 180 | 177 | } |
| 181 | 178 | |
| Index: trunk/phase3/includes/SpecialLog.php |
| — | — | @@ -257,11 +257,7 @@ |
| 258 | 258 | $titleLink = $this->skin->makeBrokenLinkObj( $title ); |
| 259 | 259 | } |
| 260 | 260 | $userLink = $this->skin->makeLinkObj( $user, htmlspecialchars( $s->user_name ) ); |
| 261 | | - if( '' === $s->log_comment ) { |
| 262 | | - $comment = ''; |
| 263 | | - } else { |
| 264 | | - $comment = '(<em>' . $this->skin->formatComment( $s->log_comment ) . '</em>)'; |
| 265 | | - } |
| | 261 | + $comment = $this->skin->commentBlock( $s->log_comment ); |
| 266 | 262 | $paramArray = LogPage::extractParams( $s->log_params ); |
| 267 | 263 | |
| 268 | 264 | $action = LogPage::actionText( $s->log_type, $s->log_action, $titleLink, $paramArray ); |
| Index: trunk/phase3/includes/PageHistory.php |
| — | — | @@ -194,10 +194,7 @@ |
| 195 | 195 | $s .= $isminor ? ' <span class="minor">'.$message['minoreditletter'].'</span>': '' ; |
| 196 | 196 | |
| 197 | 197 | |
| 198 | | - if ( '' != $c && '*' != $c ) { |
| 199 | | - $c = $this->mSkin->formatcomment( $c, $this->mTitle ); |
| 200 | | - $s .= " <em>($c)</em>"; |
| 201 | | - } |
| | 198 | + $s .= $this->mSkin->commentBlock( $c, $this->mTitle ); |
| 202 | 199 | if ($notificationtimestamp && ($ts >= $notificationtimestamp)) { |
| 203 | 200 | $s .= wfMsg( 'updatedmarker' ); |
| 204 | 201 | } |
| Index: trunk/phase3/includes/SpecialUnusedimages.php |
| — | — | @@ -44,12 +44,10 @@ |
| 45 | 45 | # Last modified date |
| 46 | 46 | . ' . . '.$wgLang->timeanddate($result->value) |
| 47 | 47 | # Link to username |
| 48 | | - . ' . . '.$skin->makeLinkObj( Title::makeTitle( NS_USER, $result->img_user_text ), $result->img_user_text); |
| 49 | | - |
| | 48 | + . ' . . '.$skin->makeLinkObj( Title::makeTitle( NS_USER, $result->img_user_text ), $result->img_user_text) |
| 50 | 49 | # If there is a description, show it |
| 51 | | - if($result->img_description != '') { |
| 52 | | - $return .= ' <i>(' . $skin->formatComment( $result->img_description ) . ')</i>'; |
| 53 | | - } |
| | 50 | + . $skin->commentBlock( $result->img_description ); |
| | 51 | + |
| 54 | 52 | return $return; |
| 55 | 53 | } |
| 56 | 54 | |