Merge branch 'master' of https://github.com/unaio/una

inc/js/classes/BxDolCmts.js

@@ -526,10 +526,10 @@ BxDolCmts.prototype._getCmt = function (e, iCmtId)
 
             //--- Some number of comments already loaded ---//
             if($(sListId + ' > li.cmt').length)
-                $(sListId + ' > li.cmt:last').after($(oData.content).hide()).next('li.cmt:hidden').bxTime().bx_anim('toggle', $this._sAnimationEffect, $this._iAnimationSpeed);
+                $(sListId + ' > li.cmt:last').after($(oData.content).hide()).next('li.cmt:hidden').bxProcessHtml().bx_anim('toggle', $this._sAnimationEffect, $this._iAnimationSpeed);
             //-- There is no comments at all ---//
             else
-            	$(sListId).hide().html(oData.content).bxTime().bx_anim('show', $this._sAnimationEffect, $this._iAnimationSpeed);
+            	$(sListId).hide().html(oData.content).bxProcessHtml().bx_anim('show', $this._sAnimationEffect, $this._iAnimationSpeed);
         },
         'json'
     );
@@ -591,19 +591,19 @@ BxDolCmts.prototype._getForm = function (e, iCmtParentId, onLoad)
 
 BxDolCmts.prototype._cmtsAppend = function(sIdTo, sContent)
 {
-	$(sIdTo).append($(sContent).hide()).children(':hidden').bxTime().bx_anim('show', this._sAnimationEffect, this._iAnimationSpeed);
+	$(sIdTo).append($(sContent).hide()).children(':hidden').bxProcessHtml().bx_anim('show', this._sAnimationEffect, this._iAnimationSpeed);
 };
 
 BxDolCmts.prototype._cmtsPrepend = function(sIdTo, sContent)
 {
-	$(sIdTo).prepend($(sContent).hide()).children(':hidden').bxTime().bx_anim('show', this._sAnimationEffect, this._iAnimationSpeed);
+	$(sIdTo).prepend($(sContent).hide()).children(':hidden').bxProcessHtml().bx_anim('show', this._sAnimationEffect, this._iAnimationSpeed);
 };
 
 BxDolCmts.prototype._cmtsReplace = function(oReplace, sContent, onLoad)
 {
 	var $this = this;
 	$(oReplace).bx_anim('hide', this._sAnimationEffect, this._iAnimationSpeed, function() {
-		$(this).after($(sContent).hide()).nextAll(':hidden').bxTime().bx_anim('show', $this._sAnimationEffect, $this._iAnimationSpeed, function() {
+		$(this).after($(sContent).hide()).nextAll(':hidden').bxProcessHtml().bx_anim('show', $this._sAnimationEffect, $this._iAnimationSpeed, function() {
 			$this._cmtsBlink($(this));
 
 			if(typeof onLoad == 'function')
@@ -616,7 +616,7 @@ BxDolCmts.prototype._cmtsReplaceContent = function(oParent, sContent, onLoad)
 {
 	var $this = this;
 	$(oParent).bx_anim('hide', this._sAnimationEffect, this._iAnimationSpeed, function() {
-		$(this).html(sContent).bxTime().bx_anim('show', $this._sAnimationEffect, $this._iAnimationSpeed, function() {
+		$(this).html(sContent).bxProcessHtml().bx_anim('show', $this._sAnimationEffect, $this._iAnimationSpeed, function() {
 			$this._cmtsBlink($(this));
 
 			if(typeof onLoad == 'function')

inc/js/classes/BxDolGrid.js

@@ -19,7 +19,7 @@ function BxDolGrid (sObject, oOptions) {
     this._sSearchInputText = undefined == oOptions.text_search_input ? '' : oOptions.text_search_input;
     this._oPopupOptions = $.extend({
     	onBeforeShow: function(oElement) {
-    		jQuery(oElement).bxTime();
+    		jQuery(oElement).bxProcessHtml();
     	}
     }, oOptions.popup_options);
     this._oQueryAppend = oOptions.query_append;
@@ -435,7 +435,7 @@ BxDolGrid.prototype._onDataReloaded = function (isSkipSearchInput) {
 
     jQuery('#' + this._sIdTable + ' tbody tr:odd').addClass('bx-def-color-bg-hl');
     
-    jQuery('#' + this._sIdTable).bxTime();
+    jQuery('#' + this._sIdTable).bxProcessHtml();
 
     if (this._oOptions.sorting)
         this.orderable();

inc/js/functions.js

@@ -32,7 +32,7 @@ function processJsonData(oData) {
 	    		oPopup = $(oData.popup);
 
 	    	$('#' + oPopup.attr('id')).remove();
-	        oPopup.hide().prependTo('body').bxTime().dolPopup(oOptions);
+	        oPopup.hide().prependTo('body').bxProcessHtml().dolPopup(oOptions);
 	    }
 
 	    if (oData && oData.eval != undefined)
@@ -84,11 +84,7 @@ function getHtmlData( elem, url, callback, method , confirmation)
 		if (undefined != method && (method == 'post' || method == 'POST')) {
 		    $.post(url, function(data) {
 		        $block.html(data);
-		        $block.css('position', blockPos).bxTime();
-		        if ($.isFunction($.fn.addWebForms))
-		            $block.addWebForms();
-
-		        bx_activate_anim_icons();
+		        $block.css('position', blockPos).bxProcessHtml();
 
 		        if (typeof callback == 'function')
 		            callback.apply($block);
@@ -96,11 +92,7 @@ function getHtmlData( elem, url, callback, method , confirmation)
 		} 
 		else {
 		    $block.load(url + '&_r=' + Math.random(), function() {
-		        $(this).css('position', blockPos).bxTime();
-		        if ($.isFunction($.fn.addWebForms))
-		            $(this).addWebForms();
-
-		        bx_activate_anim_icons();
+		        $(this).css('position', blockPos).bxProcessHtml();
 
 		        if (typeof callback == 'function')
 		            callback.apply(this);
@@ -453,7 +445,7 @@ function bx_menu_slide (sObject, oElement, sPosition, oOptions, oVars) {
         var fOnLoad = function() {
         	bx_loading_content(oLoading, false);
 
-        	$(sIdSel).bxTime().show();
+        	$(sIdSel).bxProcessHtml().show();
         };
 
         $(sIdSel).find(oOptions.container).load(bx_append_url_params('menu.php', $.extend({o:sObject}, oVars)), function () {
@@ -702,10 +694,45 @@ function bx_time(sLang, isAutoupdate, sRootSel) {
 }
 
 (function($) {
+
     $.fn.bxTime = function() {
         bx_time(undefined, undefined, this);
         return this;
-    }; 
+    };
+
+    /**
+     * process HTML which was added dynamicly on the page
+     */ 
+    $.fn.bxProcessHtml = function (oCallback) {
+        var eElement = $(this);
+        if ('undefined' !== typeof(eElement)) {
+            // process js time
+            eElement.bxTime();
+
+            // process web forms
+            if ($.isFunction($.fn.addWebForms))
+	            eElement.addWebForms();
+            
+            // process animating icons
+        	bx_activate_anim_icons();
+
+            // process syntax hightlighing
+            if ('undefined' !== typeof(Prism) && eElement.size())
+                Prism.highlightAllUnder(eElement[0]);
+        }
+        if ('undefined' !== typeof(oCallback)) {
+            oCallback(eElement);
+        }
+
+        if (typeof glOnProcessHtml !== 'undefined' && glOnProcessHtml instanceof Array) {
+            for (var i = 0; i < glOnProcessHtml.length; i++)
+                if (typeof glOnProcessHtml[i] === "function")
+                    glOnProcessHtml[i](this);
+        }
+        
+        return this;
+    }
+
 } (jQuery));
 
 
@@ -816,7 +843,7 @@ function bx_search (n, sFormSel, sResultsContSel, sLoadingContSel, bSortResults)
                 data += e.outerHTML;
             });
         } 
-        $(sResultsContSel).html(data).bxTime();
+        $(sResultsContSel).html(data).bxProcessHtml();
     });
 
     return false;
@@ -987,11 +1014,22 @@ function bx_get_scripts (aFiles, fCallback)
                 fCallback && fCallback();
             } 
             else {
-                $.getScript(aFiles[iCounter]).done(fHandler);
+                $.bxGetCachedScript(aFiles[iCounter]).done(fHandler);
             }
         };
 
-    $.getScript(aFiles[iCounter]).done(fHandler);
+    $.bxGetCachedScript(aFiles[iCounter]).done(fHandler);
 }
 
+jQuery.bxGetCachedScript = function(sUrl, oOptions) 
+{ 
+    oOptions = $.extend(oOptions || {}, {
+        dataType: "script",
+        cache: true,
+        url: sUrl
+    });
+
+    return jQuery.ajax(oOptions);
+};
+
 /** @} */

inc/js/jquery.dolPopup.js

@@ -471,7 +471,7 @@
                 var fOnLoad = function() {
                 	bx_loading_content(oLoading, false);
 
-                	$('#' + sPopupId + ' ' + options.container).bxTime().show();
+                	$('#' + sPopupId + ' ' + options.container).bxProcessHtml().show();
 
 					$('#' + sPopupId)._dolPopupSetPosition({
 						pointer: oPointerOptions

modules/base/general/classes/BxBaseModGeneralFormEntry.php

@@ -138,7 +138,8 @@ class BxBaseModGeneralFormEntry extends BxTemplFormView
 			'name' => $this->aInputs[$CNF['FIELD_PHOTO']]['name'],
 			'content_id' => $this->aInputs[$CNF['FIELD_PHOTO']]['content_id'],
 			'editor_id' => isset($CNF['FIELD_TEXT_ID']) ? $CNF['FIELD_TEXT_ID'] : '',
-			'thumb_id' => isset($CNF['FIELD_THUMB']) && isset($aContentInfo[$CNF['FIELD_THUMB']]) ? $aContentInfo[$CNF['FIELD_THUMB']] : 0,
+            'thumb_id' => isset($CNF['FIELD_THUMB']) && isset($aContentInfo[$CNF['FIELD_THUMB']]) ? $aContentInfo[$CNF['FIELD_THUMB']] : 0,
+            'name_thumb' => isset($CNF['FIELD_THUMB']) ? $CNF['FIELD_THUMB'] : '',
 			'bx_if:set_thumb' => array (
 				'condition' => CHECK_ACTION_RESULT_ALLOWED === $this->_oModule->checkAllowedSetThumb($this->aInputs[$CNF['FIELD_PHOTO']]['content_id']),
 				'content' => array (

modules/base/general/template/css/manage_tools.css

@@ -6,10 +6,13 @@ div.bx-grid-header div.bx-form-element-wrapper {
 }
 
 /*--- Administration tools ---*/
-div.bx-grid-header div#bx-form-element-filter1 {
+div.bx-grid-header div#bx-form-element-filter1,
+div.bx-grid-header div#bx-form-element-filter2
+{
     margin-right: 20px;
 }
 div.bx-grid-header div#bx-form-element-filter1,
+div.bx-grid-header div#bx-form-element-filter2,
 div.bx-grid-header div#bx-form-element-search {
     margin-top: 0px;
 }

modules/base/profile/classes/BxBaseModProfileFormsEntryHelper.php

@@ -144,7 +144,12 @@ class BxBaseModProfileFormsEntryHelper extends BxBaseModGeneralFormsEntryHelper
             $oForm->processFiles($CNF['FIELD_COVER'], $iContentId, true);
 
         // alert
-        bx_alert($this->_oModule->getName(), 'added', $iContentId);
+        $aContentInfo = $this->_oModule->_oDb->getContentInfoById($iContentId);
+        $aParams = array();        
+        if(isset($aContentInfo[$CNF['FIELD_ALLOW_VIEW_TO']]))
+            $aParams['privacy_view'] = $aContentInfo[$CNF['FIELD_ALLOW_VIEW_TO']];
+        
+        bx_alert($this->_oModule->getName(), 'added', $iContentId, false, $aParams);
 
         // switch context to the created profile
         if ($this->_oModule->serviceActAsProfile()) {

modules/base/text/classes/BxBaseModTextDb.php

@@ -42,6 +42,12 @@ class BxBaseModTextDb extends BxBaseModGeneralDb
         $sQuery = "SELECT `c`.* FROM `" . $this->_oConfig->CNF['TABLE_ENTRIES'] . "` AS `c` WHERE `c`.`" . $CNF['FIELD_AUTHOR'] . "`=:author AND (0 $sWhere)" . $sOrderBy;
         return $this->getAll($sQuery, $aBindings);
     }
+    
+    public function getEntriesNumByContext ($iProfileId)
+    {
+        $sQuery = $this->prepare ("SELECT COUNT(*) FROM `" . $this->_oConfig->CNF['TABLE_ENTRIES'] . "` WHERE `" . $this->_oConfig->CNF['FIELD_ALLOW_VIEW_TO'] . "` = ?", - $iProfileId);
+        return $this->getOne($sQuery);
+    }
 }
 
 /** @} */

modules/base/text/classes/BxBaseModTextModule.php

@@ -125,6 +125,14 @@ class BxBaseModTextModule extends BxBaseModGeneralModule implements iBxDolConten
     {
         return $this->_serviceTemplateFunc ('entryAuthor', $iContentId);
     }
+    
+    /**
+     * Entry context block
+     */
+    public function serviceEntityContext ($iContentId = 0)
+    {
+        return $this->_serviceTemplateFunc ('entryContext', $iContentId);
+    }
 
     public function serviceEntityBreadcrumb ($iContentId = 0)
     {

modules/base/text/classes/BxBaseModTextTemplate.php

@@ -66,10 +66,52 @@ class BxBaseModTextTemplate extends BxBaseModGeneralTemplate
         return $this->parseHtmlByName($sTemplateName, $aVars);
     }
 
+    function entryContext ($aData, $iProfileId = false, $sFuncContextDesc = 'getContextDesc', $sTemplateName = 'context.html', $sFuncContextAddon = 'getContextAddon')
+    {
+        $CNF = &$this->getModule()->_oConfig->CNF;
+
+        $iContextId = $aData[$CNF['FIELD_ALLOW_VIEW_TO']];
+        if ($iContextId >= 0)
+            return '';
+        
+        $iProfileId = - $iContextId;
+
+        $oProfile = BxDolProfile::getInstance($iProfileId);
+        if (!$oProfile) 
+            $oProfile = BxDolProfileUndefined::getInstance();
+
+        if (!$oProfile)
+            return '';
+
+        $sName = $oProfile->getDisplayName();
+        $sAddon = $sFuncContextAddon ? $this->$sFuncContextAddon($aData, $oProfile) : '';
+
+        $aVars = array (
+            'author_url' => $oProfile->getUrl(),
+            'author_thumb_url' => $oProfile->getThumb(),
+            'author_unit' => $oProfile->getUnit(0, array('template' => 'unit_wo_info')),
+            'author_title' => $sName,
+            'author_title_attr' => bx_html_attribute($sName),
+            'author_desc' => $sFuncContextDesc ? $this->$sFuncContextDesc($aData) : '',
+            'bx_if:addon' => array (
+                'condition' => (bool)$sAddon,
+                'content' => array (
+                    'content' => $sAddon,
+                ),
+            ),
+        );
+        return $this->parseHtmlByName($sTemplateName, $aVars);
+    }
+
     function getAuthorDesc ($aData)
     {
         return '';
     }
+    
+    function getContextDesc ($aData)
+    {
+        return '';
+    }
 
     function getAuthorAddon ($aData, $oProfile)
     {
@@ -78,6 +120,14 @@ class BxBaseModTextTemplate extends BxBaseModGeneralTemplate
         $sUrl = BxDolPermalinks::getInstance()->permalink($sUrl);
         return _t($CNF['T']['txt_all_entries_by'], $sUrl, $oProfile->getDisplayName(), $this->getModule()->_oDb->getEntriesNumByAuthor($oProfile->id()));
     }
+    
+    function getContextAddon ($aData, $oProfile)
+    {
+        $CNF = &$this->getModule()->_oConfig->CNF;
+        $sUrl = 'page.php?i=' . $CNF['URI_ENTRIES_BY_CONTEXT'] . '&profile_id=' . $oProfile->id();
+        $sUrl = BxDolPermalinks::getInstance()->permalink($sUrl);
+        return _t($CNF['T']['txt_all_entries_in'], $sUrl, $oProfile->getDisplayName(), $this->getModule()->_oDb->getEntriesNumByContext($oProfile->id()));
+    }
 
     public function entryBreadcrumb($aContentInfo, $aTmplVarsItems = array())
     {

modules/base/text/template/context.html

@@ -0,0 +1,14 @@
+<div class="bx-base-text-author bx-def-unit absolute">
+    <div class="bx-def-unit-img">__author_unit__</div>
+    <div class="bx-def-unit-info bx-def-thumb-size-min-height bx-def-thumb-size-max-height bx-def-thumb-size-left-indent">
+        <div class="bx-def-unit-info-cnt bx-def-box-sizing">
+            <div class="bx-def-unit-line"><a class="bx-def-unit-info-title" href="__author_url__" title="__author_title_attr__">__author_title__</a></div>
+            <div class="bx-def-unit-line bx-def-font-grayed bx-def-font-small">__author_desc__</div> 
+        </div>
+    </div>
+</div>
+<bx_if:addon>
+    <div class="bx-def-margin-sec-top">
+        __content__ 
+    </div>
+</bx_if:addon>

modules/base/text/template/form_ghost_template.html

@@ -29,4 +29,8 @@
     $(".bx-base-general-icon-{file_id}").bind('dragstart', function(){
         return false; 
     });
+
+    // select first image as a thumb by default
+    if (1 == $('input[name="__name_thumb__[]"]').length)
+        $('input[name="__name_thumb__[]"]').attr('checked', true);
 </script>

modules/boonex/albums/classes/BxAlbumsConfig.php

@@ -140,6 +140,7 @@ class BxAlbumsConfig extends BxBaseModTextConfig
             	'menu_item_manage_my' => '_bx_albums_menu_item_title_manage_my',
             	'menu_item_manage_all' => '_bx_albums_menu_item_title_manage_all',
                 'txt_all_entries_by' => '_bx_albums_txt_all_entries_by',
+                'txt_all_entries_in' => '_bx_albums_txt_all_entries_in',
             	'txt_all_entries_by_author' => '_bx_albums_page_title_browse_by_author',
                 'txt_all_entries_by_context' => '_bx_albums_page_title_browse_by_context',
             ),

modules/boonex/albums/install/langs/en.xml

@@ -120,13 +120,13 @@
 	<string name="_bx_albums_page_title_sys_manage_administration"><![CDATA[Manage All Albums]]></string>
 	<string name="_bx_albums_page_title_manage"><![CDATA[Manage]]></string>
 	<string name="_bx_albums_page_block_title_system_manage"><![CDATA[Manage Own Albums]]></string>
-	<string name="_bx_albums_page_block_title_system_manage_administration"><![CDATA[Manage All Albums]]></string>
+	<string name="_bx_albums_page_block_title_system_manage_administration"><![CDATA[Manage All Albums]]></string>  
 	<string name="_bx_albums_page_block_title_manage"><![CDATA[Manage]]></string>
 	<string name="_bx_albums_page_block_title_popular_keywords_albums"><![CDATA[Popular Albums Hashtags]]></string>
 	<string name="_bx_albums_page_block_title_popular_keywords_media"><![CDATA[Popular Media Hashtags]]></string>
 	<string name="_bx_albums_page_block_title_popular_keywords_media_camera"><![CDATA[Popular Cameras]]></string>
 	<string name="_bx_albums_page_block_title_my_entries"><![CDATA[My Albums]]></string>
-	<string name="_bx_albums_page_title_sys_entries_search"><![CDATA[Search]]></string>
+  	<string name="_bx_albums_page_title_sys_entries_search"><![CDATA[Search]]></string>
     <string name="_bx_albums_page_title_entries_search"><![CDATA[Search]]></string>
     <string name="_bx_albums_page_block_title_search_form"><![CDATA[Search Form]]></string>
     <string name="_bx_albums_page_block_title_search_results"><![CDATA[Search Results]]></string>
@@ -142,6 +142,8 @@
     <string name="_bx_albums_page_block_title_popular_media_view_showcase"><![CDATA[Top Images]]></string>
     <string name="_bx_albums_page_block_title_sys_featured_media_view_showcase"><![CDATA[Featured Images (Showcase View)]]></string>
     <string name="_bx_albums_page_block_title_featured_media_view_showcase"><![CDATA[Featured Images]]></string>
+	<string name="_bx_albums_page_block_title_sys_entry_context"><![CDATA[Posted in]]></string>
+  	<string name="_bx_albums_page_block_title_entry_context"><![CDATA[Posted in]]></string>
 
     <string name="_bx_albums_menu_set_title_view_entry"><![CDATA[Album Actions]]></string>
     <string name="_bx_albums_menu_title_view_entry"><![CDATA[Album Actions]]></string>
@@ -216,6 +218,7 @@
     <string name="_bx_albums_search_extended_media_cmts"><![CDATA[Images Comments Search]]></string>
 
     <string name="_bx_albums_txt_all_entries_by"><![CDATA[<a href="{0}">All Albums by {1} ({2})</a>]]></string>
+    <string name="_bx_albums_txt_all_entries_in"><![CDATA[<a href="{0}">All Albums in {1} ({2})</a>]]></string>
     <string name="_bx_albums_txt_sample_single"><![CDATA[album]]></string>
     <string name="_bx_albums_txt_sample_single_with_article"><![CDATA[an album]]></string>
     <string name="_bx_albums_txt_sample_comment_single"><![CDATA[comment to album]]></string>

modules/boonex/albums/install/sql/enable.sql

@@ -51,16 +51,15 @@ INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title`, `designb
 INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `uri`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
 ('bx_albums_view_entry', '_bx_albums_page_title_sys_view_entry', '_bx_albums_page_title_view_entry', 'bx_albums', 10, 2147483647, 1, 'view-album', '', '', '', '', 0, 1, 0, 'BxAlbumsPageEntry', 'modules/boonex/albums/classes/BxAlbumsPageEntry.php');
 
-INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
-('bx_albums_view_entry', 4, 'bx_albums', '_bx_albums_page_block_title_entry_text', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_albums\";s:6:\"method\";s:17:\"entity_text_block\";}', 0, 0, 1, 0),
-('bx_albums_view_entry', 4, 'bx_albums', '_bx_albums_page_block_title_entry_attachments', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_albums\";s:6:\"method\";s:18:\"entity_attachments\";}', 0, 0, 1, 1),
-('bx_albums_view_entry', 4, 'bx_albums', '_bx_albums_page_block_title_entry_social_sharing', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_albums\";s:6:\"method\";s:21:\"entity_social_sharing\";}', 0, 0, 1, 2),
-('bx_albums_view_entry', 4, 'bx_albums', '_bx_albums_page_block_title_entry_comments', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_albums\";s:6:\"method\";s:15:\"entity_comments\";}', 0, 0, 1, 3),
-('bx_albums_view_entry', 4, 'bx_albums', '_bx_albums_page_block_title_entry_location', 3, 2147483647, 'service', 'a:4:{s:6:\"module\";s:6:\"system\";s:6:\"method\";s:13:\"locations_map\";s:6:\"params\";a:2:{i:0;s:9:\"bx_albums\";i:1;s:4:\"{id}\";}s:5:\"class\";s:20:\"TemplServiceMetatags\";}', 0, 0, 1, 4),
-
-('bx_albums_view_entry', 2, 'bx_albums', '_bx_albums_page_block_title_entry_author', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_albums\";s:6:\"method\";s:13:\"entity_author\";}', 0, 0, 1, 0),
-
-('bx_albums_view_entry', 3, 'bx_albums', '_bx_albums_page_block_title_entry_info', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_albums\";s:6:\"method\";s:11:\"entity_info\";}', 0, 0, 1, 0);
+INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
+('bx_albums_view_entry', 4, 'bx_albums','' , '_bx_albums_page_block_title_entry_text', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_albums\";s:6:\"method\";s:17:\"entity_text_block\";}', 0, 0, 1, 0),
+('bx_albums_view_entry', 4, 'bx_albums','' , '_bx_albums_page_block_title_entry_attachments', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_albums\";s:6:\"method\";s:18:\"entity_attachments\";}', 0, 0, 1, 1),
+('bx_albums_view_entry', 4, 'bx_albums','' , '_bx_albums_page_block_title_entry_social_sharing', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_albums\";s:6:\"method\";s:21:\"entity_social_sharing\";}', 0, 0, 1, 2),
+('bx_albums_view_entry', 4, 'bx_albums','' , '_bx_albums_page_block_title_entry_comments', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_albums\";s:6:\"method\";s:15:\"entity_comments\";}', 0, 0, 1, 3),
+('bx_albums_view_entry', 4, 'bx_albums','' , '_bx_albums_page_block_title_entry_location', 3, 2147483647, 'service', 'a:4:{s:6:\"module\";s:6:\"system\";s:6:\"method\";s:13:\"locations_map\";s:6:\"params\";a:2:{i:0;s:9:\"bx_albums\";i:1;s:4:\"{id}\";}s:5:\"class\";s:20:\"TemplServiceMetatags\";}', 0, 0, 1, 4),
+('bx_albums_view_entry', 2, 'bx_albums','' , '_bx_albums_page_block_title_entry_author', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_albums\";s:6:\"method\";s:13:\"entity_author\";}', 0, 0, 1, 0),
+('bx_albums_view_entry', 2, 'bx_albums', '_bx_albums_page_block_title_sys_entry_context', '_bx_albums_page_block_title_entry_context', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_albums\";s:6:\"method\";s:14:\"entity_context\";}', 0, 0, 1, 1),
+('bx_albums_view_entry', 3, 'bx_albums','' , '_bx_albums_page_block_title_entry_info', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_albums\";s:6:\"method\";s:11:\"entity_info\";}', 0, 0, 1, 0);
 
 -- PAGE: view media
 INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 

modules/boonex/albums/template/context.html

@@ -0,0 +1 @@
+<bx_include_base:../modules/base/text/template/context.html />

modules/boonex/convos/classes/BxCnvAlertsResponse.php

@@ -22,6 +22,9 @@ class BxCnvAlertsResponse extends BxBaseModTextAlertsResponse
         if ($this->MODULE == $oAlert->sUnit && 'commentPost' == $oAlert->sAction)
             BxDolService::call($this->MODULE, 'trigger_comment_post', array($oAlert->iObject, $oAlert->aExtras['comment_author_id'], $oAlert->aExtras['comment_id'], 0, $oAlert->aExtras['comment_text']));
 
+        if ('profile' == $oAlert->sUnit && 'delete' == $oAlert->sAction && (!isset($oAlert->aExtras['delete_with_content']) || !$oAlert->aExtras['delete_with_content']))
+            BxDolService::call($this->MODULE, 'remove_collaborator_from_all_conversations', array($oAlert->iObject));
+        
         parent::response($oAlert);
     }
 }

modules/boonex/convos/classes/BxCnvDb.php

@@ -43,6 +43,24 @@ class BxCnvDb extends BxBaseModTextDb
         return $this->query($sQuery);
     }
 
+    /**
+     * Remove collaborator from all conversations (when profile is deleted)
+     * @param $iProfileId profile id to remove
+     * @return number of deletions
+     */
+    public function removeCollaboratorFromAllConversations($iProfileId)
+    {
+        $aConvos = $this->getColumn("SELECT `conv_id` FROM `" . $this->getPrefix() . "conv2folder` WHERE `collaborator` = ?", array($iProfileId));
+        if (!($iRet = $this->query("DELETE FROM `" . $this->getPrefix() . "conv2folder` WHERE `collaborator` = ?", array($iProfileId))))
+            return 0;
+
+        foreach ($aConvos as $iConversationId) {
+            if (!$this->getCollaborators($iConversationId))
+                $this->deleteConvo($iConversationId);
+        }
+        return $iRet;
+    }
+    
     public function getCollaborators($iConversationId)
     {
         $sQuery = $this->prepare("SELECT `collaborator`, `read_comments` FROM `" . $this->getPrefix() . "conv2folder` WHERE `conv_id` = ?", $iConversationId);
@@ -91,10 +109,12 @@ class BxCnvDb extends BxBaseModTextDb
         }
 
         $sQuery = "DELETE FROM `" . $this->getPrefix() . "conv2folder` WHERE `conv_id` = :conv_id" . $sWhere;
-        if (!$this->query($sQuery, $aBindings))
-            return false;
+        $this->query($sQuery, $aBindings);
 
         // delete whole conversation if there is no refencences to the conversation in conv2folder table
+        if ($this->getCollaborators($iConversationId))
+            return false;
+            
         $sQuery = $this->prepare("SELECT `id` FROM `" . $this->getPrefix() . "conv2folder` WHERE `conv_id` = ?", $iConversationId);
         if (!$this->getOne($sQuery)) {
             $CNF = &$this->_oConfig->CNF;

modules/boonex/convos/classes/BxCnvModule.php

@@ -325,6 +325,44 @@ class BxCnvModule extends BxBaseModTextModule
         return '';
     }
 
+    /**
+     * Delete content entry
+     * @param $iContentId content id 
+     * @return error message or empty string on success
+     */
+    public function serviceDeleteEntity ($iContentId, $sFuncDelete = 'deleteData')
+    {
+        return $this->_oDb->deleteConvo($iContentId);
+    }
+    
+    /**
+     * Delete profile from all conversation (when profile is delete without content)
+     * @param $iProfileId profile id 
+     * @return number of deleted items
+     */    
+    public function serviceRemoveCollaboratorFromAllConversations ($iProfileId)
+    {
+        return $this->_oDb->removeCollaboratorFromAllConversations((int)$iProfileId);
+    }
+    
+    /**
+     * Delete all content by profile (when profile is delete with content)
+     * @param $iProfileId profile id 
+     * @return number of deleted items
+     */
+    public function serviceDeleteEntitiesByAuthor ($iProfileId)
+    {
+        $a = $this->_oDb->getEntriesByAuthor((int)$iProfileId);
+        if (!$a)
+            return 0;
+
+        $iCount = 0;
+        foreach ($a as $aContentInfo)
+            $iCount += ('' == $this->serviceDeleteEntity($aContentInfo[$this->_oConfig->CNF['FIELD_ID']]) ? 1 : 0);
+
+        return $iCount;
+    }
+    
     /**
      * No moderators for personal convos
      */

modules/boonex/convos/classes/BxCnvPageEntry.php

@@ -19,6 +19,9 @@ class BxCnvPageEntry extends BxBaseModTextPageEntry
         $this->MODULE = 'bx_convos';
         parent::__construct($aObject, $oTemplate);
 
+        if (!$this->_aContentInfo)
+            return;
+
         $CNF = &$this->_oModule->_oConfig->CNF;
 
         $this->_oModule->_oDb->updateReadComments(bx_get_logged_profile_id(), $this->_aContentInfo[$CNF['FIELD_ID']], $this->_aContentInfo[$CNF['FIELD_COMMENTS']]);

modules/boonex/forum/classes/BxForumConfig.php

@@ -142,6 +142,7 @@ class BxForumConfig extends BxBaseModTextConfig
             	'filter_item_select_one_filter1' => '_bx_forum_grid_filter_item_title_adm_select_one_filter1',
             	'menu_item_manage_my' => '_bx_forum_menu_item_title_manage_my',
             	'menu_item_manage_all' => '_bx_forum_menu_item_title_manage_all',
+                'txt_all_entries_in' => '_bx_forum_txt_all_entries_in',
             	'txt_all_entries_by_author' => '_bx_forum_page_title_browse_by_author',
                 'txt_all_entries_by_context' => '_bx_forum_page_title_browse_by_context',
             	'txt_pict_use_as_thumb' => '_bx_forum_form_entry_input_picture_use_as_thumb'

modules/boonex/forum/install/langs/en.xml

@@ -136,7 +136,10 @@
     <string name="_bx_forum_page_block_title_entries_in_context"><![CDATA[Discussions in <a href="{profile_link}">{display_name}</a>]]></string>
     <string name="_bx_forum_page_block_title_sys_entries_in_context"><![CDATA[Discussions in context]]></string>
     <string name="_bx_forum_page_block_title_entries_actions"><![CDATA[Discussions actions]]></string>
-    <string name="_bx_forum_page_block_title_browse_cmts"><![CDATA[Forum's Comments]]></string>
+	<string name="_bx_forum_page_block_title_sys_entry_context"><![CDATA[Posted in]]></string>
+  	<string name="_bx_forum_page_block_title_entry_context"><![CDATA[Posted in]]></string>
+    
+	<string name="_bx_forum_page_block_title_browse_cmts"><![CDATA[Forum's Comments]]></string>
     <string name="_bx_forum_page_title_sys_manage"><![CDATA[Manage Own]]></string>
 	<string name="_bx_forum_page_title_sys_manage_administration"><![CDATA[Manage All]]></string>
 	<string name="_bx_forum_page_title_manage"><![CDATA[Manage]]></string>
@@ -154,7 +157,6 @@
     <string name="_bx_forum_page_block_title_search_results"><![CDATA[Search Results]]></string>
     <string name="_bx_forum_page_block_title_search_form_cmts"><![CDATA[Comments Search Form]]></string>
     <string name="_bx_forum_page_block_title_search_results_cmts"><![CDATA[Comments Search Results]]></string>
-
     <string name="_bx_forum_menu_title_submenu"><![CDATA[Forum Submenu]]></string>
     <string name="_bx_forum_menu_set_title_submenu"><![CDATA[Forum Submenu]]></string>
     <string name="_bx_forum_menu_item_title_system_create_entry"><![CDATA[New Discussion]]></string>
@@ -266,8 +268,8 @@
     <string name="_bx_forum_txt_sample_single_with_article"><![CDATA[a discussion]]></string>
     <string name="_bx_forum_x_date_by_x_replier"><![CDATA[{0} by {1}]]></string>
     <string name="_bx_forum_you_are_last_replier"><![CDATA[You are last replier]]></string>
-    
-    
+
+    <string name="_bx_forum_txt_all_entries_in"><![CDATA[<a href="{0}">All Discussions in {1} ({2})</a>]]></string>
     <string name="_bx_forum_email_new_reply"><![CDATA[New reply]]></string>
     <string name="_bx_forum_email_new_reply_subject"><![CDATA[New reply in "{PageTitle}" discussion]]></string>
     <string name="_bx_forum_email_new_reply_body"><![CDATA[{email_header}

modules/boonex/forum/install/sql/enable.sql

@@ -48,14 +48,15 @@ INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title`, `designb
 INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
 ('bx_forum_view_entry', 'view-discussion', '_bx_forum_page_title_sys_view_entry', '_bx_forum_page_title_view_entry', @sName, 10, 2147483647, 1, '', '', '', '', 0, 1, 0, 'BxForumPageEntry', 'modules/boonex/forum/classes/BxForumPageEntry.php');
 
-INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
-('bx_forum_view_entry', 1, @sName, '_bx_forum_page_block_title_entry_breadcrumb', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:8:"bx_forum";s:6:"method";s:17:"entity_breadcrumb";}', 0, 0, 1, 0),
-('bx_forum_view_entry', 2, @sName, '_bx_forum_page_block_title_entry_author', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:8:"bx_forum";s:6:"method";s:13:"entity_author";}', 0, 0, 1, 0),
-('bx_forum_view_entry', 3, @sName, '_bx_forum_page_block_title_entry_participants', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:8:"bx_forum";s:6:"method";s:19:"entity_participants";}', 0, 0, 1, 0),
-('bx_forum_view_entry', 4, @sName, '_bx_forum_page_block_title_entry_text', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:8:"bx_forum";s:6:"method";s:17:"entity_text_block";}', 0, 0, 1, 0),
-('bx_forum_view_entry', 4, @sName, '_bx_forum_page_block_title_entry_all_actions', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:8:"bx_forum";s:6:"method";s:18:"entity_all_actions";}', 0, 0, 1, 1),
-('bx_forum_view_entry', 4, @sName, '_bx_forum_page_block_title_entry_attachments', 11, 2147483647, 'service', 'a:2:{s:6:"module";s:8:"bx_forum";s:6:"method";s:18:"entity_attachments";}', 0, 0, 1, 2),
-('bx_forum_view_entry', 4, @sName, '_bx_forum_page_block_title_entry_comments', 11, 2147483647, 'service', 'a:2:{s:6:"module";s:8:"bx_forum";s:6:"method";s:15:"entity_comments";}', 0, 0, 1, 3);
+INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
+('bx_forum_view_entry', 1, @sName,'', '_bx_forum_page_block_title_entry_breadcrumb', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:8:"bx_forum";s:6:"method";s:17:"entity_breadcrumb";}', 0, 0, 1, 0),
+('bx_forum_view_entry', 2, @sName,'', '_bx_forum_page_block_title_entry_author', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:8:"bx_forum";s:6:"method";s:13:"entity_author";}', 0, 0, 1, 0),
+('bx_forum_view_entry', 2, @sName, '_bx_forum_page_block_title_sys_entry_context', '_bx_forum_page_block_title_entry_context', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_forum\";s:6:\"method\";s:14:\"entity_context\";}', 0, 0, 1, 1),
+('bx_forum_view_entry', 3, @sName,'', '_bx_forum_page_block_title_entry_participants', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:8:"bx_forum";s:6:"method";s:19:"entity_participants";}', 0, 0, 1, 0),
+('bx_forum_view_entry', 4, @sName,'', '_bx_forum_page_block_title_entry_text', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:8:"bx_forum";s:6:"method";s:17:"entity_text_block";}', 0, 0, 1, 0),
+('bx_forum_view_entry', 4, @sName,'', '_bx_forum_page_block_title_entry_all_actions', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:8:"bx_forum";s:6:"method";s:18:"entity_all_actions";}', 0, 0, 1, 1),
+('bx_forum_view_entry', 4, @sName,'', '_bx_forum_page_block_title_entry_attachments', 11, 2147483647, 'service', 'a:2:{s:6:"module";s:8:"bx_forum";s:6:"method";s:18:"entity_attachments";}', 0, 0, 1, 2),
+('bx_forum_view_entry', 4, @sName,'', '_bx_forum_page_block_title_entry_comments', 11, 2147483647, 'service', 'a:2:{s:6:"module";s:8:"bx_forum";s:6:"method";s:15:"entity_comments";}', 0, 0, 1, 3);
 
 -- PAGE: new entries
 INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `uri`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
@@ -117,7 +118,7 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 
 -- PAGE: entries in context
 INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
-('bx_forum_context', 'forum-context', '_bx_forum_page_title_sys_entries_in_context', '_bx_forum_page_title_entries_in_context', 'bx_forum', 5, 2147483647, 1, '', '', '', '', 0, 1, 0, 'BxForumPageAuthor', 'modules/boonex/forum/classes/BxForumPageAuthor.php');
+('bx_forum_context', 'discussions-context', '_bx_forum_page_title_sys_entries_in_context', '_bx_forum_page_title_entries_in_context', 'bx_forum', 5, 2147483647, 1, '', '', '', '', 0, 1, 0, 'BxForumPageAuthor', 'modules/boonex/forum/classes/BxForumPageAuthor.php');
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
 ('bx_forum_context', 1, @sName, '_bx_forum_page_block_title_sys_entries_in_context', '_bx_forum_page_block_title_entries_in_context', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_forum\";s:6:\"method\";s:14:\"browse_context\";}', 0, 0, 1, 1);
@@ -272,7 +273,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- MENU: add menu item to profiles modules (trigger* menu sets are processed separately upon modules enable/disable)
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
 ('trigger_profile_view_submenu', @sName, 'discussions-author', '_bx_forum_menu_item_title_system_view_entries_author', '_bx_forum_menu_item_title_view_entries_author', 'page.php?i=discussions-author&profile_id={profile_id}', '', '', 'comments-o col-blue2', '', 2147483647, 1, 0, 0),
-('trigger_group_view_submenu', @sName, 'discussions-context', '_bx_forum_menu_item_title_system_view_entries_in_context', '_bx_forum_menu_item_title_view_entries_in_context', 'page.php?i=forum-context&profile_id={profile_id}', '', '', 'comments-o col-blue2', '', 2147483647, 1, 0, 0);
+('trigger_group_view_submenu', @sName, 'discussions-context', '_bx_forum_menu_item_title_system_view_entries_in_context', '_bx_forum_menu_item_title_view_entries_in_context', 'page.php?i=discussions-context&profile_id={profile_id}', '', '', 'comments-o col-blue2', '', 2147483647, 1, 0, 0);
 
 -- GRIDS: main
 INSERT INTO `sys_objects_grid` (`object`, `source_type`, `source`, `table`, `field_id`, `field_order`, `paginate_url`, `paginate_per_page`, `paginate_simple`, `paginate_get_start`, `paginate_get_per_page`, `filter_fields`, `filter_mode`, `sorting_fields`, `visible_for_levels`, `override_class_name`, `override_class_file`) VALUES

modules/boonex/forum/template/context.html

@@ -0,0 +1 @@
+<bx_include_base:../modules/base/text/template/context.html />

modules/boonex/glossary/classes/BxGlsrConfig.php

@@ -123,6 +123,7 @@ class BxGlsrConfig extends BxBaseModTextConfig
                 'menu_item_manage_my' => '_bx_glossary_menu_item_title_manage_my',
                 'menu_item_manage_all' => '_bx_glossary_menu_item_title_manage_all',
                 'txt_all_entries_by' => '_bx_glossary_txt_all_entries_by',
+                'txt_all_entries_in' => '_bx_glossary_txt_all_entries_in',
                 'txt_all_entries_by_author' => '_bx_glossary_page_title_browse_by_author',
                 'txt_all_entries_by_context' => '_bx_glossary_page_title_browse_by_context',
                 'txt_pict_use_as_thumb' => '_bx_glossary_form_entry_input_picture_use_as_thumb'

modules/boonex/glossary/install/langs/en.xml

@@ -114,7 +114,7 @@
     <string name="_bx_glossary_page_block_title_entries_actions"><![CDATA[Terms actions]]></string>
     <string name="_bx_glossary_page_block_title_browse_cmts"><![CDATA[Terms' Comments]]></string>
 	<string name="_bx_glossary_page_title_sys_manage"><![CDATA[Manage Own]]></string>
-	<string name="_bx_glossary_page_title_sys_manage_administration"><![CDATA[Manage All]]></string>
+	<string name="_bx_glossary_page_title_sys_manage_administration"><![CDATA[Manage All]]></string> 
 	<string name="_bx_glossary_page_title_manage"><![CDATA[Manage]]></string>
 	<string name="_bx_glossary_page_block_title_system_manage"><![CDATA[Manage Own]]></string>
 	<string name="_bx_glossary_page_block_title_system_manage_administration"><![CDATA[Manage All]]></string>
@@ -129,6 +129,8 @@
     <string name="_bx_glossary_page_block_title_popular_entries_view_showcase"><![CDATA[Popular Terms]]></string>
     <string name="_bx_glossary_page_block_title_sys_featured_entries_view_showcase"><![CDATA[Featured Terms (Showcase View)]]></string>
     <string name="_bx_glossary_page_block_title_featured_entries_view_showcase"><![CDATA[Featured Terms]]></string>
+	<string name="_bx_glossary_page_block_title_sys_entry_context"><![CDATA[Posted in]]></string>
+	<string name="_bx_glossary_page_block_title_entry_context"><![CDATA[Posted in]]></string>
 
     <string name="_bx_glossary_menu_set_title_view_entry"><![CDATA[Term Actions]]></string>
     <string name="_bx_glossary_menu_title_view_entry"><![CDATA[Term Actions]]></string>
@@ -203,6 +205,7 @@
     <string name="_bx_glossary_cat_Infinitives"><![CDATA[Infinitives]]></string>
 
     <string name="_bx_glossary_txt_all_entries_by"><![CDATA[<a href="{0}">All Terms by {1} ({2})</a>]]></string>
+    <string name="_bx_glossary_txt_all_entries_in"><![CDATA[<a href="{0}">All Terms in {1} ({2})</a>]]></string>
     <string name="_bx_glossary_txt_sample_single"><![CDATA[term]]></string>
     <string name="_bx_glossary_txt_sample_single_with_article"><![CDATA[a term]]></string>
     <string name="_bx_glossary_txt_sample_comment_single"><![CDATA[comment to term]]></string>

modules/boonex/glossary/install/sql/enable.sql

@@ -54,6 +54,7 @@ INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `lay
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
 ('bx_glossary_view_entry', 1, 'bx_glossary', '', '_bx_glossary_page_block_title_entry_text', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:11:\"bx_glossary\";s:6:\"method\";s:17:\"entity_text_block\";}', 0, 0, 1, 0),
 ('bx_glossary_view_entry', 2, 'bx_glossary', '', '_bx_glossary_page_block_title_entry_author', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:11:\"bx_glossary\";s:6:\"method\";s:13:\"entity_author\";}', 0, 0, 0, 0),
+('bx_glossary_view_entry', 2, 'bx_glossary', '_bx_glossary_page_block_title_sys_entry_context', '_bx_glossary_page_block_title_entry_context', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:11:\"bx_glossary\";s:6:\"method\";s:14:\"entity_context\";}', 0, 0, 1, 1),
 ('bx_glossary_view_entry', 3, 'bx_glossary', '', '_bx_glossary_page_block_title_entry_info', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:11:\"bx_glossary\";s:6:\"method\";s:11:\"entity_info\";}', 0, 0, 0, 1),
 ('bx_glossary_view_entry', 4, 'bx_glossary', '', '_bx_glossary_page_block_title_entry_all_actions', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:11:\"bx_glossary\";s:6:\"method\";s:18:\"entity_all_actions\";}', 0, 0, 1, 0),
 ('bx_glossary_view_entry', 4, 'bx_glossary', '', '_bx_glossary_page_block_title_entry_actions', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:11:\"bx_glossary\";s:6:\"method\";s:14:\"entity_actions\";}', 0, 0, 0, 1),

modules/boonex/glossary/template/context.html

@@ -0,0 +1 @@
+<bx_include_base:../modules/base/text/template/context.html />

modules/boonex/intercom/classes/BxIntercomModule.php

@@ -26,7 +26,7 @@ class BxIntercomModule extends BxDolModule
 
         $aSettings = array(
             'app_id' => $sAppId,
-            'hide_default_launcher' => ('messenger' == bx_get('i')),
+            'hide_default_launcher' => ('on' == getParam('bx_intercom_option_hide_launcher') || 'messenger' == bx_get('i')),
             'alignment' => getParam('bx_intercom_option_alignment'),
             'horizontal_padding' => getParam('bx_intercom_option_horizontal_padding'),
             'vertical_padding' => getParam('bx_intercom_option_vertical_padding'),
@@ -39,6 +39,8 @@ class BxIntercomModule extends BxDolModule
 	        $aSettings['email'] = $oAccountObject->getEmail();
 	        $aSettings['created_at'] = $aInfo['added'];
         }
+
+        bx_alert('bx_intercom', 'integration', 0, 0, array('settings' => &$aSettings));
         
         $sSettings = json_encode($aSettings);
 

modules/boonex/intercom/install/langs/en.xml

@@ -8,6 +8,7 @@
     <string name="_bx_intercom_adm_stg_cpt_category_general"><![CDATA[General]]></string>
     <string name="_bx_intercom_option_app_id"><![CDATA[Intercom App ID]]></string>
     <string name="_bx_intercom_option_api_key"><![CDATA[Intercom Access Token]]></string>
+    <string name="_bx_intercom_option_hide_launcher"><![CDATA[Hide Launcher]]></string>
     <string name="_bx_intercom_option_alignment"><![CDATA[Widget Alignment]]></string>
     <string name="_bx_intercom_option_horizontal_padding"><![CDATA[Widget Horizontal Padding]]></string>
     <string name="_bx_intercom_option_vertical_padding"><![CDATA[Widget Vertical Padding]]></string>

modules/boonex/intercom/install/sql/enable.sql

@@ -13,6 +13,7 @@ SET @iCategId = LAST_INSERT_ID();
 INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `check`, `check_error`, `order`, `extra`) VALUES
 ('bx_intercom_option_app_id', '', @iCategId, '_bx_intercom_option_app_id', 'digit', '', '', 10, ''),
 ('bx_intercom_option_api_key', '', @iCategId, '_bx_intercom_option_api_key', 'digit', '', '', 20, ''),
+('bx_intercom_option_hide_launcher', '', @iCategId, '_bx_intercom_option_hide_launcher', 'checkbox', '', '', 22, ''),
 ('bx_intercom_option_alignment', 'right', @iCategId, '_bx_intercom_option_alignment', 'select', '', '', 30, 'right,left'),
 ('bx_intercom_option_horizontal_padding', '20', @iCategId, '_bx_intercom_option_horizontal_padding', 'digit', '', '', 32, ''),
 ('bx_intercom_option_vertical_padding', '20', @iCategId, '_bx_intercom_option_vertical_padding', 'digit', '', '', 34, '');

modules/boonex/market/classes/BxMarketConfig.php

@@ -177,6 +177,7 @@ class BxMarketConfig extends BxBaseModTextConfig
             	'menu_item_manage_my' => '_bx_market_menu_item_title_manage_my',
             	'menu_item_manage_all' => '_bx_market_menu_item_title_manage_all',
                 'txt_all_entries_by' => '_bx_market_txt_all_entries_by',
+                'txt_all_entries_in' => '_bx_market_txt_all_entries_in',
                 'txt_all_entries_by_author' => '_bx_market_page_title_browse_by_author',
                 'txt_all_entries_by_context' => '_bx_market_page_title_browse_by_context',
                 'txt_per_day' => '_bx_market_txt_per_day',

modules/boonex/market/install/langs/en.xml

@@ -169,6 +169,9 @@
     <string name="_bx_market_page_block_title_updated_entries"><![CDATA[Updated Products]]></string>
     <string name="_bx_market_page_block_title_updated_entries_view_extended"><![CDATA[Updated Products (Extended View)]]></string>
     <string name="_bx_market_page_block_title_updated_entries_view_full"><![CDATA[Updated Products (Full View)]]></string>
+	<string name="_bx_market_page_block_title_sys_entry_context"><![CDATA[Posted in]]></string>
+    <string name="_bx_market_page_block_title_entry_context"><![CDATA[Posted in]]></string>
+	
     <string name="_bx_market_page_title_sys_view_entry_comments"><![CDATA[Product Reviews]]></string>
     <string name="_bx_market_page_title_view_entry_comments"><![CDATA[Reviews to {title}]]></string>
     <string name="_bx_market_page_title_sys_view_entry_info"><![CDATA[Product Info]]></string>
@@ -386,6 +389,7 @@
 	<string name="_bx_market_err_not_accept_payments_recurring"><![CDATA[You need to activate at least one payment provider, which is working with Subscriptions. You may do it via My Account menu -> Settings page -> <a href="{0}">Payments</a> tab.]]></string>
 
     <string name="_bx_market_txt_all_entries_by"><![CDATA[<a href="{0}">All Products by {1} ({2})</a>]]></string>
+    <string name="_bx_market_txt_all_entries_in"><![CDATA[<a href="{0}">All Products in {1} ({2})</a>]]></string>
     <string name="_bx_market_txt_category"><![CDATA[Category:]]></string>
     <string name="_bx_market_txt_most_current_version"><![CDATA[The most current version]]></string>
     <string name="_bx_market_txt_sample_single"><![CDATA[product]]></string>

modules/boonex/market/install/sql/enable.sql

@@ -63,6 +63,7 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 ('bx_market_view_entry', 2, 'bx_market', '', '_bx_market_page_block_title_entry_actions', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_market";s:6:"method";s:14:"entity_actions";}', 0, 0, 0, 2),
 ('bx_market_view_entry', 2, 'bx_market', '', '_bx_market_page_block_title_entry_comments', 11, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_market";s:6:"method";s:15:"entity_comments";}', 0, 0, 1, 3),
 ('bx_market_view_entry', 2, 'bx_market', '', '_bx_market_page_block_title_entry_author_entries', 11, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_market";s:6:"method";s:22:"entity_author_entities";}', 0, 0, 1, 4),
+('bx_market_view_entry', 2, 'bx_market', '_bx_market_page_block_title_sys_entry_context', '_bx_market_page_block_title_entry_context', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_market\";s:6:\"method\";s:14:\"entity_context\";}', 0, 0, 1, 1),
 ('bx_market_view_entry', 3, 'bx_market', '', '_bx_market_page_block_title_entry_social_sharing', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_market";s:6:"method";s:21:"entity_social_sharing";}', 0, 0, 1, 0),
 ('bx_market_view_entry', 3, 'bx_market', '', '_bx_market_page_block_title_entry_info', 11, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_market";s:6:"method";s:11:"entity_info";}', 0, 0, 1, 2),
 ('bx_market_view_entry', 3, 'bx_market', '', '_bx_market_page_block_title_entry_rating', 11, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_market";s:6:"method";s:13:"entity_rating";}', 0, 0, 1, 3),

modules/boonex/market/template/context.html

@@ -0,0 +1 @@
+<bx_include_base:../modules/base/text/template/context.html />

modules/boonex/notifications/js/view.js

@@ -44,7 +44,7 @@ BxNtfsView.prototype._getPosts = function(oElement) {
         		$this.loadingInBlock(oElement, false);
 
     			$('#' + $this._aHtmlIds['events']).bx_anim('hide', $this._sAnimationEffect, $this._iAnimationSpeed, function() {
-	                $(this).html(sEvents).show().bxTime();
+	                $(this).html(sEvents).show().bxProcessHtml();
 	            });
         	}
         },

modules/boonex/photos/classes/BxPhotosConfig.php

@@ -129,6 +129,7 @@ class BxPhotosConfig extends BxBaseModTextConfig
             	'menu_item_manage_my' => '_bx_photos_menu_item_title_manage_my',
             	'menu_item_manage_all' => '_bx_photos_menu_item_title_manage_all',
                 'txt_all_entries_by' => '_bx_photos_txt_all_entries_by',
+                'txt_all_entries_in' => '_bx_photos_txt_all_entries_in',
                 'txt_all_entries_by_author' => '_bx_photos_page_title_browse_by_author',
                 'txt_all_entries_by_context' => '_bx_photos_page_title_browse_by_context',
             	'txt_pict_use_as_thumb' => '_bx_photos_form_entry_input_picture_use_as_thumb'

modules/boonex/photos/install/langs/en.xml

@@ -134,6 +134,8 @@
     <string name="_bx_photos_page_block_title_popular_entries_view_showcase"><![CDATA[Popular Photos]]></string>
     <string name="_bx_photos_page_block_title_sys_featured_entries_view_showcase"><![CDATA[Featured Photos (Showcase View)]]></string>
     <string name="_bx_photos_page_block_title_featured_entries_view_showcase"><![CDATA[Featured Photos]]></string>
+    <string name="_bx_photos_page_block_title_sys_entry_context"><![CDATA[Posted in]]></string>
+    <string name="_bx_photos_page_block_title_entry_context"><![CDATA[Posted in]]></string>
 
   <string name="_bx_photos_menu_set_title_view_entry"><![CDATA[Photo Actions]]></string>
     <string name="_bx_photos_menu_title_view_entry"><![CDATA[Photo Actions]]></string>
@@ -209,6 +211,7 @@
     <string name="_bx_photos_cat_travel"><![CDATA[Travel]]></string>
 
     <string name="_bx_photos_txt_all_entries_by"><![CDATA[<a href="{0}">All Photos by {1} ({2})</a>]]></string>
+    <string name="_bx_photos_txt_all_entries_in"><![CDATA[<a href="{0}">All Photos in {1} ({2})</a>]]></string>
     <string name="_bx_photos_txt_sample_single"><![CDATA[photo]]></string>
     <string name="_bx_photos_txt_sample_single_with_article"><![CDATA[a photo]]></string>
     <string name="_bx_photos_txt_sample_comment_single"><![CDATA[comment to photo]]></string>

modules/boonex/photos/install/sql/enable.sql

@@ -48,7 +48,8 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 ('bx_photos_view_entry', 1, 'bx_photos', '', '_bx_photos_page_block_title_entry_photo', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_photos";s:6:"method";s:18:"entity_photo_block";}', 0, 0, 1, 0),
 ('bx_photos_view_entry', 1, 'bx_photos', '', '_bx_photos_page_block_title_entry_text', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_photos";s:6:"method";s:17:"entity_text_block";}', 0, 0, 1, 1),
 ('bx_photos_view_entry', 2, 'bx_photos', '', '_bx_photos_page_block_title_entry_author', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_photos";s:6:"method";s:13:"entity_author";}', 0, 0, 1, 0),
-('bx_photos_view_entry', 2, 'bx_market', '', '_bx_photos_page_block_title_entry_rating', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_photos";s:6:"method";s:13:"entity_rating";}', 0, 0, 1, 1),
+('bx_photos_view_entry', 2, 'bx_photos', '', '_bx_photos_page_block_title_entry_rating', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_photos";s:6:"method";s:13:"entity_rating";}', 0, 0, 1, 1),
+('bx_photos_view_entry', 2, 'bx_photos', '_bx_photos_page_block_title_sys_entry_context', '_bx_photos_page_block_title_entry_context', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_photos\";s:6:\"method\";s:14:\"entity_context\";}', 0, 0, 1, 1),
 ('bx_photos_view_entry', 3, 'bx_photos', '', '_bx_photos_page_block_title_entry_info', 11, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_photos";s:6:"method";s:11:"entity_info";}', 0, 0, 1, 1),
 ('bx_photos_view_entry', 3, 'bx_photos', '', '_bx_photos_page_block_title_entry_location', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_photos";s:6:"method";s:15:"entity_location";}', 0, 0, 0, 2),
 ('bx_photos_view_entry', 4, 'bx_photos', '', '_bx_photos_page_block_title_entry_all_actions', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_photos";s:6:"method";s:18:"entity_all_actions";}', 0, 0, 1, 0),

modules/boonex/photos/template/context.html

@@ -0,0 +1 @@
+<bx_include_base:../modules/base/text/template/context.html />

modules/boonex/polls/classes/BxPollsConfig.php

@@ -129,6 +129,7 @@ class BxPollsConfig extends BxBaseModTextConfig
             	'menu_item_manage_my' => '_bx_polls_menu_item_title_manage_my',
             	'menu_item_manage_all' => '_bx_polls_menu_item_title_manage_all',
                 'txt_all_entries_by' => '_bx_polls_txt_all_entries_by',
+                'txt_all_entries_in' => '_bx_polls_txt_all_entries_in',
                 'txt_all_entries_by_author' => '_bx_polls_page_title_browse_by_author',
                 'txt_all_entries_by_context' => '_bx_polls_page_title_browse_by_context',
             	'txt_pict_use_as_thumb' => '_bx_polls_form_entry_input_picture_use_as_thumb'

modules/boonex/polls/install/langs/en.xml

@@ -133,6 +133,8 @@
     <string name="_bx_polls_page_block_title_popular_entries_view_showcase"><![CDATA[Popular Polls]]></string>
     <string name="_bx_polls_page_block_title_sys_featured_entries_view_showcase"><![CDATA[Featured Polls (Showcase View)]]></string>
     <string name="_bx_polls_page_block_title_featured_entries_view_showcase"><![CDATA[Featured Polls]]></string>
+    <string name="_bx_polls_page_block_title_sys_entry_context"><![CDATA[Posted in]]></string>
+    <string name="_bx_polls_page_block_title_entry_context"><![CDATA[Posted in]]></string>
 
     <string name="_bx_polls_menu_set_title_view_entry"><![CDATA[Poll Actions]]></string>
     <string name="_bx_polls_menu_title_view_entry"><![CDATA[Poll Actions]]></string>
@@ -222,6 +224,7 @@
     <string name="_bx_polls_cat_yes_or_no"><![CDATA[Yes or No]]></string>
 
     <string name="_bx_polls_txt_all_entries_by"><![CDATA[<a href="{0}">All Polls by {1} ({2})</a>]]></string>
+    <string name="_bx_polls_txt_all_entries_in"><![CDATA[<a href="{0}">All Polls in {1} ({2})</a>]]></string>
     <string name="_bx_polls_txt_sample_single"><![CDATA[poll]]></string>
     <string name="_bx_polls_txt_sample_single_with_article"><![CDATA[a poll]]></string>
     <string name="_bx_polls_txt_sample_comment_single"><![CDATA[comment to poll]]></string>

modules/boonex/polls/install/sql/enable.sql

@@ -50,6 +50,7 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 ('bx_polls_view_entry', 1, 'bx_polls', '', '_bx_polls_page_block_title_entry_text', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_polls\";s:6:\"method\";s:17:\"entity_text_block\";}', 0, 0, 1, 1),
 ('bx_polls_view_entry', 1, 'bx_polls', '', '_bx_polls_page_block_title_entry_subentries', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_polls\";s:6:\"method\";s:20:\"get_block_subentries\";}', 0, 0, 1, 2),
 ('bx_polls_view_entry', 2, 'bx_polls', '', '_bx_polls_page_block_title_entry_author', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_polls\";s:6:\"method\";s:13:\"entity_author\";}', 0, 0, 1, 0),
+('bx_polls_view_entry', 2, 'bx_polls', '_bx_polls_page_block_title_sys_entry_context', '_bx_polls_page_block_title_entry_context', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_polls\";s:6:\"method\";s:14:\"entity_context\";}', 0, 0, 1, 1),
 ('bx_polls_view_entry', 3, 'bx_polls', '', '_bx_polls_page_block_title_entry_info', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_polls\";s:6:\"method\";s:11:\"entity_info\";}', 0, 0, 1, 1),
 ('bx_polls_view_entry', 3, 'bx_polls', '', '_bx_polls_page_block_title_entry_location', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_polls\";s:6:\"method\";s:15:\"entity_location\";}', 0, 0, 0, 2),
 ('bx_polls_view_entry', 4, 'bx_polls', '', '_bx_polls_page_block_title_entry_all_actions', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_polls\";s:6:\"method\";s:18:\"entity_all_actions\";}', 0, 0, 1, 0),

modules/boonex/polls/template/context.html

@@ -0,0 +1 @@
+<bx_include_base:../modules/base/text/template/context.html />

modules/boonex/posts/classes/BxPostsConfig.php

@@ -126,6 +126,7 @@ class BxPostsConfig extends BxBaseModTextConfig
             	'menu_item_manage_my' => '_bx_posts_menu_item_title_manage_my',
             	'menu_item_manage_all' => '_bx_posts_menu_item_title_manage_all',
                 'txt_all_entries_by' => '_bx_posts_txt_all_entries_by',
+                'txt_all_entries_in' => '_bx_posts_txt_all_entries_in',
                 'txt_all_entries_by_author' => '_bx_posts_page_title_browse_by_author',
                 'txt_all_entries_by_context' => '_bx_posts_page_title_browse_by_context',
             	'txt_pict_use_as_thumb' => '_bx_posts_form_entry_input_picture_use_as_thumb'

modules/boonex/posts/install/langs/en.xml

@@ -125,12 +125,14 @@
 	<string name="_bx_posts_page_block_title_cats"><![CDATA[Posts Categories]]></string>
 	<string name="_bx_posts_page_block_title_entry_info"><![CDATA[Info]]></string>
 	<string name="_bx_posts_page_block_title_my_entries"><![CDATA[My Posts]]></string>
-    <string name="_bx_posts_page_block_title_sys_recent_entries_view_showcase"><![CDATA[Latest Posts (Showcase View)]]></string>
-    <string name="_bx_posts_page_block_title_recent_entries_view_showcase"><![CDATA[Latest Posts]]></string>
-    <string name="_bx_posts_page_block_title_sys_popular_entries_view_showcase"><![CDATA[Popular Posts (Showcase View)]]></string>
-    <string name="_bx_posts_page_block_title_popular_entries_view_showcase"><![CDATA[Popular Posts]]></string>
-    <string name="_bx_posts_page_block_title_sys_featured_entries_view_showcase"><![CDATA[Featured Posts (Showcase View)]]></string>
-    <string name="_bx_posts_page_block_title_featured_entries_view_showcase"><![CDATA[Featured Posts]]></string>
+	<string name="_bx_posts_page_block_title_sys_recent_entries_view_showcase"><![CDATA[Latest Posts (Showcase View)]]></string>
+	<string name="_bx_posts_page_block_title_recent_entries_view_showcase"><![CDATA[Latest Posts]]></string>
+	<string name="_bx_posts_page_block_title_sys_popular_entries_view_showcase"><![CDATA[Popular Posts (Showcase View)]]></string>
+	<string name="_bx_posts_page_block_title_popular_entries_view_showcase"><![CDATA[Popular Posts]]></string>
+	<string name="_bx_posts_page_block_title_sys_featured_entries_view_showcase"><![CDATA[Featured Posts (Showcase View)]]></string>
+	<string name="_bx_posts_page_block_title_featured_entries_view_showcase"><![CDATA[Featured Posts]]></string>
+	<string name="_bx_posts_page_block_title_sys_entry_context"><![CDATA[Posted in]]></string>
+	<string name="_bx_posts_page_block_title_entry_context"><![CDATA[Posted in]]></string>  
 
     <string name="_bx_posts_menu_set_title_view_entry"><![CDATA[Post Actions]]></string>
     <string name="_bx_posts_menu_title_view_entry"><![CDATA[Post Actions]]></string>
@@ -228,6 +230,7 @@
     <string name="_bx_posts_cat_Weddings"><![CDATA[Weddings]]></string>
     <string name="_bx_posts_cat_Womens_Fashion"><![CDATA[Women's Fashion]]></string>
 
+    <string name="_bx_posts_txt_all_entries_in"><![CDATA[<a href="{0}">All Posts in {1} ({2})</a>]]></string>
     <string name="_bx_posts_txt_all_entries_by"><![CDATA[<a href="{0}">All Posts by {1} ({2})</a>]]></string>
     <string name="_bx_posts_txt_sample_single"><![CDATA[post]]></string>
     <string name="_bx_posts_txt_sample_single_with_article"><![CDATA[a post]]></string>

modules/boonex/posts/install/sql/enable.sql

@@ -54,6 +54,7 @@ INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `lay
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
 ('bx_posts_view_entry', 1, 'bx_posts', '', '_bx_posts_page_block_title_entry_text', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_posts\";s:6:\"method\";s:17:\"entity_text_block\";}', 0, 0, 1, 0),
 ('bx_posts_view_entry', 2, 'bx_posts', '', '_bx_posts_page_block_title_entry_author', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_posts\";s:6:\"method\";s:13:\"entity_author\";}', 0, 0, 1, 0),
+('bx_posts_view_entry', 2, 'bx_posts', '_bx_posts_page_block_title_sys_entry_context', '_bx_posts_page_block_title_entry_context', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_posts\";s:6:\"method\";s:14:\"entity_context\";}', 0, 0, 1, 1),
 ('bx_posts_view_entry', 3, 'bx_posts', '', '_bx_posts_page_block_title_entry_info', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_posts\";s:6:\"method\";s:11:\"entity_info\";}', 0, 0, 1, 1),
 ('bx_posts_view_entry', 3, 'bx_posts', '', '_bx_posts_page_block_title_entry_location', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_posts\";s:6:\"method\";s:15:\"entity_location\";}', 0, 0, 0, 2),
 ('bx_posts_view_entry', 4, 'bx_posts', '', '_bx_posts_page_block_title_entry_all_actions', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_posts\";s:6:\"method\";s:18:\"entity_all_actions\";}', 0, 0, 1, 0),

modules/boonex/posts/template/context.html

@@ -0,0 +1 @@
+<bx_include_base:../modules/base/text/template/context.html />

modules/boonex/russian/data/langs/bx_albums/ru.xml

@@ -140,6 +140,8 @@
     <string name="_bx_albums_page_block_title_recent_media_view_showcase"><![CDATA[Недавние изображения]]]></string>
     <string name="_bx_albums_page_block_title_sys_popular_media_view_showcase"><![CDATA[Популярные изображения (Витринный просмотр)]]></string>
     <string name="_bx_albums_page_block_title_popular_media_view_showcase"><![CDATA[Популярные изображения]]></string>
+    <string name="_bx_albums_page_block_title_sys_entry_context"><![CDATA[Опубликовано в]]></string>
+    <string name="_bx_albums_page_block_title_entry_context"><![CDATA[Опубликовано в]]></string>
 
     <string name="_bx_albums_menu_set_title_view_entry"><![CDATA[Действия для альбома]]></string>
     <string name="_bx_albums_menu_title_view_entry"><![CDATA[Действия для альбома]]></string>
@@ -214,6 +216,7 @@
     <string name="_bx_albums_search_extended_media_cmts"><![CDATA[Поиск комментариев к изображениям]]></string>
 
     <string name="_bx_albums_txt_all_entries_by"><![CDATA[<a href="{0}">Все альбомы от {1} ({2})</a>]]></string>
+    <string name="_bx_albums_txt_all_entries_in"><![CDATA[<a href="{0}">Все альбомы в {1} ({2})</a>]]></string>
     <string name="_bx_albums_txt_sample_single"><![CDATA[альбом]]></string>
     <string name="_bx_albums_txt_sample_single_with_article"><![CDATA[альбом]]></string>
     <string name="_bx_albums_txt_sample_comment_single"><![CDATA[комментарий к альбому]]></string>

modules/boonex/russian/data/langs/bx_forum/ru.xml

@@ -137,7 +137,10 @@
     <string name="_bx_forum_page_block_title_sys_entries_in_context"><![CDATA[Обсуждения в контексте]]></string>
     <string name="_bx_forum_page_block_title_entries_actions"><![CDATA[Обсуждения - Действия]]></string>
     <string name="_bx_forum_page_block_title_browse_cmts"><![CDATA[Форум - Комментарии]]></string>
-    <string name="_bx_forum_page_title_sys_manage"><![CDATA[Управление собственными обсуждениями]]></string>
+    <string name="_bx_forum_page_block_title_sys_entry_context"><![CDATA[Опубликовано в]]></string>
+    <string name="_bx_forum_page_block_title_entry_context"><![CDATA[Опубликовано в]]></string>
+
+  <string name="_bx_forum_page_title_sys_manage"><![CDATA[Управление собственными обсуждениями]]></string>
 	<string name="_bx_forum_page_title_sys_manage_administration"><![CDATA[Управление всеми обсуждениями]]></string>
 	<string name="_bx_forum_page_title_manage"><![CDATA[Управление]]></string>
 	<string name="_bx_forum_page_block_title_system_manage"><![CDATA[Управление собственными обсуждениями]]></string>
@@ -262,6 +265,7 @@
 	<string name="_bx_forum_txt_entry_sticked"><![CDATA[Закрепленное обсуждение]]></string>
 	<string name="_bx_forum_txt_sample_comment_single"><![CDATA[комментарий к обсуждению]]></string>
 	<string name="_bx_forum_txt_sample_vote_single"><![CDATA[голос за обсуждение]]></string>
+  <string name="_bx_forum_txt_all_entries_in"><![CDATA[<a href="{0}">Все обсуждения в {1} ({2})</a>]]></string>
 	<string name="_bx_forum_txt_sample_single"><![CDATA[обсуждение]]></string>
 	<string name="_bx_forum_txt_sample_single_with_article"><![CDATA[обсуждение]]></string>
     <string name="_bx_forum_x_date_by_x_replier"><![CDATA[{0} {1}]]></string>

modules/boonex/russian/data/langs/bx_glossary/ru.xml

@@ -130,6 +130,8 @@
     <string name="_bx_glossary_page_block_title_popular_entries_view_showcase"><![CDATA[Популярные Глоссарий]]></string>
     <string name="_bx_glossary_page_block_title_sys_featured_entries_view_showcase"><![CDATA[[Продвинутые Глоссарий (Витринный просмотр)]]></string>
     <string name="_bx_glossary_page_block_title_featured_entries_view_showcase"><![CDATA[Продвинутые Глоссарий]]></string>
+    <string name="_bx_glossary_page_block_title_sys_entry_context"><![CDATA[Опубликовано в]]></string>
+    <string name="_bx_glossary_page_block_title_entry_context"><![CDATA[Опубликовано в]]></string>
 
     <string name="_bx_glossary_menu_set_title_view_entry"><![CDATA[Публикация - Действия]]></string>
     <string name="_bx_glossary_menu_title_view_entry"><![CDATA[Публикация - Действия]]></string>
@@ -229,7 +231,8 @@
     <string name="_bx_glossary_cat_Weddings"><![CDATA[Свадьба]]></string>
     <string name="_bx_glossary_cat_Womens_Fashion"><![CDATA[Женская мода]]></string>
 
-    <string name="_bx_glossary_txt_all_entries_by"><![CDATA[<a href="{0}">Все Глоссарий от {1} ({2})</a>]]></string>
+    <string name="_bx_glossary_txt_all_entries_by"><![CDATA[<a href="{0}">Все термины от {1} ({2})</a>]]></string>
+    <string name="_bx_glossary_txt_all_entries_in"><![CDATA[<a href="{0}">Все термины в {1} ({2})</a>]]></string>
     <string name="_bx_glossary_txt_sample_single"><![CDATA[публикация]]></string>
     <string name="_bx_glossary_txt_sample_single_with_article"><![CDATA[публикация]]></string>
     <string name="_bx_glossary_txt_sample_comment_single"><![CDATA[комментарий к Глоссарий]]></string>

modules/boonex/russian/data/langs/bx_intercom/ru.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources name="ru" flag="ru" title="Russian">
+	<string name="_sys_module_intercom"><![CDATA[Intercom]]></string>
+	<string name="_bx_intercom"><![CDATA[Intercom]]></string>
+	<string name="_bx_intercom_setting"><![CDATA[Настройки Intercom]]></string>
+	<string name="_bx_intercom_adm_stg_cpt_type"><![CDATA[Intercom]]></string>
+	<string name="_bx_intercom_adm_stg_cpt_category_general"><![CDATA[Основные]]></string>
+	<string name="_bx_intercom_option_app_id"><![CDATA[App ID для Intercom]]></string>
+	<string name="_bx_intercom_option_api_key"><![CDATA[Access Token для Intercom]]></string>
+	<string name="_bx_intercom_option_hide_launcher"><![CDATA[Скрытый запуск]]></string>
+	<string name="_bx_intercom_option_alignment"><![CDATA[Выравнивание виджета]]></string>
+	<string name="_bx_intercom_option_horizontal_padding"><![CDATA[Горизонтальный отступ виджета]]></string>
+	<string name="_bx_intercom_option_vertical_padding"><![CDATA[Вертикальный отступ виджета]]></string>
+	<string name="_bx_intercom_information"><![CDATA[Информация]]></string>
+	<string name="_bx_intercom_information_block"><![CDATA[
+		Этот модуль добавит Intercom на ваш сайт. <br />
+		Чтобы включить этот модуль, вам необходимо получить идентификатор приложения Intercom на сайте <a target="_blank" href="https://www.intercom.io"> www.intercom.io</a>.<br />
+		<a target="_blank" href="https://app.intercom.com/developers/_">Нажмите здесь, чтобы получить токен доступа</a>]]>
+	</string>
+</resources>

modules/boonex/russian/data/langs/bx_market/ru.xml

@@ -214,6 +214,8 @@
     <string name="_bx_market_page_block_title_popular_entries_view_showcase"><![CDATA[Популярные продукты]]></string>
     <string name="_bx_market_page_block_title_sys_featured_entries_view_showcase"><![CDATA[Продвинутые продукты (Витринный просмотр)]]></string>
     <string name="_bx_market_page_block_title_featured_entries_view_showcase"><![CDATA[Продвинутые продукты]]></string>
+    <string name="_bx_market_page_block_title_sys_entry_context"><![CDATA[Опубликовано в]]></string>
+    <string name="_bx_market_page_block_title_entry_context"><![CDATA[Опубликовано в]]></string>
 
     <string name="_bx_market_menu_set_title_view_entry"><![CDATA[Продукт - Действия]]></string>
     <string name="_bx_market_menu_title_view_entry"><![CDATA[Продукт - Действия]]></string>
@@ -386,6 +388,7 @@
 	<string name="_bx_market_err_not_accept_payments_recurring"><![CDATA[Вам необходимо активировать хотя бы одину платежную систему, работающую с подписками. Вы можете сделать это через меню Мой аккаунт -> страница Заказы -> <a href="{0}">вкладка Настройки</a>.]]></string>
 
     <string name="_bx_market_txt_all_entries_by"><![CDATA[<a href="{0}">Все продукты от {1} ({2})</a>]]></string>
+    <string name="_bx_market_txt_all_entries_in"><![CDATA[<a href="{0}">Все продукты в {1} ({2})</a>]]></string>
     <string name="_bx_market_txt_category"><![CDATA[Категория:]]></string>
     <string name="_bx_market_txt_most_current_version"><![CDATA[Самая новая версия]]></string>
     <string name="_bx_market_txt_sample_single"><![CDATA[продукт]]></string>

modules/boonex/russian/data/langs/bx_photos/ru.xml

@@ -118,7 +118,10 @@
     <string name="_bx_photos_page_block_title_sys_entries_in_context"><![CDATA[Фото в контексте]]></string>
     <string name="_bx_photos_page_block_title_entries_actions"><![CDATA[Фото - Действия]]></string>
     <string name="_bx_photos_page_block_title_browse_cmts"><![CDATA[Фото - Комментарии]]></string>
-	<string name="_bx_photos_page_title_sys_manage"><![CDATA[Управление собственными фото]]></string>
+    <string name="_bx_photos_page_block_title_sys_entry_context"><![CDATA[Опубликовано в]]></string>
+    <string name="_bx_photos_page_block_title_entry_context"><![CDATA[Опубликовано в]]></string>
+
+  <string name="_bx_photos_page_title_sys_manage"><![CDATA[Управление собственными фото]]></string>
 	<string name="_bx_photos_page_title_sys_manage_administration"><![CDATA[Управление всеми фото]]></string>
 	<string name="_bx_photos_page_title_manage"><![CDATA[Управление]]></string>
 	<string name="_bx_photos_page_block_title_system_manage"><![CDATA[Управление собственными фото]]></string>
@@ -209,6 +212,7 @@
     <string name="_bx_photos_cat_travel"><![CDATA[Путешествия]]></string>
 
     <string name="_bx_photos_txt_all_entries_by"><![CDATA[<a href="{0}">Все фото от {1} ({2})</a>]]></string>
+    <string name="_bx_photos_txt_all_entries_in"><![CDATA[<a href="{0}">Все фото в {1} ({2})</a>]]></string>
     <string name="_bx_photos_txt_sample_single"><![CDATA[фото]]></string>
     <string name="_bx_photos_txt_sample_single_with_article"><![CDATA[фото]]></string>
     <string name="_bx_photos_txt_sample_comment_single"><![CDATA[комментарий к фото]]></string>

modules/boonex/russian/data/langs/bx_polls/ru.xml

@@ -133,6 +133,8 @@
     <string name="_bx_polls_page_block_title_popular_entries_view_showcase"><![CDATA[Популярные голосования]]></string>
     <string name="_bx_polls_page_block_title_sys_featured_entries_view_showcase"><![CDATA[Продвинутые голосования (Витринный просмотр)]]></string>
     <string name="_bx_polls_page_block_title_featured_entries_view_showcase"><![CDATA[Продвинутые голосования]]></string>
+    <string name="_bx_polls_page_block_title_sys_entry_context"><![CDATA[Опубликовано в]]></string>
+    <string name="_bx_polls_page_block_title_entry_context"><![CDATA[Опубликовано в]]></string>
 
     <string name="_bx_polls_menu_set_title_view_entry"><![CDATA[Голосование - Действия]]></string>
     <string name="_bx_polls_menu_title_view_entry"><![CDATA[Голосование - Действия]]></string>
@@ -221,6 +223,7 @@
     <string name="_bx_polls_cat_yes_or_no"><![CDATA[Да или нет]]></string>
 
     <string name="_bx_polls_txt_all_entries_by"><![CDATA[<a href="{0}">Все голосования от {1} ({2})</a>]]></string>
+    <string name="_bx_polls_txt_all_entries_in"><![CDATA[<a href="{0}">Все голосования в {1} ({2})</a>]]></string>
     <string name="_bx_polls_txt_sample_single"><![CDATA[голосование]]></string>
     <string name="_bx_polls_txt_sample_single_with_article"><![CDATA[голосование]]></string>
     <string name="_bx_polls_txt_sample_comment_single"><![CDATA[комментарий к голосованию]]></string>

modules/boonex/russian/data/langs/bx_posts/ru.xml

@@ -131,8 +131,10 @@
     <string name="_bx_posts_page_block_title_popular_entries_view_showcase"><![CDATA[Популярные публикации]]></string>
     <string name="_bx_posts_page_block_title_sys_featured_entries_view_showcase"><![CDATA[[Продвинутые публикации (Витринный просмотр)]]></string>
     <string name="_bx_posts_page_block_title_featured_entries_view_showcase"><![CDATA[Продвинутые публикации]]></string>
+    <string name="_bx_posts_page_block_title_sys_entry_context"><![CDATA[Опубликовано в]]></string>
+    <string name="_bx_posts_page_block_title_entry_context"><![CDATA[Опубликовано в]]></string>
 
-    <string name="_bx_posts_menu_set_title_view_entry"><![CDATA[Публикация - Действия]]></string>
+  <string name="_bx_posts_menu_set_title_view_entry"><![CDATA[Публикация - Действия]]></string>
     <string name="_bx_posts_menu_title_view_entry"><![CDATA[Публикация - Действия]]></string>
     <string name="_bx_posts_menu_title_submenu"><![CDATA[Публикации - Подменю]]></string>
     <string name="_bx_posts_menu_set_title_submenu"><![CDATA[Публикации - Подменю]]></string>
@@ -229,6 +231,7 @@
     <string name="_bx_posts_cat_Womens_Fashion"><![CDATA[Женская мода]]></string>
 
     <string name="_bx_posts_txt_all_entries_by"><![CDATA[<a href="{0}">Все публикации от {1} ({2})</a>]]></string>
+    <string name="_bx_posts_txt_all_entries_in"><![CDATA[<a href="{0}">Все публикации в {1} ({2})</a>]]></string>
     <string name="_bx_posts_txt_sample_single"><![CDATA[публикация]]></string>
     <string name="_bx_posts_txt_sample_single_with_article"><![CDATA[публикация]]></string>
     <string name="_bx_posts_txt_sample_comment_single"><![CDATA[комментарий к публикации]]></string>

modules/boonex/russian/data/langs/bx_shopify/ru.xml

@@ -143,8 +143,11 @@
     <string name="_bx_shopify_page_block_title_popular_entries_view_showcase"><![CDATA[Популярные товары]]></string>
     <string name="_bx_shopify_page_block_title_sys_featured_entries_view_showcase"><![CDATA[Продвинутые товары (Витринный просмотр)]]></string>
     <string name="_bx_shopify_page_block_title_featured_entries_view_showcase"><![CDATA[Продвинутые товары]]></string>
+    <string name="_bx_shopify_page_block_title_sys_entry_context"><![CDATA[Опубликовано в]]></string>
+    <string name="_bx_shopify_page_block_title_entry_context"><![CDATA[Опубликовано в]]></string>
 
-    <string name="_bx_shopify_menu_set_title_view_entry"><![CDATA[Товар - Действия]]></string>
+
+  <string name="_bx_shopify_menu_set_title_view_entry"><![CDATA[Товар - Действия]]></string>
     <string name="_bx_shopify_menu_title_view_entry"><![CDATA[Товар - Действия]]></string>
     <string name="_bx_shopify_menu_title_submenu"><![CDATA[Товары - Подменю]]></string>
     <string name="_bx_shopify_menu_set_title_submenu"><![CDATA[Товары - Подменю]]></string>
@@ -230,6 +233,7 @@
     <string name="_bx_shopify_err_load_collection"><![CDATA[Невозможно загрузить коллекцию. Пожалуйста, проверьте настройки вашего магазина.]]></string>
 
     <string name="_bx_shopify_txt_all_entries_by"><![CDATA[<a href="{0}">Все товары от {1} ({2})</a>]]></string>
+    <string name="_bx_shopify_txt_all_entries_in"><![CDATA[<a href="{0}">Все альбомы в {1} ({2})</a>]]></string>
     <string name="_bx_shopify_txt_sample_single"><![CDATA[товар]]></string>
     <string name="_bx_shopify_txt_sample_single_with_article"><![CDATA[товар]]></string>
     <string name="_bx_shopify_txt_sample_comment_single"><![CDATA[комментарии к товару]]></string>

modules/boonex/russian/data/langs/bx_snipcart/ru.xml

@@ -157,6 +157,8 @@
     <string name="_bx_snipcart_page_block_title_popular_entries_view_showcase"><![CDATA[Популярные товары]]></string>
     <string name="_bx_snipcart_page_block_title_sys_featured_entries_view_showcase"><![CDATA[Продвинутые товары (Витринный просмотр)]]></string>
     <string name="_bx_snipcart_page_block_title_featured_entries_view_showcase"><![CDATA[Продвинутые товары]]></string>
+    <string name="_bx_snipcart_page_block_title_sys_entry_context"><![CDATA[Опубликовано в]]></string>
+    <string name="_bx_snipcart_page_block_title_entry_context"><![CDATA[Опубликовано в]]></string>
 
     <string name="_bx_snipcart_menu_set_title_view_entry"><![CDATA[Товар - Действия]]></string>
     <string name="_bx_snipcart_menu_title_view_entry"><![CDATA[Товар - Действия]]></string>
@@ -248,6 +250,7 @@
     <string name="_bx_snipcart_err_not_configured"><![CDATA[Сначала вам необходимо настроить магазин. <a href="{0}">Нажмите здесь</a>.]]></string>
 
     <string name="_bx_snipcart_txt_all_entries_by"><![CDATA[<a href="{0}">Все товары от {1} ({2})</a>]]></string>
+    <string name="_bx_snipcart_txt_all_entries_in"><![CDATA[<a href="{0}">Все товары в {1} ({2})</a>]]></string>
     <string name="_bx_snipcart_txt_sample_single"><![CDATA[товар]]></string>
     <string name="_bx_snipcart_txt_sample_single_with_article"><![CDATA[товар]]></string>
     <string name="_bx_snipcart_txt_sample_comment_single"><![CDATA[комментарии к товару]]></string>

modules/boonex/russian/data/langs/bx_videos/ru.xml

@@ -137,6 +137,8 @@
     <string name="_bx_videos_page_block_title_popular_entries_view_showcase"><![CDATA[Популярные Видео]]></string>
     <string name="_bx_videos_page_block_title_sys_featured_entries_view_showcase"><![CDATA[Продвинутые Видео (Витринный просмотр)]]></string>
     <string name="_bx_videos_page_block_title_featured_entries_view_showcase"><![CDATA[Продвинутые Видео]]></string>
+    <string name="_bx_videos_page_block_title_sys_entry_context"><![CDATA[Опубликовано в]]></string>
+    <string name="_bx_videos_page_block_title_entry_context"><![CDATA[Опубликовано в]]></string>
 
     <string name="_bx_videos_menu_set_title_view_entry"><![CDATA[Видео - Действия]]></string>
     <string name="_bx_videos_menu_title_view_entry"><![CDATA[Видео - Действия]]></string>
@@ -212,6 +214,7 @@
     <string name="_bx_videos_cat_travel"><![CDATA[Путешествия]]></string>
 
     <string name="_bx_videos_txt_all_entries_by"><![CDATA[<a href="{0}">Все видео от {1} ({2})</a>]]></string>
+    <string name="_bx_videos_txt_all_entries_in"><![CDATA[<a href="{0}">Все видео в {1} ({2})</a>]]></string>
     <string name="_bx_videos_txt_sample_single"><![CDATA[видео]]></string>
     <string name="_bx_videos_txt_sample_single_with_article"><![CDATA[видео]]></string>
     <string name="_bx_videos_txt_sample_comment_single"><![CDATA[комментарий к видео]]></string>

modules/boonex/shopify/classes/BxShopifyConfig.php

@@ -128,6 +128,7 @@ class BxShopifyConfig extends BxBaseModTextConfig
             	'menu_item_manage_my' => '_bx_shopify_menu_item_title_manage_my',
             	'menu_item_manage_all' => '_bx_shopify_menu_item_title_manage_all',
                 'txt_all_entries_by' => '_bx_shopify_txt_all_entries_by',
+                'txt_all_entries_in' => '_bx_shopify_txt_all_entries_in',
                 'txt_all_entries_by_author' => '_bx_shopify_page_title_browse_by_author',
                 'txt_all_entries_by_context' => '_bx_shopify_page_title_browse_by_context',
             	'txt_pict_use_as_thumb' => '_bx_shopify_form_entry_input_picture_use_as_thumb'

modules/boonex/shopify/install/langs/en.xml

@@ -143,6 +143,8 @@
     <string name="_bx_shopify_page_block_title_popular_entries_view_showcase"><![CDATA[Popular Goods]]></string>
     <string name="_bx_shopify_page_block_title_sys_featured_entries_view_showcase"><![CDATA[Featured Goods (Showcase View)]]></string>
     <string name="_bx_shopify_page_block_title_featured_entries_view_showcase"><![CDATA[Featured Goods]]></string>
+    <string name="_bx_shopify_page_block_title_sys_entry_context"><![CDATA[Posted in]]></string>
+    <string name="_bx_shopify_page_block_title_entry_context"><![CDATA[Posted in]]></string>
 
     <string name="_bx_shopify_menu_set_title_view_entry"><![CDATA[Goods Actions]]></string>
     <string name="_bx_shopify_menu_title_view_entry"><![CDATA[Goods Actions]]></string>
@@ -230,6 +232,7 @@
     <string name="_bx_shopify_err_load_collection"><![CDATA[Cannot load collection. Please check your shop settings.]]></string>
 
     <string name="_bx_shopify_txt_all_entries_by"><![CDATA[<a href="{0}">All Goods by {1} ({2})</a>]]></string>
+    <string name="_bx_shopify_txt_all_entries_in"><![CDATA[<a href="{0}">All Goods in {1} ({2})</a>]]></string>
     <string name="_bx_shopify_txt_sample_single"><![CDATA[shop item]]></string>
     <string name="_bx_shopify_txt_sample_single_with_article"><![CDATA[a shop item]]></string>
     <string name="_bx_shopify_txt_sample_comment_single"><![CDATA[comment to shop item]]></string>

modules/boonex/shopify/install/sql/enable.sql

@@ -45,6 +45,7 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 ('bx_shopify_view_entry', 1, 'bx_shopify', '', '_bx_shopify_page_block_title_entry_text', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:10:"bx_shopify";s:6:"method";s:17:"entity_text_block";}', 0, 0, 1, 0),
 ('bx_shopify_view_entry', 1, 'bx_shopify', '', '_bx_shopify_page_block_title_entry_attachments', 11, 2147483647, 'service', 'a:2:{s:6:"module";s:10:"bx_shopify";s:6:"method";s:18:"entity_attachments";}', 0, 0, 1, 1),
 ('bx_shopify_view_entry', 2, 'bx_shopify', '', '_bx_shopify_page_block_title_entry_author', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:10:"bx_shopify";s:6:"method";s:13:"entity_author";}', 0, 0, 1, 0),
+('bx_shopify_view_entry', 2, 'bx_shopify', '_bx_shopify_page_block_title_sys_entry_context', '_bx_shopify_page_block_title_entry_context', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:10:\"bx_shopify\";s:6:\"method\";s:14:\"entity_context\";}', 0, 0, 1, 1),
 ('bx_shopify_view_entry', 3, 'bx_shopify', '', '_bx_shopify_page_block_title_entry_info', 11, 2147483647, 'service', 'a:2:{s:6:"module";s:10:"bx_shopify";s:6:"method";s:11:"entity_info";}', 0, 0, 1, 1),
 ('bx_shopify_view_entry', 3, 'bx_shopify', '', '_bx_shopify_page_block_title_entry_location', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:10:"bx_shopify";s:6:"method";s:15:"entity_location";}', 0, 0, 0, 2),
 ('bx_shopify_view_entry', 4, 'bx_shopify', '', '_bx_shopify_page_block_title_entry_all_actions', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:10:"bx_shopify";s:6:"method";s:18:"entity_all_actions";}', 0, 0, 1, 0),

modules/boonex/shopify/template/context.html

@@ -0,0 +1 @@
+<bx_include_base:../modules/base/text/template/context.html />

modules/boonex/snipcart/classes/BxSnipcartConfig.php

@@ -129,6 +129,7 @@ class BxSnipcartConfig extends BxBaseModTextConfig
             	'menu_item_manage_my' => '_bx_snipcart_menu_item_title_manage_my',
             	'menu_item_manage_all' => '_bx_snipcart_menu_item_title_manage_all',
                 'txt_all_entries_by' => '_bx_snipcart_txt_all_entries_by',
+                'txt_all_entries_in' => '_bx_snipcart_txt_all_entries_in',
                 'txt_all_entries_by_author' => '_bx_snipcart_page_title_browse_by_author',
                 'txt_all_entries_by_context' => '_bx_snipcart_page_title_browse_by_context',
             	'txt_pict_use_as_thumb' => '_bx_snipcart_form_entry_input_picture_use_as_thumb'

modules/boonex/snipcart/install/langs/en.xml

@@ -157,6 +157,8 @@
     <string name="_bx_snipcart_page_block_title_popular_entries_view_showcase"><![CDATA[Popular Goods]]></string>
     <string name="_bx_snipcart_page_block_title_sys_featured_entries_view_showcase"><![CDATA[Featured Goods (Showcase View)]]></string>
     <string name="_bx_snipcart_page_block_title_featured_entries_view_showcase"><![CDATA[Featured Goods]]></string>
+    <string name="_bx_snipcart_page_block_title_sys_entry_context"><![CDATA[Posted in]]></string>
+    <string name="_bx_snipcart_page_block_title_entry_context"><![CDATA[Posted in]]></string>
 
     <string name="_bx_snipcart_menu_set_title_view_entry"><![CDATA[Goods Actions]]></string>
     <string name="_bx_snipcart_menu_title_view_entry"><![CDATA[Goods Actions]]></string>
@@ -248,6 +250,7 @@
     <string name="_bx_snipcart_err_not_configured"><![CDATA[You need to configure shop settings first. <a href="{0}">Click here</a>.]]></string>
 
     <string name="_bx_snipcart_txt_all_entries_by"><![CDATA[<a href="{0}">All Goods by {1} ({2})</a>]]></string>
+    <string name="_bx_snipcart_txt_all_entries_in"><![CDATA[<a href="{0}">All Goods in {1} ({2})</a>]]></string>
     <string name="_bx_snipcart_txt_sample_single"><![CDATA[shop item]]></string>
     <string name="_bx_snipcart_txt_sample_single_with_article"><![CDATA[a shop item]]></string>
     <string name="_bx_snipcart_txt_sample_comment_single"><![CDATA[comment to shop item]]></string>

modules/boonex/snipcart/install/sql/enable.sql

@@ -47,6 +47,7 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 ('bx_snipcart_view_entry', 1, 'bx_snipcart', '', '_bx_snipcart_page_block_title_entry_text', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:11:"bx_snipcart";s:6:"method";s:17:"entity_text_block";}', 0, 0, 1, 0),
 ('bx_snipcart_view_entry', 1, 'bx_snipcart', '', '_bx_snipcart_page_block_title_entry_attachments', 11, 2147483647, 'service', 'a:2:{s:6:"module";s:11:"bx_snipcart";s:6:"method";s:18:"entity_attachments";}', 0, 0, 1, 1),
 ('bx_snipcart_view_entry', 2, 'bx_snipcart', '', '_bx_snipcart_page_block_title_entry_author', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:11:"bx_snipcart";s:6:"method";s:13:"entity_author";}', 0, 0, 1, 0),
+('bx_snipcart_view_entry', 2, 'bx_snipcart', '_bx_snipcart_page_block_title_sys_entry_context', '_bx_snipcart_page_block_title_entry_context', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:11:\"bx_snipcart\";s:6:\"method\";s:14:\"entity_context\";}', 0, 0, 1, 1),
 ('bx_snipcart_view_entry', 3, 'bx_snipcart', '', '_bx_snipcart_page_block_title_entry_info', 11, 2147483647, 'service', 'a:2:{s:6:"module";s:11:"bx_snipcart";s:6:"method";s:11:"entity_info";}', 0, 0, 1, 1),
 ('bx_snipcart_view_entry', 3, 'bx_snipcart', '', '_bx_snipcart_page_block_title_entry_location', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:11:"bx_snipcart";s:6:"method";s:15:"entity_location";}', 0, 0, 0, 2),
 ('bx_snipcart_view_entry', 4, 'bx_snipcart', '', '_bx_snipcart_page_block_title_entry_all_actions', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:11:"bx_snipcart";s:6:"method";s:18:"entity_all_actions";}', 0, 0, 1, 0),

modules/boonex/snipcart/template/context.html

@@ -0,0 +1 @@
+<bx_include_base:../modules/base/text/template/context.html />

modules/boonex/timeline/js/post.js

@@ -307,7 +307,7 @@ BxTimelinePost.prototype._onGetPost = function(oData) {
 		if(oEmpty.is(':visible'))
 			oEmpty.hide();
 
-		var oContent = $(oData.item).bxTime();
+		var oContent = $(oData.item).bxProcessHtml();
 		switch(oData.view) {
 			case 'timeline':
 				var oTimeline = $('#' + $this._aHtmlIds['main_timeline']);

modules/boonex/timeline/js/view.js

@@ -191,7 +191,7 @@ BxTimelineView.prototype.changePage = function(oLink, iStart, iPerPage) {
     		case 'timeline':
     			oView = $this.oViewTimeline;
     			oView.find('.' + $this.sClassItems).append($(sItems).hide()).find('.' + $this.sClassItem + ':hidden').bx_anim('show', $this._sAnimationEffect, $this._iAnimationSpeed, function() {
-					$(this).bxTime();
+					$(this).bxProcessHtml();
 
 					$this.initFlickity();
 
@@ -202,7 +202,7 @@ BxTimelineView.prototype.changePage = function(oLink, iStart, iPerPage) {
 
     		case 'outline':
     			oView = $this.oViewOutline;
-    			$this.appendMasonry($(sItems).bxTime(), function() {
+    			$this.appendMasonry($(sItems).bxProcessHtml(), function() {
     				$this.initFlickity();
 
     				//--- Init Video Layout
@@ -308,7 +308,7 @@ BxTimelineView.prototype.commentItem = function(oLink, sSystem, iId) {
         	if(!oData.content)
         		return;
 
-        	oComments.html($(oData.content).hide()).children(':hidden').bxTime().bx_anim('show', $this._sAnimationEffect, $this._iAnimationSpeed);
+        	oComments.html($(oData.content).hide()).children(':hidden').bxProcessHtml().bx_anim('show', $this._sAnimationEffect, $this._iAnimationSpeed);
         },
         'json'
     );
@@ -770,7 +770,7 @@ BxTimelineView.prototype._onGetPosts = function(oData) {
 		switch(oData.view) {
 			case 'timeline':
 				oView.find('.' + this.sClassItems).bx_anim('hide', this._sAnimationEffect, this._iAnimationSpeed, function() {
-					$(this).html(sItems).show().bxTime();
+					$(this).html(sItems).show().bxProcessHtml();
 
 					$this.blink($(this));
 					$this.initFlickity();
@@ -781,7 +781,7 @@ BxTimelineView.prototype._onGetPosts = function(oData) {
 
 			case 'outline':
 				oView.find('.' + this.sClassItems).bx_anim('hide', this._sAnimationEffect, this._iAnimationSpeed, function() {
-			        $(this).html(sItems).show().bxTime();
+			        $(this).html(sItems).show().bxProcessHtml();
 
 			        if($this.isMasonry())
 			        	$this.destroyMasonry();
@@ -804,7 +804,7 @@ BxTimelineView.prototype._onGetPost = function(oData) {
 	if(!$.trim(oData.item).length) 
 		return;
 
-	var oItem = $(oData.item).bxTime();
+	var oItem = $(oData.item).bxProcessHtml();
 	var oView = $('#' + this._aHtmlIds['main_' + oData.view]);
 
 	switch(oData.view) {

modules/boonex/videos/classes/BxVideosConfig.php

@@ -136,6 +136,7 @@ class BxVideosConfig extends BxBaseModTextConfig
             	'menu_item_manage_my' => '_bx_videos_menu_item_title_manage_my',
             	'menu_item_manage_all' => '_bx_videos_menu_item_title_manage_all',
                 'txt_all_entries_by' => '_bx_videos_txt_all_entries_by',
+                'txt_all_entries_in' => '_bx_videos_txt_all_entries_in',
                 'txt_all_entries_by_author' => '_bx_videos_page_title_browse_by_author',
             	'txt_pict_use_as_thumb' => '_bx_videos_form_entry_input_picture_use_as_thumb',
                 'txt_all_entries_by_context' => '_bx_videos_page_title_browse_by_context',

modules/boonex/videos/install/langs/en.xml

@@ -137,6 +137,8 @@
     <string name="_bx_videos_page_block_title_popular_entries_view_showcase"><![CDATA[Popular Videos]]></string>
     <string name="_bx_videos_page_block_title_sys_featured_entries_view_showcase"><![CDATA[Featured Videos (Showcase View)]]></string>
     <string name="_bx_videos_page_block_title_featured_entries_view_showcase"><![CDATA[Featured Videos]]></string>
+    <string name="_bx_videos_page_block_title_sys_entry_context"><![CDATA[Posted in]]></string>
+    <string name="_bx_videos_page_block_title_entry_context"><![CDATA[Posted in]]></string>
 
     <string name="_bx_videos_menu_set_title_view_entry"><![CDATA[Video Actions]]></string>
     <string name="_bx_videos_menu_title_view_entry"><![CDATA[Video Actions]]></string>
@@ -212,6 +214,7 @@
     <string name="_bx_videos_cat_travel"><![CDATA[Travel]]></string>
 
     <string name="_bx_videos_txt_all_entries_by"><![CDATA[<a href="{0}">All Videos by {1} ({2})</a>]]></string>
+    <string name="_bx_videos_txt_all_entries_in"><![CDATA[<a href="{0}">All Videos in {1} ({2})</a>]]></string>
     <string name="_bx_videos_txt_sample_single"><![CDATA[video]]></string>
     <string name="_bx_videos_txt_sample_single_with_article"><![CDATA[a video]]></string>
     <string name="_bx_videos_txt_sample_comment_single"><![CDATA[comment to video]]></string>

modules/boonex/videos/install/sql/enable.sql

@@ -48,7 +48,8 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 ('bx_videos_view_entry', 1, 'bx_videos', '', '_bx_videos_page_block_title_entry_video', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_videos";s:6:"method";s:18:"entity_video_block";}', 0, 0, 1, 0),
 ('bx_videos_view_entry', 1, 'bx_videos', '', '_bx_videos_page_block_title_entry_text', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_videos";s:6:"method";s:17:"entity_text_block";}', 0, 0, 1, 1),
 ('bx_videos_view_entry', 2, 'bx_videos', '', '_bx_videos_page_block_title_entry_author', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_videos";s:6:"method";s:13:"entity_author";}', 0, 0, 1, 0),
-('bx_videos_view_entry', 2, 'bx_market', '', '_bx_videos_page_block_title_entry_rating', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_videos";s:6:"method";s:13:"entity_rating";}', 0, 0, 1, 1),
+('bx_videos_view_entry', 2, 'bx_videos', '_bx_videos_page_block_title_sys_entry_context', '_bx_videos_page_block_title_entry_context', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:9:\"bx_videos\";s:6:\"method\";s:14:\"entity_context\";}', 0, 0, 1, 1),
+('bx_videos_view_entry', 2, 'bx_videos', '', '_bx_videos_page_block_title_entry_rating', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_videos";s:6:"method";s:13:"entity_rating";}', 0, 0, 1, 1),
 ('bx_videos_view_entry', 3, 'bx_videos', '', '_bx_videos_page_block_title_entry_info', 11, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_videos";s:6:"method";s:11:"entity_info";}', 0, 0, 1, 1),
 ('bx_videos_view_entry', 3, 'bx_videos', '', '_bx_videos_page_block_title_entry_location', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_videos";s:6:"method";s:15:"entity_location";}', 0, 0, 0, 2),
 ('bx_videos_view_entry', 4, 'bx_videos', '', '_bx_videos_page_block_title_entry_all_actions', 13, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_videos";s:6:"method";s:18:"entity_all_actions";}', 0, 0, 1, 0),

modules/boonex/videos/template/context.html

@@ -0,0 +1 @@
+<bx_include_base:../modules/base/text/template/context.html />

studio/js/dashboard.js

@@ -15,7 +15,7 @@ function BxDolStudioDashboard(oOptions) {
 
     var $this = this;
     $(document).ready(function() {
-    	$('.bx-dbd-block-content').bxTime();
+    	$('.bx-dbd-block-content').bxProcessHtml();
     });
 }
 
@@ -192,7 +192,7 @@ BxDolStudioDashboard.prototype.hostTools = function(sAction) {
 			    return;
 
 			$('#' + sDivId).hide().html(sData).bx_anim('show', 'fade', 'slow', function() {
-				$(this).bxTime();
+				$(this).bxProcessHtml();
 			});
 		},
 		'html'

studio/js/store.js

@@ -235,7 +235,7 @@ BxDolStudioStore.prototype.info = function(sModuleName, oLink) {
 			var sId = $this.sIdPopupProduct;
 			if(oData.code == 0 && oData.popup.length > 0) {
 		        $('#' + sId).remove();
-				$(oData.popup).appendTo('body').bxTime();
+				$(oData.popup).appendTo('body').bxProcessHtml();
 				$('#' + sId).dolPopup({
 					onShow: function() {
 						$this.initScreenshots(oData.screenshots);

template/scripts/BxBaseEditorTinyMCE.php

@@ -28,6 +28,7 @@ class BxBaseEditorTinyMCE extends BxDolEditor
                         entity_encoding: 'raw',
                         browser_spellcheck: true,
                         branding: false,
+                        link_assume_external_targets: true,
                         body_class: 'bx-def-color-bg-block',
                         codesample_languages: [
                             {text: 'HTML/XML', value: 'markup'},