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

inc/js/classes/BxDolVoteReactions.js

@@ -69,7 +69,7 @@ BxDolVoteReactions.prototype.onVote = function (oLink, oData, onComplete)
     //--- Update Counter.
     var oCounter = this._getCounter(oLink);
     if(oCounter && oCounter.length > 0)
-        oCounter.filter('.' + oData.reaction).html(oData.countf).bx_anim(oData.count > 0 ? 'show' : 'hide');
+        oCounter.filter('.' + oData.reaction).html(oData.countf).toggleClass('bx-vc-hidden', !oData.count);
 
     if(typeof onComplete == 'function')
         onComplete(oLink, oData);

modules/base/general/classes/BxBaseModGeneralSearchResult.php

@@ -117,15 +117,16 @@ class BxBaseModGeneralSearchResult extends BxTemplSearchResult
         return $iPerPageInShowCase;
     }
     
-    function displayResultBlock ()
+    function displayResultBlock()
     {
-		if ($this->bShowcaseView){
-            $this->addContainerClass(array('bx-def-margin-sec-lefttopright-neg', 'bx-base-unit-showcase-wrapper'));
-			$this->aCurrent['paginate']['perPage'] = $this->getItemPerPageInShowCase();
-			$this->oModule->_oTemplate->addCss(array(BX_DIRECTORY_PATH_PLUGINS_PUBLIC . 'flickity/|flickity.css'));
+        if ($this->bShowcaseView) {
+            $this->addContainerClass(array('bx-base-unit-showcase-wrapper'));
+            $this->aCurrent['paginate']['perPage'] = $this->getItemPerPageInShowCase();
+            $this->oModule->_oTemplate->addCss(array(BX_DIRECTORY_PATH_PLUGINS_PUBLIC . 'flickity/|flickity.css'));
             $this->oModule->_oTemplate->addJs(array('flickity/flickity.pkgd.min.js','modules/base/general/js/|showcase.js'));
-		}
-		return parent::displayResultBlock ();
+        }
+
+        return parent::displayResultBlock();
     }
 }
 

modules/base/profile/classes/BxBaseModProfileSearchResult.php

