Changeset 15914 for trunk

Timestamp:

01/24/12 02:35:42 (4 months ago)

Author:

Anton Lesnikov

Message:

Navigation Builder check lists.

Location:

trunk

Files:

• install/sql/v70.sql (modified) (1 diff)
• modules/boonex/english/install/data/langs/en.xml (modified) (1 diff)
• studio/classes/BxDolStudioGrid.php (modified) (2 diffs)
• studio/classes/BxDolStudioNavigationQuery.php (modified) (2 diffs)
• studio/js/navigation_menus.js (modified) (1 diff)
• studio/templates/base/scripts/BxBaseStudioNavigationMenus.php (modified) (10 diffs)

trunk/install/sql/v70.sql

@@ -4684 +4684 @@
 ('sys_studio_nav_items', 'actions', '', '17%', '', '', 8),
 ('sys_studio_nav_import', 'icon', '_adm_nav_txt_items_icon', '10%', '', '', 1),
-('sys_studio_nav_import', 'title', '_adm_nav_txt_items_title', '30%', '', '', 2),
-('sys_studio_nav_import', 'link', '_adm_nav_txt_items_link', '20%', '', '', 3),
-('sys_studio_nav_import', 'module', '_adm_nav_txt_items_module', '20%', '', '', 4),
+('sys_studio_nav_import', 'title', '_adm_nav_txt_items_title', '30%', '28', '', 2),
+('sys_studio_nav_import', 'link', '_adm_nav_txt_items_link', '25%', '23', '', 3),
+('sys_studio_nav_import', 'module', '_adm_nav_txt_items_module', '15%', '13', '', 4),
 ('sys_studio_nav_import', 'actions', '', '20%', '', '', 5),
 ('sys_studio_forms', 'switcher', '', '10%', '', '', 1),

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

@@ -2167 +2167 @@
     <string name="_adm_nav_dsc_menus_set_name"><![CDATA[Assign a Set of menu Items]]></string>
     <string name="_adm_nav_err_menus_set_name"><![CDATA[Please, assign a Set.]]></string>
-    <string name="_adm_nav_txt_menus_set_name_select"><![CDATA[Select Set]]></string>
+    <string name="_adm_nav_txt_menus_set_name_select"><![CDATA[Select Set...]]></string>
+    <string name="_adm_nav_txt_menus_set_name_new"><![CDATA[Create New]]></string>
+    <string name="_adm_nav_txt_menus_set_title"><![CDATA[Set Title]]></string>
+    <string name="_adm_nav_dsc_menus_set_title"><![CDATA[Descriptive name displayed in Studio only. Use at least 3 characters.]]></string>
+    <string name="_adm_nav_err_menus_set_title"><![CDATA[A unique title with at least 3 characters is required.]]></string>
     <string name="_adm_nav_txt_menus_style"><![CDATA[Style]]></string>
     <string name="_adm_nav_dsc_menus_style"><![CDATA[Select presentation style - the way this menu will be displayed on site]]></string>
     <string name="_adm_nav_err_menus_style"><![CDATA[Please, select a presentation style.]]></string>
-    <string name="_adm_nav_txt_menus_style_select"><![CDATA[Select Style]]></string>
+    <string name="_adm_nav_txt_menus_style_select"><![CDATA[Select Style...]]></string>
     <string name="_adm_nav_btn_menus_add"><![CDATA[Add]]></string>
     <string name="_adm_nav_btn_menus_cancel"><![CDATA[Cancel]]></string>

trunk/studio/classes/BxDolStudioGrid.php

@@ -17 +17 @@
 
 class BxDolStudioGrid extends BxTemplGrid {
-    protected $oDb;
     protected $sParamsDivider;
+    public $oDb;
 
     public function __construct ($aOptions, $oTemplate = false) {
@@ -27 +27 @@
     }
 
+    public function getSystemName($sValue) {
+        return str_replace(' ', '_', strtolower($sValue));
+    }
+
+    public function getClassName($sValue) {
+        return str_replace(' ', '', ucwords(str_replace('_', ' ', $sValue)));
+    }
+
     protected function _isVisibleGrid ($a) {
         return isAdmin();
     }
-
-    protected function getSystemName($sValue) {
-        return str_replace(' ', '_', strtolower($sValue));
-    }
-
-    protected function getClassName($sValue) {
-        return str_replace(' ', '', ucwords(str_replace('_', ' ', $sValue)));
-    }
 }
 /** @} */

trunk/studio/classes/BxDolStudioNavigationQuery.php

@@ -61 +61 @@
     }
 
