| Index: branches/js2-work/phase3/js/mwEmbed/modules/UploadWizard/mw.UploadWizard.js |
| — | — | @@ -967,7 +967,7 @@ |
| 968 | 968 | |
| 969 | 969 | _this.errorDiv = $j( '<div class="mwe-upwiz-details-error"></div>' ); |
| 970 | 970 | |
| 971 | | - _this.dataDiv = $j( '<div class="mwe-upwiz-details-data"></div>' ); |
| | 971 | + _this.dataDiv = $j( '<div class="mwe-upwiz-data"></div>' ); |
| 972 | 972 | |
| 973 | 973 | // descriptions |
| 974 | 974 | _this.descriptionsDiv = $j( '<div class="mwe-upwiz-details-descriptions mwe-upwiz-details-input"></div>' ); |
| — | — | @@ -1838,11 +1838,11 @@ |
| 1839 | 1839 | + '</div>' |
| 1840 | 1840 | + '<div class="mwe-upwiz-tabdiv" id="mwe-upwiz-tabdiv-details">' |
| 1841 | 1841 | + '<div id="mwe-upwiz-macro">' |
| | 1842 | + + '<div id="mwe-upwiz-macro-progress" class="ui-helper-clearfix"></div>' |
| 1842 | 1843 | + '<div id="mwe-upwiz-macro-choice">' |
| 1843 | 1844 | + '<div>' + gM( 'mwe-upwiz-intro-details' ) + '</div>' |
| 1844 | 1845 | + '<div id="mwe-upwiz-macro-deeds"></div>' |
| 1845 | 1846 | + '</div>' |
| 1846 | | - + '<div id="mwe-upwiz-macro-progress"></div>' |
| 1847 | 1847 | + '<div id="mwe-upwiz-macro-files"></div>' |
| 1848 | 1848 | + '<div class="mwe-upwiz-macro-edit-submit"></div>' // button added below |
| 1849 | 1849 | + '</div>' |
| — | — | @@ -2218,7 +2218,6 @@ |
| 2219 | 2219 | }, |
| 2220 | 2220 | |
| 2221 | 2221 | |
| 2222 | | - // might as well hardcode more of this? |
| 2223 | 2222 | prefillThanksPage: function() { |
| 2224 | 2223 | var _this = this; |
| 2225 | 2224 | |
| — | — | @@ -2226,11 +2225,11 @@ |
| 2227 | 2226 | var width = mw.getConfig( 'thumbnailWidth' ); |
| 2228 | 2227 | |
| 2229 | 2228 | $j.each( _this.uploads, function(i, upload) { |
| 2230 | | - var thanksDiv = $j( '<div class="mwe-thanks ui-helper-clearfix" />' ); |
| 2231 | | - var thumbnailDiv = $j( '<div></div>' ).addClass( 'mwe-upwiz-links-thumbnail' ); |
| | 2229 | + var thanksDiv = $j( '<div class="mwe-upwiz-thanks ui-helper-clearfix" />' ); |
| | 2230 | + var thumbnailDiv = $j( '<div></div>' ).addClass( 'mwe-upwiz-thumbnail' ); |
| 2232 | 2231 | thanksDiv.append( thumbnailDiv ); |
| 2233 | 2232 | |
| 2234 | | - /* this is copied code, evil */ |
| | 2233 | + /* XXX this is copied code, evil */ |
| 2235 | 2234 | var callback = function( thumbnail ) { |
| 2236 | 2235 | // side effect: will replace thumbnail's loadingSpinner |
| 2237 | 2236 | thumbnailDiv.html( |
| — | — | @@ -2253,8 +2252,7 @@ |
| 2254 | 2253 | var thumbWikiText = "[[" + thumbTitle + "|thumb]]"; |
| 2255 | 2254 | |
| 2256 | 2255 | thanksDiv.append( |
| 2257 | | - $j( '<div class="mwe-upwiz-info-file"></div>' ) |
| 2258 | | - .addClass( 'mwe-upwiz-thanks-links' ) |
| | 2256 | + $j( '<div class="mwe-upwiz-data"></div>' ) |
| 2259 | 2257 | .append( |
| 2260 | 2258 | $j('<p/>').append( |
| 2261 | 2259 | gM( 'mwe-upwiz-thanks-link', |
| — | — | @@ -2268,13 +2266,17 @@ |
| 2269 | 2267 | gM( 'mwe-upwiz-thanks-wikitext' ), |
| 2270 | 2268 | $j( '<br />' ), |
| 2271 | 2269 | $j( '<textarea class="mwe-long-textarea" rows="1"/>' ) |
| | 2270 | + .growTextArea() |
| 2272 | 2271 | .append( thumbWikiText ) |
| | 2272 | + .trigger( 'change' ) // to make it grow to fit |
| 2273 | 2273 | ), |
| 2274 | 2274 | $j('<p/>').append( |
| 2275 | 2275 | gM( 'mwe-upwiz-thanks-url' ), |
| 2276 | 2276 | $j( '<br />' ), |
| 2277 | 2277 | $j( '<textarea class="mwe-long-textarea" rows="1"/>' ) |
| | 2278 | + .growTextArea() |
| 2278 | 2279 | .append( upload.imageinfo.descriptionurl ) |
| | 2280 | + .trigger( 'change' ) // to make it grow to fit |
| 2279 | 2281 | ) |
| 2280 | 2282 | ) |
| 2281 | 2283 | ); |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/UploadWizard/css/uploadWizard.css |
| — | — | @@ -268,7 +268,7 @@ |
| 269 | 269 | margin-right: 12px; |
| 270 | 270 | } |
| 271 | 271 | |
| 272 | | -.mwe-upwiz-details-data { |
| | 272 | +.mwe-upwiz-data { |
| 273 | 273 | float: left; |
| 274 | 274 | } |
| 275 | 275 | |
| — | — | @@ -399,6 +399,8 @@ |
| 400 | 400 | width: 280px; |
| 401 | 401 | } |
| 402 | 402 | |
| | 403 | + |
| | 404 | + |
| 403 | 405 | .mwe-upwiz-details-label { |
| 404 | 406 | width: 100px; |
| 405 | 407 | float: left; |
| — | — | @@ -473,4 +475,3 @@ |
| 474 | 476 | margin-top: 5px; |
| 475 | 477 | } |
| 476 | 478 | |
| 477 | | - |