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

modules/boonex/intercom/classes/BxIntercomModule.php

@@ -26,6 +26,9 @@ class BxIntercomModule extends BxDolModule
 
         $aSettings = array(
             'app_id' => $sAppId,
+            'alignment' => getParam('bx_intercom_option_alignment'),
+            'horizontal_padding' => getParam('bx_intercom_option_horizontal_padding'),
+            'vertical_padding' => getParam('bx_intercom_option_vertical_padding'),
         );
 
         if (isLogged() && ($oProfile = BxDolProfile::getInstance()) && ($oAccountObject = $oProfile->getAccountObject())) {

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

@@ -8,6 +8,9 @@
     <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_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>
 
 	<string name="_bx_intercom_information"><![CDATA[Information]]></string>
     <string name="_bx_intercom_information_block"><![CDATA[

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

@@ -12,7 +12,10 @@ 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_api_key', '', @iCategId, '_bx_intercom_option_api_key', 'digit', '', '', 20, ''),
+('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, '');
 
 -- Injections