+    function isSetExists($sName) {
+        $sSql = $this->prepare("SELECT COUNT(*) FROM `sys_menu_sets` WHERE `set_name`=? LIMIT 1", $sName);
+        return (int)$this->getOne($sSql) == 1;
+    }
+
     function getSets($aParams, &$aItems, $bReturnCount = true) {
         $aMethod = array('name' => 'getAll', 'params' => array(0 => 'query'));
@@ -99 +104 @@
             LIMIT 1";
         return (int)$this->getOne($sQuery);
+    }
+
+    function addSet($aFields) {
+        $sSql = "INSERT INTO `sys_menu_sets` SET `" . implode("`=?, `", array_keys($aFields)) . "`=?";
+        $sSql = call_user_func_array(array($this, 'prepare'), array_merge(array($sSql), array_values($aFields)));
+        return (int)$this->query($sSql) > 0; 
     }
 

trunk/studio/js/navigation_menus.js

@@ -27 +27 @@
     glGrids[this.sObjNameGrid].setFilter(sValueModule + this.sParamsDivider + sValueSearch, true);
 };
+
+BxDolStudioNavigationMenus.prototype.onSelectSet = function(oSelect) {
+    var sSet = $(oSelect).val();
+
+    if(sSet == 'sys_create_new')
+        $('#bx-form-element-set_title').show();
+    else
+        $('#bx-form-element-set_title').hide();
+};
 /** @} */

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

@@ -11 +11 @@
 
 bx_import('BxDolStudioNavigationMenus');
+bx_import('BxTemplStudioFormView');
+
+class BxDolStudioNavigationMenusCheckerHelper extends BxDolFormCheckerHelper {
+    function checkUniqueSet($sVal) {
+        if(empty($sVal))
+            return false;
+
+        bx_import('BxDolGrid');
+        $oGrid = BxDolGrid::getObjectInstance('sys_studio_nav_menus');
+        if(!$oGrid)
+            return false;
+
+        $sVal = 'custom_' . $oGrid->getSystemName($sVal);
+        return !$oGrid->oDb->isSetExists($sVal);
+    }
+}
 
 class BxBaseStudioNavigationMenus extends BxDolStudioNavigationMenus {
+    private $sCreateNew = 'sys_create_new';
+
     function __construct($aOptions, $oTemplate = false) {
         parent::__construct($aOptions, $oTemplate);
@@ -34 +52 @@
                     'submit_name' => 'do_submit'
                 ),
+                'checker_helper' => 'BxDolStudioNavigationMenusCheckerHelper'
             ),
             'inputs' => array (
@@ -59 +78 @@
                     'value' => '',
                     'values' => array(
-                        array('key' => '', 'value' => _t('_adm_nav_txt_menus_set_name_select'))
+                        array('key' => '', 'value' => _t('_adm_nav_txt_menus_set_name_select')),
+                        array('key' => $this->sCreateNew, 'value' => _t('_adm_nav_txt_menus_set_name_new'))
                     ),
                     'required' => '1',
+                    'attrs' => array(
+                        'id' => 'bx-form-field-set-name',
+                        'onchange' => $this->getJsObject() . ".onSelectSet(this)"
+                    ),
                     'db' => array (
                         'pass' => 'Xss',
@@ -69 +93 @@
                         'params' => array(),
                         'error' => _t('_adm_nav_err_menus_set_name'),
+                    ),
+                ),
+                'set_title' => array(
+                    'type' => 'text',
+                    'name' => 'set_title',
+                    'caption' => _t('_adm_nav_txt_menus_set_title'),
+                    'info' => _t('_adm_nav_dsc_menus_set_title'),
+                    'value' => '',
+                    'required' => '1',
+                    'tr_attrs' => array(
+                        'style' => 'display:none'
+                    ),
+                    'db' => array (
+                        'pass' => 'Xss',
+                    ),
+                    'checker' => array (
+                        'func' => 'UniqueSet',
+                        'params' => array(),
+                        'error' => _t('_adm_nav_err_menus_set_title'),
                     ),
                 ),
@@ -121 +164 @@
             $aForm['inputs']['template_id']['values'][] = array('key' => $aTemplate['id'], 'value' => _t($aTemplate['title']));
 
-        bx_import('BxTemplStudioFormView');
         $oForm = new BxTemplStudioFormView($aForm);
+        if($oForm->isSubmitted() && isset($oForm->aInputs['set_name']))
+            $this->updateSetFields($oForm);
+
         $oForm->initChecker();
