| Index: branches/js2-work/phase3/js/mwEmbed/modules/UploadWizard/mw.UploadWizard.js |
| — | — | @@ -61,8 +61,8 @@ |
| 62 | 62 | "mwe-upwiz-macro-edit": "Update descriptions", |
| 63 | 63 | "mwe-upwiz-thanks-intro": "Thanks for uploading your works! You can now use your files on a Wikipedia article or link to them from elsewhere on the web.", |
| 64 | 64 | "mwe-upwiz-thanks-link": "This file is now available at <b><tt>$1</tt></b>.", |
| 65 | | - "mwe-upwiz-thanks-wikitext": "To use it in a Wikipedia article, copy this text into an article: ", |
| 66 | | - "mwe-upwiz-thanks-url": "To link to it in HTML, copy this HTML code: ", |
| | 65 | + "mwe-upwiz-thanks-wikitext": "<b>To use it in a Wikipedia article</b>, copy this text into an article: ", |
| | 66 | + "mwe-upwiz-thanks-url": "<b>To link to it in HTML</b>, copy this HTML code: ", |
| 67 | 67 | |
| 68 | 68 | "mwe-upwiz-upload-error-bad-filename-extension": "This wiki does not accept filenames with the extension \"$1\".", |
| 69 | 69 | "mwe-upwiz-upload-error-duplicate": "This file was previously uploaded to this wiki.", |
| — | — | @@ -961,7 +961,7 @@ |
| 962 | 962 | |
| 963 | 963 | _this.descriptions = []; |
| 964 | 964 | |
| 965 | | - _this.div = $j( '<div class="mwe-upwiz-details-file"></div>' ); |
| | 965 | + _this.div = $j( '<div class="mwe-upwiz-info-file"></div>' ); |
| 966 | 966 | |
| 967 | 967 | _this.thumbnailDiv = $j( '<div class="mwe-upwiz-thumbnail"></div>' ); |
| 968 | 968 | |
| — | — | @@ -1840,14 +1840,10 @@ |
| 1841 | 1841 | + '<div id="mwe-upwiz-macro">' |
| 1842 | 1842 | + '<div id="mwe-upwiz-macro-choice">' |
| 1843 | 1843 | + '<div>' + gM( 'mwe-upwiz-intro-details' ) + '</div>' |
| 1844 | | - + '<div id="mwe-upwiz-macro-deeds" />' |
| | 1844 | + + '<div id="mwe-upwiz-macro-deeds"></div>' |
| 1845 | 1845 | + '</div>' |
| 1846 | | - + '<div id="mwe-upwiz-macro-edit">' |
| 1847 | | - + '<div>' |
| 1848 | | - //+ '<p>' + gM( 'mwe-upwiz-macro-edit-intro' ) + '</p>' |
| 1849 | | - + '</div>' |
| 1850 | 1846 | + '<div id="mwe-upwiz-macro-progress"></div>' |
| 1851 | | - + '<div id="mwe-upwiz-macro-files"></div>' |
| | 1847 | + + '<div id="mwe-upwiz-macro-files"></div>' |
| 1852 | 1848 | + '<div class="mwe-upwiz-macro-edit-submit"></div>' // button added below |
| 1853 | 1849 | + '</div>' |
| 1854 | 1850 | + '</div>' |
| — | — | @@ -2226,12 +2222,11 @@ |
| 2227 | 2223 | prefillThanksPage: function() { |
| 2228 | 2224 | var _this = this; |
| 2229 | 2225 | |
| 2230 | | - var thanksDiv = $j( '#mwe-upwiz-thanks' ); |
| 2231 | | - |
| 2232 | | - thanksDiv.append( $j( '<p>' ).append( gM( 'mwe-upwiz-thanks-intro' ) ) ); |
| | 2226 | + $j( '#mwe-upwiz-thanks' ).append( $j( '<p>' ).append( gM( 'mwe-upwiz-thanks-intro' ) ) ); |
| 2233 | 2227 | var width = mw.getConfig( 'thumbnailWidth' ); |
| 2234 | 2228 | |
| 2235 | 2229 | $j.each( _this.uploads, function(i, upload) { |
| | 2230 | + var thanksDiv = $j( '<div class="mwe-thanks ui-helper-clearfix" />' ); |
| 2236 | 2231 | var thumbnailDiv = $j( '<div></div>' ).addClass( 'mwe-upwiz-links-thumbnail' ); |
| 2237 | 2232 | thanksDiv.append( thumbnailDiv ); |
| 2238 | 2233 | |
| — | — | @@ -2255,29 +2250,36 @@ |
| 2256 | 2251 | /* end evil copied code */ |
| 2257 | 2252 | |
| 2258 | 2253 | var thumbTitle = upload.title.replace(/^File/, 'Image'); // XXX is this really necessary? |
| 2259 | | - var thumbWikiText = "[[" + thumbTitle + "|thumb|right]]"; |
| | 2254 | + var thumbWikiText = "[[" + thumbTitle + "|thumb]]"; |
| 2260 | 2255 | |
| 2261 | 2256 | thanksDiv.append( |
| 2262 | | - $j( '<div></div>' ) |
| | 2257 | + $j( '<div class="mwe-upwiz-info-file"></div>' ) |
| 2263 | 2258 | .addClass( 'mwe-upwiz-thanks-links' ) |
| 2264 | | - .append( $j('<p/>') |
| 2265 | | - .append( gM( 'mwe-upwiz-thanks-link', |
| 2266 | | - $j( '<a />' ) |
| 2267 | | - .attr( { target: '_new', href: upload.imageinfo.descriptionurl } ) |
| 2268 | | - .text( upload.title ) ) ) ) |
| 2269 | | - .append( $j('<p/>') |
| 2270 | | - .append( gM( 'mwe-upwiz-thanks-wikitext' ), |
| 2271 | | - $j( '<textarea></textarea>' ) |
| 2272 | | - .addClass( 'mwe-thanks-input-textarea' ) |
| 2273 | | - .append( thumbWikiText ) ) ) |
| 2274 | | - .append( $j('<p/>') |
| 2275 | | - .append( gM( 'mwe-upwiz-thanks-url' ), |
| 2276 | | - $j( '<input />' ) |
| 2277 | | - .addClass( 'mwe-thanks-input' ) |
| 2278 | | - .attr( { type: 'text', value: upload.imageinfo.descriptionurl } ) ) ) |
| 2279 | | - |
| | 2259 | + .append( |
| | 2260 | + $j('<p/>').append( |
| | 2261 | + gM( 'mwe-upwiz-thanks-link', |
| | 2262 | + $j( '<a />' ) |
| | 2263 | + .attr( { target: '_new', |
| | 2264 | + href: upload.imageinfo.descriptionurl } ) |
| | 2265 | + .text( upload.title ) |
| | 2266 | + ) |
| | 2267 | + ), |
| | 2268 | + $j('<p/>').append( |
| | 2269 | + gM( 'mwe-upwiz-thanks-wikitext' ), |
| | 2270 | + $j( '<br />' ), |
| | 2271 | + $j( '<textarea class="mwe-long-textarea" rows="1"/>' ) |
| | 2272 | + .append( thumbWikiText ) |
| | 2273 | + ), |
| | 2274 | + $j('<p/>').append( |
| | 2275 | + gM( 'mwe-upwiz-thanks-url' ), |
| | 2276 | + $j( '<br />' ), |
| | 2277 | + $j( '<textarea class="mwe-long-textarea" rows="1"/>' ) |
| | 2278 | + .append( upload.imageinfo.descriptionurl ) |
| | 2279 | + ) |
| | 2280 | + ) |
| 2280 | 2281 | ); |
| 2281 | 2282 | |
| | 2283 | + $j( '#mwe-upwiz-thanks' ).append( thanksDiv ); |
| 2282 | 2284 | } ); |
| 2283 | 2285 | }, |
| 2284 | 2286 | |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/UploadWizard/css/uploadWizard.css |
| — | — | @@ -353,7 +353,7 @@ |
| 354 | 354 | #mwe-upwiz-macro-files { |
| 355 | 355 | margin-top: 12px; |
| 356 | 356 | } |
| 357 | | -.mwe-upwiz-details-file { |
| | 357 | +.mwe-upwiz-info-file { |
| 358 | 358 | border-bottom: 1px solid #e0e0e0; |
| 359 | 359 | margin-bottom: 12px; |
| 360 | 360 | padding-bottom: 12px; |
| — | — | @@ -474,4 +474,3 @@ |
| 475 | 475 | } |
| 476 | 476 | |
| 477 | 477 | |
| 478 | | - |