Changeset 15942 for trunk/inc

Timestamp:

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

Author:

Alexander Trofimov

Message:

Frontend

Location:

trunk/inc

Files:

• classes/BxDolAcl.php (modified) (1 diff)
• classes/BxDolPage.php (modified) (1 diff)
• classes/BxDolTemplate.php (modified) (7 diffs)
• design.inc.php (modified) (1 diff)
• js/functions.js (modified) (4 diffs)
• js/jquery.dolPopup.js (modified) (1 diff)

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() {