| Index: trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css |
| — | — | @@ -166,6 +166,15 @@ |
| 167 | 167 | clear: left; |
| 168 | 168 | padding-right: 160px; |
| 169 | 169 | } |
| | 170 | + |
| | 171 | +.articleFeedbackv5-feedback blockquote .articleFeedbackv5-comment-full { |
| | 172 | + display: none; |
| | 173 | +} |
| | 174 | + |
| | 175 | +.articleFeedbackv5-comment-toggle { |
| | 176 | + margin-left: 7px; |
| | 177 | +} |
| | 178 | + |
| 170 | 179 | .articleFeedbackv5-feedback .articleFeedbackv5-comment-details { |
| 171 | 180 | padding-top: 30px; |
| 172 | 181 | float: right; |
| — | — | @@ -202,6 +211,13 @@ |
| 203 | 212 | #articleFeedbackv5-special-add-feedback:after { |
| 204 | 213 | clear:both; |
| 205 | 214 | } |
| | 215 | +#articleFeedbackv5-show-feedback { |
| | 216 | + width: 100%; |
| | 217 | + float: none; |
| | 218 | + margin: 0; |
| | 219 | + padding: 0; |
| | 220 | +} |
| | 221 | + |
| 206 | 222 | #articleFeedbackv5-show-feedback .articleFeedbackv5-abuse-link { |
| 207 | 223 | |
| 208 | 224 | } |
| — | — | @@ -327,10 +343,6 @@ |
| 328 | 344 | background-size: 11px 7px; |
| 329 | 345 | } |
| 330 | 346 | |
| 331 | | -.articleFeedbackv5-comment-full { |
| 332 | | - display: none; |
| 333 | | -} |
| 334 | | - |
| 335 | 347 | a.helpful-active { |
| 336 | 348 | background: url(images/bg-button.png) !important; |
| 337 | 349 | color: white !important; |
| Index: trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js |
| — | — | @@ -533,7 +533,7 @@ |
| 534 | 534 | if ( resetContents ) { |
| 535 | 535 | $( '#articleFeedbackv5-show-feedback' ).empty(); |
| 536 | 536 | } |
| 537 | | - var $newList = $( '<div></div>' ).html( data['articlefeedbackv5-view-feedback'].feedback ); |
| | 537 | + $newList = $( '#articleFeedbackv5-show-feedback' ).append( data['articlefeedbackv5-view-feedback'].feedback ); |
| 538 | 538 | $newList.find( '.articleFeedbackv5-feedback' ).each( function () { |
| 539 | 539 | var id = $( this ).attr( 'rel' ); |
| 540 | 540 | if ( id in $.articleFeedbackv5special.activity ) { |
| — | — | @@ -553,7 +553,6 @@ |
| 554 | 554 | $.articleFeedbackv5special.markHidden( $( this ) ); |
| 555 | 555 | } |
| 556 | 556 | } ); |
| 557 | | - $( '#articleFeedbackv5-show-feedback' ).append( $newList ); |
| 558 | 557 | $( '#articleFeedbackv5-feedback-count-total' ).text( data['articlefeedbackv5-view-feedback'].count ); |
| 559 | 558 | $.articleFeedbackv5special.listControls.continue = data['articlefeedbackv5-view-feedback'].continue; |
| 560 | 559 | } else { |
| Index: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php |
| — | — | @@ -271,14 +271,14 @@ |
| 272 | 272 | $wgHooks['ArticleSaveComplete'][] = 'ArticleFeedbackv5Hooks::trackEditSuccess'; |
| 273 | 273 | |
| 274 | 274 | // API Registration |
| 275 | | -$wgAPIListModules['articlefeedbackv5-view-ratings'] = 'ApiViewRatingsArticleFeedbackv5'; |
| 276 | | -$wgAPIListModules['articlefeedbackv5-view-feedback'] = 'ApiViewFeedbackArticleFeedbackv5'; |
| 277 | | -$wgAPIModules['articlefeedbackv5-flag-feedback'] = 'ApiFlagFeedbackArticleFeedbackv5'; |
| | 275 | +#$wgAPIListModules['articlefeedbackv5-view-ratings'] = 'ApiViewRatingsArticleFeedbackv5'; |
| | 276 | +#$wgAPIListModules['articlefeedbackv5-view-feedback'] = 'ApiViewFeedbackArticleFeedbackv5'; |
| | 277 | +#$wgAPIModules['articlefeedbackv5-flag-feedback'] = 'ApiFlagFeedbackArticleFeedbackv5'; |
| 278 | 278 | $wgAPIModules['articlefeedbackv5'] = 'ApiArticleFeedbackv5'; |
| 279 | 279 | |
| 280 | 280 | // Special Page |
| 281 | | -$wgSpecialPages['ArticleFeedbackv5'] = 'SpecialArticleFeedbackv5'; |
| 282 | | -$wgSpecialPageGroups['ArticleFeedbackv5'] = 'other'; |
| | 281 | +#$wgSpecialPages['ArticleFeedbackv5'] = 'SpecialArticleFeedbackv5'; |
| | 282 | +#$wgSpecialPageGroups['ArticleFeedbackv5'] = 'other'; |
| 283 | 283 | |
| 284 | 284 | $wgAvailableRights[] = 'aftv5-hide-feedback'; |
| 285 | 285 | $wgAvailableRights[] = 'aftv5-delete-feedback'; |
| Index: trunk/extensions/ArticleFeedbackv5/api/ApiViewFeedbackArticleFeedbackv5.php |
| — | — | @@ -590,32 +590,35 @@ |
| 591 | 591 | |
| 592 | 592 | $short = $wgLang->truncate( $text, 500 ); |
| 593 | 593 | |
| 594 | | - $rv = Html::openElement( 'blockquote', |
| 595 | | - array( |
| 596 | | - 'class' => 'articleFeedbackv5-comment-short', |
| 597 | | - 'id' => "articleFeedbackv5-comment-short-$feedbackId" |
| 598 | | - ) ) |
| 599 | | - . htmlspecialchars( $short ) |
| 600 | | - . Html::closeElement( 'blockquote' ); |
| | 594 | + $rv = Html::openElement( 'blockquote' ) |
| | 595 | + . Html::element( 'span', |
| | 596 | + array( |
| | 597 | + 'class' => 'articleFeedbackv5-comment-short', |
| | 598 | + 'id' => "articleFeedbackv5-comment-short-$feedbackId" |
| | 599 | + ), |
| | 600 | + htmlspecialchars( $short ) |
| | 601 | + ); |
| 601 | 602 | |
| 602 | 603 | // If the short string is the same size as the |
| 603 | 604 | // original, no truncation happened, so no |
| 604 | 605 | // controls are needed. |
| 605 | 606 | if ( $short != $text ) { |
| 606 | 607 | // Show the short text, with the 'show more' control. |
| 607 | | - $rv .= Html::openElement( 'blockquote', |
| 608 | | - array( |
| 609 | | - 'class' => 'articleFeedbackv5-comment-full', |
| 610 | | - 'id' => "articleFeedbackv5-comment-full-$feedbackId" |
| 611 | | - ) ) |
| 612 | | - . htmlspecialchars( $text ) |
| 613 | | - . Html::closeElement( 'blockquote' ) |
| | 608 | + $rv .= Html::element( 'span', |
| | 609 | + array( |
| | 610 | + 'class' => 'articleFeedbackv5-comment-full', |
| | 611 | + 'id' => "articleFeedbackv5-comment-full-$feedbackId" |
| | 612 | + ), |
| | 613 | + htmlspecialchars( $text ) |
| | 614 | + ) |
| 614 | 615 | . Html::element( 'a', array( |
| 615 | 616 | 'class' => 'articleFeedbackv5-comment-toggle', |
| 616 | 617 | 'id' => "articleFeedbackv5-comment-toggle-$feedbackId" |
| 617 | 618 | ), wfMessage( 'articlefeedbackv5-comment-more' )->escaped() ); |
| 618 | 619 | } |
| 619 | 620 | |
| | 621 | + $rv .= Html::closeElement( 'blockquote' ); |
| | 622 | + |
| 620 | 623 | return $rv; |
| 621 | 624 | } |
| 622 | 625 | |