-
         if($oForm->isSubmittedAndValid()) {
             $sTitleValue = $oForm->getCleanValue('title');
@@ -130 +174 @@
             $sTitleKey = '_adm_nav_txt_menu_' . $sObject;
             BxDolForm::setSubmittedValue('title', $sTitleKey, $aForm['form_attrs']['method']);
+
+            //--- New Set Creation 
+            if($oForm->getCleanValue('set_name') == $this->sCreateNew) {
+                $sSetTitleValue = $oForm->getCleanValue('set_title');
+                $sSetName = 'custom_' . $this->getSystemName($sSetTitleValue);
+                $sSetTitleKey = '_adm_nav_txt_set_' . $sSetName;
+
+                if($this->oDb->addSet(array('set_name' => $sSetName, 'module' => BX_DOL_STUDIO_GRID_MODULE_CUSTOM, 'title' => $sSetTitleKey, 'deletable' => 1))) {
+                    bx_import('BxDolStudioLanguagesUtils');
+                    BxDolStudioLanguagesUtils::getInstance()->addLanguageString($sSetTitleKey, $sSetTitleValue);
+
+                    BxDolForm::setSubmittedValue('set_name', $sSetName, $oForm->aFormAttrs['method']);
+                }
+            }
+            unset($oForm->aInputs['set_title']);
 
             $iId = (int)$oForm->insert(array('object' => $sObject, 'module' => BX_DOL_STUDIO_GRID_MODULE_CUSTOM, 'deleteable' => 1, 'active' => 1));
@@ -153 +212 @@
             $this->_echoResultJson(array('popup' => $sContent), true);
         }
+    }
+
+    protected function updateSetFields(&$oForm) {
+        if($oForm->getCleanValue('set_name') != $this->sCreateNew)
+            unset($oForm->aInputs['set_title']['checker']);
+        else
+            unset($oForm->aInputs['set_title']['tr_attrs']['style']);
     }
 
@@ -225 +291 @@
                     'value' => $aMenu['set_name'],
                     'values' => array(
-                        array('key' => '', 'value' => _t('_adm_nav_txt_menus_set_name_select'))
+                        array('key' => '', 'value' => _t('_adm_nav_txt_menus_set_name_select')),
+                        array('key' => $this->sCreateNew, 'value' => _t('_adm_nav_txt_menus_set_name_new'))
                     ),
                     'required' => '1',
+                    'attrs' => array(
+                        'id' => 'bx-form-field-set-name',
+                        'onchange' => $this->getJsObject() . ".onSelectSet(this)"
+                    ),
                     'db' => array (
                         'pass' => 'Xss',
@@ -235 +306 @@
                         'params' => array(),
                         'error' => _t('_adm_nav_err_menus_set_name'),
+                    ),
+                ),
+                'set_title' => array(
+                    'type' => 'text',
+                    'name' => 'set_title',
+                    'caption' => _t('_adm_nav_txt_menus_set_title'),
+                    'info' => _t('_adm_nav_dsc_menus_set_title'),
+                    'value' => '',
+                    'required' => '1',
+                    'tr_attrs' => array(
+                        'style' => 'display:none'
+                    ),
+                    'db' => array (
+                        'pass' => 'Xss',
+                    ),
+                    'checker' => array (
+                        'func' => 'UniqueSet',
+                        'params' => array(),
+                        'error' => _t('_adm_nav_err_menus_set_title'),
                     ),
                 ),
@@ -287 +377 @@
             $aForm['inputs']['template_id']['values'][] = array('key' => $aTemplate['id'], 'value' => _t($aTemplate['title']));
 
-        bx_import('BxTemplStudioFormView');
         $oForm = new BxTemplStudioFormView($aForm);
+        if($oForm->isSubmitted() && isset($oForm->aInputs['set_name']))
+            $this->updateSetFields($oForm);
+
         $oForm->initChecker();
-
         if($oForm->isSubmittedAndValid()) {
             $sTitleValue = $oForm->getCleanValue('title');
             BxDolForm::setSubmittedValue('title', $aMenu['title'], $aForm['form_attrs']['method']);
+
+            //--- New Set Creation 
+            if($oForm->getCleanValue('set_name') == $this->sCreateNew) {
+                $sSetTitleValue = $oForm->getCleanValue('set_title');
+                $sSetName = 'custom_' . $this->getSystemName($sSetTitleValue);
+                $sSetTitleKey = '_adm_nav_txt_set_' . $sSetName;
+
+                if($this->oDb->addSet(array('set_name' => $sSetName, 'module' => BX_DOL_STUDIO_GRID_MODULE_CUSTOM, 'title' => $sSetTitleKey, 'deletable' => 1))) {
+                    bx_import('BxDolStudioLanguagesUtils');
+                    BxDolStudioLanguagesUtils::getInstance()->addLanguageString($sSetTitleKey, $sSetTitleValue);
+
+                    BxDolForm::setSubmittedValue('set_name', $sSetName, $oForm->aFormAttrs['method']);
+                }
+            }
+            unset($oForm->aInputs['set_title']);
 
             if($oForm->update($iId) !== false) {