AntonLV 12 лет назад
Родитель
Сommit
c116cded96

+ 8 - 8
studio/js/store.js

@@ -155,7 +155,7 @@ BxDolStudioStore.prototype._getFile = function(sAction, mixedId, onResult, oButt
 	var oDate = new Date();
 	var $this = this;
 
-	bx_loading(this.sIdPageContent, true);
+	bx_loading_btn(oButton, true);
 	$(oButton).addClass('bx-btn-disabled');
 
 	$.get(
@@ -176,7 +176,7 @@ BxDolStudioStore.prototype._getFile = function(sAction, mixedId, onResult, oButt
 };
 
 BxDolStudioStore.prototype._onGetFile = function(oData, oButton) {
-	bx_loading(this.sIdPageContent, false);
+	bx_loading_btn(oButton, false);
 
 	switch(parseInt(oData.code)) {
 		case 1:
@@ -272,7 +272,7 @@ BxDolStudioStore.prototype.install = function(sValue, oInput) {
 		});
 	};
 
-	return this.perform('install', sValue, onSuccess);
+	return this.perform('install', sValue, onSuccess, oInput);
 };
 
 BxDolStudioStore.prototype.update = function(sValue, oInput) {
@@ -281,7 +281,7 @@ BxDolStudioStore.prototype.update = function(sValue, oInput) {
 		$(oInput).parents('.bx-std-product:first').hide();
 	};
 
-	return this.perform('update', sValue, onSuccess);
+	return this.perform('update', sValue, onSuccess, oInput);
 };
 
 BxDolStudioStore.prototype.remove = function(sValue, oInput) {
@@ -298,17 +298,17 @@ BxDolStudioStore.prototype.remove = function(sValue, oInput) {
 		}
 	};
 
-    return this.perform('delete', sValue, onSuccess);
+    return this.perform('delete', sValue, onSuccess, oInput);
 };
 
