Index: trunk/extensions/ArticleFeedback/ArticleFeedback.hooks.php |
— | — | @@ -31,11 +31,14 @@ |
32 | 32 | 'articlefeedback-pitch-or', |
33 | 33 | 'articlefeedback-pitch-thanks', |
34 | 34 | 'articlefeedback-pitch-survey-message', |
| 35 | + 'articlefeedback-pitch-survey-body', |
35 | 36 | 'articlefeedback-pitch-survey-accept', |
36 | 37 | 'articlefeedback-pitch-join-message', |
| 38 | + 'articlefeedback-pitch-join-body', |
37 | 39 | 'articlefeedback-pitch-join-accept', |
38 | 40 | 'articlefeedback-pitch-join-login', |
39 | 41 | 'articlefeedback-pitch-edit-message', |
| 42 | + 'articlefeedback-pitch-edit-body', |
40 | 43 | 'articlefeedback-pitch-edit-accept', |
41 | 44 | 'articlefeedback-survey-title', |
42 | 45 | 'articlefeedback-survey-message-success', |
Index: trunk/extensions/ArticleFeedback/modules/jquery.articleFeedback/jquery.articleFeedback.js |
— | — | @@ -57,6 +57,7 @@ |
58 | 58 | <div class="articleFeedback-title"></div>\ |
59 | 59 | <div class="articleFeedback-pop">\ |
60 | 60 | <div class="articleFeedback-message"></div>\ |
| 61 | + <div class="articleFeedback-body"></div>\ |
61 | 62 | <button class="articleFeedback-accept"></button>\ |
62 | 63 | <button class="articleFeedback-reject"></button>\ |
63 | 64 | </div>\ |
— | — | @@ -307,6 +308,9 @@ |
308 | 309 | .find( '.articleFeedback-message' ) |
309 | 310 | .text( mw.msg( context.options.pitches[key].message ) ) |
310 | 311 | .end() |
| 312 | + .find( '.articleFeedback-body' ) |
| 313 | + .text( mw.msg( context.options.pitches[key].body ) ) |
| 314 | + .end() |
311 | 315 | .find( '.articleFeedback-accept' ) |
312 | 316 | .text( mw.msg( context.options.pitches[key].accept ) ) |
313 | 317 | .click( function() { |
— | — | @@ -317,6 +321,7 @@ |
318 | 322 | ); |
319 | 323 | } ) |
320 | 324 | .button() |
| 325 | + .addClass( 'ui-button-green' ) |
321 | 326 | .end() |
322 | 327 | .find( '.articleFeedback-reject' ) |
323 | 328 | .text( mw.msg( context.options.pitches[key].reject ) ) |
— | — | @@ -356,7 +361,8 @@ |
357 | 362 | context.options.pitches[$pitch.attr( 'rel' )].altAction |
358 | 363 | ); |
359 | 364 | } ) |
360 | | - .button(); |
| 365 | + .button() |
| 366 | + .addClass( 'ui-button-green' ); |
361 | 367 | } |
362 | 368 | } |
363 | 369 | } ) |
— | — | @@ -365,7 +371,7 @@ |
366 | 372 | // Activate tooltips |
367 | 373 | .find( '[title]' ) |
368 | 374 | .tipsy( { |
369 | | - 'gravity': 'sw', |
| 375 | + 'gravity': 'se', |
370 | 376 | 'center': false, |
371 | 377 | 'fade': true, |
372 | 378 | 'delayIn': 300, |
— | — | @@ -399,6 +405,7 @@ |
400 | 406 | // Buttonify the button |
401 | 407 | .find( '.articleFeedback-submit' ) |
402 | 408 | .button() |
| 409 | + .addClass( 'ui-button-blue' ) |
403 | 410 | .click( function() { |
404 | 411 | $.articleFeedback.fn.submit.call( context ); |
405 | 412 | var pitches = []; |
Index: trunk/extensions/ArticleFeedback/modules/jquery.articleFeedback/images/pop.png |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Index: trunk/extensions/ArticleFeedback/modules/jquery.articleFeedback/images/check.png |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Index: trunk/extensions/ArticleFeedback/modules/jquery.articleFeedback/images/success.png |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
Property changes on: trunk/extensions/ArticleFeedback/modules/jquery.articleFeedback/images/success.png |
___________________________________________________________________ |
Added: svn:mime-type |
406 | 413 | + application/octet-stream |
Index: trunk/extensions/ArticleFeedback/modules/jquery.articleFeedback/jquery.articleFeedback.css |
— | — | @@ -90,7 +90,7 @@ |
91 | 91 | font-size: 1em; |
92 | 92 | padding-left: 28px; |
93 | 93 | line-height: 32px; |
94 | | - background-image: url(images/check.png); |
| 94 | + background-image: url(images/success.png); |
95 | 95 | background-repeat: no-repeat; |
96 | 96 | background-position: left center; |
97 | 97 | margin-bottom: 0.5em; |
— | — | @@ -99,21 +99,28 @@ |
100 | 100 | .articleFeedback-pitch .articleFeedback-pop { |
101 | 101 | padding: 1em; |
102 | 102 | margin: 0; |
103 | | - background-color: #b2d6f6; |
| 103 | + background-color: white; |
| 104 | + border: solid 1px silver; |
| 105 | + /* |
104 | 106 | background-image: url(images/pop.png); |
105 | 107 | background-position: center center; |
106 | 108 | background-repeat: no-repeat; |
107 | | - text-align: center; |
| 109 | + */ |
108 | 110 | -webkit-border-radius: 5px; |
109 | 111 | -moz-border-radius: 5px; |
110 | 112 | border-radius: 5px; |
111 | 113 | } |
112 | 114 | |
113 | 115 | .articleFeedback-message { |
114 | | - margin: 0.5em; |
| 116 | + margin: 0.33em; |
115 | 117 | font-size: 1.5em; |
116 | 118 | } |
117 | 119 | |
| 120 | +.articleFeedback-body { |
| 121 | + margin: 0.5em; |
| 122 | + color: #333333; |
| 123 | +} |
| 124 | + |
118 | 125 | .articleFeedback-switch { |
119 | 126 | cursor: pointer; |
120 | 127 | color: #0645AD; |
— | — | @@ -312,7 +319,7 @@ |
313 | 320 | } |
314 | 321 | .articleFeedback-success span { |
315 | 322 | display: none; |
316 | | - background-image: url(images/check.png); |
| 323 | + background-image: url(images/success.png); |
317 | 324 | background-repeat: no-repeat; |
318 | 325 | background-position: center left; |
319 | 326 | padding-left: 28px; |
Index: trunk/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.js |
— | — | @@ -205,6 +205,7 @@ |
206 | 206 | }, |
207 | 207 | 'title': 'articlefeedback-pitch-thanks', |
208 | 208 | 'message': 'articlefeedback-pitch-survey-message', |
| 209 | + 'body': 'articlefeedback-pitch-survey-body', |
209 | 210 | 'accept': 'articlefeedback-pitch-survey-accept', |
210 | 211 | 'reject': 'articlefeedback-pitch-reject' |
211 | 212 | }, |
— | — | @@ -228,6 +229,7 @@ |
229 | 230 | }, |
230 | 231 | 'title': 'articlefeedback-pitch-thanks', |
231 | 232 | 'message': 'articlefeedback-pitch-join-message', |
| 233 | + 'body': 'articlefeedback-pitch-join-body', |
232 | 234 | 'accept': 'articlefeedback-pitch-join-accept', |
233 | 235 | 'reject': 'articlefeedback-pitch-reject', |
234 | 236 | // Special alternative action for going to login page |
— | — | @@ -276,6 +278,7 @@ |
277 | 279 | }, |
278 | 280 | 'title': 'articlefeedback-pitch-thanks', |
279 | 281 | 'message': 'articlefeedback-pitch-edit-message', |
| 282 | + 'body': 'articlefeedback-pitch-join-body', |
280 | 283 | 'accept': 'articlefeedback-pitch-edit-accept', |
281 | 284 | 'reject': 'articlefeedback-pitch-reject' |
282 | 285 | } |
Index: trunk/extensions/ArticleFeedback/ArticleFeedback.i18n.php |
— | — | @@ -35,7 +35,7 @@ |
36 | 36 | 'articlefeedback-form-panel-expertise-profession' => 'It is part of my profession', |
37 | 37 | 'articlefeedback-form-panel-expertise-hobby' => 'It is related to my hobbies or interests', |
38 | 38 | 'articlefeedback-form-panel-expertise-other' => 'The source of my knowledge is not listed here', |
39 | | - 'articlefeedback-form-panel-submit' => 'Submit feedback', |
| 39 | + 'articlefeedback-form-panel-submit' => 'Submit ratings', |
40 | 40 | 'articlefeedback-form-panel-success' => 'Saved successfully', |
41 | 41 | 'articlefeedback-report-switch-label' => 'View page ratings', |
42 | 42 | 'articlefeedback-report-panel-title' => 'Page ratings', |
— | — | @@ -54,11 +54,14 @@ |
55 | 55 | 'articlefeedback-pitch-or' => 'or', |
56 | 56 | 'articlefeedback-pitch-thanks' => 'Thanks! Your ratings have been saved.', |
57 | 57 | 'articlefeedback-pitch-survey-message' => 'Please take a moment to complete a short survey.', |
| 58 | + 'articlefeedback-pitch-survey-body' => '', |
58 | 59 | 'articlefeedback-pitch-survey-accept' => 'Start survey', |
59 | | - 'articlefeedback-pitch-join-message' => 'Did you know that you can create an account? An account will help you track your edits, get involved in discussions, and be a part of the community.', |
| 60 | + 'articlefeedback-pitch-join-message' => 'Did you know that you can create an account?', |
| 61 | + 'articlefeedback-pitch-join-body' => 'An account will help you track your edits, get involved in discussions, and be a part of the community.', |
60 | 62 | 'articlefeedback-pitch-join-accept' => 'Create an account', |
61 | 63 | 'articlefeedback-pitch-join-login' => 'Log in', |
62 | 64 | 'articlefeedback-pitch-edit-message' => 'Did you know that you can edit this page?', |
| 65 | + 'articlefeedback-pitch-edit-body' => '', |
63 | 66 | 'articlefeedback-pitch-edit-accept' => 'Edit this page', |
64 | 67 | 'articlefeedback-survey-message-success' => 'Thanks for filling out the survey.', |
65 | 68 | 'articlefeedback-survey-message-error' => 'An error has occurred. |