#28 - Trans Box popup update.

inc/classes/BxDolTemplate.php

@@ -908,7 +908,7 @@ class BxDolTemplate extends BxDol implements iBxDolSingleton {
                 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-popup-content-wrapped"></div>') . '</div>';
+                $sRet = BxTemplFunctions::getInstance()->transBox('bx-popup-loading', '<div class="bx-def-padding bx-popup-content-wrapped"></div>', true);
                 break;
             case 'main_div_width':
                 if(!empty($this->aPage['width']))

inc/js/classes/BxDolCmts.js

@@ -305,7 +305,7 @@ BxDolCmts.prototype.showImage = function(oLink, iId) {
     if(oLink)
     	this._loadingInContent(oLink, true);
 
-    jQuery.post (
+    jQuery.get (
         this._sActionsUrl,
         oData,
         function (s) {
@@ -316,7 +316,7 @@ BxDolCmts.prototype.showImage = function(oLink, iId) {
 	        	if(oLink)
 	        		$this._loadingInContent(oLink, false);
 
-	        	$(this).parents('.cmt-attached-image').dolPopup({
+	        	$(this).parents('.bx-popup-wrapper').dolPopup({
 		        	fog: {
 						color: '#fff',
 						opacity: .7

inc/profiles.inc.php

@@ -249,7 +249,7 @@ function bx_login_form($bStudio = false, $bAjaxMode = false) {
     $sFormCode = BxDolService::call('system', 'login_form', array(), 'TemplServiceLogin');
 
     if ($bAjaxMode) {
-        echo $GLOBALS['oFunctions']->transBox($sFormCode, true);
+        echo $GLOBALS['oFunctions']->transBox('', $sFormCode, false, true);
         exit;
     }
 

modules/boonex/persons/classes/BxPersonsTemplate.php

@@ -67,7 +67,7 @@ class BxPersonsTemplate extends BxDolModuleTemplate {
         $sCoverPopup = '';
         if ($aData[BxPersonsConfig::$FIELD_COVER]) {
             bx_import('BxTemplFunctions');
-            $sCoverPopup = BxTemplFunctions::getInstance()->transBox($this->parseHtmlByName('image_popup.html', array (
+            $sCoverPopup = BxTemplFunctions::getInstance()->transBox('bx-persons-popup-cover', $this->parseHtmlByName('image_popup.html', array (
                 'image_url' => $sUrlCover,
                 'bx_if:owner' => array (
                     'condition' => CHECK_ACTION_RESULT_ALLOWED === $oModuleMain->isAllowedChangeCover($aData),
@@ -75,13 +75,13 @@ class BxPersonsTemplate extends BxDolModuleTemplate {
                         'change_image_url' => $sUrlCoverChange,
                     ),
                 ),
-            )), true);
+            )), true, true);
         }
 
         $sPicturePopup = '';
         if ($aData[BxPersonsConfig::$FIELD_PICTURE]) {
             bx_import('BxTemplFunctions');
-            $sPicturePopup = BxTemplFunctions::getInstance()->transBox($this->parseHtmlByName('image_popup.html', array (
+            $sPicturePopup = BxTemplFunctions::getInstance()->transBox('bx-persons-popup-picture', $this->parseHtmlByName('image_popup.html', array (
                 'image_url' => $sUrlPicture,
                 'bx_if:owner' => array (
                     'condition' => CHECK_ACTION_RESULT_ALLOWED === $oModuleMain->isAllowedEdit($aData),
@@ -89,7 +89,7 @@ class BxPersonsTemplate extends BxDolModuleTemplate {
                         'change_image_url' => $sUrlPictureChange,
                     ),
                 ),
-            )), true);
+            )), true, true);
         }
 
         // generate html        

modules/boonex/persons/template/cover.html

@@ -7,13 +7,8 @@
     </div>
 </div>
 
-<div id="bx-persons-popup-cover" style="display:none;">
-    __cover_popup__
-</div>
-
-<div id="bx-persons-popup-picture" style="display:none;">
-    __picture_popup__
-</div>
+__cover_popup__
+__picture_popup__
 
 <script>
     function bx_persons_popup (sId, sUrl) {

modules/boonex/timeline/classes/BxTimelineTemplate.php

@@ -112,14 +112,8 @@ class BxTimelineTemplate extends BxDolModuleTemplate
 
     public function getViewItemPopup($iId)
     {
-    	$sContent = $this->getViewItemBlock($iId);
-
     	bx_import('BxTemplFunctions');
-    	return $this->parsePageByName('view_item.html', array(
-    		'style_prefix' => $this->_oConfig->getPrefix('style'),
-    		'id' => $iId,
-    		'content' => BxTemplFunctions::getInstance()->transBox($sContent)
-    	));
+    	return BxTemplFunctions::getInstance()->transBox('bx-timeline-item-popup-' + $iId, $this->getViewItemBlock($iId));
     }
 
     public function getPost(&$aEvent, $aBrowseParams = array())

modules/boonex/timeline/js/view.js

@@ -81,7 +81,7 @@ BxTimelineView.prototype.showMoreContent = function(oLink) {
 };
 
 BxTimelineView.prototype.showItemMenu = function(oLink) {
-	var sId = $(oLink).parents('.bx-tl-item-menu:first').children('.bx-db-menu-popup:hidden').attr('id');
+	var sId = $(oLink).parents('.bx-tl-item-menu:first').children('.bx-popup-wrapper:hidden').attr('id');
 	if(sId)
 		bx_menu_popup_inline('#' + sId, oLink);
 };

modules/boonex/timeline/template/view_item.html

@@ -1 +0,0 @@
-<div id="bx-timeline-item-popup-__id__" class="__style_prefix__-item-popup bx-popup-width">__content__</div>

samples/BxGridMy.php

@@ -207,7 +207,7 @@ class BxGridMy extends BxTemplGrid {
 
             bx_import('BxTemplFunctions');
             // we need to use 'transBox' function to properly display 'popup'
-            $s = BxTemplFunctions::getInstance()->transBox('
+            $s = BxTemplFunctions::getInstance()->transBox('', '
                 <div class="bx-def-padding-top bx-def-padding-left bx-def-padding-right bx-def-color-bg-block" style="width:300px;">' . $oForm->getCode() . '</div>
                 <script>
                     $(document).ready(function () {

samples/popup.php

@@ -41,7 +41,7 @@ function PageCompMainCode() {
     ob_start();    
     
     // transBox
-    echo '<div id="bx-sample-popup-transbox" style="display:none;">' . BxTemplFunctions::getInstance()->transBox('<div class="bx-def-padding">transBox</div>') . '</div>';
+    echo BxTemplFunctions::getInstance()->transBox('bx-sample-popup-transbox', '<div class="bx-def-padding">transBox</div>', true);
     echo '<button class="bx-btn" onclick="$(\'#bx-sample-popup-transbox\').dolPopup()">transBox</button>';
 
     // transBox AJAX
@@ -59,7 +59,7 @@ function PageCompMainCode() {
     echo '<hr class="bx-def-hr" />';
 
     // transBox with pointer
-    echo '<div id="bx-sample-popup-transbox-with-pointer" style="display:none;">' . BxTemplFunctions::getInstance()->transBox('<div class="bx-def-padding">transBox with pointer</div>') . '</div>';
+    echo BxTemplFunctions::getInstance()->transBox('bx-sample-popup-transbox-with-pointer', '<div class="bx-def-padding">transBox with pointer</div>', true);
     echo '<button class="bx-btn" onclick="$(\'#bx-sample-popup-transbox-with-pointer\').dolPopup({pointer:{el:$(this)}})">transBox with pointer</button>';
 
     // popupBox with pointer

studio/classes/BxDolStudioModules.php

@@ -67,7 +67,7 @@ class BxDolStudioModules extends BxDol {
 
 	        if(!empty($aResult['message'])) {
 	            bx_import('BxTemplStudioFunctions');
-	            $aResult['message'] = BxTemplStudioFunctions::getInstance()->transBox($aResult['message']);
+	            $aResult['message'] = BxTemplStudioFunctions::getInstance()->transBox('', $aResult['message']);
 	        }
 
 	        $oJson = new Services_JSON();		        

studio/classes/BxDolStudioStore.php

@@ -159,7 +159,7 @@ class BxDolStudioStore extends BxTemplStudioPage {
                 $aResult['message'] = BxDolStudioTemplate::getInstance()->parseHtmlByName('mod_action_result.html', array('content' => $aResult['message']));
 
                 bx_import('BxTemplStudioFunctions');
-                $aResult['message'] = BxTemplStudioFunctions::getInstance()->transBox($aResult['message']);
+                $aResult['message'] = BxTemplStudioFunctions::getInstance()->transBox('', $aResult['message']);
             }
 
 	        $oJson = new Services_JSON();		        

studio/template/form_view_translatable.html

@@ -2,5 +2,5 @@
     <div class="bx-form-input-language-current bx-def-font-small" style="background-image:url(__flag__)">
         <a href="javascript:void(0)" onclick="javascript: fvtTogglePopup('__name__', this)">__title__</a>
     </div>
-    <div id="bx-form-field-translator-popup-__name__" style="display:none">__popup__</div>
+    __popup__
 </div>

studio/template/login.html

@@ -3,4 +3,4 @@
 var oBxDolStudioLogin = new BxDolStudioLogin();
 -->
 </script>
-<div id="bx-std-login-form-box" style="display:none">__form__</div>
+__form__

studio/template/page_caption_actions_popup.html

@@ -1 +0,0 @@
-<div id="bx-std-pcap-menu-popup-actions" style="display:none">__content__</div>

studio/template/page_caption_help_popup.html

@@ -1 +0,0 @@
-<div id="bx-std-pcap-menu-popup-help" style="display:none">__content__</div>

studio/template/scripts/BxBaseStudioFormView.php

@@ -181,7 +181,7 @@ class BxBaseStudioFormView extends BxDolStudioForm {
         }
 
         $sPopup = $this->oTemplate->parseHtmlByName('form_view_translator.html', array('bx_repeat:languages' => $aTmplVars));
-        $sPopup = $oFunctions->transBox($sPopup);
+        $sPopup = $oFunctions->transBox('bx-form-field-translator-popup-' . $sInputName, $sPopup, true);
 
         $aLanguage = $oLanguage->getLanguageInfo($sLanguage);
         $sControl = $this->oTemplate->parseHtmlByName('form_view_translatable.html', array(

studio/template/scripts/BxBaseStudioFunctions.php

@@ -101,9 +101,8 @@ class BxBaseStudioFunctions extends BxBaseFunctions implements iBxDolSingleton {
             'action_url' => BX_DOL_URL_ROOT . 'member.php',
             'forgot_password_url' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=forgot-password'),
 	    ));
-	    $sHtml = $this->transBox($sHtml);
 	    $sHtml = $oTemplate->parseHtmlByName('login.html', array (
-	        'form' => $sHtml,
+	        'form' => $this->transBox('bx-std-login-form-box', $sHtml, true),
 	    ));
 
 	    $oTemplate->setPageNameIndex(BX_PAGE_CLEAR);

studio/template/scripts/BxBaseStudioPage.php

@@ -89,16 +89,12 @@ class BxBaseStudioPage extends BxDolStudioPage {
         $oFunctions = BxTemplStudioFunctions::getInstance();
 
         $sHelp = $this->getPageCaptionHelp();
-        if(($bHelp = strlen($sHelp)) > 0) {
-            $sHelp = $oFunctions->transBox($sHelp);
-            $sHelp = $oTemplate->parseHtmlByName('page_caption_help_popup.html', array('content' => $sHelp));
-        }
+        if(($bHelp = strlen($sHelp)) > 0)
+            $sHelp = $oFunctions->transBox('bx-std-pcap-menu-popup-help', $sHelp, true);
 
         $sActions = $this->getPageCaptionActions();
-        if(($bActions = strlen($sActions)) > 0) {
-            $sActions = $oFunctions->transBox($sActions);
-            $sActions = $oTemplate->parseHtmlByName('page_caption_actions_popup.html', array('content' => $sActions));
-        }
+        if(($bActions = strlen($sActions)) > 0)
+            $sActions = $oFunctions->transBox('bx-std-pcap-menu-popup-actions', $sActions, true);
 
         $oTemplate->addInjection('injection_header', 'text', $sHelp . $sActions);
 

template/comment_actions.html

@@ -14,5 +14,5 @@
 	<div class="__style_prefix__-comment-manage-link bx-def-font-large">
 		<a class="__style_prefix__-comment-manage bx-def-margin-sec-left-auto" href="javascript:void(0)" onclick="__js_object__.toggleManagePopup(this, __id__); return false;" title="<bx_text_attribute:_Manage />"><i class="sys-icon chevron-down"></i></a>
 	</div>
-	<div id="__popup_id__" class="__style_prefix__-comment-manage" style="display:none;">__popup_text__</div>
+	__popup_text__
 </bx_if:show_menu_manage>

template/comment_image.html

@@ -1 +0,0 @@
-<div id="__id__" class="__style_prefix__-attached-image" style="display:none;">__content__</div>

template/comment_manage.html

@@ -1 +1 @@
-<div class="__style_prefix__-cm-cnt bx-def-padding">__content__</div>
+<div class="__style_prefix__-comment-manage bx-def-padding">__content__</div>

template/comment_pb_list.html

@@ -1,9 +0,0 @@
-<div class="__style_prefix__-pb-list bx-def-padding-sec">
-	<div class="__style_prefix__-pb-list-cnt">
-		<div class="__style_prefix__-pb-items">
-			<bx_repeat:list>
-				<div class="__style_prefix__-pb-item bx-def-padding-sec">__user_unit__</div>
-			</bx_repeat:list>
-		</div>
-	</div>
-</div>

template/comment_plused_by.html

@@ -1 +1,9 @@
-<div id="__id__" class="__style_prefix__-plused-by" style="display:none;">__content__</div>
+<div class="__style_prefix__-pb-list bx-def-padding-sec">
+	<div class="__style_prefix__-pb-list-cnt">
+		<div class="__style_prefix__-pb-items">
+			<bx_repeat:list>
+				<div class="__style_prefix__-pb-item bx-def-padding-sec">__user_unit__</div>
+			</bx_repeat:list>
+		</div>
+	</div>
+</div>

template/css/cmts.css

@@ -139,7 +139,7 @@
 		background-repeat: no-repeat;
 	}
 
-	div.cmt-attached-image img {
+	img.cmt-attached-image {
 		position: relative;
 		max-width: 600px;
 		max-height: 600px;

template/popup_trans.html

@@ -1,4 +1,4 @@
-<div class="bx-popup-wrapper">
+<div  id="__id__" class="bx-popup-wrapper" style="__wrapper_style__">
     <div class="bx-popup-box-pointer"><i class="bx-popup-border"></i></div>
     <div class="bx-popup bx-popup-trans bx-popup-border bx-popup-color-bg bx-def-round-corners">
         <div class="bx-popup-content" style="">__content__</div>

template/scripts/BxBaseCmtsView.php

@@ -309,17 +309,13 @@ class BxBaseCmtsView extends BxDolCmts {
 			);
     	}
 
-    	bx_import('BxTemplStudioFunctions');
-        $sContent = BxTemplStudioFunctions::getInstance()->transBox($oTemplate->parseHtmlByName('comment_pb_list.html', array(
+    	$sContent = $oTemplate->parseHtmlByName('comment_plused_by.html', array(
     		'style_prefix' => $this->_sStylePrefix,
     		'bx_repeat:list' => $aTmplUsers
-    	)));
+    	));
 
-        return $oTemplate->parseHtmlByName('comment_plused_by.html', array(
-        	'style_prefix' => $this->_sStylePrefix,
-        	'id' => $this->_sSystem . '-plused-by',
-        	'content' => $sContent
-        ));
+    	bx_import('BxTemplStudioFunctions');
+        return BxTemplStudioFunctions::getInstance()->transBox($this->_sSystem . '-plused-by', $sContent, true);
     }
 
     function getImage($iImgId)
@@ -332,21 +328,18 @@ class BxBaseCmtsView extends BxDolCmts {
     	bx_import('BxDolStorage');
 		$oStorage = BxDolStorage::getObjectInstance($this->_sStorageObject);
 
-    	bx_import('BxTemplStudioFunctions');
-        $sContent = BxTemplStudioFunctions::getInstance()->transBox($oTemplate->parseHtmlByName('bx_img.html', array(
+		$sContent = $oTemplate->parseHtmlByName('bx_img.html', array(
     		'src' => $oStorage->getFileUrlById($iImgId),
         	'bx_repeat:attrs' => array(
         		array('key' => 'alt', 'value' => bx_html_attribute(_t('_cmt_view_attached_image'))),
         		array('key' => 'title', 'value' => bx_html_attribute(_t('_cmt_close_attached_image'))),
-        		array('key' => 'onclick', 'value' => $this->_sJsObjName . '.hideImage(this);')
+        		array('key' => 'onclick', 'value' => $this->_sJsObjName . '.hideImage(this);'),
+        		array('key' => 'class', 'value' => $this->_sStylePrefix . '-attached-image')
         	)
-    	)));
+    	));
 
-        return $oTemplate->parseHtmlByName('comment_image.html', array(
-        	'style_prefix' => $this->_sStylePrefix,
-        	'id' => $this->_sSystem . '-attached-image', 
-        	'content' => $sContent
-        ));
+    	bx_import('BxTemplStudioFunctions');
+        return BxTemplStudioFunctions::getInstance()->transBox($this->_sSystem . '-attached-image', $sContent, true);
     }
 
     /**
@@ -436,11 +429,13 @@ class BxBaseCmtsView extends BxDolCmts {
 		$sMenuManage = $oMenuManage->getCode();
 		$bMenuManage = !empty($sMenuManage);
 		if($bMenuManage) {
-			bx_import('BxTemplStudioFunctions');
-			$sMenuManage = BxTemplStudioFunctions::getInstance()->transBox($oTemplate->parseHtmlByName('comment_manage.html', array(
+			$sMenuManage = $oTemplate->parseHtmlByName('comment_manage.html', array(
 				'style_prefix' => $this->_sStylePrefix,
 				'content' => $sMenuManage
-			)));
+			));
+
+			bx_import('BxTemplFunctions');
+			$sMenuManage = BxTemplFunctions::getInstance()->transBox($this->_sSystem . '-manage-' . $aCmt['cmt_id'], $sMenuManage, true);
 		}
 
         return $oTemplate->parseHtmlByName('comment_actions.html', array(
@@ -465,7 +460,6 @@ class BxBaseCmtsView extends BxDolCmts {
         			'js_object' => $this->_sJsObjName,
         			'style_prefix' => $this->_sStylePrefix,
         			'id' => $aCmt['cmt_id'],
-        			'popup_id' => $this->_sSystem . '-manage-' . $aCmt['cmt_id'],
         			'popup_text' => $sMenuManage
         		)
         	)

template/scripts/BxBaseFunctions.php

@@ -179,12 +179,12 @@ class BxBaseFunctions extends BxDol implements iBxDolSingleton {
     /**
      * Get standard popup box with title.
      *
+     * @param string $sName - unique name
      * @param string $sTitle - translated title
      * @param string $sContent - content of the box
      * @return HTML string
      */
     function popupBox($sName, $sTitle, $sContent, $isHiddenByDefault = false) {
-
         $iId = !empty($sName) ? $sName : time();
 
         return $this->_oTemplate->parseHtmlByName('popup_box.html', array(
@@ -198,13 +198,20 @@ class BxBaseFunctions extends BxDol implements iBxDolSingleton {
     /**
      * Get popup box without title.
      *
+     * @param string $sName - unique name
      * @param string $sContent - content of the box
      * @return HTML string
      */
-    function transBox($sContent, $isPlaceInCenter = false) {
+    function transBox($sName, $sContent, $isHiddenByDefault = false, $isPlaceInCenter = false) {
+    	$iId = !empty($sName) ? $sName : time();
+
         return
             ($isPlaceInCenter ? '<div class="login_ajax_wrap">' : '') .
-                $this->_oTemplate->parseHtmlByName('popup_trans.html', array('content' => $sContent)) .
+                $this->_oTemplate->parseHtmlByName('popup_trans.html', array(
+                	'id' => $iId,
+                	'wrapper_style' => $isHiddenByDefault ? 'display:none;' : '',
+                	'content' => $sContent
+                )) .
             ($isPlaceInCenter ? '</div>' : '');
     }
 
@@ -565,7 +572,7 @@ EOF;
 
             if ($sMenu) {
                 $sId = 'bx-menu-db-' . time() . rand(0, PHP_INT_MAX);
-                $sCode .= '<div class="bx-db-menu-popup" id="' . $sId . '" style="display:none;">' . BxTemplFunctions::getInstance()->transBox('<div class="bx-def-padding bx-def-color-bg-block">' . $sMenu . '</div>') . '</div>';
+                $sCode .= BxTemplFunctions::getInstance()->transBox($sId, '<div class="bx-def-padding bx-def-color-bg-block">' . $sMenu . '</div>', true);
                 $aButtonMenu = array ('icon' => 'reorder', 'onclick' => "bx_menu_popup_inline('#" . $sId . "', this)");
             }
             

template/scripts/BxBaseUploaderHTML5.php

@@ -68,7 +68,7 @@ class BxBaseUploaderHTML5 extends BxDolUploader {
         ));
 
         bx_import('BxTemplFunctions');
-        return BxTemplFunctions::getInstance()->transBox($sForm);
+        return BxTemplFunctions::getInstance()->transBox('', $sForm);
     }
 
     /**

template/scripts/BxBaseUploaderSimple.php

@@ -57,7 +57,7 @@ class BxBaseUploaderSimple extends BxDolUploader {
         ));
 
         bx_import('BxTemplFunctions');
-        return BxTemplFunctions::getInstance()->transBox($sForm);
+        return BxTemplFunctions::getInstance()->transBox('', $sForm);
     }