Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/316824
Change subject: Show reference # for inline errors
......................................................................
Show reference # for inline errors
Only general, not field-specific.
Change-Id: Ieb611f87ab9de7580d9d2263742eeb967bd795c2
---
M amazon_gateway/amazon.js
M gateway_forms/Mustache.php
M gateway_forms/mustache/index.html.mustache
M modules/js/ext.donationInterface.forms.js
M modules/js/ext.donationInterface.validation.js
5 files changed, 17 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/24/316824/1
diff --git a/amazon_gateway/amazon.js b/amazon_gateway/amazon.js
index c859e56..2e3b6e3 100644
--- a/amazon_gateway/amazon.js
+++ b/amazon_gateway/amazon.js
@@ -62,6 +62,9 @@
$( '#topError' ).append(
$( '<p class="error">' + message + '</p>' )
);
+ $( '#errorReference' )
+ .removeClass( 'errorMsgHide' )
+ .addClass( 'errorMsg' );
}
function reloadPage() {
@@ -277,6 +280,9 @@
return;
}
$( '#topError' ).html('');
+ $( '#errorReference' )
+ .removeClass( 'errorMsg' )
+ .addClass( 'errorMsgHide' );
$( '#overlay' ).show();
lockDonationAmount();
var postdata = {
diff --git a/gateway_forms/Mustache.php b/gateway_forms/Mustache.php
index e62071e..51a8256 100644
--- a/gateway_forms/Mustache.php
+++ b/gateway_forms/Mustache.php
@@ -276,6 +276,9 @@
if ( $key === 'currency_code' || $key === 'amount' ) {
$return['show_amount_input'] = true;
}
+ if ( !empty( $return['errors']['general'] ) ) {
+ $return['show_error_reference'] = true;
+ }
}
return $return;
}
diff --git a/gateway_forms/mustache/index.html.mustache
b/gateway_forms/mustache/index.html.mustache
index 60063e1..ea905bb 100644
--- a/gateway_forms/mustache/index.html.mustache
+++ b/gateway_forms/mustache/index.html.mustache
@@ -9,6 +9,7 @@
<div id="greenBackground" class="">
{{> no_script }}
<div id="topError"
class="creditcard-error-msg">{{# errors/general }}<p class="error">{{{ message
}}}</p>{{/ errors/general }}</div>
+ <p id="errorReference" class="errorMsg{{^
show_error_reference }}Hide{{/ show_error_reference }}" >{{ l10n
"donate_interface-error-reference" contribution_tracking_id }}</p>
<form name="payment" id="payment-form" method="post"
action="{{ action }}">
<div id="payment_gateway-personal-info">
diff --git a/modules/js/ext.donationInterface.forms.js
b/modules/js/ext.donationInterface.forms.js
index a777555..2a0c7ff 100644
--- a/modules/js/ext.donationInterface.forms.js
+++ b/modules/js/ext.donationInterface.forms.js
@@ -36,6 +36,10 @@
function callDonateApi( successCallback ) {
di.forms.disable();
di.forms.clean();
+ $( '#topError' ).html('');
+ $( '#errorReference' )
+ .removeClass( 'errorMsg' )
+ .addClass( 'errorMsgHide' );
$( '#paymentContinueBtn' ).removeClass( 'enabled' );
var sendData = {
diff --git a/modules/js/ext.donationInterface.validation.js
b/modules/js/ext.donationInterface.validation.js
index 187529d..74979b6 100644
--- a/modules/js/ext.donationInterface.validation.js
+++ b/modules/js/ext.donationInterface.validation.js
@@ -26,6 +26,9 @@
$( '#topError' ).html(
generalErrors.join( '<br/>' )
);
+ $( '#errorReference' )
+ .removeClass( 'errorMsgHide' )
+ .addClass( 'errorMsg' );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/316824
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb611f87ab9de7580d9d2263742eeb967bd795c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
