Changeset 15939 for trunk

Timestamp:

02/01/12 00:05:23 (4 months ago)

Author:

Anton Lesnikov

Message:

Studio -> Page Builder -> Add Block.

Location:

trunk

Files:

• modules/boonex/english/install/data/langs/en.xml (modified) (1 diff)
• studio/classes/BxDolStudioBuilderPageQuery.php (modified) (2 diffs)
• studio/classes/BxDolStudioPage.php (modified) (1 diff)
• studio/js/builder_page.js (modified) (3 diffs)
• studio/templates/base/bp_add_block.html (modified) (1 diff)
• studio/templates/base/css/builder_page.css (modified) (1 diff)
• studio/templates/base/scripts/BxBaseStudioBuilderPage.php (modified) (7 diffs)

trunk/modules/boonex/english/install/data/langs/en.xml

@@ -2490 +2490 @@
     <string name="_adm_bp_btn_block_cancel"><![CDATA[Cancel]]></string>
     <string name="_adm_bp_txt_blocks_selected"><![CDATA[blocks selected]]></string>
-    <string name=""><![CDATA[]]></string>    
-    <string name=""><![CDATA[]]></string>
+    <string name="_adm_bp_scs_blocks_added"><![CDATA[The blocks were successfully added.]]></string>    
+    <string name="_adm_bp_err_blocks_added"><![CDATA[Cannot add blocks.]]></string>
     <string name=""><![CDATA[]]></string>
     <string name=""><![CDATA[]]></string>

trunk/studio/classes/BxDolStudioBuilderPageQuery.php

@@ -172 +172 @@
     }
 
