Merge branch 'master' of github.com:boonex/dolphin

inc/js/classes/BxDolCmts.js

@@ -350,39 +350,6 @@ BxDolCmts.prototype.toggleManagePopup = function(oLink, iCmtId) {
 	});
 };
 
-BxDolCmts.prototype.togglePlusedByPopup = function(oLink, iCmtId) {
-	var $this = this;
-    var oData = this._getDefaultActions();
-    oData['action'] = 'GetPlusedBy';
-    oData['CmtId'] = iCmtId;
-
-    var oPopup = $(".bx-popup-applied:visible");
-    if(oPopup.length) {
-    	oPopup.dolPopupHide();
-    	return;
-    }
-
-	this._loadingInContent(oLink, true);
-
-	jQuery.post (
-		this._sActionsUrl,
-        oData,
-        function (s) {
-			$this._loadingInContent(oLink, false);
-
-			var oPopup = $(s).hide(); 
-
-	    	$('#' + oPopup.attr('id')).remove();
-	        oPopup.prependTo('body').dolPopup({
-	        	pointer:{
-	    			el:$(oLink)
-	    		}
-	        });
-        }
-	);
-};
-
-
 BxDolCmts.prototype._getCmt = function (e, iCmtId)
 {
     var $this = this;

modules/boonex/developer/classes/BxDevBuilderPage.php

@@ -272,7 +272,7 @@ class BxDevBuilderPage extends BxTemplStudioBuilderPage {
         unset($aForm['inputs']['url']['attrs']['disabled']);
 
         $aForm['inputs']['deletable'] = array(
-            'type' => 'checkbox',
+            'type' => 'switcher',
             'name' => 'deletable',
             'caption' => _t('_bx_dev_bp_txt_page_deletable'),
             'info' => '',
@@ -330,7 +330,7 @@ class BxDevBuilderPage extends BxTemplStudioBuilderPage {
         unset($aForm['inputs']['cache_lifetime']['attrs']);
 
         $aForm['inputs']['cache_editable'] = array(
-            'type' => 'checkbox',
+            'type' => 'switcher',
             'name' => 'cache_editable',
             'caption' => _t('_bx_dev_bp_txt_page_cache_editable'),
             'info' => '',

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

@@ -373,6 +373,8 @@
     <string name="_bx_dev_bp_txt_block_deletable"><![CDATA[Deletable]]></string>
     <string name="_bx_dev_bp_txt_sys_block_copyable"><![CDATA[Copyable]]></string>
     <string name="_bx_dev_bp_txt_block_copyable"><![CDATA[Copyable]]></string>
+    <string name="_bx_dev_bp_txt_sys_block_active"><![CDATA[Active]]></string>
+    <string name="_bx_dev_bp_txt_block_active"><![CDATA[Active]]></string>
     <string name="_bx_dev_bp_btn_sys_block_add"><![CDATA[Add]]></string>
     <string name="_bx_dev_bp_btn_block_add"><![CDATA[Add]]></string>
     <string name="_bx_dev_bp_btn_block_save"><![CDATA[Save]]></string>

modules/boonex/developer/install/sql/install.sql

@@ -95,7 +95,7 @@ INSERT INTO `sys_form_inputs` (`object`, `module`, `name`, `value`, `values`, `c
 ('mod_dev_forms_form', @sName, 'uri', '', '', 0, 'text', '_bx_dev_frm_txt_sys_forms_uri', '_bx_dev_frm_txt_forms_uri', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 0, 0),
 ('mod_dev_forms_form', @sName, 'uri_title', '', '', 0, 'text', '_bx_dev_frm_txt_sys_forms_uri_title', '_bx_dev_frm_txt_forms_uri_title', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 0, 0),
 ('mod_dev_forms_form', @sName, 'params', '', '', 0, 'textarea', '_bx_dev_frm_txt_sys_forms_params', '_bx_dev_frm_txt_forms_params', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 0, 0),
-('mod_dev_forms_form', @sName, 'deletable', '1', '', 0, 'checkbox', '_bx_dev_frm_txt_sys_forms_deletable', '_bx_dev_frm_txt_forms_deletable', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 0, 0),
+('mod_dev_forms_form', @sName, 'deletable', '1', '', 0, 'switcher', '_bx_dev_frm_txt_sys_forms_deletable', '_bx_dev_frm_txt_forms_deletable', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 0, 0),
 ('mod_dev_forms_form', @sName, 'override_class_name', '', '', 0, 'text', '_bx_dev_frm_txt_sys_forms_override_class_name', '_bx_dev_frm_txt_forms_override_class_name', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 0, 0),
 ('mod_dev_forms_form', @sName, 'override_class_file', '', '', 0, 'text', '_bx_dev_frm_txt_sys_forms_override_class_file', '_bx_dev_frm_txt_forms_override_class_file', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 0, 0),
 ('mod_dev_forms_form', @sName, 'controls', '', 'do_submit,cancel', 0, 'input_set', '', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
@@ -155,7 +155,7 @@ INSERT INTO `sys_form_inputs` (`object`, `module`, `name`, `value`, `values`, `c
 ('mod_dev_forms_display', @sName, 'module', '', '', 0, 'select', '_bx_dev_frm_txt_sys_displays_module', '_bx_dev_frm_txt_displays_module', '', 1, 0, 0, '', '', '', 'Avail', '', '_bx_dev_frm_err_displays_module', 'Xss', '', 0, 0),
 ('mod_dev_forms_display', @sName, 'object', '', '', 0, 'select', '_bx_dev_frm_txt_sys_displays_object', '_bx_dev_frm_txt_displays_object', '', 1, 0, 0, '', '', '', 'Avail', '', '_bx_dev_frm_err_displays_object', 'Xss', '', 0, 0),
 ('mod_dev_forms_display', @sName, 'title', '', '', 0, 'text', '_bx_dev_frm_txt_sys_displays_title', '_bx_dev_frm_txt_displays_title', '', 1, 0, 0, '', '', '', 'Length', 'a:2:{s:3:"min";i:6;s:3:"max";i:100;}', '_bx_dev_frm_err_displays_title', 'Xss', '', 0, 0),
-('mod_dev_forms_display', @sName, 'view_mode', '1', '', 0, 'checkbox', '_bx_dev_frm_txt_sys_displays_view_mode', '_bx_dev_frm_txt_displays_view_mode', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 0, 0),
+('mod_dev_forms_display', @sName, 'view_mode', '1', '', 0, 'switcher', '_bx_dev_frm_txt_sys_displays_view_mode', '_bx_dev_frm_txt_displays_view_mode', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 0, 0),
 ('mod_dev_forms_display', @sName, 'controls', '', 'do_submit,cancel', 0, 'input_set', '', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
 ('mod_dev_forms_display', @sName, 'do_submit', '_bx_dev_frm_btn_displays_add', '', 0, 'submit', '_bx_dev_frm_btn_sys_displays_add', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
 ('mod_dev_forms_display', @sName, 'cancel', '_bx_dev_frm_btn_displays_cancel', '', 0, 'button', '_bx_dev_frm_btn_sys_displays_cancel', '', '', 0, 0, 0, 'a:2:{s:7:"onclick";s:45:"$(''.bx-popup-applied:visible'').dolPopupHide()";s:5:"class";s:22:"bx-def-margin-sec-left";}', '', '', '', '', '', '', '', 0, 0);
@@ -194,7 +194,7 @@ INSERT INTO `sys_form_inputs` (`object`, `module`, `name`, `value`, `values`, `c
 ('mod_dev_forms_prelist', @sName, 'key', '', '', 0, 'text', '_bx_dev_frm_txt_sys_prelists_key', '_bx_dev_frm_txt_prelists_key', '', 1, 0, 0, '', '', '', 'Length', 'a:2:{s:3:"min";i:6;s:3:"max";i:100;}', '_bx_dev_frm_err_prelists_key', 'Xss', '', 0, 0),
 ('mod_dev_forms_prelist', @sName, 'module', '', '', 0, 'select', '_bx_dev_frm_txt_sys_prelists_module', '_bx_dev_frm_txt_prelists_module', '', 1, 0, 0, '', '', '', 'Avail', '', '_bx_dev_frm_err_prelists_module', 'Xss', '', 0, 0),
 ('mod_dev_forms_prelist', @sName, 'title', '', '', 0, 'text', '_bx_dev_frm_txt_sys_prelists_title', '_bx_dev_frm_txt_prelists_title', '', 1, 0, 0, '', '', '', 'Length', 'a:2:{s:3:"min";i:6;s:3:"max";i:100;}', '_bx_dev_frm_err_prelists_title', 'Xss', '', 0, 0),
-('mod_dev_forms_prelist', @sName, 'use_for_sets', '1', '', 1, 'checkbox', '_bx_dev_frm_txt_sys_prelists_use_for_sets', '_bx_dev_frm_txt_prelists_use_for_sets', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 0, 0),
+('mod_dev_forms_prelist', @sName, 'use_for_sets', '1', '', 1, 'switcher', '_bx_dev_frm_txt_sys_prelists_use_for_sets', '_bx_dev_frm_txt_prelists_use_for_sets', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 0, 0),
 ('mod_dev_forms_prelist', @sName, 'controls', '', 'do_submit,cancel', 0, 'input_set', '', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
 ('mod_dev_forms_prelist', @sName, 'do_submit', '_bx_dev_frm_btn_prelists_add', '', 0, 'submit', '_bx_dev_frm_btn_sys_prelists_add', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
 ('mod_dev_forms_prelist', @sName, 'cancel', '_bx_dev_frm_btn_prelists_cancel', '', 0, 'button', '_bx_dev_frm_btn_sys_prelists_cancel', '', '', 0, 0, 0, 'a:2:{s:7:"onclick";s:45:"$(''.bx-popup-applied:visible'').dolPopupHide()";s:5:"class";s:22:"bx-def-margin-sec-left";}', '', '', '', '', '', '', '', 0, 0);
@@ -313,7 +313,7 @@ INSERT INTO `sys_form_inputs` (`object`, `module`, `name`, `value`, `values`, `c
 ('mod_dev_nav_menu', @sName, 'title', '', '', 0, 'text', '_bx_dev_nav_txt_sys_menus_title', '_bx_dev_nav_txt_menus_title', '', 1, 0, 0, '', '', '', 'Length', 'a:2:{s:3:"min";i:6;s:3:"max";i:100;}', '_bx_dev_nav_err_menus_title', 'Xss', '', 0, 0),
 ('mod_dev_nav_menu', @sName, 'set_name', '', '', 0, 'select', '_bx_dev_nav_txt_sys_menus_set_name', '_bx_dev_nav_txt_menus_set_name', '', 1, 0, 0, '', '', '', 'Avail', '', '_bx_dev_nav_err_menus_set_name', 'Xss', '', 0, 0),
 ('mod_dev_nav_menu', @sName, 'template_id', '', '', 0, 'select', '_bx_dev_nav_txt_sys_menus_template_id', '_bx_dev_nav_txt_menus_template_id', '', 1, 0, 0, '', '', '', 'Avail', '', '_bx_dev_nav_err_menus_template_id', 'Int', '', 0, 0),
-('mod_dev_nav_menu', @sName, 'deletable', '1', '', 0, 'checkbox', '_bx_dev_nav_txt_sys_menus_deletable', '_bx_dev_nav_txt_menus_deletable', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 0, 0),
+('mod_dev_nav_menu', @sName, 'deletable', '1', '', 0, 'switcher', '_bx_dev_nav_txt_sys_menus_deletable', '_bx_dev_nav_txt_menus_deletable', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 0, 0),
 ('mod_dev_nav_menu', @sName, 'override_class_name', '', '', 0, 'text', '_bx_dev_nav_txt_sys_menus_override_class_name', '_bx_dev_nav_txt_menus_override_class_name', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 0, 0),
 ('mod_dev_nav_menu', @sName, 'override_class_file', '', '', 0, 'text', '_bx_dev_nav_txt_sys_menus_override_class_file', '_bx_dev_nav_txt_menus_override_class_file', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 0, 0),
 ('mod_dev_nav_menu', @sName, 'controls', '', 'do_submit,cancel', 0, 'input_set', '', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
@@ -359,7 +359,7 @@ INSERT INTO `sys_form_inputs` (`object`, `module`, `name`, `value`, `values`, `c
 ('mod_dev_nav_set', @sName, 'module', '', '', 0, 'select', '_bx_dev_nav_txt_sys_sets_module', '_bx_dev_nav_txt_sets_module', '', 1, 0, 0, '', '', '', 'Avail', '', '_bx_dev_nav_err_sets_module', 'Xss', '', 0, 0),
 ('mod_dev_nav_set', @sName, 'set_name', '', '', 0, 'text', '_bx_dev_nav_txt_sys_sets_set_name', '_bx_dev_nav_txt_sets_set_name', '', 1, 0, 0, '', '', '', 'Length', 'a:2:{s:3:"min";i:6;s:3:"max";i:100;}', '_bx_dev_nav_err_sets_set_name', 'Xss', '', 0, 0),
 ('mod_dev_nav_set', @sName, 'title', '', '', 0, 'text', '_bx_dev_nav_txt_sys_sets_title', '_bx_dev_nav_txt_sets_title', '', 1, 0, 0, '', '', '', 'Length', 'a:2:{s:3:"min";i:6;s:3:"max";i:100;}', '_bx_dev_nav_err_sets_title', 'Xss', '', 0, 0),
-('mod_dev_nav_set', @sName, 'deletable', '1', '', 0, 'checkbox', '_bx_dev_nav_txt_sys_sets_deletable', '_bx_dev_nav_txt_sets_deletable', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 0, 0),
+('mod_dev_nav_set', @sName, 'deletable', '1', '', 0, 'switcher', '_bx_dev_nav_txt_sys_sets_deletable', '_bx_dev_nav_txt_sets_deletable', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 0, 0),
 ('mod_dev_nav_set', @sName, 'controls', '', 'do_submit,cancel', 0, 'input_set', '', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
 ('mod_dev_nav_set', @sName, 'do_submit', '_bx_dev_nav_btn_sets_add', '', 0, 'submit', '_bx_dev_nav_btn_sys_sets_add', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
 ('mod_dev_nav_set', @sName, 'cancel', '_bx_dev_nav_btn_sets_cancel', '', 0, 'button', '_bx_dev_nav_btn_sys_sets_cancel', '', '', 0, 0, 0, 'a:2:{s:7:"onclick";s:45:"$(''.bx-popup-applied:visible'').dolPopupHide()";s:5:"class";s:22:"bx-def-margin-sec-left";}', '', '', '', '', '', '', '', 0, 0);
@@ -402,7 +402,7 @@ INSERT INTO `sys_form_inputs` (`object`, `module`, `name`, `value`, `values`, `c
 ('mod_dev_nav_item', @sName, 'target', '', '', 0, 'text', '_bx_dev_nav_txt_sys_items_target', '_bx_dev_nav_txt_items_target', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 0, 0),
 ('mod_dev_nav_item', @sName, 'icon', '', '', 0, 'text', '_bx_dev_nav_txt_sys_items_icon', '_bx_dev_nav_txt_items_icon', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 0, 0),
 ('mod_dev_nav_item', @sName, 'submenu_object', '', '', 0, 'text', '_bx_dev_nav_txt_sys_items_submenu_object', '_bx_dev_nav_txt_items_submenu_object', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 0, 0),
-('mod_dev_nav_item', @sName, 'copyable', '1', '', 0, 'checkbox', '_bx_dev_nav_txt_sys_items_copyable', '_bx_dev_nav_txt_items_copyable', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 0, 0),
+('mod_dev_nav_item', @sName, 'copyable', '1', '', 0, 'switcher', '_bx_dev_nav_txt_sys_items_copyable', '_bx_dev_nav_txt_items_copyable', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 0, 0),
 ('mod_dev_nav_item', @sName, 'controls', '', 'do_submit,cancel', 0, 'input_set', '', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
 ('mod_dev_nav_item', @sName, 'do_submit', '_bx_dev_nav_btn_items_add', '', 0, 'submit', '_bx_dev_nav_btn_sys_items_add', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
 ('mod_dev_nav_item', @sName, 'cancel', '_bx_dev_nav_btn_items_cancel', '', 0, 'button', '_bx_dev_nav_btn_sys_items_cancel', '', '', 0, 0, 0, 'a:2:{s:7:"onclick";s:45:"$(''.bx-popup-applied:visible'').dolPopupHide()";s:5:"class";s:22:"bx-def-margin-sec-left";}', '', '', '', '', '', '', '', 0, 0);
@@ -455,7 +455,7 @@ INSERT INTO `sys_form_inputs` (`object`, `module`, `name`, `value`, `values`, `c
 ('mod_dev_bp_page', @sName, 'uri', '', '', 0, 'text', '_bx_dev_bp_txt_sys_page_uri', '_bx_dev_bp_txt_page_uri', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 0, 0),
 ('mod_dev_bp_page', @sName, 'url', '', '', 0, 'text', '_bx_dev_bp_txt_sys_page_url', '_bx_dev_bp_txt_page_url', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 0, 0),
 ('mod_dev_bp_page', @sName, 'layout_id', '', '', 0, 'select', '_bx_dev_bp_txt_sys_page_layout_id', '_bx_dev_bp_txt_page_layout_id', '', 1, 0, 0, '', '', '', 'Avail', '', '_bx_dev_bp_err_page_layout_id', 'Int', '', 0, 0),
-('mod_dev_bp_page', @sName, 'deletable', '1', '', 0, 'checkbox', '_bx_dev_bp_txt_sys_page_deletable', '_bx_dev_bp_txt_page_deletable', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 0, 0),
+('mod_dev_bp_page', @sName, 'deletable', '1', '', 0, 'switcher', '_bx_dev_bp_txt_sys_page_deletable', '_bx_dev_bp_txt_page_deletable', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 0, 0),
 ('mod_dev_bp_page', @sName, 'override_class_name', '', '', 0, 'text', '_bx_dev_bp_txt_sys_page_override_class_name', '_bx_dev_bp_txt_page_override_class_name', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 0, 0),
 ('mod_dev_bp_page', @sName, 'override_class_file', '', '', 0, 'text', '_bx_dev_bp_txt_sys_page_override_class_file', '_bx_dev_bp_txt_page_override_class_file', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 0, 0),
 ('mod_dev_bp_page', @sName, 'controls', '', 'do_submit,cancel', 0, 'input_set', '', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
@@ -494,8 +494,9 @@ INSERT INTO `sys_form_inputs` (`object`, `module`, `name`, `value`, `values`, `c
 ('mod_dev_bp_block', @sName, 'designbox_id', '', '', 0, 'select', '_bx_dev_bp_txt_sys_block_designbox_id', '_bx_dev_bp_txt_block_designbox_id', '', 1, 0, 0, '', '', '', 'Avail', '', '_bx_dev_bp_err_block_designbox_id', 'Xss', '', 0, 0),
 ('mod_dev_bp_block', @sName, 'visible_for', '', '', 0, 'select', '_bx_dev_bp_txt_sys_block_visible_for', '_bx_dev_bp_txt_block_visible_for', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 0, 0),
 ('mod_dev_bp_block', @sName, 'visible_for_levels', '', '', 0, 'checkbox_set', '_bx_dev_bp_txt_sys_block_visible_for_levels', '_bx_dev_bp_txt_block_visible_for_levels', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 0, 0),
-('mod_dev_bp_block', @sName, 'deletable', '1', '', 0, 'checkbox', '_bx_dev_bp_txt_sys_block_deletable', '_bx_dev_bp_txt_block_deletable', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 0, 0),
-('mod_dev_bp_block', @sName, 'copyable', '1', '', 0, 'checkbox', '_bx_dev_bp_txt_sys_block_copyable', '_bx_dev_bp_txt_block_copyable', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 0, 0),
+('mod_dev_bp_block', @sName, 'deletable', '1', '', 0, 'switcher', '_bx_dev_bp_txt_sys_block_deletable', '_bx_dev_bp_txt_block_deletable', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 0, 0),
+('mod_dev_bp_block', @sName, 'copyable', '1', '', 0, 'switcher', '_bx_dev_bp_txt_sys_block_copyable', '_bx_dev_bp_txt_block_copyable', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 0, 0),
+('mod_dev_bp_block', @sName, 'active', '1', '', 0, 'switcher', '_bx_dev_bp_txt_sys_block_active', '_bx_dev_bp_txt_block_active', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 0, 0),
 ('mod_dev_bp_block', @sName, 'controls', '', 'do_submit,cancel,delete', 0, 'input_set', '', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
 ('mod_dev_bp_block', @sName, 'do_submit', '_bx_dev_bp_btn_block_add', '', 0, 'submit', '_bx_dev_bp_btn_sys_block_add', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
 ('mod_dev_bp_block', @sName, 'cancel', '_bx_dev_bp_btn_block_cancel', '', 0, 'button', '_bx_dev_bp_btn_sys_block_cancel', '', '', 0, 0, 0, 'a:2:{s:7:"onclick";s:45:"$(''.bx-popup-applied:visible'').dolPopupHide()";s:5:"class";s:22:"bx-def-margin-sec-left";}', '', '', '', '', '', '', '', 0, 0),
@@ -511,10 +512,11 @@ INSERT INTO `sys_form_display_inputs` (`display_name`, `input_name`, `visible_fo
 ('mod_dev_bp_block_edit', 'visible_for_levels', 2147483647, 1, 7),
 ('mod_dev_bp_block_edit', 'deletable', 2147483647, 1, 8),
 ('mod_dev_bp_block_edit', 'copyable', 2147483647, 1, 9),
-('mod_dev_bp_block_edit', 'controls', 2147483647, 1, 10),
-('mod_dev_bp_block_edit', 'do_submit', 2147483647, 1, 11),
-('mod_dev_bp_block_edit', 'cancel', 2147483647, 1, 12),
-('mod_dev_bp_block_edit', 'delete', 2147483647, 1, 13);
+('mod_dev_bp_block_edit', 'active', 2147483647, 1, 10),
+('mod_dev_bp_block_edit', 'controls', 2147483647, 1, 11),
+('mod_dev_bp_block_edit', 'do_submit', 2147483647, 1, 12),
+('mod_dev_bp_block_edit', 'cancel', 2147483647, 1, 13),
+('mod_dev_bp_block_edit', 'delete', 2147483647, 1, 14);
 
 --
 -- Polyglot -> Grid descriptors

modules/boonex/timeline/classes/BxTimelineModule.php

@@ -321,15 +321,18 @@ class BxTimelineModule extends BxDolModule
         $oResponse->response($oAlert);
     }
 
-    public function serviceGetBlockPost($iProfileId = 0)
+    /*
+	 * Get Post block for a separate page. 
+	 */
+    public function serviceGetBlockPost($sProfileModule = 'bx_persons', $iProfileId = 0)
     {
-    	return $this->serviceGetBlockPostProfile($iProfileId);
+    	return $this->serviceGetBlockPostProfile($sProfileModule, $iProfileId);
     }
 
-	public function serviceGetBlockPostProfile($iProfileId = 0)
+	public function serviceGetBlockPostProfile($sProfileModule = 'bx_persons', $iProfileId = 0)
 	{
-		if(!$iProfileId && bx_get('id') !== false) {
-			$oProfile = BxDolProfile::getInstanceByContentAndType(bx_process_input(bx_get('id'), BX_DATA_INT), 'bx_persons');
+		if(empty($iProfileId) && !empty($sProfileModule) && bx_get('id') !== false) {
+			$oProfile = BxDolProfile::getInstanceByContentAndType(bx_process_input(bx_get('id'), BX_DATA_INT), $sProfileModule);
 			if(!empty($oProfile))
             	$iProfileId = $oProfile->id();
 		}
@@ -348,19 +351,22 @@ class BxTimelineModule extends BxDolModule
         );
 	}
 
-	public function serviceGetBlockView($iProfileId = 0)
+	/*
+	 * Get View block for a separate page. Will return a block with "Empty" message if nothing found. 
+	 */
+	public function serviceGetBlockView($sProfileModule = 'bx_persons', $iProfileId = 0)
 	{
-		$aBlock = $this->serviceGetBlockViewProfile($iProfileId);
+		$aBlock = $this->serviceGetBlockViewProfile($sProfileModule, $iProfileId);
 		if(!empty($aBlock))
 			return $aBlock;
 
     	return array('content' => MsgBox(_t('_bx_timeline_txt_msg_no_results'))); 
     }
 
-	public function serviceGetBlockViewProfile($iProfileId = 0, $iStart = -1, $iPerPage = -1, $sFilter = '', $aModules = array(), $iTimeline = -1)
+	public function serviceGetBlockViewProfile($sProfileModule = 'bx_persons', $iProfileId = 0, $iStart = -1, $iPerPage = -1, $sFilter = '', $aModules = array(), $iTimeline = -1)
 	{
-		if(!$iProfileId && bx_get('id') !== false) {
-			$oProfile = BxDolProfile::getInstanceByContentAndType(bx_process_input(bx_get('id'), BX_DATA_INT), 'bx_persons');
+		if(empty($iProfileId) && !empty($sProfileModule) && bx_get('id') !== false) {
+			$oProfile = BxDolProfile::getInstanceByContentAndType(bx_process_input(bx_get('id'), BX_DATA_INT), $sProfileModule);
 			if(!empty($oProfile))
             	$iProfileId = $oProfile->id();
 		}

modules/boonex/timeline/classes/BxTimelineTemplate.php

@@ -653,11 +653,16 @@ class BxTimelineTemplate extends BxDolModuleTemplate
 
 		//--- Process Text ---// 
 		$sUrl = isset($aContent['url']) ? bx_html_attribute($aContent['url']) : '';
-		$sTitle = isset($aContent['title']) ? bx_process_output($aContent['title']) : '';
+		$sTitle = $sTitleAttr = '';
+		if(isset($aContent['title'])) {
+			$sTitle = bx_process_output($aContent['title']);
+			$sTitleAttr = bx_html_attribute($aContent['title']);
+		}
+
 		if(!empty($sUrl) && !empty($sTitle))
 			$sTitle = $this->parseHtmlByName('bx_a.html', array(
 				'href' => $sUrl,
-				'title' => $sTitle,
+				'title' => $sTitleAttr,
 				'bx_repeat:attrs' => array(
 					array('key' => 'class', 'value' => $sStylePrefix . '-title')
 				),

studio/template/scripts/BxBaseStudioFormsField.php

@@ -810,7 +810,7 @@ class BxBaseStudioFormsFieldText extends BxBaseStudioFormsFieldBlockHeader {
                 )
             ),
             'required' => array(
-                'type' => 'checkbox',
+                'type' => 'switcher',
                 'name' => 'required',
                 'caption' => _t('_adm_form_txt_field_required'),
                 'info' => _t('_adm_form_dsc_field_required'),

template/comment.html

@@ -27,7 +27,7 @@
 						__text__<bx_if:show_more><span class="__style_prefix__-body-see-more">... <a class="bx-def-font-small" href="javascript:void(0)" onclick="__js_object__.showMore(this);"><bx_text:_see_more /></a></span><span style="display:none;"> __text_more__</span></bx_if:show_more>
 					</div>
 					<bx_if:show_attached>
-						<div class="__style_prefix__-attached bx-clearfix">
+						<div class="__style_prefix__-attached bx-def-margin-thd-leftright-neg bx-clearfix">
 							<bx_repeat:attached>
 								<div class="__style_prefix__-attached-preview bx-def-round-corners bx-def-margin-thd">
 									<a href="javascript:void(0)" onclick="__js_object__.showImage(this, __id__); return false;" title="<bx_text_attribute:_cmt_view_attached_image />">

template/comment_actions.html

@@ -3,12 +3,6 @@
 		<a class="__style_prefix__-ago" href="__view_link__" rel="nofollow">__ago__</a>
 	</div>
 	__menu_actions__
-	<!--
-	//TODO: Move counters inside menu
-	<div class="__style_prefix__-points-wrp bx-def-margin-left" <bx_if:hide_rate_count>style="display:none;"</bx_if:hide_rate_count>>
-		<a class="__style_prefix__-points" href="javascript:void(0)" onclick="__js_object__.togglePlusedByPopup(this, __id__); return false;" title="<bx_text_attribute:_Plused_by_popup />">__points__</a>
-	</div>
-	 -->
 </div>
 <bx_if:show_menu_manage>
 	<div class="__style_prefix__-comment-manage-link bx-def-font-large">

template/comment_hidden.html

@@ -1,3 +1,3 @@
-<li id="cmt__id__-hidden" class="cmt-replacement">
+<li id="cmt__id__-hidden" class="cmt-replacement bx-def-margin-sec-bottom bx-def-font-small">
 	__title__ <bx_if:show_replies>__replies__. </bx_if:show_replies><a href="javascript:void(0)" onclick="javascript:__js_object__.showReplacement(__id__)"><bx_text:_show_replacement /></a>.
 </li>

template/comment_plused_by.html

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

template/css/cmts.css

@@ -28,15 +28,15 @@
        display: none;
     }
     li.cmt-replacement {
-       height: 30px;
-       margin-bottom: 10px;
-       position: relative;
-       background-color: #ededed;
-       overflow: hidden;
-       text-indent: 10px;
-       line-height: 30px;
-       font-size: 11px;
-       color: #333333;
+    	position: relative;
+		height: 30px;
+		height: 1.875rem;
+		background-color: #ededed;
+		text-indent: 10px;
+    	text-indent: 0.5rem;
+		line-height: 30px;
+    	line-height: 1.875rem;
+    	overflow: hidden;
     }
     div.cmt-cnt {
 		position: relative;
@@ -56,13 +56,6 @@
     li.cmt-more-root div.cmt-more-cont {
     	position: relative;
     }
-    li.cmt-more-root div.cmt-more-line {
-    	position: absolute;
-    	top: 50%;
-    	width: 100%;
-		border-width: 4px;
-    	borded-bottom: none;
-    }
     li.cmt-more-root .bx-btn {
     	position: relative;
 		float: none;
@@ -78,6 +71,7 @@
     	text-align: center;
     }
     div.cmt-avatar .sys-icon {
+    	font-size: 60px;
 		font-size: 3.75rem;
     }
     div.cmt-info {
@@ -112,9 +106,11 @@
     }
 	div.cmt-cont .bullet {
 		padding: 0px 5px;
+		padding: 0px 0.3rem;
     }
     div.cmt-cont .cmt-post-reply .bx-form-element-wrapper {
 		margin-top: 10px;
+    	margin-top: 0.5rem;
     }
 	div.cmt-cont .cmt-post-reply .bx-form-element-wrapper:first-child {
 		margin-top: 0px;
@@ -122,18 +118,15 @@
     span.cmt-body-see-more a {
 		font-weight: bold;
     }
-    
-    div.cmt-attached {
-		margin-left: -5px;
-    	margin-right: -5px;
-    }
     div.cmt-attached-preview {
 		overflow:hidden;
     }
     div.cmt-attached-preview,
     div.cmt-attached-preview img {
     	width: 100px;
+    	width: 6.25rem;
     	height: 100px;
+    	height: 6.25rem;
     }
     div.cmt-attached-preview {
     	position: relative;
@@ -147,7 +140,9 @@
 	img.cmt-attached-image {
 		position: relative;
 		max-width: 600px;
+		max-width: 37.5rem;
 		max-height: 600px;
+		max-height: 37.5rem;
 		cursor: pointer;
 	}
 	
@@ -177,19 +172,6 @@
 		white-space: nowrap;
     }
 
-    /*--- Comment Plused By ---*/
-    div.cmt-pb-list {}
-    div.cmt-pb-list-cnt {
-    	max-height: 200px;
-    	min-width: 195px;
-		overflow: auto;
-    }
-    div.cmt-pb-list div.bx-persons-unit {
-		float: none;
-    	margin-right: 0px;
-    	margin-bottom: 0px;
-    }
-
     /*--- Add Comment/Reply Styles ---*/
     div.cmt-reply {
 		position: relative;
@@ -201,6 +183,7 @@
     /*--- Add Comment/Reply Form Styles ---*/
     form.cmt-post-reply .bx-form-input-textarea {
 		height: 64px;
+    	height: 4rem;
     }
     form.cmt-post-reply .bx-form-input-submit {
     	text-transform: uppercase;
@@ -225,7 +208,9 @@
     div.cmts-uploader-file-preview,
     div.cmts-uploader-file-preview img {
 		width: 100px;
+    	width: 6.25rem;
     	height: 100px;
+    	height: 6.25rem;
     }
     div.cmts-uploader-file-preview img {
 		background-position: center center;

template/css/default.less

@@ -96,6 +96,9 @@
     .margin-left(@bx-margin-thd);
     .margin-right(@bx-margin-thd);
 }
+.bx-def-margin-thd-leftright-neg {
+	.bx-dm-margin-leftright-neg(0.3rem);
+}
 .bx-def-margin-thd-topbottom {
     .margin-top(@bx-margin-thd);
     .margin-bottom(@bx-margin-thd);

template/css/vote.css

@@ -2,7 +2,9 @@
 div.bx-vote-by-list {}
 div.bx-vote-by-list-cnt {
 	max-height: 200px;
-	min-width: 225px;
+	max-height: 12.5rem;
+	min-width: 220px;
+	min-width: 13.75rem;
 	overflow: auto;
 }
 div.bx-vote-by-list div.bx-persons-unit {

template/scripts/BxBaseCmts.php

@@ -294,30 +294,6 @@ class BxBaseCmts extends BxDolCmts {
         return $this->_getFormEdit($aCmt);
     }
 
-    function getPlusedBy($iCmtId)
-    {
-    	$oTemplate = BxDolTemplate::getInstance();
-
-    	$aTmplUsers = array();
-
-    	$aUserIds = $this->_oQuery->getRatedBy($this->_aSystem['system_id'], $iCmtId);
-    	foreach($aUserIds as $iUserId) {
-    		list($sUserName, $sUserUrl, $sUserIcon, $sUserUnit) = $this->_getAuthorInfo($iUserId);
-			$aTmplUsers[] = array(
-				'style_prefix' => $this->_sStylePrefix,
-				'user_unit' => $sUserUnit
-			);
-    	}
-
-    	$sContent = $oTemplate->parseHtmlByName('comment_plused_by.html', array(
-    		'style_prefix' => $this->_sStylePrefix,
-    		'bx_repeat:list' => $aTmplUsers
-    	));
-
-    	bx_import('BxTemplStudioFunctions');
-        return BxTemplStudioFunctions::getInstance()->transBox($this->_sSystem . '-plused-by', $sContent, true);
-    }
-
     function getImage($iImgId)
     {
     	if(!$this->isAttachImageEnabled())

template/scripts/BxBaseFunctions.php

@@ -508,7 +508,7 @@ EOF;
         // add button width popup
         $sId = 'bx-str-limit-' . rand(1, PHP_INT_MAX);
         $sPopup = '<img class="bx-str-limit" onclick="$(\'#' . $sId . '\').dolPopup({pointer:{el:$(this), offset:\'10 1\'}})" src="' . $this->getTemplateImage('str-limit.png') . '"/>';
-        $sPopup .= '<div id="' . $sId . '" style="display:none;">' . BxTemplFunctions::getInstance()->transBox('<div class="bx-def-padding bx-def-color-bg-block">'.$sString.'</div>') . '</div>';
+        $sPopup .= '<div id="' . $sId . '" style="display:none;">' . BxTemplFunctions::getInstance()->transBox('', '<div class="bx-def-padding bx-def-color-bg-block">'.$sString.'</div>') . '</div>';
 
         return $bReturnString ? $sResult . $sPopup : array($sResult, $sPopup);
     }