-BxDolStudioStore.prototype.perform = function(sType, sValue, onSuccess) {
+BxDolStudioStore.prototype.perform = function(sType, sValue, onSuccess, oInput) {
 	var oDate = new Date();
 	var $this = this;
 
 	if(!sValue)
         return false;
 
-	bx_loading(this.sIdPageContent, true);
+	bx_loading_btn(oInput, true);
 
     $.post(
     	this.sActionsUrl,
@@ -318,7 +318,7 @@ BxDolStudioStore.prototype.perform = function(sType, sValue, onSuccess) {
     		_t:oDate.getTime()
     	},
     	function (oData) {
-    		bx_loading($this.sIdPageContent, false);
+    		bx_loading_btn(oInput, false);
 
     		if(oData.message.length > 0)
     			$this.showPopup('bx-std-str-popup-' + sType, oData.message);

+ 12 - 4
studio/template/str_product_v1.html

@@ -15,14 +15,22 @@
         <div class="bx-std-pc-vendor bx-def-margin-thd-top bx-def-font-small">__vendor__ &bull; <span class="bx-std-pc-version">__version__</span></div>
         <div class="bx-std-pc-action bx-def-margin-thd-top">
         	<div class="bx-std-pc-buttons bx-std-pcb-install bx-clearfix" <bx_if:hide_install>style="display:none"</bx_if:hide_install>>
-        		<input class="bx-btn bx-btn-small bx-def-margin-sec-left-auto" type="button" value="<bx_text:_adm_btn_install_submit />" onclick="javascript:__js_object__.install('__dir__', this)" />
-        		<input class="bx-btn bx-btn-small bx-def-margin-sec-left-auto" type="button" value="<bx_text:_adm_btn_delete_submit />" onclick="javascript:__js_object__.remove('__dir__', this)" />
+        		<button class="bx-btn bx-btn-small bx-def-margin-sec-left-auto" type="button" onclick="javascript:__js_object__.install('__dir__', this)">
+        			<bx_text:_adm_btn_install_submit />
+        		</button>
+        		<button class="bx-btn bx-btn-small bx-def-margin-sec-left-auto" type="button" onclick="javascript:__js_object__.remove('__dir__', this)">
+        			<bx_text:_adm_btn_delete_submit />
+        		</button>
         	</div>
         	<div class="bx-std-pc-buttons bx-std-pcb-queued bx-clearfix" <bx_if:hide_queued>style="display:none"</bx_if:hide_queued>>
-            	<input class="bx-btn bx-btn-small bx-btn-disabled" type="button" value="<bx_text:_adm_btn_queued_submit />" />
+            	<button class="bx-btn bx-btn-small bx-btn-disabled" type="button">
+            		<bx_text:_adm_btn_queued_submit />
+            	</button>
             </div>
             <div class="bx-std-pc-buttons bx-std-pcb-installed bx-clearfix" <bx_if:hide_installed>style="display:none"</bx_if:hide_installed>>
-            	<input class="bx-btn bx-btn-small bx-btn-disabled" type="button" value="<bx_text:_adm_btn_installed_submit />" />
+            	<button class="bx-btn bx-btn-small bx-btn-disabled" type="button">
+            		<bx_text:_adm_btn_installed_submit />
+            	</button>
             </div>
         </div>
     </div>

+ 15 - 5
studio/template/str_product_v2.html

@@ -20,19 +20,29 @@
         </bx_if:show_count_price>
         <div class="bx-std-pc-action bx-def-margin-thd-top bx-clearfix">
         	<bx_if:show_purchase>
-            	<input class="bx-btn bx-btn-small bx-std-pc-purchase" type="button" value="<bx_text:_adm_btn_purchase_submit />" onclick="javascript:__js_object__.addToCart('__vendor__', __id__, this)" />
+            	<button class="bx-btn bx-btn-small bx-std-pc-purchase" type="button" onclick="javascript:__js_object__.addToCart('__vendor__', __id__, this)">
+            		<bx_text:_adm_btn_purchase_submit />
+            	</button>
             </bx_if:show_purchase>
         	<bx_if:show_download>
-            	<input class="bx-btn bx-btn-small bx-std-pc-download" type="button" value="<bx_text:_adm_btn_download_submit />" onclick="javascript:__js_object__.getFile(__file_id__, this)" />
+            	<button class="bx-btn bx-btn-small bx-std-pc-download" type="button" onclick="javascript:__js_object__.getFile(__file_id__, this)">
+            		<bx_text:_adm_btn_download_submit />
+            	</button>
             </bx_if:show_download>
             <bx_if:show_download_disabled>
-            	<input class="bx-btn bx-btn-small bx-btn-disabled bx-std-pc-download" type="button" value="<bx_text:_adm_btn_download_submit />" disabled="disabled" />
+            	<button class="bx-btn bx-btn-small bx-btn-disabled bx-std-pc-download" type="button" disabled="disabled">
+            		<bx_text:_adm_btn_download_submit />
+            	</button>
             </bx_if:show_download_disabled>
             <bx_if:show_queued_disabled>
-            	<input class="bx-btn bx-btn-small bx-btn-disabled bx-std-pc-queued" type="button" value="<bx_text:_adm_btn_queued_submit />" disabled="disabled" />
+            	<button class="bx-btn bx-btn-small bx-btn-disabled bx-std-pc-queued" type="button" disabled="disabled">
+            		<bx_text:_adm_btn_queued_submit />
+            	</button>
             </bx_if:show_queued_disabled>
             <bx_if:show_delete>
-            	<input class="bx-btn bx-btn-small bx-std-pc-delete" type="button" value="<bx_text:_adm_btn_delete_submit />" onclick="javascript:__js_object__.deleteFromCart('__vendor__', __id__, this)" />
+            	<button class="bx-btn bx-btn-small bx-std-pc-delete" type="button" onclick="javascript:__js_object__.deleteFromCart('__vendor__', __id__, this)">
+            		<bx_text:_adm_btn_delete_submit />
+            	</button>
             </bx_if:show_delete>
         </div>
     </div>

+ 3 - 1
studio/template/str_update_v1.html

@@ -14,7 +14,9 @@
         </div>
         <div class="bx-std-pc-vendor bx-def-margin-thd-top bx-def-font-small">__vendor__ &bull; <span class="bx-std-pc-versions">__versions__</span></div>
         <div class="bx-std-pc-action bx-def-margin-thd-top bx-clearfix">
-        	<input class="bx-btn bx-btn-small" type="button" value="<bx_text:_adm_btn_install_submit />" onclick="javascript:__js_object__.update('__dir__', this)" />
+        	<button class="bx-btn bx-btn-small" type="button" onclick="javascript:__js_object__.update('__dir__', this)">
+        		<bx_text:_adm_btn_install_submit />
+        	</button>
         </div>
     </div>
 </div>

+ 1 - 1
studio/template/str_update_v2.html

@@ -15,7 +15,7 @@
         <div class="bx-std-pc-vendor bx-def-margin-thd-top bx-def-font-small">__vendor__ &bull; <span class="bx-std-pc-versions">__versions__</span></div>
         <div class="bx-std-pc-action bx-def-margin-thd-top bx-clearfix">
         	<bx_if:show_download>
-            	<input class="bx-btn bx-btn-small bx-std-pc-download" type="button" value="__caption__" onclick="javascript:__on_click__" />
+            	<button class="bx-btn bx-btn-small bx-std-pc-download" type="button" onclick="javascript:__on_click__">__caption__</button>
             </bx_if:show_download>
         </div>
     </div>