AntonLV 9 лет назад
Родитель
Сommit
bcfc05f2de

+ 1 - 1
studio/classes/BxDolStudioInstaller.php

@@ -573,7 +573,7 @@ class BxDolStudioInstaller extends BxDolInstallerUtils
     	if(is_int($mixedResult))
     		return $this->actionOperationFailed($mixedResult);
 
-        $sResult = '<br />' . _t('_adm_err_modules_wrong_mysql_query') . '<br />';
+        $sResult = _t('_adm_err_modules_wrong_mysql_query') . '<br />';
         foreach($mixedResult['content'] as $aQuery) {
             $sResult .= _t('_adm_err_modules_wrong_mysql_query_msg', $aQuery['error']) . '<br />';
             $sResult .= '<pre>' . $aQuery['query'] . '</pre>';

+ 17 - 1
studio/classes/BxDolStudioStore.php

@@ -161,7 +161,23 @@ class BxDolStudioStore extends BxTemplStudioPage
             }
 
             if(!empty($aResult['message']))
-				$aResult['message'] = BxTemplStudioFunctions::getInstance()->inlineBox('', BxDolStudioTemplate::getInstance()->parseHtmlByName('mod_action_result_inline.html', array('content' => $aResult['message'])), true);
+				$aResult['message'] = BxDolStudioTemplate::getInstance()->parseHtmlByName('popup_chain.html', array(
+					'html_id' => 'mod_action_result',
+				    'bx_repeat:items' => array(array(
+				        'bx_if:show_as_hidden' => array(
+        	    			'condition' => false,
+        	    			'content' => array(),
+        	    		),
+        	    		'item' => $aResult['message'],
+        	    		'bx_if:show_previous' => array(
+        	    			'condition' => false,
+        	    			'content' => array(
+        	    		        'onclick_previous' => ''
+        	    		    )
+        	    		),
+        	    		'onclick_close' => '$(this).parents(\'.bx-popup-applied:visible:first\').dolPopupHide();'
+				    ))
+				));
 
             echo json_encode($aResult);
             exit;

+ 8 - 3
studio/js/store.js

@@ -424,9 +424,14 @@ BxDolStudioStore.prototype.changePagePaginate = function(oButton, sType, iStart,
 };
 
 BxDolStudioStore.prototype.showNotification = function(sContent) {
-	$(sContent).appendTo('body').dolPopupInline({
-		removeOnClose: true
-	});   
+	$(sContent).appendTo('body').dolPopup({
+    	position: 'fixed',
+    	left: '1rem',
+    	top: 'auto',
+    	bottom: '1rem',
+    	fog: false,
+    	removeOnClose: true
+    }); 
 };
 
 /**

+ 0 - 3
studio/template/mod_action_result_inline.html

@@ -1,3 +0,0 @@
-<div class="bx-mod-action-result">
-    <div class="bx-mod-action-result-cnt">__content__</div>
-</div>