jenkins-bot has submitted this change and it was merged.
Change subject: Move details step status labels from PHP to JS
......................................................................
Move details step status labels from PHP to JS
This also corrects their rendering to have some spacing between the
label and nearby button. Similar to cae915a6dfb422d6dc8c7b87dd83d3438b7077ef.
Change-Id: I74f0d0602117fc13695ecaf9affbff7b066f54b2
---
M UploadWizardHooks.php
M includes/specials/SpecialUploadWizard.php
M resources/ui/uw.ui.Details.js
3 files changed, 28 insertions(+), 16 deletions(-)
Approvals:
MarkTraceur: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UploadWizardHooks.php b/UploadWizardHooks.php
index d92fb17..9ec9c99 100644
--- a/UploadWizardHooks.php
+++ b/UploadWizardHooks.php
@@ -636,6 +636,11 @@
'oojs',
'uw.ui.Step',
),
+
+ 'messages' => array(
+ 'mwe-upwiz-file-some-failed',
+ 'mwe-upwiz-file-all-failed',
+ ),
),
'uw.ui.Thanks' => array(
diff --git a/includes/specials/SpecialUploadWizard.php
b/includes/specials/SpecialUploadWizard.php
index 5bff0ed..08e527f 100644
--- a/includes/specials/SpecialUploadWizard.php
+++ b/includes/specials/SpecialUploadWizard.php
@@ -444,12 +444,8 @@
'<div
class="mwe-upwiz-buttons">' .
'<div
id="mwe-upwiz-details-error-count" class="mwe-upwiz-file-endchoice
mwe-error"></div>' .
'<div
class="mwe-upwiz-start-next mwe-upwiz-file-endchoice"></div>' .
- '<div
class="mwe-upwiz-file-next-some-failed mwe-upwiz-file-endchoice">' .
- $this->msg(
"mwe-upwiz-file-some-failed" )->text() .
- '</div>' .
- '<div
class="mwe-upwiz-file-next-all-failed mwe-upwiz-file-endchoice">' .
- $this->msg(
"mwe-upwiz-file-all-failed" )->text() .
- '</div>' .
+ '<div
class="mwe-upwiz-file-next-some-failed mwe-upwiz-file-endchoice"></div>' .
+ '<div
class="mwe-upwiz-file-next-all-failed mwe-upwiz-file-endchoice"></div>' .
'</div>' .
'</div>' .
diff --git a/resources/ui/uw.ui.Details.js b/resources/ui/uw.ui.Details.js
index ddd81bd..209de52 100644
--- a/resources/ui/uw.ui.Details.js
+++ b/resources/ui/uw.ui.Details.js
@@ -52,14 +52,6 @@
$( '#mwe-upwiz-step-details' )
);
- this.$nextSomeFailed = this.$div
- .find( '.mwe-upwiz-file-next-some-failed' )
- .hide();
-
- this.$nextAllFailed = this.$div
- .find( '.mwe-upwiz-file-next-all-failed' )
- .hide();
-
this.nextButton = new oo.ui.ButtonWidget( {
label: mw.message( 'mwe-upwiz-next-details' ).text(),
flags: [ 'progressive', 'primary' ]
@@ -79,14 +71,33 @@
flags: [ 'progressive', 'primary' ]
} ).on( 'click', startDetails );
- this.$div.find( '.mwe-upwiz-file-next-some-failed' ).append(
this.nextButtonDespiteFailures.$element, this.retryButtonSomeFailed.$element );
+ this.$div.find( '.mwe-upwiz-file-next-some-failed' ).append(
+ new OO.ui.HorizontalLayout( {
+ items: [
+ new OO.ui.LabelWidget( {
+ label: mw.message(
'mwe-upwiz-file-some-failed' ).text()
+ } ),
+ this.nextButtonDespiteFailures,
+ this.retryButtonSomeFailed
+ ]
+ } ).$element
+ );
this.retryButtonAllFailed = new oo.ui.ButtonWidget( {
label: mw.message( 'mwe-upwiz-file-retry' ).text(),
flags: [ 'progressive', 'primary' ]
} ).on( 'click', startDetails );
- this.$div.find( '.mwe-upwiz-file-next-all-failed' ).append(
this.retryButtonAllFailed.$element );
+ this.$div.find( '.mwe-upwiz-file-next-all-failed' ).append(
+ new OO.ui.HorizontalLayout( {
+ items: [
+ new OO.ui.LabelWidget( {
+ label: mw.message(
'mwe-upwiz-file-all-failed' ).text()
+ } ),
+ this.retryButtonAllFailed
+ ]
+ } ).$element
+ );
this.$errorCount = this.$div.find(
'#mwe-upwiz-details-error-count' );
}
--
To view, visit https://gerrit.wikimedia.org/r/237455
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I74f0d0602117fc13695ecaf9affbff7b066f54b2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: MarkTraceur <mtrac...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
