| Index: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php |
| — | — | @@ -46,7 +46,7 @@ |
| 47 | 47 | 'articlefeedbackv5-bucket1-disclosure-privacy-policy-linktext' => 'terms', |
| 48 | 48 | 'articlefeedbackv5-bucket1-form-pending' => 'Your feedback has not been submitted yet', |
| 49 | 49 | 'articlefeedbackv5-bucket5-form-success' => 'Saved successfully', |
| 50 | | - 'articlefeedbackv5-bucket1-form-submit' => 'Submit Your Feedback', |
| | 50 | + 'articlefeedbackv5-bucket1-form-submit' => 'Post Your Feedback', |
| 51 | 51 | 'articlefeedbackv5-shared-on-feedback' => 'Your comment will be shared on this $1.', |
| 52 | 52 | 'articlefeedbackv5-shared-on-feedback-linktext' => 'feedback page', |
| 53 | 53 | 'articlefeedbackv5-transparency-terms' => 'By posting, you agree to transparency under these $1.', |
| Index: trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css |
| — | — | @@ -414,32 +414,19 @@ |
| 415 | 415 | width: 100%; |
| 416 | 416 | } |
| 417 | 417 | /* tooltip styling. by default the element to be styled is .tooltip */ |
| 418 | | -<<<<<<< .mine |
| 419 | 418 | .articleFeedbackv5-panel .title-wrap { |
| 420 | 419 | position: relative; |
| 421 | 420 | } |
| 422 | 421 | .articleFeedbackv5-panel .articleFeedbackv5-tooltip { |
| 423 | | - display:none; |
| | 422 | + display: none; |
| 424 | 423 | position: absolute; |
| 425 | 424 | z-index: 15; |
| 426 | 425 | top: -185px; |
| 427 | 426 | right: -105px; |
| 428 | | -======= |
| 429 | | -.articleFeedbackv5-panel .title-wrap { |
| 430 | | - position: relative; |
| | 427 | + font-size: 12px; |
| | 428 | + width: 234px; |
| | 429 | + color: #000; |
| 431 | 430 | } |
| 432 | | -.articleFeedbackv5-panel .articleFeedbackv5-tooltip { |
| 433 | | - display:none; |
| 434 | | - position: absolute; |
| 435 | | - z-index: 15; |
| 436 | | - top: -175px; |
| 437 | | - right: -105px; |
| 438 | | ->>>>>>> .r103389 |
| 439 | | - font-size:12px; |
| 440 | | - width:234px; |
| 441 | | - color:#000; |
| 442 | | -} |
| 443 | | -<<<<<<< .mine |
| 444 | 431 | .articleFeedbackv5-panel .articleFeedbackv5-tooltip .tooltip-top { |
| 445 | 432 | background: url(images/bg-tooltip-top.png); |
| 446 | 433 | height: 11px; |
| — | — | @@ -453,24 +440,6 @@ |
| 454 | 441 | background: url(images/bg-tooltip-bottom.png); |
| 455 | 442 | height: 26px; |
| 456 | 443 | } |
| 457 | | -======= |
| 458 | | -.articleFeedbackv5-panel .articleFeedbackv5-tooltip .tooltip-top { |
| 459 | | - background: url(images/bg-tooltip-top.png); |
| 460 | | - height: 11px; |
| 461 | | -} |
| 462 | | -.articleFeedbackv5-panel .articleFeedbackv5-tooltip .tooltip-repeat { |
| 463 | | - background: url(images/bg-tooltip.png) repeat-y; |
| 464 | | - padding: 0 20px 10px; |
| 465 | | - margin: 0; |
| 466 | | -} |
| 467 | | -.articleFeedbackv5-panel .articleFeedbackv5-tooltip .tooltip-repeat p { |
| 468 | | - display: block; |
| 469 | | -} |
| 470 | | -.articleFeedbackv5-panel .articleFeedbackv5-tooltip .tooltip-bottom { |
| 471 | | - background: url(images/bg-tooltip-bottom.png); |
| 472 | | - height: 26px; |
| 473 | | -} |
| 474 | | ->>>>>>> .r103389 |
| 475 | 444 | .articleFeedbackv5-panel { |
| 476 | 445 | width: 598px; |
| 477 | 446 | background: #f5faff; |
| — | — | @@ -549,16 +518,19 @@ |
| 550 | 519 | } |
| 551 | 520 | .articleFeedbackv5-panel .articleFeedbackv5-disclosure { |
| 552 | 521 | float: left; |
| 553 | | - width: 280px; |
| 554 | | - margin: 0 0 0 10px; |
| | 522 | + width: 335px; |
| | 523 | + margin: 10px 0 0; |
| 555 | 524 | } |
| | 525 | +.articleFeedbackv5-panel .articleFeedbackv5-disclosure p { |
| | 526 | + margin: 0; |
| | 527 | +} |
| 556 | 528 | .articleFeedbackv5-panel .articleFeedbackv5-submit { |
| 557 | 529 | float: right; |
| 558 | 530 | height: 25px; |
| 559 | | - width: 200px; |
| | 531 | + width: 180px; |
| 560 | 532 | text-align: center; |
| 561 | 533 | background: url(images/bg-submit-disable.png) repeat-x !important; |
| 562 | | - margin: 10px 53px 0 0 !important; |
| | 534 | + margin: 10px 30px 0 0 !important; |
| 563 | 535 | border: none !important; |
| 564 | 536 | -moz-border-radius: 3px; |
| 565 | 537 | -webkit-border-radius: 3px; |
| Index: trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js |
| — | — | @@ -166,7 +166,8 @@ |
| 167 | 167 | <textarea id="find-feedback" class="feedback-text" name="comment"></textarea>\ |
| 168 | 168 | </div>\ |
| 169 | 169 | <div class="articleFeedbackv5-disclosure">\ |
| 170 | | - <p></p>\ |
| | 170 | + <p class="articlefeedbackv5-shared-on-feedback"></p>\ |
| | 171 | + <p class="articlefeedbackv5-transparency-terms"></p>\ |
| 171 | 172 | </div>\ |
| 172 | 173 | <button class="articleFeedbackv5-submit" type="submit" disabled="disabled"><html:msg key="bucket1-form-submit" /></button>\ |
| 173 | 174 | <div class="clear"></div>\ |
| — | — | @@ -179,23 +180,25 @@ |
| 180 | 181 | $block.find( '.articleFeedbackv5-tooltip' ).hide(); |
| 181 | 182 | |
| 182 | 183 | // Fill in the disclosure text |
| 183 | | - $block.find( '.articleFeedbackv5-disclosure p' ) |
| | 184 | + $block.find( '.articlefeedbackv5-shared-on-feedback' ) |
| 184 | 185 | .html( $.articleFeedbackv5.buildLink( |
| 185 | | - 'articlefeedbackv5-bucket1-disclosure', |
| | 186 | + 'articlefeedbackv5-shared-on-feedback', |
| 186 | 187 | { |
| 187 | 188 | href: mw.config.get( 'wgScript' ) + '?' + $.param( { |
| 188 | 189 | title: mw.config.get( 'wgPageName' ), |
| 189 | 190 | action: 'feedback' |
| 190 | 191 | } ), |
| 191 | | - text: 'articlefeedbackv5-bucket1-disclosure-shared-linktext', |
| | 192 | + text: 'articlefeedbackv5-shared-on-feedback-linktext', |
| 192 | 193 | target: '_blank' |
| 193 | | - }, |
| | 194 | + } ) ); |
| | 195 | + $block.find( '.articlefeedbackv5-transparency-terms' ) |
| | 196 | + .html( $.articleFeedbackv5.buildLink( |
| | 197 | + 'articlefeedbackv5-transparency-terms', |
| 194 | 198 | { |
| 195 | 199 | href: mw.util.wikiGetlink( mw.config.get( 'wgArticleFeedbackv5TermsPage' ) ), |
| 196 | | - text: 'articlefeedbackv5-bucket1-disclosure-privacy-policy-linktext', |
| | 200 | + text: 'articlefeedbackv5-transparency-terms-linktext', |
| 197 | 201 | target: '_blank' |
| 198 | | - } |
| 199 | | - ).replace( /\$0/, '<br />' ) ); |
| | 202 | + } ) ); |
| 200 | 203 | |
| 201 | 204 | // Localize the block |
| 202 | 205 | $block.localize( { 'prefix': 'articlefeedbackv5-' } ); |
| Index: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.hooks.php |
| — | — | @@ -71,9 +71,6 @@ |
| 72 | 72 | 'articlefeedbackv5-bucket1-toggle-found-no-full', |
| 73 | 73 | 'articlefeedbackv5-bucket1-question-comment-yes', |
| 74 | 74 | 'articlefeedbackv5-bucket1-question-comment-no', |
| 75 | | - 'articlefeedbackv5-bucket1-disclosure', |
| 76 | | - 'articlefeedbackv5-bucket1-disclosure-shared-linktext', |
| 77 | | - 'articlefeedbackv5-bucket1-disclosure-privacy-policy-linktext', |
| 78 | 75 | 'articlefeedbackv5-bucket1-form-pending', |
| 79 | 76 | 'articlefeedbackv5-bucket1-form-success', |
| 80 | 77 | 'articlefeedbackv5-bucket1-form-submit', |