jenkins-bot has submitted this change and it was merged. Change subject: Mark required fields under "Release Rights" ......................................................................
Mark required fields under "Release Rights" Mark the required fields under "This file is not my own work" in the "Release Rights" stage as required in the same way as the fields in the "Describe" stage. (By adding a key "* = This field is required." and by adding red asterisks to the field labels.) Bugzilla Bug 42775 - Confusing annotation about mandatory fields in Special:UploadWizard https://bugzilla.wikimedia.org/show_bug.cgi?id=42775 Note that the radio choice between "This file is my own work" and "This file is not my own work" is also in some sense a required field but as it has no single label as the text box fields do I haven't marked it as required in any way. Under "This file is my own work" there is another field (the input for username) that has the same problem - it is required but there is no obvious label to put an asterisk by. I have left these problems unsolved and they would make sense as future work. One possible problem with this actual change is that the key appears in the "Release Rights" section initially when all required input fields are hidden and thus no labels with asterisks are visible. Might this be confusing to the user? Change-Id: I6c0274f9d10bd83d5916a475458b0cc88ddc81c2 --- M includes/specials/SpecialUploadWizard.php M resources/mw.UploadWizardDeed.js 2 files changed, 5 insertions(+), 2 deletions(-) Approvals: Gilles: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specials/SpecialUploadWizard.php b/includes/specials/SpecialUploadWizard.php index 60b3ee2..69b4da1 100644 --- a/includes/specials/SpecialUploadWizard.php +++ b/includes/specials/SpecialUploadWizard.php @@ -431,6 +431,7 @@ . '</div>' . '<div class="mwe-upwiz-stepdiv" id="mwe-upwiz-stepdiv-deeds" style="display:none;">' + . '<div id="mwe-upwiz-reqd-field-explain-container"><span class="mwe-upwiz-required-marker">*</span> = ' . $this->msg( "mwe-upwiz-error-blank" )->text() . '</div>' . '<div id="mwe-upwiz-deeds-thumbnails" class="ui-helper-clearfix"></div>' . '<div id="mwe-upwiz-deeds" class="ui-helper-clearfix"></div>' . '<div id="mwe-upwiz-deeds-custom" class="ui-helper-clearfix"></div>' diff --git a/resources/mw.UploadWizardDeed.js b/resources/mw.UploadWizardDeed.js index 9d4a865..1e42ba9 100644 --- a/resources/mw.UploadWizardDeed.js +++ b/resources/mw.UploadWizardDeed.js @@ -355,7 +355,8 @@ .append( $( '<label>' ) .text( mw.message( 'mwe-upwiz-source' ).text() ) .attr( 'for', 'mwe-source-' + this.getInstanceCount() ) - .addHint( 'source' ), + .addHint( 'source' ) + .requiredFieldLabel(), this.sourceInput ), $( '<label generated="true" class="mwe-validator-error" style="display:block;" />' ) .attr( 'for', 'mwe-author-' + this.getInstanceCount() ), @@ -363,7 +364,8 @@ .append( $( '<label>' ) .text( mw.message( 'mwe-upwiz-author' ).text() ) .attr( 'for', 'mwe-author-' + this.getInstanceCount() ) - .addHint( 'author' ), + .addHint( 'author' ) + .requiredFieldLabel(), this.authorInput ), $( '<div class="mwe-upwiz-thirdparty-license" />' ) .append( $( '<div>' ).msg( 'mwe-upwiz-source-thirdparty-cases', this.uploadCount ) ) -- To view, visit https://gerrit.wikimedia.org/r/68948 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6c0274f9d10bd83d5916a475458b0cc88ddc81c2 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/UploadWizard Gerrit-Branch: master Gerrit-Owner: Bakert <[email protected]> Gerrit-Reviewer: Drecodeam <[email protected]> Gerrit-Reviewer: Gilles <[email protected]> Gerrit-Reviewer: MarkTraceur <[email protected]> Gerrit-Reviewer: Nemo bis <[email protected]> Gerrit-Reviewer: Nischayn22 <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
