Merge branch 'master' of github.com:boonex/dolphin

studio/js/builder_page.js

@@ -175,7 +175,7 @@ BxDolStudioBuilderPage.prototype.deleteBlockImage = function(iId) {
 };
 
 BxDolStudioBuilderPage.prototype.onChangeVisibleFor = function(oSelect) {
-	$('#bx-form-element-visible_for_levels').bx_anim($(oSelect).val() == 'all' ? 'hide' : 'show', this.sAnimationEffect, this.iAnimationSpeed);
+	$(oSelect).parents('form:first').find('#bx-form-element-visible_for_levels').bx_anim($(oSelect).val() == 'all' ? 'hide' : 'show', this.sAnimationEffect, this.iAnimationSpeed);
 };
 
 BxDolStudioBuilderPage.prototype.onEditBlock = function(oData) {

studio/template/scripts/BxBaseStudioBuilderPage.php

@@ -573,6 +573,7 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
         if(empty($aBlock) || !is_array($aBlock))
             return array('msg' => _t('_adm_bp_err_block_not_found'));
 
+		bx_import('BxDolStudioUtils');
         $aForm = array(
             'form_attrs' => array(
                 'id' => 'adm-bp-block-edit',
@@ -994,6 +995,7 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
                 )
             );
         else
+        	bx_import('BxDolStudioUtils');
             $aInputs = array(
                 'visible_for' => array(
                     'type' => 'select',

studio/template/scripts/BxBaseStudioFormsFields.php

@@ -166,6 +166,7 @@ class BxBaseStudioFormsFields extends BxDolStudioFormsFields
             exit;
         }
 
+        bx_import('BxDolStudioUtils');
         $aForm = array(
             'form_attrs' => array(
                 'id' => 'adm-form-field-visibility',

studio/template/scripts/BxBaseStudioNavigationItems.php

@@ -222,6 +222,7 @@ class BxBaseStudioNavigationItems extends BxDolStudioNavigationItems
             exit;
         }
 
+		bx_import('BxDolStudioUtils');
         $aForm = array(
             'form_attrs' => array(
                 'id' => 'adm-nav-item-create',