| Index: trunk/extensions/UploadWizard/resources/uploadWizard.css |
| — | — | @@ -15,15 +15,6 @@ |
| 16 | 16 | max-width: 900px; /* wild guess */ |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | | -/* |
| 20 | | -.upload-section { |
| 21 | | - padding: 1em; |
| 22 | | - margin-bottom: 0.5em; |
| 23 | | - margin-top: 0.5em; |
| 24 | | - border: 1px solid #e0e0e0; |
| 25 | | -} |
| 26 | | -*/ |
| 27 | | - |
| 28 | 19 | #mwe-upwiz-steps { |
| 29 | 20 | background-color: white; |
| 30 | 21 | background-image: none; |
| — | — | @@ -177,16 +168,18 @@ |
| 178 | 169 | |
| 179 | 170 | .mwe-upwiz-file-preview { |
| 180 | 171 | float: left; |
| 181 | | - height: 40px; |
| 182 | | - width: 40px; |
| 183 | | - margin-right: 6px; |
| 184 | | - background: url('images/32px-Blank-document.svg.png') no-repeat center top; |
| | 172 | + height: 100px; |
| | 173 | + width: 100px; |
| | 174 | + padding: 0.5em; |
| | 175 | + border: 1px solid #e0e0e0; |
| | 176 | + margin-right: 1em; |
| | 177 | + background: url('images/32px-Blank-document.svg.png') no-repeat center center; |
| 185 | 178 | } |
| 186 | 179 | |
| 187 | 180 | .mwe-upwiz-file-preview-broken { |
| 188 | | - height: 40px !important; |
| 189 | | - width: 40px !important; |
| 190 | | - background: url('images/32px-Blank-document-broken.svg.png') no-repeat center top !important; |
| | 181 | + height: 100px !important; |
| | 182 | + width: 100px !important; |
| | 183 | + background: url('images/32px-Blank-document-broken.svg.png') no-repeat center center !important; |
| 191 | 184 | } |
| 192 | 185 | |
| 193 | 186 | .mwe-upwiz-add-files-n { |
| — | — | @@ -353,35 +346,28 @@ |
| 354 | 347 | background: #ffffe0; |
| 355 | 348 | } |
| 356 | 349 | |
| 357 | | -.mwe-upwiz-thumbnail, .mwe-upwiz-thumbnail-small { |
| | 350 | +.mwe-upwiz-thumbnail { |
| 358 | 351 | border: 1px solid #cccccc; |
| 359 | 352 | text-align: center; |
| 360 | 353 | background: #ffffff; |
| | 354 | + width: 100px; |
| | 355 | + padding: 8px; |
| 361 | 356 | } |
| 362 | 357 | |
| 363 | | -.mwe-upwiz-thumbnail { |
| 364 | | - padding: 0.5em; |
| 365 | | - width: auto; |
| 366 | | -} |
| 367 | | - |
| 368 | 358 | .mwe-upwiz-thumbnail-side { |
| 369 | 359 | float: left; |
| 370 | 360 | margin-bottom: 1em; |
| 371 | 361 | margin-right: 1em; |
| | 362 | + width: 116px; /* see .mwe-upwiz-thumbnail, 100 + 8 + 8 */ |
| 372 | 363 | } |
| 373 | 364 | |
| 374 | | -.mwe-upwiz-thumbnail-small { |
| 375 | | - padding: 0.25em; |
| 376 | | - width: 60px; |
| 377 | | -} |
| 378 | | - |
| 379 | 365 | #mwe-upwiz-deeds-thumbnails { |
| 380 | 366 | text-align: center; |
| 381 | 367 | margin: 1em 0; |
| 382 | 368 | background: #f0f0f0; |
| 383 | 369 | } |
| 384 | 370 | |
| 385 | | -#mwe-upwiz-deeds-thumbnails .mwe-upwiz-thumbnail-small { |
| | 371 | +#mwe-upwiz-deeds-thumbnails .mwe-upwiz-thumbnail { |
| 386 | 372 | display: inline-block; |
| 387 | 373 | margin: 1em; |
| 388 | 374 | vertical-align: middle; |
| — | — | @@ -461,11 +447,10 @@ |
| 462 | 448 | } |
| 463 | 449 | |
| 464 | 450 | #mwe-upwiz-macro-files { |
| 465 | | - margin-top: 12px; |
| 466 | 451 | } |
| 467 | 452 | |
| 468 | 453 | .mwe-upwiz-info-file { |
| 469 | | - margin-bottom: 1em; |
| | 454 | + padding: 1em; |
| 470 | 455 | } |
| 471 | 456 | |
| 472 | 457 | .mwe-upwiz-details-fieldname { |
| Index: trunk/extensions/UploadWizard/resources/mw.UploadWizard.js |
| — | — | @@ -205,14 +205,13 @@ |
| 206 | 206 | _this.ui.setStatus( 'mwe-upwiz-getting-metadata' ); |
| 207 | 207 | if ( result.upload ) { |
| 208 | 208 | _this.extractUploadInfo( result.upload ); |
| 209 | | - // create the small thumbnail used on the 'upload' step |
| 210 | 209 | _this.getThumbnail( |
| 211 | 210 | function( image ) { |
| 212 | 211 | // n.b. if server returns a URL, which is a 404, we do NOT get broken image |
| 213 | 212 | _this.ui.setPreview( image ); // make the thumbnail the preview image |
| 214 | 213 | }, |
| 215 | | - mw.UploadWizard.config[ 'iconThumbnailWidth' ], |
| 216 | | - mw.UploadWizard.config[ 'iconThumbnailMaxHeight' ] |
| | 214 | + mw.UploadWizard.config[ 'thumbnailWidth' ], |
| | 215 | + mw.UploadWizard.config[ 'thumbnailMaxHeight' ] |
| 217 | 216 | ); |
| 218 | 217 | // create the large thumbnail that the other thumbnails link to |
| 219 | 218 | _this.getThumbnail( |
| — | — | @@ -662,11 +661,6 @@ |
| 663 | 662 | upload.deedChooser = _this.deedChooser; |
| 664 | 663 | } |
| 665 | 664 | |
| 666 | | - /* put a border below every details div except the last */ |
| 667 | | - if ( i < lastUploadIndex ) { |
| 668 | | - upload.details.div.css( 'border-bottom', '1px solid #e0e0e0' ); |
| 669 | | - } |
| 670 | | - |
| 671 | 665 | // only necessary if (somehow) they have beaten the check-as-you-type |
| 672 | 666 | upload.details.titleInput.checkUnique(); |
| 673 | 667 | } ); |
| — | — | @@ -1343,9 +1337,9 @@ |
| 1344 | 1338 | setup: function() { |
| 1345 | 1339 | var _this = this; |
| 1346 | 1340 | // add a preview on the deeds page |
| 1347 | | - var thumbnailDiv = $j( '<div class="mwe-upwiz-thumbnail-small"></div>' ); |
| | 1341 | + var thumbnailDiv = $j( '<div></div>' ).addClass( 'mwe-upwiz-thumbnail' ); |
| 1348 | 1342 | $j( '#mwe-upwiz-deeds-thumbnails' ).append( thumbnailDiv ); |
| 1349 | | - _this.upload.setThumbnail( thumbnailDiv, mw.UploadWizard.config[ 'smallThumbnailWidth' ], mw.UploadWizard.config[ 'smallThumbnailMaxHeight' ] ); |
| | 1343 | + _this.upload.setThumbnail( thumbnailDiv, mw.UploadWizard.config[ 'thumbnailWidth' ], mw.UploadWizard.config[ 'thumbnailMaxHeight' ] ); |
| 1350 | 1344 | _this.upload.deedThumbnailDiv = thumbnailDiv; |
| 1351 | 1345 | } |
| 1352 | 1346 | }; |
| Index: trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js |
| — | — | @@ -20,7 +20,7 @@ |
| 21 | 21 | |
| 22 | 22 | _this.descriptions = []; |
| 23 | 23 | |
| 24 | | - _this.div = $j( '<div class="mwe-upwiz-info-file ui-helper-clearfix"></div>' ); |
| | 24 | + _this.div = $j( '<div class="mwe-upwiz-info-file ui-helper-clearfix filled"></div>' ); |
| 25 | 25 | |
| 26 | 26 | _this.thumbnailDiv = $j( '<div class="mwe-upwiz-thumbnail mwe-upwiz-thumbnail-side"></div>' ); |
| 27 | 27 | |