Changeset 15959 for trunk/inc

Timestamp:

02/07/12 21:29:48 (4 months ago)

Author:

Alexander Trofimov

Message:

Popups redesign

Location:

trunk/inc

Files:

• classes/BxDolTemplate.php (modified) (1 diff)
• design.inc.php (modified) (1 diff)
• js/jquery.dolPopup.js (modified) (5 diffs)

trunk/inc/classes/BxDolTemplate.php

@@ -852 +852 @@
             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>';
+                $sRet = '<div id="bx-popup-loading" style="display:none;">' . BxTemplFunctions::getInstance()->transBox('<div class="bx-def-padding bx-popup-content-wrapped"></div>') . '</div>';
                 break;
             case 'main_div_width':

trunk/inc/design.inc.php

@@ -148 +148 @@
 }
 
-function PopupBox($sName, $sTitle, $sContent, $aActions = array(), $isHiddenByDefault = false) {
-    bx_import('BxTemplFunctions');
-    return BxTemplFunctions::getInstance()->popupBox($sName, $sTitle, $sContent, $aActions, $isHiddenByDefault);
+function PopupBox($sName, $sTitle, $sContent, $isHiddenByDefault = false) {
+    bx_import('BxTemplFunctions');
+    return BxTemplFunctions::getInstance()->popupBox($sName, $sTitle, $sContent, $isHiddenByDefault);
 }
 

trunk/inc/js/jquery.dolPopup.js

@@ -167 +167 @@
             return;
 
+        if ('undefined' == typeof(options.container))
+            options.container = '.bx-popup-content-wrapped';
+
         var bx_menu_on = function (e, b) {
             var li = $(e).parents('li:first');   
@@ -222 +225 @@
 
                 $('body').append('<div id="bx-popup-ajax-wrapper-' + id + '" style="display:none;">' + $('#bx-popup-loading').html() + '</div>');
-                bx_loading_content($('#bx-popup-ajax-wrapper-' + id + ' .bx-popup-ajax-content'), true, true);
-                console.log('iswin:' + $.isWindow(e[0]) + " / ");
-                console.log(e);
+                bx_loading_content($('#bx-popup-ajax-wrapper-' + id + ' .bx-popup-content-wrapped'), true, true);
+
                 $('#bx-popup-ajax-wrapper-' + id).dolPopup({
                     pointer: $.isWindow(e[0]) ? false : {el:e, align:'center'},
@@ -233 +235 @@
                 });
 
-                $('#bx-popup-ajax-wrapper-' + id + ' .bx-popup-ajax-content').load(sUrlRoot + options.url, function () {                    
+                $('#bx-popup-ajax-wrapper-' + id).find(options.container).load(sUrlRoot + options.url, function () {                    
                     $('#bx-popup-ajax-wrapper-' + id)._dolPopupSetPosition({
                         pointer: $.isWindow(e[0]) ? false : {el:e, align:'center'}
@@ -272 +274 @@
                     at: o.pointer.align + ' bottom',
                     collision: 'flip none',
-                    offset: parseInt(aOffset[0]) + ' ' + parseInt(aOffset[1])
+                    offset: parseInt(aOffset[0]) + ' ' + parseInt(aOffset[1] - 0)
                 });
 
@@ -279 +281 @@
                     my: 'center top',
                     at: 'center bottom',
-                    offset: (parseInt(aOffsetPointer[0]) + parseInt(aOffsetPointer[0])) + ' ' + (parseInt(aOffsetPointer[1]) + parseInt(aOffset[1]))
+                    offset: (parseInt(aOffsetPointer[0]) + parseInt(aOffsetPointer[0])) + ' ' + (parseInt(aOffsetPointer[1]) + parseInt(aOffset[1]) + 0)
                 });