Added loading text to form button.

Close #2918
opencart · May 19, 2015 · cea6ae6 · cea6ae6
1 parent 24d791d
commit cea6ae6
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 8 deletions.
diff --git a/upload/catalog/controller/payment/bank_transfer.php b/upload/catalog/controller/payment/bank_transfer.php
@@ -6,6 +6,7 @@ public function index() {
 		$data['text_instruction'] = $this->language->get('text_instruction');
 		$data['text_description'] = $this->language->get('text_description');
 		$data['text_payment'] = $this->language->get('text_payment');
+		$data['text_loading'] = $this->language->get('text_loading');
 
 		$data['button_confirm'] = $this->language->get('button_confirm');
 

diff --git a/upload/catalog/controller/payment/bluepay_redirect.php b/upload/catalog/controller/payment/bluepay_redirect.php
@@ -144,5 +144,4 @@ public function callback() {
 		$this->response->addHeader('Content-Type: application/json');
 		$this->response->setOutput(json_encode($this->request->get));
 	}
-
 }
diff --git a/upload/catalog/controller/payment/cheque.php b/upload/catalog/controller/payment/cheque.php
@@ -7,6 +7,7 @@ public function index() {
 		$data['text_payable'] = $this->language->get('text_payable');
 		$data['text_address'] = $this->language->get('text_address');
 		$data['text_payment'] = $this->language->get('text_payment');
+		$data['text_loading'] = $this->language->get('text_loading');
 
 		$data['button_confirm'] = $this->language->get('button_confirm');
 

diff --git a/upload/catalog/controller/payment/cod.php b/upload/catalog/controller/payment/cod.php
@@ -3,6 +3,8 @@ class ControllerPaymentCod extends Controller {
 	public function index() {
 		$data['button_confirm'] = $this->language->get('button_confirm');
 
+		$data['text_loading'] = $this->language->get('text_loading');
+
 		$data['continue'] = $this->url->link('checkout/success');
 
 		if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/payment/cod.tpl')) {

diff --git a/upload/catalog/controller/payment/free_checkout.php b/upload/catalog/controller/payment/free_checkout.php
@@ -3,6 +3,8 @@ class ControllerPaymentFreeCheckout extends Controller {
 	public function index() {
 		$data['button_confirm'] = $this->language->get('button_confirm');
 
+		$data['text_loading'] = $this->language->get('text_loading');
+
 		$data['continue'] = $this->url->link('checkout/success');
 
 		if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/payment/free_checkout.tpl')) {

diff --git a/upload/catalog/controller/payment/g2apay.php b/upload/catalog/controller/payment/g2apay.php
@@ -1,11 +1,10 @@
 <?php
-
 class ControllerPaymentG2APay extends Controller {
-
 	public function index() {
 		$this->load->language('payment/g2apay');
 
 		$data['button_confirm'] = $this->language->get('button_confirm');
+
 		$data['action'] = $this->url->link('payment/g2apay/checkout', '', 'SSL');
 
 		if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/payment/g2apay.tpl')) {
@@ -175,5 +174,4 @@ public function ipn() {
 			}
 		}
 	}
-
 }
diff --git a/upload/catalog/view/theme/default/template/payment/bank_transfer.tpl b/upload/catalog/view/theme/default/template/payment/bank_transfer.tpl
@@ -6,7 +6,7 @@
 </div>
 <div class="buttons">
   <div class="pull-right">
-    <input type="button" value="<?php echo $button_confirm; ?>" id="button-confirm" class="btn btn-primary" />
+    <input type="button" value="<?php echo $button_confirm; ?>" id="button-confirm" class="btn btn-primary" data-loading-text="<?php echo $text_loading; ?>" />
   </div>
 </div>
 <script type="text/javascript"><!--

diff --git a/upload/catalog/view/theme/default/template/payment/cheque.tpl b/upload/catalog/view/theme/default/template/payment/cheque.tpl
@@ -8,7 +8,7 @@
 </div>
 <div class="buttons">
   <div class="pull-right">
-    <input type="button" value="<?php echo $button_confirm; ?>" id="button-confirm" class="btn btn-primary" />
+    <input type="button" value="<?php echo $button_confirm; ?>" id="button-confirm" class="btn btn-primary" data-loading-text="<?php echo $text_loading; ?>" />
   </div>
 </div>
 <script type="text/javascript"><!--

diff --git a/upload/catalog/view/theme/default/template/payment/cod.tpl b/upload/catalog/view/theme/default/template/payment/cod.tpl
@@ -1,6 +1,6 @@
 <div class="buttons">
   <div class="pull-right">
-    <input type="button" value="<?php echo $button_confirm; ?>" id="button-confirm" class="btn btn-primary" />
+    <input type="button" value="<?php echo $button_confirm; ?>" id="button-confirm" class="btn btn-primary" data-loading-text="<?php echo $text_loading; ?>" />
   </div>
 </div>
 <script type="text/javascript"><!--

diff --git a/upload/catalog/view/theme/default/template/payment/free_checkout.tpl b/upload/catalog/view/theme/default/template/payment/free_checkout.tpl
@@ -1,6 +1,6 @@
 <div class="buttons">
   <div class="pull-right">
-    <input type="button" value="<?php echo $button_confirm; ?>" id="button-confirm" class="btn btn-primary" />
+    <input type="button" value="<?php echo $button_confirm; ?>" id="button-confirm" class="btn btn-primary" data-loading-text="<?php echo $text_loading; ?>" />
   </div>
 </div>
 <script type="text/javascript"><!--