Просмотр исходного кода

Ticket #255 - Clean up: Studio improvements.

AntonLV 10 лет назад
Родитель
Сommit
6256dfd939

+ 5 - 0
studio/classes/BxDolStudioModule.php

@@ -99,6 +99,11 @@ class BxDolStudioModule extends BxTemplStudioPage
 				break;
 		}
 
+		if(!empty($aResult['message']))
+			$aResult['message'] = BxTemplStudioFunctions::getInstance()->transBox('', BxDolStudioTemplate::getInstance()->parseHtmlByName('mod_action_result.html', array(
+            	'content' => $aResult['message'])
+        	));
+
 		echo json_encode($aResult);
 		exit;
     }

+ 13 - 2
studio/js/module.js

@@ -15,17 +15,20 @@ function BxDolStudioModule(oOptions) {
 BxDolStudioModule.prototype.activate = function(sName, oChecbox) {
 	var $this = this;
 	var oDate = new Date();
+	var sAction = 'activate'; 
+
+	$('.bx-popup-applied:visible').dolPopupHide();
 
 	$.get(
 		this.sActionsUrl,
 		{
-			mod_action: 'activate',
+			mod_action: sAction,
 			mod_value: sName,
 			_t:oDate.getTime()
 		},
 		function(oData) {
 			if(oData.code != 0) {
-				alert(oData.message);
+				$this.popup(sAction, oData.message);
 
 				$(oChecbox).attr('checked', 'checked').trigger('enable');
 				return;
@@ -47,4 +50,12 @@ BxDolStudioModule.prototype.activate = function(sName, oChecbox) {
 	);
 	return true;
 };
+
+BxDolStudioModule.prototype.popup = function(sType, sValue) {
+	var sId = 'bx-std-mod-popup-' + sType;
+
+    $('#' + sId).remove();
+    $('<div id="' + sId + '" style="display: none;"></div>').prependTo('body').html(sValue);
+    $('#' + sId).dolPopup({});
+};
 /** @} */

+ 8 - 0
studio/template/css/module.css

@@ -0,0 +1,8 @@
+/*--- Module pages -> Action popups ---*/
+div.bx-mod-action-result-step {
+	max-width: 480px;
+	max-width: 30rem;
+}
+div.bx-mod-ars-content {
+	overflow-x: auto;
+}

+ 3 - 2
studio/template/css/modules.css

@@ -9,5 +9,6 @@ div.bx-mod-action-result-step {
 	max-width: 480px;
 	max-width: 30rem;
 }
-div.bx-mod-ars-title,
-div.bx-mod-ars-content {}
+div.bx-mod-ars-content {
+	overflow-x: auto;
+}