http://www.mediawiki.org/wiki/Special:Code/MediaWiki/69114
Revision: 69114
Author: neilk
Date: 2010-07-06 21:31:43 +0000 (Tue, 06 Jul 2010)
Log Message:
-----------
description adder fixed, fixed layout for description deleter boxes, removed
some html divs from the object properties
Modified Paths:
--------------
trunk/extensions/UploadWizard/js/mw.UploadWizard.js
trunk/extensions/UploadWizard/styles/uploadWizard.css
Modified: trunk/extensions/UploadWizard/js/mw.UploadWizard.js
===================================================================
--- trunk/extensions/UploadWizard/js/mw.UploadWizard.js 2010-07-06 21:09:04 UTC
(rev 69113)
+++ trunk/extensions/UploadWizard/js/mw.UploadWizard.js 2010-07-06 21:31:43 UTC
(rev 69114)
@@ -1127,7 +1127,7 @@
_this.titleErrorDiv = $j('<div
class="mwe-upwiz-details-input-error"><label class="mwe-error" for="' +
_this.titleId + '" generated="true"/></div>');
- _this.titleContainerDiv = $j('<div
class="mwe-upwiz-details-fieldname-input ui-helper-clearfix"></div>')
+ var titleContainerDiv = $j('<div
class="mwe-upwiz-details-fieldname-input ui-helper-clearfix"></div>')
.append(
_this.titleErrorDiv,
$j( '<div class="mwe-upwiz-details-fieldname"></div>' )
@@ -1145,9 +1145,9 @@
_this.deedDiv
);
- _this.moreDetailsDiv = $j('<div class="mwe-more-details"></div>');
+ moreDetailsDiv = $j('<div class="mwe-more-details"></div>');
- _this.moreDetailsCtrlDiv = $j( '<div
class="mwe-upwiz-details-more-options"></div>' );
+ moreDetailsCtrlDiv = $j( '<div
class="mwe-upwiz-details-more-options"></div>' );
var dateInputId = "dateInput" + ( _this.upload.index ).toString();
var dateDisplayInputId = "dateDisplayInput" + ( _this.upload.index
).toString();
@@ -1180,7 +1180,7 @@
.append( _this.otherInformationInput );
- $j( _this.moreDetailsDiv ).append(
+ $j( moreDetailsDiv ).append(
dateInputDiv,
// location goes here
otherInformationDiv
@@ -1189,10 +1189,11 @@
_this.$form = $j( '<form></form>' );
_this.$form.append(
_this.descriptionsDiv,
- _this.titleContainerDiv,
+ descriptionAdderDiv,
+ titleContainerDiv,
_this.copyrightInfoFieldset,
- _this.moreDetailsCtrlDiv,
- _this.moreDetailsDiv
+ moreDetailsCtrlDiv,
+ moreDetailsDiv
);
$j( _this.dataDiv ).append(
@@ -1235,7 +1236,7 @@
/* if the date is not valid, we need to pop open the "more options".
How?
guess we'll revalidate it with element */
- mw.UploadWizardUtil.makeToggler( _this.moreDetailsCtrlDiv,
_this.moreDetailsDiv );
+ mw.UploadWizardUtil.makeToggler( moreDetailsCtrlDiv, moreDetailsDiv );
_this.addDescription( true, mw.getConfig('userLanguage') );
$j( containerDiv ).append( _this.div );
@@ -1262,7 +1263,8 @@
alert( "please wait, still checking the title for
uniqueness..." );
return false;
}
-
+
+ // all other fields validated with validator js
var formValid = _this.$form.valid();
return titleInputValid && formValid;
@@ -2033,8 +2035,6 @@
+ '<div id="mwe-upwiz-add-file-container"
class="mwe-upwiz-add-files-0">'
+ '<a id="mwe-upwiz-add-file">' +
gM("mwe-upwiz-add-file-0") + '</a>'
+ '</div>'
- + '<div id="proceed"
class="mwe-upwiz-file-indicator">'
- + '</div>'
+ '</div>'
+ '<div id="mwe-upwiz-progress"
class="ui-helper-clearfix"></div>'
+ '</div>'
@@ -2462,7 +2462,6 @@
if ( _this.uploads.length ) {
$j( '#mwe-upwiz-upload-ctrl' ).removeAttr( 'disabled'
);
- $j( '#proceed' ).show();
$j( '#mwe-upwiz-stepdiv-file .mwe-upwiz-buttons'
).show();
$j( '#mwe-upwiz-add-file' ).html( gM(
'mwe-upwiz-add-file-n' ) );
$j( '#mwe-upwiz-add-file-container'
).removeClass('mwe-upwiz-add-files-0');
@@ -2471,7 +2470,6 @@
$j( '#mwe-upwiz-files .mwe-upwiz-file:filled:even'
).removeClass( 'odd' );
} else {
$j( '#mwe-upwiz-upload-ctrl' ).attr( 'disabled',
'disabled' );
- $j( '#proceed' ).hide();
$j( '#mwe-upwiz-stepdiv-file .mwe-upwiz-buttons'
).hide();
$j( '#mwe-upwiz-add-file' ).html( gM(
'mwe-upwiz-add-file-0' ) );
$j( '#mwe-upwiz-add-file-container'
).addClass('mwe-upwiz-add-files-0');
Modified: trunk/extensions/UploadWizard/styles/uploadWizard.css
===================================================================
--- trunk/extensions/UploadWizard/styles/uploadWizard.css 2010-07-06
21:09:04 UTC (rev 69113)
+++ trunk/extensions/UploadWizard/styles/uploadWizard.css 2010-07-06
21:31:43 UTC (rev 69114)
@@ -272,9 +272,10 @@
vertical-align: middle;
}
+/* I don't like that this has to have width, to ensure that all the floats
work out correctly.*/
.mwe-upwiz-data {
float: left;
- width: 44em;
+ width: 46em;
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