@@ -16,7 +16,7 @@ class BxBaseModProfileSearchResult extends BxBaseModGeneralSearchResult
     public function __construct($sMode = '', $aParams = array())
     {
         parent::__construct($sMode, $aParams);
-        $this->aUnitViews = array('gallery' => 'unit_with_cover.html', 'showcase' => 'unit_with_cover_showcase.html', 'showcase_wo_info' => 'unit_wo_info_showcase.html', 'simple' => 'unit_wo_links.html');
+        $this->aUnitViews = array('gallery' => 'unit_with_cover.html', 'gallery_wo_info' => 'unit_wo_info.html', 'showcase' => 'unit_with_cover_showcase.html', 'showcase_wo_info' => 'unit_wo_info_showcase.html', 'simple' => 'unit_wo_links.html');
         if (!empty($aParams['unit_views']) && is_array($aParams['unit_views']))
             $this->aUnitViews = array_merge ($this->aUnitViews, $aParams['unit_views']);
         if (!empty($aParams['unit_view']))
@@ -24,13 +24,20 @@ class BxBaseModProfileSearchResult extends BxBaseModGeneralSearchResult
         
         $this->sUnitTemplate = $this->aUnitViews[$this->sUnitViewDefault];
         $this->sCenterContentUnitSelector = '.bx-base-pofile-unit';
-        $this->addContainerClass (array('bx-def-margin-sec-lefttopright-neg', 'bx-base-pofile-units-wrapper', 'bx-def-margin-sec-bottom-neg'));
-		if (in_array($this->sUnitTemplate, array('unit_with_cover_showcase.html', 'unit_wo_info_showcase.html'))){
-			$this->bShowcaseView = true;
+        $this->addContainerClass (array(
+            'bx-base-pofile-units-wrapper', 
+            'bx-base-puw-' . str_replace('_' ,  '-', $this->sUnitViewDefault),
+            'bx-def-margin-sec-neg'
+        ));
+
+        if(in_array($this->sUnitTemplate, array('unit_wo_info.html', 'unit_wo_info_showcase.html'))) {
+            $this->removeContainerClass('bx-def-margin-sec-neg');
+        }
+        if(in_array($this->sUnitTemplate, array('unit_with_cover_showcase.html', 'unit_wo_info_showcase.html'))) {
+            $this->bShowcaseView = true;
 
-			$this->removeContainerClass ('bx-def-margin-bottom-neg');
-			if($this->sUnitTemplate == 'unit_wo_info_showcase.html')
-				$this->addContainerAttribute(array('bx-sc-group-cells' => 3));
+            if($this->sUnitTemplate == 'unit_wo_info_showcase.html')
+                $this->addContainerAttribute(array('bx-sc-group-cells' => 3));
         }
         if ($sMode == 'recommended')
             $this->bRecommendedView=true;

modules/base/profile/template/css/main.css

@@ -392,6 +392,15 @@ a.bx-base-pofile-cover-thumb p.bx-base-pofile-unit-thumb.bx-def-ava-big-size {
     justify-content: flex-start;
 }
 
+.bx-base-pofile-units-wrapper.bx-base-puw-gallery-wo-info {
+    -webkit-justify-content: space-between;
+    justify-content: space-between;
+}
+.bx-base-pofile-units-wrapper.bx-base-puw-gallery-wo-info:before,
+.bx-base-pofile-units-wrapper.bx-base-puw-gallery-wo-info:after {
+    display: none;
+}
+
 .bx-base-pofile-units-wrapper .bx-base-pofile-unit-with-cover {
     -webkit-box-flex: 0;
 

modules/boonex/ads/classes/BxAdsConfig.php

@@ -58,6 +58,7 @@ class BxAdsConfig extends BxBaseModTextConfig
             'FIELD_COMMENTS' => 'comments',
             'FIELD_STATUS' => 'status',
             'FIELD_STATUS_ADMIN' => 'status_admin',
+            'FIELD_LOCATION' => 'location',
             'FIELD_LOCATION_PREFIX' => 'location',
             'FIELD_LABELS' => 'labels',
             'FIELD_ANONYMOUS' => 'anonymous',

modules/boonex/ads/install/sql/install.sql

@@ -10,6 +10,8 @@ CREATE TABLE IF NOT EXISTS `bx_ads_entries` (
   `price` varchar(255) NOT NULL,
   `year` varchar(255) NOT NULL,
   `text` mediumtext NOT NULL,
+  `labels` text NOT NULL,
+  `location` text NOT NULL,
   `views` int(11) NOT NULL default '0',
   `rate` float NOT NULL default '0',
   `votes` int(11) NOT NULL default '0',

modules/boonex/albums/classes/BxAlbumsConfig.php

@@ -50,6 +50,7 @@ class BxAlbumsConfig extends BxBaseModTextConfig
             'FIELD_COMMENTS' => 'comments',
             'FIELD_STATUS' => 'status',
             'FIELD_STATUS_ADMIN' => 'status_admin',
+            'FIELD_LOCATION' => 'location',
             'FIELD_LOCATION_PREFIX' => 'location',
             'FIELD_LABELS' => 'labels',
             'FIELDS_WITH_KEYWORDS' => 'auto', // can be 'auto', array of fields or comma separated string of field names, works only when OBJECT_METATAGS is specified

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

@@ -10,6 +10,8 @@ CREATE TABLE IF NOT EXISTS `bx_albums_albums` (
   `thumb` int(11) NOT NULL,
   `title` varchar(255) NOT NULL,
   `text` text NOT NULL,
+  `labels` text NOT NULL,
+  `location` text NOT NULL,
   `views` int(11) NOT NULL default '0',
   `rate` float NOT NULL default '0',
   `votes` int(11) NOT NULL default '0',

modules/boonex/events/classes/BxEventsConfig.php

@@ -57,6 +57,7 @@ class BxEventsConfig extends BxBaseModProfileConfig
             'FIELD_VIEWS' => 'views',
             'FIELD_COMMENTS' => 'comments',
             'FIELDS_QUICK_SEARCH' => array('event_name'),
+            'FIELD_LOCATION' => 'location',
             'FIELD_LOCATION_PREFIX' => 'location',
             'FIELDS_WITH_KEYWORDS' => 'auto', // can be 'auto', array of fields or comma separated string of field names, works only when OBJECT_METATAGS is specified
             'FIELD_LABELS' => 'labels',

modules/boonex/events/install/sql/install.sql

@@ -15,6 +15,8 @@ CREATE TABLE IF NOT EXISTS `bx_events_data` (
   `date_start` int(11) DEFAULT NULL,
   `date_end` int(11) DEFAULT NULL,
   `timezone` varchar(255) DEFAULT NULL,
+  `labels` text NOT NULL,
+  `location` text NOT NULL,
   `views` int(11) NOT NULL default '0',
   `rate` float NOT NULL default '0',
   `votes` int(11) NOT NULL default '0',

modules/boonex/files/classes/BxFilesConfig.php

@@ -48,6 +48,7 @@ class BxFilesConfig extends BxBaseModTextConfig
             'FIELD_COMMENTS' => 'comments',
             'FIELD_STATUS' => 'status',
             'FIELD_STATUS_ADMIN' => 'status_admin',
+            'FIELD_LOCATION' => 'location',
             'FIELD_LOCATION_PREFIX' => 'location',
             'FIELD_LABELS' => 'labels',
             'FIELDS_WITH_KEYWORDS' => 'auto', // can be 'auto', array of fields or comma separated string of field names, works only when OBJECT_METATAGS is specified

modules/boonex/files/install/sql/install.sql

@@ -13,6 +13,8 @@ CREATE TABLE IF NOT EXISTS `bx_files_main` (
   `desc` text NOT NULL,
   `data` text NOT NULL,
   `data_processed` tinyint(4) NOT NULL DEFAULT '0',
+  `labels` text NOT NULL,
+  `location` text NOT NULL,
   `views` int(11) NOT NULL default '0',
   `rate` float NOT NULL default '0',
   `votes` int(11) NOT NULL default '0',

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

@@ -15,6 +15,7 @@ CREATE TABLE IF NOT EXISTS `bx_forum_discussions` (
   `lr_timestamp` int(11) NOT NULL,
   `lr_profile_id` int(11) NOT NULL,
   `lr_comment_id` int(11) NOT NULL,
+  `labels` text NOT NULL,
   `views` int(11) NOT NULL default '0',
   `rate` float NOT NULL default '0',
   `votes` int(11) NOT NULL default '0',

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

@@ -11,6 +11,7 @@ CREATE TABLE IF NOT EXISTS `bx_glossary_terms` (
   `title` varchar(255) NOT NULL,
   `cat` int(11) NOT NULL,
   `text` text NOT NULL,
+  `labels` text NOT NULL,
   `views` int(11) NOT NULL default '0',
   `rate` float NOT NULL default '0',
   `votes` int(11) NOT NULL default '0',

modules/boonex/groups/classes/BxGroupsConfig.php

@@ -55,6 +55,7 @@ class BxGroupsConfig extends BxBaseModProfileConfig
             'FIELD_VIEWS' => 'views',
             'FIELD_COMMENTS' => 'comments',
             'FIELDS_QUICK_SEARCH' => array('group_name'),
+            'FIELD_LOCATION' => 'location',
             'FIELD_LOCATION_PREFIX' => 'location',
             'FIELD_LABELS' => 'labels',
             'FIELDS_WITH_KEYWORDS' => 'auto', // can be 'auto', array of fields or comma separated string of field names, works only when OBJECT_METATAGS is specified

modules/boonex/groups/install/sql/install.sql

@@ -11,6 +11,8 @@ CREATE TABLE IF NOT EXISTS `bx_groups_data` (
   `group_name` varchar(255) NOT NULL,
   `group_cat` int(11) NOT NULL,
   `group_desc` text NOT NULL,
+  `labels` text NOT NULL,
+  `location` text NOT NULL,
   `views` int(11) NOT NULL default '0',
   `rate` float NOT NULL default '0',
   `votes` int(11) NOT NULL default '0',

modules/boonex/market/classes/BxMarketConfig.php

@@ -76,6 +76,7 @@ class BxMarketConfig extends BxBaseModTextConfig
             'FIELD_FEATURED' => 'featured',
             'FIELD_STATUS' => 'status',
             'FIELD_STATUS_ADMIN' => 'status_admin',
+            'FIELD_LOCATION' => 'location',
             'FIELD_LOCATION_PREFIX' => 'location',
             'FIELD_LABELS' => 'labels',
             'FIELDS_QUICK_SEARCH' => array('title'),

modules/boonex/market/classes/BxMarketFormEntry.php

@@ -282,22 +282,16 @@ class BxMarketFormEntry extends BxBaseModTextFormEntry
     	return $aResult;
     }
 
-    protected function genCustomInputSubentries($aInput)
+    protected function genCustomInputSubentries ($aInput)
     {
-        $this->addCssJsUi();
-
         $CNF = &$this->_oModule->_oConfig->CNF;
 
-        $sGetSubentriesUrl = BX_DOL_URL_ROOT . $this->_oModule->_oConfig->getBaseUri() . 'get_subentries';
-        $sPlaceholder = bx_html_attribute(_t('_bx_market_form_entry_input_subentries_placeholder'), BX_ESCAPE_STR_QUOTE);
-
-        $this->oTemplate->addJs(array(
-            'jquery.form.min.js',
-        ));
+        $aInput['ajax_get_suggestions'] = BX_DOL_URL_ROOT . $this->_oModule->_oConfig->getBaseUri() . 'get_subentries';
+        $aInput['placeholder'] = _t('_bx_market_form_entry_input_subentries_placeholder');
 
         $sVals = '';
-        if (!empty($aInput['value']) && is_array($aInput['value'])) {
-            foreach ($aInput['value'] as $iValue) {
+        if(!empty($aInput['value']) && is_array($aInput['value'])) {
+            foreach($aInput['value'] as $iValue) {
                 $iValue = (int)$iValue;
                 if(!$iValue)
                     continue;
@@ -310,17 +304,9 @@ class BxMarketFormEntry extends BxBaseModTextFormEntry
             }
             $sVals = trim($sVals, ',');
         }
+        $aInput['value'] = $sVals;
 
-        return $this->oTemplate->parseHtmlByName('form_field_custom_suggestions.html', array(
-            'id' => $aInput['name'] . time(),
-            'url_get_recipients' => $sGetSubentriesUrl,
-            'name' => $aInput['name'],
-			'b_img' => 1,
-			'only_once' => 0,
-			'on_select' => 'null',
-		    'placeholder' => $sPlaceholder,
-            'vals' => $sVals,
-        ));
+        return $this->genCustomInputUsernamesSuggestions($aInput);
     }
 }
 

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

@@ -20,6 +20,8 @@ CREATE TABLE IF NOT EXISTS `bx_market_products` (
   `price_recurring` float NOT NULL default '0',
   `duration_recurring` varchar(16) NOT NULL default 'month',
   `trial_recurring` int(11) NOT NULL default '0',
+  `labels` text NOT NULL,
+  `location` text NOT NULL,
   `views` int(11) NOT NULL default '0',
   `rate` float NOT NULL default '0',
   `votes` int(11) NOT NULL default '0',

modules/boonex/organizations/classes/BxOrgsConfig.php

@@ -56,6 +56,7 @@ class BxOrgsConfig extends BxBaseModProfileConfig
             'FIELD_VIEWS' => 'views',
             'FIELD_COMMENTS' => 'comments',
             'FIELDS_QUICK_SEARCH' => array('org_name'),
+            'FIELD_LOCATION' => 'location',
             'FIELD_LOCATION_PREFIX' => 'location',
             'FIELD_LABELS' => 'labels',
             'FIELDS_WITH_KEYWORDS' => 'auto', // can be 'auto', array of fields or comma separated string of field names, works only when OBJECT_METATAGS is specified

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

@@ -166,12 +166,13 @@
     <string name="_bx_orgs_page_block_title_profile_related_me"><![CDATA[Relationships with Me]]></string>
     <string name="_bx_orgs_page_block_title_profile_comments"><![CDATA[Comments]]></string>
     <string name="_bx_orgs_page_block_title_profile_comments_link"><![CDATA[Comments to <a href="{entry_link}">{title}</a>]]></string>
-	<string name="_bx_orgs_page_block_title_profile_actions"><![CDATA[Actions]]></string>
-	<string name="_bx_orgs_page_block_title_featured_profiles"><![CDATA[Featured Organizations]]></string>
-	<string name="_bx_orgs_page_block_title_latest_profiles"><![CDATA[New Organizations]]></string>
-	<string name="_bx_orgs_page_block_title_system_manage"><![CDATA[Manage Own Organizations]]></string>
-	<string name="_bx_orgs_page_block_title_system_manage_administration"><![CDATA[Manage All Organizations]]></string>
-	<string name="_bx_orgs_page_block_title_manage"><![CDATA[Manage Organizations]]></string>
+    <string name="_bx_orgs_page_block_title_profile_actions"><![CDATA[Actions]]></string>
+    <string name="_bx_orgs_page_block_title_featured_profiles"><![CDATA[Featured Organizations]]></string>
+    <string name="_bx_orgs_page_block_title_latest_profiles"><![CDATA[New Organizations]]></string>
+    <string name="_bx_orgs_page_block_title_system_manage"><![CDATA[Manage Own Organizations]]></string>
+    <string name="_bx_orgs_page_block_title_system_manage_administration"><![CDATA[Manage All Organizations]]></string>
+    <string name="_bx_orgs_page_block_title_manage"><![CDATA[Manage Organizations]]></string>
+    <string name="_bx_orgs_page_block_title_sys_active_profiles"><![CDATA[Active Organizations]]></string>
     <string name="_bx_orgs_page_block_title_active_profiles"><![CDATA[Active Organizations]]></string>
     <string name="_bx_orgs_page_block_title_online_profiles"><![CDATA[Online Organizations]]></string>
     <string name="_bx_orgs_page_block_title_categories"><![CDATA[Organization categories]]></string>

modules/boonex/organizations/install/sql/enable.sql

@@ -224,7 +224,8 @@ INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title_system`, `
 ('', 0, 'bx_organizations', '', '_bx_orgs_page_block_title_categories', 11, 2147483647, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:15:"categories_list";s:6:"params";a:2:{i:0;s:21:"bx_organizations_cats";i:1;a:2:{s:10:\"show_empty\";b:1;s:21:\"show_empty_categories\";b:1;}}s:5:"class";s:20:"TemplServiceCategory";}', 1, 1, 1, IFNULL(@iBlockOrder, 0) + 1),
 ('', 0, 'bx_organizations', '_bx_orgs_page_block_title_sys_featured_entries_view_showcase', '_bx_orgs_page_block_title_featured_entries_view_showcase', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:16:\"bx_organizations\";s:6:\"method\";s:15:\"browse_featured\";s:6:\"params\";a:3:{s:9:\"unit_view\";s:8:\"showcase\";s:13:\"empty_message\";b:0;s:13:\"ajax_paginate\";b:0;}}', 0, 1, 1, IFNULL(@iBlockOrder, 0) + 2),
 ('', 0, 'bx_organizations', '_bx_orgs_page_block_title_sys_recommended_entries_view_showcase', '_bx_orgs_page_block_title_recommended_entries_view_showcase', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:16:\"bx_organizations\";s:6:\"method\";s:18:\"browse_recommended\";s:6:\"params\";a:3:{s:9:\"unit_view\";s:8:\"showcase\";s:13:\"empty_message\";b:0;s:13:\"ajax_paginate\";b:0;}}', 0, 1, 1, IFNULL(@iBlockOrder, 0) + 3),
-('', 0, 'bx_organizations', '_bx_orgs_page_block_title_sys_active_entries_view_showcase', '_bx_orgs_page_block_title_active_entries_view_showcase', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:16:\"bx_organizations\";s:6:\"method\";s:22:\"browse_active_profiles\";s:6:\"params\";a:3:{s:9:\"unit_view\";s:16:\"showcase_wo_info\";s:13:\"empty_message\";b:0;s:13:\"ajax_paginate\";b:0;}}', 0, 1, 1, IFNULL(@iBlockOrder, 0) + 4);
+('', 0, 'bx_organizations', '_bx_orgs_page_block_title_sys_active_entries_view_showcase', '_bx_orgs_page_block_title_active_entries_view_showcase', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:16:\"bx_organizations\";s:6:\"method\";s:22:\"browse_active_profiles\";s:6:\"params\";a:3:{s:9:\"unit_view\";s:16:\"showcase_wo_info\";s:13:\"empty_message\";b:0;s:13:\"ajax_paginate\";b:0;}}', 0, 1, 1, IFNULL(@iBlockOrder, 0) + 4),
+('', 0, 'bx_organizations', '_bx_orgs_page_block_title_sys_active_profiles', '_bx_orgs_page_block_title_active_profiles', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:16:\"bx_organizations\";s:6:\"method\";s:22:\"browse_active_profiles\";s:6:\"params\";a:3:{s:9:\"unit_view\";s:15:\"gallery_wo_info\";s:13:\"empty_message\";b:0;s:13:\"ajax_paginate\";b:0;}}', 0, 1, 1, IFNULL(@iBlockOrder, 0) + 5);
 
 
 -- MENU

modules/boonex/organizations/install/sql/install.sql

@@ -12,6 +12,8 @@ CREATE TABLE IF NOT EXISTS `bx_organizations_data` (
   `org_name` varchar(255) NOT NULL,
   `org_cat` int(11) NOT NULL,
   `org_desc` text NOT NULL,
+  `labels` text NOT NULL,
+  `location` text NOT NULL,
   `views` int(11) NOT NULL default '0',
   `rate` float NOT NULL default '0',
   `votes` int(11) NOT NULL default '0',

modules/boonex/persons/classes/BxPersonsConfig.php

@@ -51,6 +51,7 @@ class BxPersonsConfig extends BxBaseModProfileConfig
             'FIELD_VIEWS' => 'views',
             'FIELD_COMMENTS' => 'comments',
             'FIELDS_QUICK_SEARCH' => array('fullname'),
+            'FIELD_LOCATION' => 'location',
             'FIELD_LOCATION_PREFIX' => 'location',
             'FIELD_LABELS' => 'labels',
             'FIELDS_WITH_KEYWORDS' => 'auto', // can be 'auto', array of fields or comma separated string of field names, works only when OBJECT_METATAGS is specified

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

@@ -157,6 +157,7 @@
     <string name="_bx_persons_page_block_title_system_manage"><![CDATA[Manage Own People]]></string>
     <string name="_bx_persons_page_block_title_system_manage_administration"><![CDATA[Manage All People]]></string>
     <string name="_bx_persons_page_block_title_manage"><![CDATA[Manage People]]></string>
+    <string name="_bx_persons_page_block_title_sys_active_profiles"><![CDATA[Active People]]></string>
     <string name="_bx_persons_page_block_title_active_profiles"><![CDATA[Active People]]></string>
     <string name="_bx_persons_page_block_title_online_profiles"><![CDATA[Online People]]></string>
     <string name="_bx_persons_page_block_title_search_form"><![CDATA[Search Form]]></string>

modules/boonex/persons/install/sql/enable.sql

@@ -195,7 +195,8 @@ SET @iBlockOrder = (SELECT `order` FROM `sys_pages_blocks` WHERE `object` = '' A
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
 ('', 0, 'bx_persons', '_bx_persons_page_block_title_sys_featured_entries_view_showcase', '_bx_persons_page_block_title_featured_entries_view_showcase', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:10:\"bx_persons\";s:6:\"method\";s:15:\"browse_featured\";s:6:\"params\";a:3:{s:9:\"unit_view\";s:8:\"showcase\";s:13:\"empty_message\";b:0;s:13:\"ajax_paginate\";b:0;}}', 0, 1, 1, IFNULL(@iBlockOrder, 0) + 1),
 ('', 0, 'bx_persons', '_bx_persons_page_block_title_sys_recommended_entries_view_showcase', '_bx_persons_page_block_title_recommended_entries_view_showcase', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:10:\"bx_persons\";s:6:\"method\";s:18:\"browse_recommended\";s:6:\"params\";a:3:{s:9:\"unit_view\";s:8:\"showcase\";s:13:\"empty_message\";b:0;s:13:\"ajax_paginate\";b:0;}}', 0, 1, 1, IFNULL(@iBlockOrder, 0) + 2),
-('', 0, 'bx_persons', '_bx_persons_page_block_title_sys_active_entries_view_showcase', '_bx_persons_page_block_title_active_entries_view_showcase', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:10:\"bx_persons\";s:6:\"method\";s:22:\"browse_active_profiles\";s:6:\"params\";a:3:{s:9:\"unit_view\";s:16:\"showcase_wo_info\";s:13:\"empty_message\";b:0;s:13:\"ajax_paginate\";b:0;}}', 0, 1, 1, IFNULL(@iBlockOrder, 0) + 3);
+('', 0, 'bx_persons', '_bx_persons_page_block_title_sys_active_entries_view_showcase', '_bx_persons_page_block_title_active_entries_view_showcase', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:10:\"bx_persons\";s:6:\"method\";s:22:\"browse_active_profiles\";s:6:\"params\";a:3:{s:9:\"unit_view\";s:16:\"showcase_wo_info\";s:13:\"empty_message\";b:0;s:13:\"ajax_paginate\";b:0;}}', 0, 1, 1, IFNULL(@iBlockOrder, 0) + 3),
+('', 0, 'bx_persons', '_bx_persons_page_block_title_sys_active_profiles', '_bx_persons_page_block_title_active_profiles', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:10:\"bx_persons\";s:6:\"method\";s:22:\"browse_active_profiles\";s:6:\"params\";a:3:{s:9:\"unit_view\";s:15:\"gallery_wo_info\";s:13:\"empty_message\";b:0;s:13:\"ajax_paginate\";b:0;}}', 0, 1, 1, IFNULL(@iBlockOrder, 0) + 4);
 
 -- MENU
 

modules/boonex/persons/install/sql/install.sql

@@ -13,6 +13,8 @@ CREATE TABLE IF NOT EXISTS `bx_persons_data` (
   `description` text NOT NULL,
   `gender` varchar(255) DEFAULT NULL,
   `birthday` date DEFAULT NULL,
+  `labels` text NOT NULL,
+  `location` text NOT NULL,
   `views` int(11) NOT NULL default '0',
   `rate` float NOT NULL default '0',
   `votes` int(11) NOT NULL default '0',

modules/boonex/photos/classes/BxPhotosConfig.php

@@ -51,6 +51,7 @@ class BxPhotosConfig extends BxBaseModTextConfig
             'FIELD_STATUS' => 'status',
             'FIELD_STATUS_ADMIN' => 'status_admin',
             'FIELD_LABELS' => 'labels',
+            'FIELD_LOCATION' => 'location',
             'FIELD_LOCATION_PREFIX' => 'location',
             'FIELDS_WITH_KEYWORDS' => 'auto', // can be 'auto', array of fields or comma separated string of field names, works only when OBJECT_METATAGS is specified
 			

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

@@ -11,6 +11,8 @@ CREATE TABLE IF NOT EXISTS `bx_photos_entries` (
   `title` varchar(255) NOT NULL,
   `cat` int(11) NOT NULL,
   `text` text NOT NULL,
+  `labels` text NOT NULL,
+  `location` text NOT NULL,
   `views` int(11) NOT NULL default '0',
   `rate` float NOT NULL default '0',
   `votes` int(11) NOT NULL default '0',

modules/boonex/polls/classes/BxPollsConfig.php

@@ -50,6 +50,7 @@ class BxPollsConfig extends BxBaseModTextConfig
             'FIELD_COMMENTS' => 'comments',
             'FIELD_STATUS' => 'status',
             'FIELD_STATUS_ADMIN' => 'status_admin',
+            'FIELD_LOCATION' => 'location',
             'FIELD_LOCATION_PREFIX' => 'location',
             'FIELD_LABELS' => 'labels',
             'FIELDS_WITH_KEYWORDS' => 'auto', // can be 'auto', array of fields or comma separated string of field names, works only when OBJECT_METATAGS is specified

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

@@ -10,6 +10,8 @@ CREATE TABLE IF NOT EXISTS `bx_polls_entries` (
   `thumb` int(11) NOT NULL,
   `text` text NOT NULL,
   `cat` int(11) NOT NULL,
+  `labels` text NOT NULL,
+  `location` text NOT NULL,
   `views` int(11) NOT NULL default '0',
   `rate` float NOT NULL default '0',
   `votes` int(11) NOT NULL default '0',

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

@@ -166,17 +166,18 @@
     <string name="_bx_orgs_page_block_title_profile_related_me"><![CDATA[Связи со мной]]></string>
     <string name="_bx_orgs_page_block_title_profile_comments"><![CDATA[Комментарии]]></string>
     <string name="_bx_orgs_page_block_title_profile_comments_link"><![CDATA[Комментарии к <a href="{entry_link}">{title}</a>]]></string>
-	<string name="_bx_orgs_page_block_title_profile_actions"><![CDATA[Действия]]></string>
-	<string name="_bx_orgs_page_block_title_featured_profiles"><![CDATA[Продвинутые организации]]></string>
-	<string name="_bx_orgs_page_block_title_latest_profiles"><![CDATA[Новые организации]]></string>
-	<string name="_bx_orgs_page_block_title_system_manage"><![CDATA[Управление собственными организациями]]></string>
-	<string name="_bx_orgs_page_block_title_system_manage_administration"><![CDATA[Управление всеми организациями]]></string>
-	<string name="_bx_orgs_page_block_title_manage"><![CDATA[Управление]]></string>
+    <string name="_bx_orgs_page_block_title_profile_actions"><![CDATA[Действия]]></string>
+    <string name="_bx_orgs_page_block_title_featured_profiles"><![CDATA[Продвинутые организации]]></string>
+    <string name="_bx_orgs_page_block_title_latest_profiles"><![CDATA[Новые организации]]></string>
+    <string name="_bx_orgs_page_block_title_system_manage"><![CDATA[Управление собственными организациями]]></string>
+    <string name="_bx_orgs_page_block_title_system_manage_administration"><![CDATA[Управление всеми организациями]]></string>
+    <string name="_bx_orgs_page_block_title_manage"><![CDATA[Управление]]></string>
+    <string name="_bx_orgs_page_block_title_sys_active_profiles"><![CDATA[Активные организации]]></string>
     <string name="_bx_orgs_page_block_title_active_profiles"><![CDATA[Активные организации]]></string>
     <string name="_bx_orgs_page_block_title_online_profiles"><![CDATA[Онлайн организации]]></string>
-	<string name="_bx_orgs_page_block_title_categories"><![CDATA[Категории организаций]]></string>
-	<string name="_bx_orgs_page_block_title_invite_to_organization"><![CDATA[Пригласить участников в организацию]]></string>
-	<string name="_bx_orgs_page_block_title_search_form"><![CDATA[Форма поиска]]></string>
+    <string name="_bx_orgs_page_block_title_categories"><![CDATA[Категории организаций]]></string>
+    <string name="_bx_orgs_page_block_title_invite_to_organization"><![CDATA[Пригласить участников в организацию]]></string>
+    <string name="_bx_orgs_page_block_title_search_form"><![CDATA[Форма поиска]]></string>
     <string name="_bx_orgs_page_block_title_search_results"><![CDATA[Результаты поиска]]></string>
     <string name="_bx_orgs_page_block_title_search_form_cmts"><![CDATA[Форма поиска комментариев]]></string>
     <string name="_bx_orgs_page_block_title_search_results_cmts"><![CDATA[Результаты поиска комментариев]]></string>

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

@@ -157,6 +157,7 @@
     <string name="_bx_persons_page_block_title_system_manage"><![CDATA[Управление собственными профилями]]></string>
     <string name="_bx_persons_page_block_title_system_manage_administration"><![CDATA[Управление всеми профилями]]></string>
     <string name="_bx_persons_page_block_title_manage"><![CDATA[Управление]]></string>
+    <string name="_bx_persons_page_block_title_sys_active_profiles"><![CDATA[Активные пользователи]]></string>
     <string name="_bx_persons_page_block_title_active_profiles"><![CDATA[Активные пользователи]]></string>
     <string name="_bx_persons_page_block_title_online_profiles"><![CDATA[Онлайн пользователи]]></string>
     <string name="_bx_persons_page_block_title_search_form"><![CDATA[Форма поиска]]></string>

modules/boonex/shopify/classes/BxShopifyConfig.php

@@ -49,6 +49,7 @@ class BxShopifyConfig extends BxBaseModTextConfig
             'FIELD_COMMENTS' => 'comments',
             'FIELD_STATUS' => 'status',
             'FIELD_STATUS_ADMIN' => 'status_admin',
+            'FIELD_LOCATION' => 'location',
             'FIELD_LOCATION_PREFIX' => 'location',
             'FIELDS_WITH_KEYWORDS' => 'auto', // can be 'auto', array of fields or comma separated string of field names, works only when OBJECT_METATAGS is specified
 

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

@@ -10,6 +10,7 @@ CREATE TABLE IF NOT EXISTS `bx_shopify_entries` (
   `title` varchar(255) NOT NULL,
   `code` varchar(16) NOT NULL default '',
   `cat` int(11) NOT NULL,
+  `location` text NOT NULL,
   `views` int(11) NOT NULL default '0',
   `rate` float NOT NULL default '0',
   `votes` int(11) NOT NULL default '0',

modules/boonex/snipcart/classes/BxSnipcartConfig.php

@@ -48,6 +48,7 @@ class BxSnipcartConfig extends BxBaseModTextConfig
             'FIELD_COMMENTS' => 'comments',
             'FIELD_STATUS' => 'status',
             'FIELD_STATUS_ADMIN' => 'status_admin',
+            'FIELD_LOCATION' => 'location',
             'FIELD_LOCATION_PREFIX' => 'location',
             'FIELDS_WITH_KEYWORDS' => 'auto', // can be 'auto', array of fields or comma separated string of field names, works only when OBJECT_METATAGS is specified
 

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

@@ -13,6 +13,7 @@ CREATE TABLE IF NOT EXISTS `bx_snipcart_entries` (
   `text` text NOT NULL,
   `price` float NOT NULL default '0',
   `weight` float NOT NULL default '0',
+  `location` text NOT NULL,
   `views` int(11) NOT NULL default '0',
   `rate` float NOT NULL default '0',
   `votes` int(11) NOT NULL default '0',

modules/boonex/spaces/classes/BxSpacesConfig.php

@@ -57,6 +57,7 @@ class BxSpacesConfig extends BxBaseModProfileConfig
             'FIELD_VIEWS' => 'views',
             'FIELD_COMMENTS' => 'comments',
             'FIELDS_QUICK_SEARCH' => array('space_name'),
+            'FIELD_LOCATION' => 'location',
             'FIELD_LOCATION_PREFIX' => 'location',
             'FIELDS_WITH_KEYWORDS' => 'auto', // can be 'auto', array of fields or comma separated string of field names, works only when OBJECT_METATAGS is specified
             'FIELD_LABELS' => 'labels',

modules/boonex/spaces/install/sql/install.sql

@@ -13,6 +13,8 @@ CREATE TABLE IF NOT EXISTS `bx_spaces_data` (
   `space_name` varchar(255) NOT NULL,
   `space_cat` int(11) NOT NULL,
   `space_desc` text NOT NULL,
+  `labels` text NOT NULL,
+  `location` text NOT NULL,
   `views` int(11) NOT NULL default '0',
   `rate` float NOT NULL default '0',
   `votes` int(11) NOT NULL default '0',

modules/boonex/videos/classes/BxVideosConfig.php

@@ -53,6 +53,7 @@ class BxVideosConfig extends BxBaseModTextConfig
             'FIELD_STATUS' => 'status',
             'FIELD_STATUS_ADMIN' => 'status_admin',
             'FIELD_LABELS' => 'labels',
+            'FIELD_LOCATION' => 'location',
             'FIELD_LOCATION_PREFIX' => 'location',
             'FIELDS_WITH_KEYWORDS' => 'auto', // can be 'auto', array of fields or comma separated string of field names, works only when OBJECT_METATAGS is specified
             'FIELDS_DELAYED_PROCESSING' => 'videos', // can be array of fields or comma separated string of field names

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

@@ -11,6 +11,8 @@ CREATE TABLE IF NOT EXISTS `bx_videos_entries` (
   `cat` int(11) NOT NULL,
   `text` text NOT NULL,
   `duration` int(11) NOT NULL,
+  `labels` text NOT NULL,
+  `location` text NOT NULL,
   `views` int(11) NOT NULL default '0',
   `rate` float NOT NULL default '0',
   `votes` int(11) NOT NULL default '0',

template/css/menu.css

@@ -693,8 +693,8 @@ ul.bx-menu-btns-icon-hor li:last-child .bx-btn {
     position: relative;
     display: block;
 
-    padding: 8px;
-    padding: 0.5rem;
+    padding: 0 8px;
+    padding: 0 0.5rem;
 
     text-align: left;
 }
@@ -703,11 +703,6 @@ ul.bx-menu-btns-icon-hor li:last-child .bx-btn {
     vertical-align: top;
     width: 1.6rem;
 }
-.bx-menu-main-submenu.bx-menu-more-auto .bx-menu-item.bx-menu-item-more-auto > span,
-.bx-menu-custom.bx-menu-hor.bx-menu-more-auto .bx-menu-item.bx-menu-item-more-auto > span {
-    display: block;
-    margin: 0;
-}
 .bx-menu-main-submenu.bx-menu-more-auto .bx-menu-item > a:last-child,
 .bx-menu-main-submenu.bx-menu-more-auto .bx-menu-item > a.bx-btn:last-child,
 .bx-menu-main-submenu.bx-menu-more-auto .bx-menu-item > span:last-child,
@@ -726,6 +721,16 @@ ul.bx-menu-btns-icon-hor li:last-child .bx-btn {
 .bx-menu-custom.bx-menu-hor.bx-menu-more-auto .bx-menu-item.bx-menu-item-more-auto {
     display: none;
 }
+.bx-menu-main-submenu.bx-menu-more-auto .bx-menu-item.bx-menu-item-more-auto > span,
+.bx-menu-custom.bx-menu-hor.bx-menu-more-auto .bx-menu-item.bx-menu-item-more-auto > span {
+    display: block;
+    margin: 0;
+}
+.bx-menu-main-submenu.bx-menu-more-auto .bx-menu-item.bx-menu-item-more-auto .bx-popup .bx-menu-item,
+.bx-menu-custom.bx-menu-hor.bx-menu-more-auto .bx-menu-item.bx-menu-item-more-auto .bx-popup .bx-menu-item {
+    padding-top: 0.5rem;
+    padding-bottom: 0.5rem;
+}
 .bx-menu-main-submenu.bx-menu-more-auto .bx-menu-submenu-more-auto .bx-menu-item .sys-icon {
     display: inline-block;
     vertical-align: middle;
@@ -873,4 +878,9 @@ ul.bx-menu-btns-icon-hor li:last-child .bx-btn {
 }
 .bx-popup ul.bx-menu-ver.bx-menu-object-sys_switch_language_popup li span.flag-icon {
     margin-right: 0.5rem;
-}
+}
+
+/* --------------- switch template menu (popup) */
+.bx-popup .bx-menu-ver.bx-menu-object-sys_switch_template li a div > span {
+    margin-left: 0;
+}

template/scripts/BxBaseFormView.php

@@ -1117,14 +1117,18 @@ BLAH;
         $this->addCssJsUi();
 
         $sVals = '';
-        if(!empty($aInput['value']) && is_array($aInput['value'])) {
-            foreach($aInput['value'] as $sVal) {
-                if(!$sVal || !($oProfile = BxDolProfile::getInstance($sVal)))
-                    continue;
+        if(!empty($aInput['value'])) {
+            if(is_array($aInput['value'])) {
+                foreach($aInput['value'] as $sVal) {
+                    if(!$sVal || !($oProfile = BxDolProfile::getInstance($sVal)))
+                        continue;
 
-               $sVals .= '<b class="val bx-def-color-bg-hl bx-def-round-corners">' . $oProfile->getUnit(0, array('template' => 'unit_wo_info')) . $oProfile->getDisplayName() . '<input type="hidden" name="' . $aInput['name'] . '[]" value="' . $sVal . '" /></b>';
+                   $sVals .= '<b class="val bx-def-color-bg-hl bx-def-round-corners">' . $oProfile->getUnit(0, array('template' => 'unit_wo_info')) . $oProfile->getDisplayName() . '<input type="hidden" name="' . $aInput['name'] . '[]" value="' . $sVal . '" /></b>';
+                }
+                $sVals = trim($sVals, ',');
             }
-            $sVals = trim($sVals, ',');
+            else if(is_string($aInput['value']))
+                $sVals = $aInput['value'];
         }
 
         $bDisabled = isset($aInput['attrs']['disabled']) && $aInput['attrs']['disabled'] == 'disabled';