| Index: trunk/extensions/UploadWizard/styles/uploadWizard.css |
| — | — | @@ -272,9 +272,10 @@ |
| 273 | 273 | vertical-align: middle; |
| 274 | 274 | } |
| 275 | 275 | |
| | 276 | +/* I don't like that this has to have width, to ensure that all the floats work out correctly.*/ |
| 276 | 277 | .mwe-upwiz-data { |
| 277 | 278 | float: left; |
| 278 | | - width: 44em; |
| | 279 | + width: 46em; |
| 279 | 280 | } |
| 280 | 281 | |
| 281 | 282 | |
| Index: trunk/extensions/UploadWizard/js/mw.UploadWizard.js |
| — | — | @@ -1127,7 +1127,7 @@ |
| 1128 | 1128 | |
| 1129 | 1129 | _this.titleErrorDiv = $j('<div class="mwe-upwiz-details-input-error"><label class="mwe-error" for="' + _this.titleId + '" generated="true"/></div>'); |
| 1130 | 1130 | |
| 1131 | | - _this.titleContainerDiv = $j('<div class="mwe-upwiz-details-fieldname-input ui-helper-clearfix"></div>') |
| | 1131 | + var titleContainerDiv = $j('<div class="mwe-upwiz-details-fieldname-input ui-helper-clearfix"></div>') |
| 1132 | 1132 | .append( |
| 1133 | 1133 | _this.titleErrorDiv, |
| 1134 | 1134 | $j( '<div class="mwe-upwiz-details-fieldname"></div>' ) |
| — | — | @@ -1145,9 +1145,9 @@ |
| 1146 | 1146 | _this.deedDiv |
| 1147 | 1147 | ); |
| 1148 | 1148 | |
| 1149 | | - _this.moreDetailsDiv = $j('<div class="mwe-more-details"></div>'); |
| | 1149 | + moreDetailsDiv = $j('<div class="mwe-more-details"></div>'); |
| 1150 | 1150 | |
| 1151 | | - _this.moreDetailsCtrlDiv = $j( '<div class="mwe-upwiz-details-more-options"></div>' ); |
| | 1151 | + moreDetailsCtrlDiv = $j( '<div class="mwe-upwiz-details-more-options"></div>' ); |
| 1152 | 1152 | |
| 1153 | 1153 | var dateInputId = "dateInput" + ( _this.upload.index ).toString(); |
| 1154 | 1154 | var dateDisplayInputId = "dateDisplayInput" + ( _this.upload.index ).toString(); |
| — | — | @@ -1180,7 +1180,7 @@ |
| 1181 | 1181 | .append( _this.otherInformationInput ); |
| 1182 | 1182 | |
| 1183 | 1183 | |
| 1184 | | - $j( _this.moreDetailsDiv ).append( |
| | 1184 | + $j( moreDetailsDiv ).append( |
| 1185 | 1185 | dateInputDiv, |
| 1186 | 1186 | // location goes here |
| 1187 | 1187 | otherInformationDiv |
| — | — | @@ -1189,10 +1189,11 @@ |
| 1190 | 1190 | _this.$form = $j( '<form></form>' ); |
| 1191 | 1191 | _this.$form.append( |
| 1192 | 1192 | _this.descriptionsDiv, |
| 1193 | | - _this.titleContainerDiv, |
| | 1193 | + descriptionAdderDiv, |
| | 1194 | + titleContainerDiv, |
| 1194 | 1195 | _this.copyrightInfoFieldset, |
| 1195 | | - _this.moreDetailsCtrlDiv, |
| 1196 | | - _this.moreDetailsDiv |
| | 1196 | + moreDetailsCtrlDiv, |
| | 1197 | + moreDetailsDiv |
| 1197 | 1198 | ); |
| 1198 | 1199 | |
| 1199 | 1200 | $j( _this.dataDiv ).append( |
| — | — | @@ -1235,7 +1236,7 @@ |
| 1236 | 1237 | /* if the date is not valid, we need to pop open the "more options". How? |
| 1237 | 1238 | guess we'll revalidate it with element */ |
| 1238 | 1239 | |
| 1239 | | - mw.UploadWizardUtil.makeToggler( _this.moreDetailsCtrlDiv, _this.moreDetailsDiv ); |
| | 1240 | + mw.UploadWizardUtil.makeToggler( moreDetailsCtrlDiv, moreDetailsDiv ); |
| 1240 | 1241 | |
| 1241 | 1242 | _this.addDescription( true, mw.getConfig('userLanguage') ); |
| 1242 | 1243 | $j( containerDiv ).append( _this.div ); |
| — | — | @@ -1262,7 +1263,8 @@ |
| 1263 | 1264 | alert( "please wait, still checking the title for uniqueness..." ); |
| 1264 | 1265 | return false; |
| 1265 | 1266 | } |
| 1266 | | - |
| | 1267 | + |
| | 1268 | + // all other fields validated with validator js |
| 1267 | 1269 | var formValid = _this.$form.valid(); |
| 1268 | 1270 | return titleInputValid && formValid; |
| 1269 | 1271 | |
| — | — | @@ -2033,8 +2035,6 @@ |
| 2034 | 2036 | + '<div id="mwe-upwiz-add-file-container" class="mwe-upwiz-add-files-0">' |
| 2035 | 2037 | + '<a id="mwe-upwiz-add-file">' + gM("mwe-upwiz-add-file-0") + '</a>' |
| 2036 | 2038 | + '</div>' |
| 2037 | | - + '<div id="proceed" class="mwe-upwiz-file-indicator">' |
| 2038 | | - + '</div>' |
| 2039 | 2039 | + '</div>' |
| 2040 | 2040 | + '<div id="mwe-upwiz-progress" class="ui-helper-clearfix"></div>' |
| 2041 | 2041 | + '</div>' |
| — | — | @@ -2462,7 +2462,6 @@ |
| 2463 | 2463 | |
| 2464 | 2464 | if ( _this.uploads.length ) { |
| 2465 | 2465 | $j( '#mwe-upwiz-upload-ctrl' ).removeAttr( 'disabled' ); |
| 2466 | | - $j( '#proceed' ).show(); |
| 2467 | 2466 | $j( '#mwe-upwiz-stepdiv-file .mwe-upwiz-buttons' ).show(); |
| 2468 | 2467 | $j( '#mwe-upwiz-add-file' ).html( gM( 'mwe-upwiz-add-file-n' ) ); |
| 2469 | 2468 | $j( '#mwe-upwiz-add-file-container' ).removeClass('mwe-upwiz-add-files-0'); |
| — | — | @@ -2471,7 +2470,6 @@ |
| 2472 | 2471 | $j( '#mwe-upwiz-files .mwe-upwiz-file:filled:even' ).removeClass( 'odd' ); |
| 2473 | 2472 | } else { |
| 2474 | 2473 | $j( '#mwe-upwiz-upload-ctrl' ).attr( 'disabled', 'disabled' ); |
| 2475 | | - $j( '#proceed' ).hide(); |
| 2476 | 2474 | $j( '#mwe-upwiz-stepdiv-file .mwe-upwiz-buttons' ).hide(); |
| 2477 | 2475 | $j( '#mwe-upwiz-add-file' ).html( gM( 'mwe-upwiz-add-file-0' ) ); |
| 2478 | 2476 | $j( '#mwe-upwiz-add-file-container' ).addClass('mwe-upwiz-add-files-0'); |