Changeset 15970 for trunk

Timestamp:

02/09/12 22:08:36 (4 months ago)

Author:

Anton Lesnikov

Message:

Navigation Builder updates.

Location:

trunk

Files:

• modules/boonex/english/install/data/langs/en.xml (modified) (1 diff)
• studio/classes/BxDolStudioNavigationQuery.php (modified) (1 diff)
• studio/templates/base/scripts/BxBaseStudioNavigationItems.php (modified) (3 diffs)

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

@@ -2203 +2203 @@
     <string name="_adm_nav_txt_items_title"><![CDATA[Title]]></string>
     <string name="_adm_nav_txt_items_link"><![CDATA[URL]]></string>
+    <string name="_adm_nav_txt_items_link_menu"><![CDATA[Menu: {0}]]></string>
+    <string name="_adm_nav_txt_items_link_custom"><![CDATA[Custom Action]]></string>
     <string name="_adm_nav_txt_items_module"><![CDATA[Module]]></string>
     <string name="_adm_nav_txt_items_visible"><![CDATA[Visibile For]]></string>

trunk/studio/classes/BxDolStudioNavigationQuery.php

@@ -27 +27 @@
                 $aMethod['name'] = 'getRow';
                 $sWhereClause = $this->prepare(" AND `tm`.`id`=? ", $aParams['value']);
+                break;
+            case 'by_object':
+                $aMethod['name'] = 'getRow';
+                $sWhereClause = $this->prepare(" AND `tm`.`object`=? ", $aParams['value']);
                 break;
             case 'by_set_name':

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

@@ -190 +190 @@
 
             $sTitleValue = $oForm->getCleanValue('title');
-            $sName = $this->getSystemName($sTitleValue);
+            $sLink = $oForm->getCleanValue('link');
+
+            $aMatches = array();
+            $sName = preg_match("/.*page\.php\?o=([a-zA-Z0-9_-]+)$/", $sLink, $aMatches) > 0 ? $aMatches[1] : $this->getSystemName($sTitleValue);
+
             $sTitleKey = '_adm_nav_txt_menu_' . $sName;
             BxDolForm::setSubmittedValue('title', $sTitleKey, $aForm['form_attrs']['method']);
@@ -632 +636 @@
     }
 
-    protected function _getCellIcon ($mixedValue, $sKey, $aField, $aRow) {        
-        if(is_numeric($mixedValue)) {
+    protected function _getCellIcon ($mixedValue, $sKey, $aField, $aRow) {
+        $sFileUrl = "";        
+        if(is_numeric($mixedValue) && (int)$mixedValue != 0) {
             bx_import('BxDolStorage');
-            $oStorage = BxDolStorage::getObjectInstance(BX_DOL_STORAGE_OBJ_IMAGES);
-
-            if(($sFileUrl = $oStorage->getFileUrlById((int)$mixedValue)) !== false)
-                $mixedValue = $this->_oTemplate->parseHtmlByName('bx_img.html', array(
-                    'bx_if:class' => array(
-                        'condition' => true,
-                        'content' => array(
-                            'content' => 'bx-nav-item-icon'
-                        )
-                    ),
-                    'src' => $sFileUrl,
-                    'alt' => ''
-                ));
-        }
+            if(($sResult = BxDolStorage::getObjectInstance(BX_DOL_STORAGE_OBJ_IMAGES)->getFileUrlById((int)$mixedValue)) !== false)
+                $sFileUrl = $sResult;
+        }
+
+        if($sFileUrl == "")
+            $sFileUrl = $this->_oTemplate->getIconUrl($mixedValue);
+
+        if($sFileUrl != "")
+            $mixedValue = $this->_oTemplate->parseHtmlByName('bx_img.html', array(
+                'bx_if:class' => array(
+                    'condition' => true,
+                    'content' => array(
+                        'content' => 'bx-nav-item-icon'
+                    )
+                ),
+                'src' => $sFileUrl,
+                'alt' => ''
+            ));
 
         return parent::_getCellDefault($mixedValue, $sKey, $aField, $aRow);
@@ -655 +664 @@
     protected function _getCellTitle ($mixedValue, $sKey, $aField, $aRow) {        
         $mixedValue = $this->_limitMaxLength(_t($aRow['title']), $sKey, $aField, $aRow, $this->_isDisplayPopupOnTextOverflow);
+        return parent::_getCellDefault($mixedValue, $sKey, $aField, $aRow);
+    }
+
+    protected function _getCellLink ($mixedValue, $sKey, $aField, $aRow) {
+        if($aRow['submenu_object'] != "") {
+            $aMenu = array();
+            $this->oDb->getMenus(array('type' => 'by_object', 'value' => $aRow['submenu_object']), $aMenu, false);
+            $mixedValue = _t('_adm_nav_txt_items_link_menu', _t($aMenu['title']));
+        }
+        else if($aRow['submenu_object'] == "" && $aRow['onclick'] != "")
+            $mixedValue = _t('_adm_nav_txt_items_link_custom');
+
+        $mixedValue = $this->_limitMaxLength($mixedValue, $sKey, $aField, $aRow, $this->_isDisplayPopupOnTextOverflow);
         return parent::_getCellDefault($mixedValue, $sKey, $aField, $aRow);
     }