+    function copyBlocksByIds($sObject, $iCellId, $aIds) {
+        $iOrder = $this->getBlockOrderMax($sObject) + 1;
+
+        $sSql = "INSERT INTO `sys_pages_blocks` 
+            SELECT NULL AS `id`, ? AS `object`, ? AS `cell_id`, ? AS `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, ? AS `order` 
+            FROM `sys_pages_blocks` 
+            WHERE `id` IN ('" . implode("','", array_fill(0, count($aIds), '?')) . "')";
+        $sSql = call_user_func_array(array($this, 'prepare'), array_merge(array($sSql), array($sObject, $iCellId,  BX_DOL_STUDIO_MODULE_CUSTOM, $iOrder + 1), $aIds));
+        return (int)$this->query($sSql) > 0;
+    }
+
     function deleteBlocks($aParams) {
         $sWhereClause = "";
@@ -195 +206 @@
         return (int)$this->query($sSql) > 0;
     }
+
+    function getBlockOrderMax($sObject, $iCellId = 1) {
+        $sSql = $this->prepare("SELECT MAX(`order`) FROM `sys_pages_blocks` WHERE `object`=? AND `cell_id`=? LIMIT 1", $sObject, $iCellId);
+        return (int)$this->getOne($sSql);
+    }
 }
 /** @} */

trunk/studio/classes/BxDolStudioPage.php

@@ -107 +107 @@
         return stdGetClassName($sValue);
     }
+
+    protected function getModuleTitle($sName) {
+        return stdGetModuleTitle($sName);
+    }
+
+    protected function getModules($bShowCustom = true, $bShowSystem = true) {
+        return stdGetModules($bShowCustom, $bShowSystem);
+    }
 }
 /** @} */

trunk/studio/js/builder_page.js

@@ -44 +44 @@
 };
 
+BxDolStudioBuilderPage.prototype.onCreatePage = function(sPage) {
+    window.location.href = this.sActionsUrl + '?type=' + this.sType + '&page=' + sPage;
+};
+
 BxDolStudioBuilderPage.prototype.reorder = function(oDraggable) {
     var $this = this;
@@ -71 +75 @@
 
     return true;
-};
-
-BxDolStudioBuilderPage.prototype.onSelectBlock = function(oCheckbox) {
-    var iCounter = parseInt($('#adm-bp-cbf-counter').html());
-    iCounter += $(oCheckbox).attr('checked') == 'checked' ? 1 : -1;
-
-    $('#adm-bp-cbf-counter').html(iCounter);
 };
 
@@ -116 +113 @@
 };
 
+BxDolStudioBuilderPage.prototype.onSelectBlock = function(oCheckbox) {
+    var iCounter = parseInt($('#adm-bp-cbf-counter').html());
+    iCounter += $(oCheckbox).attr('checked') == 'checked' ? 1 : -1;
+
+    $('#adm-bp-cbf-counter').html(iCounter);
+};
+
+BxDolStudioBuilderPage.prototype.onCreateBlock = function(oData) {
+    window.location.href = this.sActionsUrl + '?type=' + this.sType + '&page=' + this.sPage;
+};
+
 BxDolStudioBuilderPage.prototype.performAction = function(sAction) {
     var $this = this;

trunk/studio/templates/base/bp_add_block.html

@@ -1 +1 @@
 <div class="adm-bp-create-block-form bx-def-color-bg-block">
     <div class="adm-bp-create-block-form-cnt">
-        <div class="adm-bp-cbf-left">
-            <div class="adm-bp-cbf-left-cnt">
-                <bx_include_auto:menu_side.html />
-            </div>
-        </div>
-        <div class="adm-bp-cbf-right bx-def-margin-left">
-            <div id="__html_block_lists_id__" class="adm-bp-cbf-right-cnt">__blocks__</div>
-        </div>
-        <div class="bx-std-cb"></div>
-        <div class="adm-bp-cbf-controls bx-def-padding-toprightleft">
-            <button class="bx-btn bx-btn-primary"><bx_text:_adm_bp_btn_block_add /></button>
-            <button class="bx-btn bx-def-margin-sec-left" onclick="$('.bx-popup-applied:visible').dolPopupHide()"><bx_text:_adm_bp_btn_block_cancel /></button>
-            <div class="adm-bp-cbf-counter bx-def-font-h3"><span id="adm-bp-cbf-counter">0</span> <bx_text:_adm_bp_txt_blocks_selected /></div>
-            <div class="bx-std-cb"></div>
-        </div>
+        __form__
+        <script type="text/javascript">
+            $(document).ready(function () {
+                $("#__form_id__").ajaxForm({ 
+                    dataType: "json",
+                    beforeSubmit: function(formData, jqForm, options) {
+                        bx_loading($("#__form_id__"), true);
+                    },
+                    success: function(oData) {
+                        $(".bx-popup-applied:visible").dolPopupHide();
+                        oBxDolStudioPage.processJson(oData);
+                    }
+                });
+            });
+        </script>
     </div>
-    
 </div>

trunk/studio/templates/base/css/builder_page.css

@@ -67 +67 @@
 div.adm-bp-create-block-form-cnt {}
 
+div.adm-bp-create-block-form fieldset.bx-form-section {
+    padding-bottom: 0px;
+}
+
 div.adm-bp-cbf-left {
     float: left;

trunk/studio/templates/base/scripts/BxBaseStudioBuilderPage.php

@@ -122 +122 @@
                 foreach($aBlocks as $aBlock)
                     $aTmplVarsCell['bx_repeat:blocks'][] = array(
-                        'id' => $aBlock['id'],
+                        'html_id' => $this->aHtmlIds['block_id'] . $aBlock['id'],
                         'onclick' => $sJsObject . ".showEditBlockPopup(" . $aBlock['id'] . ")",
                         'title' => _t($aBlock['title']),
@@ -211 +211 @@
             'form_attrs' => array(
                 'id' => 'adm-bp-page-create',
-                'action' => BX_DOL_URL_STUDIO . 'builder_page.php?bp_action=' . $this->sActionPageCreate,
+                'action' => BX_DOL_URL_STUDIO . 'builder_page.php?bp_action=' . $this->sActionPageCreate . '&type=' . $this->sType . '&page=' . $this->sPage,
                 'method' => 'post'
             ),
@@ -360 +360 @@
 
                 return array(
-                    //'msg' => _t('_adm_bp_scs_page_create'),
-                    'eval' => 'window.parent.location.href = "' . BX_DOL_URL_STUDIO . 'builder_page.php?type=' . $this->sType . '&page=' . $sObject . '";'
+                    'eval' => $this->getPageJsObject() . '.onCreatePage(\'' . $sObject . '\')'
                 );
             }
@@ -421 +420 @@
 
         return array(
-            'id' => $this->aHtmlIds['block_list_id'] . $sModule, 
             'content' => $this->getBlockList($sModule)
         );
@@ -432 +430 @@
         $sSelected = BX_DOL_STUDIO_BP_TYPE_DEFAULT;
 
+        $aForm = array(
+            'form_attrs' => array(
+                'id' => 'adm-bp-block-create',
+                'action' => BX_DOL_URL_STUDIO . 'builder_page.php?bp_action=' . $this->sActionBlockCreate,
+                'method' => 'post'
+            ),
+            'params' => array (
+                'db' => array(
+                    'table' => 'sys_pages_blocks',
+                    'key' => 'id',
+                    'uri' => '',
+                    'uri_title' => '',
+                    'submit_name' => 'do_submit'
+                ),
+            ),
+            'inputs' => array (
+                'page' => array(
+                    'type' => 'hidden',
+                    'name' => 'page',
+                    'value' => $this->sPage,
+                    'db' => array (
+                        'pass' => 'Xss',
+                    ),
+                ),
+                'blocks' => array(
+                    'type' => 'custom',
+                    'name' => 'blocks',
+                    'content' => '',
+                    'db' => array (
+                        'pass' => 'Int',
+                    ),
+                ),
+            )
+        );
+
         //--- get modules in menu
         $aModules = array(
             array(
-                'id' => 0,
-                'type' => BX_DOL_STUDIO_MIT_ITEM, 
-                'name' => BX_DOL_STUDIO_BP_TYPE_DEFAULT, 
-                'uri' => BX_DOL_STUDIO_BP_TYPE_DEFAULT, 
-                'title' => '_adm_bp_cpt_type_system', 
+                'name' => BX_DOL_STUDIO_MODULE_SYSTEM, 
                 'icon' => 'mi-system.png',
-                'active' => $sSelected == BX_DOL_STUDIO_BP_TYPE_DEFAULT ? 1 : 0,
+                'active' => $sSelected == BX_DOL_STUDIO_MODULE_SYSTEM ? 1 : 0,
+            ),
+            array(
+                'name' => BX_DOL_STUDIO_MODULE_CUSTOM,
+                'icon' => 'mi-system.png',
+                'active' => $sSelected == BX_DOL_STUDIO_MODULE_CUSTOM ? 1 : 0,
             ),
         );
@@ -475 +509 @@
                             )
                         ),
-                        'caption' => _t($aModule['title'])
+                        'caption' => $this->getModuleTitle($aModule['name'])
                     )
                 ),
@@ -484 +518 @@
         $aTmplParams['blocks'] = $this->getBlockList($sSelected);
 
-        $sContent = $oTemplate->parseHtmlByName('bp_add_block.html', $aTmplParams);
+        $aForm['inputs']['blocks']['content'] = $oTemplate->parseHtmlByName('bp_add_block_form.html', $aTmplParams);
+        
+        bx_import('BxTemplStudioFormView');
+        $oForm = new BxTemplStudioFormView($aForm);
+        $oForm->initChecker();
+
+        $sContent = "";
+        if($oForm->isSubmittedAndValid()) {
+            $aBlocks = $oForm->getCleanValue('blocks');
+            if($this->oDb->copyBlocksByIds($this->sPage, 1, $aBlocks))
+                return array('msg' => _t('_adm_bp_scs_blocks_added'), 'eval' => $sJsObject . '.onCreateBlock(oData)');
+            else
+                return array('msg' => _t('_adm_bp_err_blocks_added'));
+        }
 
         bx_import('BxTemplStudioFunctions');
-        $sContent = BxTemplStudioFunctions::getInstance()->popupBox($this->aHtmlIds['create_block_popup_id'], _t('_adm_bp_txt_new_block_popup'), $sContent);
+        $sContent = BxTemplStudioFunctions::getInstance()->popupBox($this->aHtmlIds['create_block_popup_id'], _t('_adm_bp_txt_new_block_popup'), $oTemplate->parseHtmlByName('bp_add_block.html', array(
+            'form_id' => $aForm['form_attrs']['id'],
+            'form' => $oForm->getCode()
+        )));
 
         return array('popup' => $sContent);