Changeset 15922 for trunk/inc

Timestamp:

01/25/12 00:01:17 (4 months ago)

Author:

Alexander Trofimov

Message:

Menu in Popup and Design Box

Location:

trunk/inc

Files:

• design.inc.php (modified) (2 diffs)
• js/jquery.dolPopup.js (modified) (1 diff)

trunk/inc/design.inc.php

@@ -51 +51 @@
 
 /**
- * Put "design box" HTML code
+ * Display "design box" HTML code
  *
- * @param string - $title title text
- * @param string - $content content
- * @param int $db_num - number of design box template, use predefined contants only, default is BX_DB_DEF,
- * @param string $caption_item - item to put at the box top, it is applicable for BX_DB_PADDING_DEF and BX_DB_DEF only
- * @param string $bottom_item - item to put at the bottom, it is applicable for BX_DB_PADDING_DEF and BX_DB_DEF only
- * @return ready HTML code
+ * @see BxBaseFunctions::DesignBoxContent
  *
  * @see BX_DB_CONTENT_ONLY
@@ -68 +63 @@
  * @see BX_DB_PADDING_NO_CAPTION
  */
-function DesignBoxContent ( $title, $content, $db_num = BX_DB_DEF, $caption_item = '', $bottom_item = '' ) {
-    return BxDolTemplate::getInstance()->parseHtmlByName('designbox_' . (int)$db_num . '.html', array(
-        'title' => $title,
-        'caption_item' => $caption_item,
-        'designbox_content' => $content,
-        'bottom_item' => $bottom_item
-    ));
+function DesignBoxContent ($sTitle, $sContent, $iTemplateNum = BX_DB_DEF, $mixedMenu = false) {
+    bx_import('BxTemplFunctions');
+    return BxTemplFunctions::getInstance()->designBoxContent ($sTitle, $sContent, $iTemplateNum, $mixedMenu);
 }
 

trunk/inc/js/jquery.dolPopup.js

@@ -177 +177 @@
                 $el.find('.bx-popup-box-pointer').css('display', 'block').position({
                     of: ePointAt,
-                    my: 'right top',
+                    my: 'center top',
                     at: 'center bottom',
                     offset: (parseInt(aOffsetPointer[0]) + parseInt(aOffsetPointer[0])) + ' ' + (parseInt(aOffsetPointer[1]) + parseInt(aOffset[1]))