Awight has uploaded a new change for review. https://gerrit.wikimedia.org/r/260229
Change subject: [WIP] Add country switcher to GlobalCollect forms ...................................................................... [WIP] Add country switcher to GlobalCollect forms Heinous mega-patch to add an intuitive OWTG link. FIXME: * Formatting is bad on the rtbt pages. Bug: T96047 Change-Id: Id55b8098f1e417f9d91f6231f7742f70b396a6a1 --- A gateway_forms/rapidhtml/html/_country_selector/default.html M globalcollect_gateway/forms/css/gc.css M globalcollect_gateway/forms/html/bt/bt.html M globalcollect_gateway/forms/html/cash/boletos.html M globalcollect_gateway/forms/html/cc/cc-a.html M globalcollect_gateway/forms/html/cc/cc-jvma.html M globalcollect_gateway/forms/html/cc/cc-vjma.html M globalcollect_gateway/forms/html/cc/cc-vm.html M globalcollect_gateway/forms/html/cc/cc-vma.html M globalcollect_gateway/forms/html/cc/cc-vmad.html M globalcollect_gateway/forms/html/cc/cc-vmaj.html M globalcollect_gateway/forms/html/cc/cc-vmd.html M globalcollect_gateway/forms/html/cc/cc-vmj.html M globalcollect_gateway/forms/html/cc/cc.html M globalcollect_gateway/forms/html/dd/dd-recurring.html M globalcollect_gateway/forms/html/dd/dd.html M globalcollect_gateway/forms/html/ew/ew-alipay.html M globalcollect_gateway/forms/html/ew/ew-webmoney.html M globalcollect_gateway/forms/html/ew/ew-yandex.html M globalcollect_gateway/forms/html/obt/obt-bpay.html M globalcollect_gateway/forms/html/rcc/rcc-vm.html M globalcollect_gateway/forms/html/rcc/rcc-vma.html M globalcollect_gateway/forms/html/rcc/rcc-vmad.html M globalcollect_gateway/forms/html/rcc/rcc-vmaj.html M globalcollect_gateway/forms/html/rtbt/rtbt-enets.html M globalcollect_gateway/forms/html/rtbt/rtbt-eps.html M globalcollect_gateway/forms/html/rtbt/rtbt-ideal-noadd.html M globalcollect_gateway/forms/html/rtbt/rtbt-ideal.html M globalcollect_gateway/forms/html/rtbt/rtbt-sofo-GB.html M globalcollect_gateway/forms/html/rtbt/rtbt-sofo.html 30 files changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/29/260229/1 diff --git a/gateway_forms/rapidhtml/html/_country_selector/default.html b/gateway_forms/rapidhtml/html/_country_selector/default.html new file mode 100644 index 0000000..71f5606 --- /dev/null +++ b/gateway_forms/rapidhtml/html/_country_selector/default.html @@ -0,0 +1,5 @@ +<span class="country_switcher"> + <a href="https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=true&landing_page=Ways_to_Give&language=@language&uselang=@language&country=@country"; title="%donate_interface-otherways-short%"> + @country / @currency_code + </a> +</span> diff --git a/globalcollect_gateway/forms/css/gc.css b/globalcollect_gateway/forms/css/gc.css index 6be8c97..be09a17 100644 --- a/globalcollect_gateway/forms/css/gc.css +++ b/globalcollect_gateway/forms/css/gc.css @@ -23,6 +23,11 @@ margin-right:0 !important; } +.country_switcher { + position: absolute; + right: 2em; +} + #payment_gateway-donate-addl-info-secure-logos { float: left; margin-right: 2em; diff --git a/globalcollect_gateway/forms/html/bt/bt.html b/globalcollect_gateway/forms/html/bt/bt.html index 44b1a53..5ffec24 100644 --- a/globalcollect_gateway/forms/html/bt/bt.html +++ b/globalcollect_gateway/forms/html/bt/bt.html @@ -44,6 +44,7 @@ <tr> <td> <div id="step1header"> + {% block country_selector %} <h3 class="amount_header">%donate_interface-amount-legend%: <span id="selected-amount">{% block donation-amount currency_code %}</span></h3> </div> </td> diff --git a/globalcollect_gateway/forms/html/cash/boletos.html b/globalcollect_gateway/forms/html/cash/boletos.html index eb84553..ec60f28 100644 --- a/globalcollect_gateway/forms/html/cash/boletos.html +++ b/globalcollect_gateway/forms/html/cash/boletos.html @@ -32,6 +32,7 @@ <tr> <td> <div id="step1header"> + {% block country_selector %} <h3 class="amount_header">%donate_interface-amount-legend%: <span id="selected-amount">{% block donation-amount currency_code %}</span></h3> </div> </td> diff --git a/globalcollect_gateway/forms/html/cc/cc-a.html b/globalcollect_gateway/forms/html/cc/cc-a.html index 9e831c5..0c54448 100644 --- a/globalcollect_gateway/forms/html/cc/cc-a.html +++ b/globalcollect_gateway/forms/html/cc/cc-a.html @@ -26,6 +26,7 @@ <tr> <td> <div id="step1header"> + {% block country_selector %} <h3 class="amount_header">%donate_interface-amount-legend%: <span id="selected-amount">{% block donation-amount currency_code %}</span></h3> </div> </td> diff --git a/globalcollect_gateway/forms/html/cc/cc-jvma.html b/globalcollect_gateway/forms/html/cc/cc-jvma.html index 79ac7d7..04d6a9d 100644 --- a/globalcollect_gateway/forms/html/cc/cc-jvma.html +++ b/globalcollect_gateway/forms/html/cc/cc-jvma.html @@ -26,6 +26,7 @@ <tr> <td> <div id="step1header"> + {% block country_selector %} <h3 class="amount_header">%donate_interface-amount-legend%: <span id="selected-amount">{% block donation-amount currency_code %}</span></h3> </div> </td> diff --git a/globalcollect_gateway/forms/html/cc/cc-vjma.html b/globalcollect_gateway/forms/html/cc/cc-vjma.html index f7502ff..59c778e 100644 --- a/globalcollect_gateway/forms/html/cc/cc-vjma.html +++ b/globalcollect_gateway/forms/html/cc/cc-vjma.html @@ -26,6 +26,7 @@ <tr> <td> <div id="step1header"> + {% block country_selector %} <h3 class="amount_header">%donate_interface-amount-legend%: <span id="selected-amount">{% block donation-amount currency_code %}</span></h3> </div> </td> diff --git a/globalcollect_gateway/forms/html/cc/cc-vm.html b/globalcollect_gateway/forms/html/cc/cc-vm.html index 9f3c9ab..74ce604 100644 --- a/globalcollect_gateway/forms/html/cc/cc-vm.html +++ b/globalcollect_gateway/forms/html/cc/cc-vm.html @@ -26,6 +26,7 @@ <tr> <td> <div id="step1header"> + {% block country_selector %} <h3 class="amount_header">%donate_interface-amount-legend%: <span id="selected-amount">{% block donation-amount currency_code %}</span></h3> </div> </td> diff --git a/globalcollect_gateway/forms/html/cc/cc-vma.html b/globalcollect_gateway/forms/html/cc/cc-vma.html index cfd7c3f..e314882 100644 --- a/globalcollect_gateway/forms/html/cc/cc-vma.html +++ b/globalcollect_gateway/forms/html/cc/cc-vma.html @@ -26,6 +26,7 @@ <tr> <td> <div id="step1header"> + {% block country_selector %} <h3 class="amount_header">%donate_interface-amount-legend%: <span id="selected-amount">{% block donation-amount currency_code %}</span></h3> </div> </td> diff --git a/globalcollect_gateway/forms/html/cc/cc-vmad.html b/globalcollect_gateway/forms/html/cc/cc-vmad.html index b18c961..352cbce 100644 --- a/globalcollect_gateway/forms/html/cc/cc-vmad.html +++ b/globalcollect_gateway/forms/html/cc/cc-vmad.html @@ -26,6 +26,7 @@ <tr> <td> <div id="step1header"> + {% block country_selector %} <h3 class="amount_header">%donate_interface-amount-legend%: <span id="selected-amount">{% block donation-amount currency_code %}</span></h3> </div> </td> diff --git a/globalcollect_gateway/forms/html/cc/cc-vmaj.html b/globalcollect_gateway/forms/html/cc/cc-vmaj.html index 959c1f6..129b018 100644 --- a/globalcollect_gateway/forms/html/cc/cc-vmaj.html +++ b/globalcollect_gateway/forms/html/cc/cc-vmaj.html @@ -26,6 +26,7 @@ <tr> <td> <div id="step1header"> + {% block country_selector %} <h3 class="amount_header">%donate_interface-amount-legend%: <span id="selected-amount">{% block donation-amount currency_code %}</span></h3> </div> </td> diff --git a/globalcollect_gateway/forms/html/cc/cc-vmd.html b/globalcollect_gateway/forms/html/cc/cc-vmd.html index 4c70c55..e3e8b75 100644 --- a/globalcollect_gateway/forms/html/cc/cc-vmd.html +++ b/globalcollect_gateway/forms/html/cc/cc-vmd.html @@ -26,6 +26,7 @@ <tr> <td> <div id="step1header"> + {% block country_selector %} <h3 class="amount_header">%donate_interface-amount-legend%: <span id="selected-amount">{% block donation-amount currency_code %}</span></h3> </div> </td> diff --git a/globalcollect_gateway/forms/html/cc/cc-vmj.html b/globalcollect_gateway/forms/html/cc/cc-vmj.html index 3161fab..5280f53 100644 --- a/globalcollect_gateway/forms/html/cc/cc-vmj.html +++ b/globalcollect_gateway/forms/html/cc/cc-vmj.html @@ -26,6 +26,7 @@ <tr> <td> <div id="step1header"> + {% block country_selector %} <h3 class="amount_header">%donate_interface-amount-legend%: <span id="selected-amount">{% block donation-amount currency_code %}</span></h3> </div> </td> diff --git a/globalcollect_gateway/forms/html/cc/cc.html b/globalcollect_gateway/forms/html/cc/cc.html index cd582a5..317de59 100644 --- a/globalcollect_gateway/forms/html/cc/cc.html +++ b/globalcollect_gateway/forms/html/cc/cc.html @@ -26,6 +26,7 @@ <tr> <td> <div id="step1header"> + {% block country_selector %} <h3 class="amount_header">%donate_interface-amount-legend%: <span id="selected-amount">{% block donation-amount currency_code %}</span></h3> </div> </td> diff --git a/globalcollect_gateway/forms/html/dd/dd-recurring.html b/globalcollect_gateway/forms/html/dd/dd-recurring.html index 97b3661..60eb8e7 100644 --- a/globalcollect_gateway/forms/html/dd/dd-recurring.html +++ b/globalcollect_gateway/forms/html/dd/dd-recurring.html @@ -26,6 +26,7 @@ <tr> <td> <div id="step1header"> + {% block country_selector %} <h3 class="amount_header">%donate_interface-monthlybox-amount%: <span id="selected-amount">{% block donation-amount currency_code %}</span></h3> </div> </td> diff --git a/globalcollect_gateway/forms/html/dd/dd.html b/globalcollect_gateway/forms/html/dd/dd.html index 762a37d..bf1884c 100644 --- a/globalcollect_gateway/forms/html/dd/dd.html +++ b/globalcollect_gateway/forms/html/dd/dd.html @@ -26,6 +26,7 @@ <tr> <td> <div id="step1header"> + {% block country_selector %} <h3 class="amount_header">%donate_interface-amount-legend%: <span id="selected-amount">{% block donation-amount currency_code %}</span></h3> </div> </td> diff --git a/globalcollect_gateway/forms/html/ew/ew-alipay.html b/globalcollect_gateway/forms/html/ew/ew-alipay.html index cbc4397..0c33294 100644 --- a/globalcollect_gateway/forms/html/ew/ew-alipay.html +++ b/globalcollect_gateway/forms/html/ew/ew-alipay.html @@ -26,6 +26,7 @@ <tr> <td> <div id="step1header"> + {% block country_selector %} <h3 class="amount_header">%donate_interface-amount-legend%: <span id="selected-amount">{% block donation-amount currency_code %}</span></h3> </div> </td> diff --git a/globalcollect_gateway/forms/html/ew/ew-webmoney.html b/globalcollect_gateway/forms/html/ew/ew-webmoney.html index 928dd90..71bf2d1 100644 --- a/globalcollect_gateway/forms/html/ew/ew-webmoney.html +++ b/globalcollect_gateway/forms/html/ew/ew-webmoney.html @@ -26,6 +26,7 @@ <tr> <td> <div id="step1header"> + {% block country_selector %} <h3 class="amount_header">%donate_interface-amount-legend%: <span id="selected-amount">{% block donation-amount currency_code %}</span></h3> </div> </td> diff --git a/globalcollect_gateway/forms/html/ew/ew-yandex.html b/globalcollect_gateway/forms/html/ew/ew-yandex.html index a83f89f..d601459 100644 --- a/globalcollect_gateway/forms/html/ew/ew-yandex.html +++ b/globalcollect_gateway/forms/html/ew/ew-yandex.html @@ -26,6 +26,7 @@ <tr> <td> <div id="step1header"> + {% block country_selector %} <h3 class="amount_header">%donate_interface-amount-legend%: <span id="selected-amount">{% block donation-amount currency_code %}</span></h3> </div> </td> diff --git a/globalcollect_gateway/forms/html/obt/obt-bpay.html b/globalcollect_gateway/forms/html/obt/obt-bpay.html index 2f9ec21..4e892c7 100644 --- a/globalcollect_gateway/forms/html/obt/obt-bpay.html +++ b/globalcollect_gateway/forms/html/obt/obt-bpay.html @@ -52,6 +52,7 @@ <tr> <td> <div id="step1header"> + {% block country_selector %} <h3 class="amount_header">%donate_interface-amount-legend%: <span id="selected-amount">{% block donation-amount currency_code %}</span></h3> </div> </td> diff --git a/globalcollect_gateway/forms/html/rcc/rcc-vm.html b/globalcollect_gateway/forms/html/rcc/rcc-vm.html index 5c288ff..d1df8d3 100644 --- a/globalcollect_gateway/forms/html/rcc/rcc-vm.html +++ b/globalcollect_gateway/forms/html/rcc/rcc-vm.html @@ -26,6 +26,7 @@ <tr> <td> <div id="step1header"> + {% block country_selector %} <h3 class="amount_header">%donate_interface-monthlybox-amount%: <span id="selected-amount">{% block donation-amount currency_code %}</span></h3> </div> </td> diff --git a/globalcollect_gateway/forms/html/rcc/rcc-vma.html b/globalcollect_gateway/forms/html/rcc/rcc-vma.html index 2dbe40a..ce59242 100644 --- a/globalcollect_gateway/forms/html/rcc/rcc-vma.html +++ b/globalcollect_gateway/forms/html/rcc/rcc-vma.html @@ -26,6 +26,7 @@ <tr> <td> <div id="step1header"> + {% block country_selector %} <h3 class="amount_header">%donate_interface-monthlybox-amount%: <span id="selected-amount">{% block donation-amount currency_code %}</span></h3> </div> </td> diff --git a/globalcollect_gateway/forms/html/rcc/rcc-vmad.html b/globalcollect_gateway/forms/html/rcc/rcc-vmad.html index 700a495..bae485b 100644 --- a/globalcollect_gateway/forms/html/rcc/rcc-vmad.html +++ b/globalcollect_gateway/forms/html/rcc/rcc-vmad.html @@ -26,6 +26,7 @@ <tr> <td> <div id="step1header"> + {% block country_selector %} <h3 class="amount_header">%donate_interface-monthlybox-amount%: <span id="selected-amount">{% block donation-amount currency_code %}</span></h3> </div> </td> diff --git a/globalcollect_gateway/forms/html/rcc/rcc-vmaj.html b/globalcollect_gateway/forms/html/rcc/rcc-vmaj.html index d818690..aa64059 100644 --- a/globalcollect_gateway/forms/html/rcc/rcc-vmaj.html +++ b/globalcollect_gateway/forms/html/rcc/rcc-vmaj.html @@ -26,6 +26,7 @@ <tr> <td> <div id="step1header"> + {% block country_selector %} <h3 class="amount_header">%donate_interface-monthlybox-amount%: <span id="selected-amount">{% block donation-amount currency_code %}</span></h3> </div> </td> diff --git a/globalcollect_gateway/forms/html/rtbt/rtbt-enets.html b/globalcollect_gateway/forms/html/rtbt/rtbt-enets.html index 8bbfd6c..2e3bde3 100644 --- a/globalcollect_gateway/forms/html/rtbt/rtbt-enets.html +++ b/globalcollect_gateway/forms/html/rtbt/rtbt-enets.html @@ -41,6 +41,7 @@ <div id="donate-content"> <div id="donate-body" style="padding: 0 1em;"> <form method="post" name="paypalcontribution"> + {% block country_selector %} <div id="step1header"><h3>%donate_interface-amount-legend% <span id="selected-amount"></span></h3></div> <h3>%donate_interface-billing-address% <span class="mute" id="change-billing" style="display: none;">(<a href="#">%donate_interface-change%</a>)</span></h3> diff --git a/globalcollect_gateway/forms/html/rtbt/rtbt-eps.html b/globalcollect_gateway/forms/html/rtbt/rtbt-eps.html index bb1f165..3a69926 100644 --- a/globalcollect_gateway/forms/html/rtbt/rtbt-eps.html +++ b/globalcollect_gateway/forms/html/rtbt/rtbt-eps.html @@ -41,6 +41,7 @@ <div id="donate-content"> <div id="donate-body" style="padding: 0 1em;"> <form method="post" name="paypalcontribution"> + {% block country_selector %} <div id="step1header"><h3>%donate_interface-amount-legend% <span id="selected-amount"></span> <span class="mute" id="change-amount" style="display: none;">(<a href="#">%donate_interface-change%</a>)</span></h3></div> <div id="step1wrapper" style="display: none;"> <div id="amtErrorMessages" class="small"></div> diff --git a/globalcollect_gateway/forms/html/rtbt/rtbt-ideal-noadd.html b/globalcollect_gateway/forms/html/rtbt/rtbt-ideal-noadd.html index 3bec148..e933a68 100644 --- a/globalcollect_gateway/forms/html/rtbt/rtbt-ideal-noadd.html +++ b/globalcollect_gateway/forms/html/rtbt/rtbt-ideal-noadd.html @@ -41,6 +41,7 @@ <div id="donate-content"> <div id="donate-body" style="padding: 0 1em;"> <form method="post" name="paypalcontribution"> + {% block country_selector %} <div id="step1header"><h3>%donate_interface-amount-legend% <span id="selected-amount"></span> <span class="mute" id="change-amount" style="display: none;">(<a href="#">%donate_interface-change%</a>)</span></h3></div> <div id="step1wrapper" style="display: none;"> <div id="amtErrorMessages" class="small"></div> diff --git a/globalcollect_gateway/forms/html/rtbt/rtbt-ideal.html b/globalcollect_gateway/forms/html/rtbt/rtbt-ideal.html index ce375db..954193f 100644 --- a/globalcollect_gateway/forms/html/rtbt/rtbt-ideal.html +++ b/globalcollect_gateway/forms/html/rtbt/rtbt-ideal.html @@ -41,6 +41,7 @@ <div id="donate-content"> <div id="donate-body" style="padding: 0 1em;"> <form method="post" name="paypalcontribution"> + {% block country_selector %} <div id="step1header"><h3>%donate_interface-amount-legend% <span id="selected-amount"></span> <span class="mute" id="change-amount" style="display: none;">(<a href="#">%donate_interface-change%</a>)</span></h3></div> <div id="step1wrapper" style="display: none;"> <div id="amtErrorMessages" class="small"></div> diff --git a/globalcollect_gateway/forms/html/rtbt/rtbt-sofo-GB.html b/globalcollect_gateway/forms/html/rtbt/rtbt-sofo-GB.html index 5b8cc3d..f972af9 100644 --- a/globalcollect_gateway/forms/html/rtbt/rtbt-sofo-GB.html +++ b/globalcollect_gateway/forms/html/rtbt/rtbt-sofo-GB.html @@ -41,6 +41,7 @@ <div id="donate-content"> <div id="donate-body" style="padding: 0 1em;"> <form method="post" name="paypalcontribution"> + {% block country_selector %} <div id="step1header"><h3>%donate_interface-amount-legend% <span id="selected-amount"></span> <span class="mute" id="change-amount" style="display: none;">(<a href="#">%donate_interface-change%</a>)</span></h3></div> <div id="step1wrapper" style="display: none;"> <div id="amtErrorMessages" class="small"></div> diff --git a/globalcollect_gateway/forms/html/rtbt/rtbt-sofo.html b/globalcollect_gateway/forms/html/rtbt/rtbt-sofo.html index 360b32d..12284cf 100644 --- a/globalcollect_gateway/forms/html/rtbt/rtbt-sofo.html +++ b/globalcollect_gateway/forms/html/rtbt/rtbt-sofo.html @@ -41,6 +41,7 @@ <div id="donate-content"> <div id="donate-body" style="padding: 0 1em;"> <form method="post" name="paypalcontribution"> + {% block country_selector %} <div id="step1header"><h3>%donate_interface-amount-legend% <span id="selected-amount"></span> <span class="mute" id="change-amount" style="display: none;">(<a href="#">%donate_interface-change%</a>)</span></h3></div> <div id="step1wrapper" style="display: none;"> <div id="amtErrorMessages" class="small"></div> -- To view, visit https://gerrit.wikimedia.org/r/260229 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id55b8098f1e417f9d91f6231f7742f70b396a6a1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Awight <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
