From 3332344c51db2077a9cdc22dff5e0c5264125c83 Mon Sep 17 00:00:00 2001
From: Remdex <remdex@gmail.com>
Date: Mon, 9 Mar 2015 17:04:25 +0100
Subject: [PATCH 1/2] Componentize get status

---
 .../defaulttheme/tpl/lhchat/getstatus.tpl.php    | 16 +++++++++++-----
 .../getstatus/lhc_chat_multiinclude.tpl.php      |  9 +++++++++
 .../tpl/lhchat/getstatus/we_here.tpl.php         | 14 ++------------
 .../lhchat/getstatus/we_here_substatus.tpl.php   | 13 +++++++++++++
 .../part/operator_profile_start_chat.tpl.php     |  1 +
 .../operator_profile_start_chat_post.tpl.php     |  5 +++++
 6 files changed, 41 insertions(+), 17 deletions(-)
 create mode 100644 lhc_web/design/defaulttheme/tpl/lhchat/getstatus/lhc_chat_multiinclude.tpl.php
 create mode 100644 lhc_web/design/defaulttheme/tpl/lhchat/getstatus/we_here_substatus.tpl.php
 create mode 100644 lhc_web/design/defaulttheme/tpl/lhchat/part/operator_profile_start_chat_post.tpl.php

diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/getstatus.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/getstatus.tpl.php
index ff31fa7bcc..ed7d9aafa1 100644
--- a/lhc_web/design/defaulttheme/tpl/lhchat/getstatus.tpl.php
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/getstatus.tpl.php
@@ -123,7 +123,7 @@
     cookieDataPers : {},
 	domain : false,
     isSharing : false,
-        
+    extensionArgs : '',    
     getCookieDomain : function(domain) {    
     	 if (this.domain !== false) {
     	 	return this.domain;
@@ -281,7 +281,7 @@
 
     parseOptions : function() {
 		argumentsQuery = new Array();
-
+        var paramsReturn = '';
 		if (typeof LHCChatOptions != 'undefined') {
 	    	if (typeof LHCChatOptions.attr != 'undefined') {
 	    		if (LHCChatOptions.attr.length > 0){
@@ -307,11 +307,15 @@
 	    	};
 
 	    	if (argumentsQuery.length > 0) {
-	    		return '&'+argumentsQuery.join('&');
+	    		paramsReturn = '&'+argumentsQuery.join('&');
 	    	};
     	};
 
-    	return '';
+    	if (this.extensionArgs != '') {
+    	    paramsReturn = paramsReturn + this.extensionArgs;
+    	}
+    	
+    	return paramsReturn;
     },
 
     parseOptionsOnline : function(){
@@ -807,7 +811,7 @@
         },<?php echo (int)(erLhcoreClassModelChatConfig::fetch('checkstatus_timeout')->current_value*1000); ?>);
         <?php endif;?>       		
     },
-    
+        
     handleMessage : function(e) {
     	var action = e.data.split(':')[0];
     	if (action == 'lhc_sizing_chat') {
@@ -857,6 +861,8 @@
     }
 };
 
+<?php include(erLhcoreClassDesign::designtpl('lhchat/getstatus/lhc_chat_multiinclude.tpl.php')); ?>	
+
 if ( window.attachEvent ) {
 	// IE
 	window.attachEvent("onmessage", lh_inst.handleMessage);
diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/getstatus/lhc_chat_multiinclude.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/getstatus/lhc_chat_multiinclude.tpl.php
new file mode 100644
index 0000000000..da748802dd
--- /dev/null
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/getstatus/lhc_chat_multiinclude.tpl.php
@@ -0,0 +1,9 @@
+<?php 
+/**
+ * You can override some main lhc javascript object attributes, or create a new one
+ * E.g
+ * lh_inst.someFunction = function(){
+ * 
+ * }
+ * */
+?>
\ No newline at end of file
diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/getstatus/we_here.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/getstatus/we_here.tpl.php
index 402c075597..b9af4e0d99 100644
--- a/lhc_web/design/defaulttheme/tpl/lhchat/getstatus/we_here.tpl.php
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/getstatus/we_here.tpl.php
@@ -3,18 +3,8 @@
 if (this.isOnline == true) {
 var lhc_hnh = <?php if (erLhcoreClassModelChatConfig::fetch('need_help_tip_timeout')->current_value > 0) : ?>lh_inst.getPersistentAttribute('lhc_hnh');<?php else : ?>lh_inst.cookieData.lhc_hnh;<?php endif;?>
 if (lhc_hnh == null || lhc_hnh == undefined || parseInt(lhc_hnh) < <?php echo time()?>) {
-var titleText = (typeof LHCChatOptions.opt.nh_title_text != 'undefined') ? LHCChatOptions.opt.nh_title_text : <?php if ($theme !== false && $theme->need_help_header !== '') : print json_encode($theme->need_help_header); else : ?><?php echo json_encode(htmlspecialchars_decode(erTranslationClassLhTranslation::getInstance()->getTranslation('chat/getstatus','Need help?'),ENT_QUOTES))?><?php endif;?>;
-var subTitleText = (typeof LHCChatOptions.opt.nh_sub_title_text != 'undefined') ? LHCChatOptions.opt.nh_sub_title_text : <?php if ($theme !== false && $theme->need_help_text !== '') : print json_encode($theme->need_help_text); else : ?><?php echo json_encode(htmlspecialchars_decode(erTranslationClassLhTranslation::getInstance()->getTranslation('chat/getstatus','Our staff is always ready to help'),ENT_QUOTES))?><?php endif;?>;
-var imageTooltip = (typeof LHCChatOptions.opt.nh_image != 'undefined') ? LHCChatOptions.opt.nh_image : '<?php echo erLhcoreClassModelChatConfig::fetch('explicit_http_mode')->current_value?>//<?php echo $_SERVER['HTTP_HOST']?><?php if ($theme !== false && $theme->need_help_image_url !== false) : print $theme->need_help_image_url; else : ?><?php echo erLhcoreClassDesign::design('images/general/operator.png');?><?php endif;?>';
-subStatus = '<div id="lhc_need_help_container" style="<?php echo $currentPosition['nh_hor_pos']?>">'+
-'<span id="lhc_need_help_triangle" style="<?php echo $currentPosition['nh_tr_pos']?>"></span>'+
-'<a id="lhc_need_help_close" title="<?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/getstatus','Close')?>" onclick="return lh_inst.lhc_need_help_hide();" href="#">×</a>';
-if (imageTooltip !== false) {
-subStatus += '<div onclick="return lh_inst.lhc_need_help_click();" id="lhc_need_help_image"><img width="60" height="60" src="' + imageTooltip + '"></div>';
-};
-subStatus += '<div onclick="return lh_inst.lhc_need_help_click();" id="lhc_need_help_main_title">'+titleText+'</div>'+
-'<span onclick="return lh_inst.lhc_need_help_click();" id="lhc_need_help_sub_title">'+subTitleText+'</span>'+
-'</div>';};
+
+<?php include(erLhcoreClassDesign::designtpl('lhchat/getstatus/we_here_substatus.tpl.php')); ?>	
 
 if (!this.cssNHWasAdded) {
 	this.cssNHWasAdded = true;
diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/getstatus/we_here_substatus.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/getstatus/we_here_substatus.tpl.php
new file mode 100644
index 0000000000..b6f5390437
--- /dev/null
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/getstatus/we_here_substatus.tpl.php
@@ -0,0 +1,13 @@
+var titleText = (typeof LHCChatOptions.opt.nh_title_text != 'undefined') ? LHCChatOptions.opt.nh_title_text : <?php if ($theme !== false && $theme->need_help_header !== '') : print json_encode($theme->need_help_header); else : ?><?php echo json_encode(htmlspecialchars_decode(erTranslationClassLhTranslation::getInstance()->getTranslation('chat/getstatus','Need help?'),ENT_QUOTES))?><?php endif;?>;
+var subTitleText = (typeof LHCChatOptions.opt.nh_sub_title_text != 'undefined') ? LHCChatOptions.opt.nh_sub_title_text : <?php if ($theme !== false && $theme->need_help_text !== '') : print json_encode($theme->need_help_text); else : ?><?php echo json_encode(htmlspecialchars_decode(erTranslationClassLhTranslation::getInstance()->getTranslation('chat/getstatus','Our staff is always ready to help'),ENT_QUOTES))?><?php endif;?>;
+var imageTooltip = (typeof LHCChatOptions.opt.nh_image != 'undefined') ? LHCChatOptions.opt.nh_image : '<?php echo erLhcoreClassModelChatConfig::fetch('explicit_http_mode')->current_value?>//<?php echo $_SERVER['HTTP_HOST']?><?php if ($theme !== false && $theme->need_help_image_url !== false) : print $theme->need_help_image_url; else : ?><?php echo erLhcoreClassDesign::design('images/general/operator.png');?><?php endif;?>';
+
+subStatus = '<div id="lhc_need_help_container" style="<?php echo $currentPosition['nh_hor_pos']?>">'+
+'<span id="lhc_need_help_triangle" style="<?php echo $currentPosition['nh_tr_pos']?>"></span>'+
+'<a id="lhc_need_help_close" title="<?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/getstatus','Close')?>" onclick="return lh_inst.lhc_need_help_hide();" href="#">×</a>';
+if (imageTooltip !== false) {
+subStatus += '<div onclick="return lh_inst.lhc_need_help_click();" id="lhc_need_help_image"><img width="60" height="60" src="' + imageTooltip + '"></div>';
+};
+subStatus += '<div onclick="return lh_inst.lhc_need_help_click();" id="lhc_need_help_main_title">'+titleText+'</div>'+
+'<span onclick="return lh_inst.lhc_need_help_click();" id="lhc_need_help_sub_title">'+subTitleText+'</span>'+
+'</div>';};
\ No newline at end of file
diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/part/operator_profile_start_chat.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/part/operator_profile_start_chat.tpl.php
index 46de10fd0b..eb59bd52e7 100644
--- a/lhc_web/design/defaulttheme/tpl/lhchat/part/operator_profile_start_chat.tpl.php
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/part/operator_profile_start_chat.tpl.php
@@ -12,5 +12,6 @@
 	    <span><i><?php if ($theme !== false && $theme->intro_operator_text != '') : ?><?php echo htmlspecialchars($theme->intro_operator_text); ?><?php else : ?><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Have a question? Ask us!');?>
 	    <?php endif;?>
 	    </i></span>
+	    <?php include(erLhcoreClassDesign::designtpl('lhchat/part/operator_profile_start_chat_post.tpl.php'));?>
      </div>
 </div>
diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/part/operator_profile_start_chat_post.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/part/operator_profile_start_chat_post.tpl.php
new file mode 100644
index 0000000000..46ba388c10
--- /dev/null
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/part/operator_profile_start_chat_post.tpl.php
@@ -0,0 +1,5 @@
+<?php 
+/**
+ * Override to append some info near operator profile
+ * */
+?>
\ No newline at end of file

From 8397c6ab501a602f256a479dd30a3467e064e936 Mon Sep 17 00:00:00 2001
From: Remdex <remdex@gmail.com>
Date: Fri, 13 Mar 2015 16:30:13 +0100
Subject: [PATCH 2/2] Enhancements

---
 lhc_web/cron.php                              |  8 ++
 lhc_web/design/defaulttheme/css/app.css       |  6 ++
 .../js/lh/dist/1-2f8b94502c46061841b2.js      |  1 -
 .../js/lh/dist/1-5dae9e1f43c9a11fb867.js      |  1 +
 .../js/lh/dist/2-9d425e902cb902dd9eb8.js      |  2 +-
 .../design/defaulttheme/js/lh/dist/bundle.js  |  2 +-
 .../js/lh/lh-modules/reveal-modal.js          | 31 +++++-
 .../defaulttheme/tpl/lhchat/chat.tpl.php      |  5 +-
 .../tpl/lhchat/customer_user_settings.tpl.php |  2 +
 ...ustomer_user_settings_multiinclude.tpl.php |  5 +
 .../angular_show_list_multiinclude.tpl.php    |  5 +
 ...ht_panel_post_pending_multiinclude.tpl.php |  5 +
 .../tpl/lhchat/offline_form.tpl.php           |  1 +
 .../part/offline_button_multiinclude.tpl.php  |  6 ++
 .../tpl/lhchat/part/operator_profile.tpl.php  |  6 +-
 .../lhchat/part/operator_profile_post.tpl.php |  4 +
 .../lhchat/part/operator_profile_pre.tpl.php  |  4 +
 ...peratormessage_button_multiinclude.tpl.php |  5 +
 .../tpl/lhchat/readoperatormessage.tpl.php    |  2 +
 .../tpl/lhkernel/alert_info.tpl.php           |  7 ++
 .../defaulttheme/tpl/pagelayouts/main.php     |  2 +
 lhc_web/lib/core/lhcore/lhsearchhandler.php   |  8 +-
 .../modules/lhchat/readoperatormessage.php    |  4 +
 lhc_web/modules/lhchat/syncadmininterface.php |  2 +
 .../util/generate_translation_file_ext.php    | 95 +++++++++++++++++++
 25 files changed, 207 insertions(+), 12 deletions(-)
 delete mode 100644 lhc_web/design/defaulttheme/js/lh/dist/1-2f8b94502c46061841b2.js
 create mode 100644 lhc_web/design/defaulttheme/js/lh/dist/1-5dae9e1f43c9a11fb867.js
 create mode 100644 lhc_web/design/defaulttheme/tpl/lhchat/customer_user_settings_multiinclude.tpl.php
 create mode 100644 lhc_web/design/defaulttheme/tpl/lhchat/lists/angular_show_list_multiinclude.tpl.php
 create mode 100644 lhc_web/design/defaulttheme/tpl/lhchat/lists/right_panel_post_pending_multiinclude.tpl.php
 create mode 100644 lhc_web/design/defaulttheme/tpl/lhchat/part/offline_button_multiinclude.tpl.php
 create mode 100644 lhc_web/design/defaulttheme/tpl/lhchat/part/operator_profile_post.tpl.php
 create mode 100644 lhc_web/design/defaulttheme/tpl/lhchat/part/operator_profile_pre.tpl.php
 create mode 100644 lhc_web/design/defaulttheme/tpl/lhchat/part/readoperatormessage_button_multiinclude.tpl.php
 create mode 100644 lhc_web/design/defaulttheme/tpl/lhkernel/alert_info.tpl.php
 create mode 100644 lhc_web/modules/lhcron/util/generate_translation_file_ext.php

diff --git a/lhc_web/cron.php b/lhc_web/cron.php
index fd0d050157..6994ad9424 100644
--- a/lhc_web/cron.php
+++ b/lhc_web/cron.php
@@ -48,6 +48,14 @@ function __autoload( $className )
 )
 );
 
+$cronjobPathOption = $input->registerOption(
+    new ezcConsoleOption(
+        'p',
+        'path',
+        ezcConsoleInput::TYPE_STRING
+    )
+);
+
 $extensionPartOption = $input->registerOption(
 new ezcConsoleOption(
     'e',
diff --git a/lhc_web/design/defaulttheme/css/app.css b/lhc_web/design/defaulttheme/css/app.css
index 67571fa293..7b324a076a 100644
--- a/lhc_web/design/defaulttheme/css/app.css
+++ b/lhc_web/design/defaulttheme/css/app.css
@@ -18,6 +18,11 @@ body {
     outline: 0;
 }
 
+#myModal,
+.modal-open{
+	padding-right:0px !important;
+}
+
 .btrad-reset{
 	border-top-right-radius: 0px;
 	border-top-left-radius: 0px;
@@ -55,6 +60,7 @@ img{max-height:100%}
 
 #widget-layout .alert{
 	margin-bottom:10px;
+	font-size:12px;
 }
 
 #widget-layout textarea,
diff --git a/lhc_web/design/defaulttheme/js/lh/dist/1-2f8b94502c46061841b2.js b/lhc_web/design/defaulttheme/js/lh/dist/1-2f8b94502c46061841b2.js
deleted file mode 100644
index 78f4fe3ed2..0000000000
--- a/lhc_web/design/defaulttheme/js/lh/dist/1-2f8b94502c46061841b2.js
+++ /dev/null
@@ -1 +0,0 @@
-webpackJsonp([1],{3:function(a){var e={cancelcolorbox:function(){$("#myModal").foundation("reveal","close")},initializeModal:function(a){var e=void 0!=a?a:"myModal";0==$("#"+e).size()&&$("body").prepend('<div id="'+e+'" class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true"></div>')},revealModal:function(a){e.initializeModal("myModal"),"undefined"==typeof a.iframe?jQuery.get(a.url,function(a){$("#myModal").html(a).modal("show")}):$("#myModal").html('<div class="modal-dialog modal-lg"><div class="modal-content"><div class="modal-header"><button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button><h4 class="modal-title" id="myModalLabel"><span class="glyphicon glyphicon-info-sign"></span></h4></div><div class="modal-body"><iframe src="'+a.url+'" frameborder="0" style="width:100%" height="'+a.height+'" /></div></div></div>').modal("show")}};a.exports=e}});
\ No newline at end of file
diff --git a/lhc_web/design/defaulttheme/js/lh/dist/1-5dae9e1f43c9a11fb867.js b/lhc_web/design/defaulttheme/js/lh/dist/1-5dae9e1f43c9a11fb867.js
new file mode 100644
index 0000000000..82c9c06784
--- /dev/null
+++ b/lhc_web/design/defaulttheme/js/lh/dist/1-5dae9e1f43c9a11fb867.js
@@ -0,0 +1 @@
+webpackJsonp([1],{3:function(e){var a={cancelcolorbox:function(){$("#myModal").foundation("reveal","close")},initializeModal:function(e){var a=void 0!=e?e:"myModal";if(0==$("#"+a).size()){var l=null;l=$(0==$("#widget-layout").size()?"body":"#widget-layout"),l.prepend('<div id="'+a+'" style="padding-right:0px !important;" class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true"></div>')}},revealModal:function(e){if(a.initializeModal("myModal"),"undefined"==typeof e.iframe)jQuery.get(e.url,function(a){"undefined"!=typeof e.showcallback&&$("#myModal").on("shown.bs.modal",e.showcallback),"undefined"!=typeof e.hidecallback&&$("#myModal").on("hide.bs.modal",e.hidecallback),$("#myModal").html(a).modal("show")});else{var l="",o="";"undefined"==typeof e.hideheader?l='<div class="modal-header"><button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button><h4 class="modal-title" id="myModalLabel"><span class="glyphicon glyphicon-info-sign"></span>&nbsp;'+("undefined"==typeof e.title?"":e.title)+"</h4></div>":o=("undefined"==typeof e.title?"":"<b>"+e.title+"</b>")+'<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>';var i="undefined"==typeof e.modalbodyclass?"":" "+e.modalbodyclass;$("#myModal").html('<div class="modal-dialog modal-lg"><div class="modal-content">'+l+'<div class="modal-body'+i+'">'+o+'<iframe src="'+e.url+'" frameborder="0" style="width:100%" height="'+e.height+'" /></div></div></div>').modal("show")}}};e.exports=a}});
\ No newline at end of file
diff --git a/lhc_web/design/defaulttheme/js/lh/dist/2-9d425e902cb902dd9eb8.js b/lhc_web/design/defaulttheme/js/lh/dist/2-9d425e902cb902dd9eb8.js
index 3acdd05f22..8872592d37 100644
--- a/lhc_web/design/defaulttheme/js/lh/dist/2-9d425e902cb902dd9eb8.js
+++ b/lhc_web/design/defaulttheme/js/lh/dist/2-9d425e902cb902dd9eb8.js
@@ -1 +1 @@
-webpackJsonp([2],[,,function(t,i,e){function n(t){return e(a(t))}function a(t){return s[t]||function(){throw new Error("Cannot find module '"+t+"'.")}()}var s={"./lhc.speak.js":4,"./lhc.translation.js":5};n.keys=function(){return Object.keys(s)},n.resolve=a,t.exports=n,n.id=2},,function(t){var i=function(){function t(t){this.recognizing=!1,this.startOnEnd=!1,this.final_transcript="",this.chat_id=t.chat_id,this.recognition=t.recognition,this.originText=""!=$("#CSChatMessage-"+this.chat_id).val()?$("#CSChatMessage-"+this.chat_id).val()+" ":""}return t.prototype.onstart=function(){$("#CSChatMessage-"+this.chat_id).addClass("admin-chat-mic"),$("#user-chat-status-"+this.chat_id).removeClass("icon-user").addClass("icon-mic"),$("#mic-chat-"+this.chat_id).addClass("icon-mic-recording").html(this.recognition.lang),$("#user-is-typing-"+this.chat_id).html("Speak now.").css("visibility","visible")},t.prototype.onend=function(){$("#user-chat-status-"+this.chat_id).addClass("icon-user").removeClass("icon-mic"),$("#CSChatMessage-"+this.chat_id).removeClass("admin-chat-mic"),$("#mic-chat-"+this.chat_id).removeClass("icon-mic-recording").html(""),$("#user-is-typing-"+this.chat_id).html(""),this.startOnEnd===!0&&(this.originText="",this.final_transcript="",this.startOnEnd=!1,this.recognition.start())},t.prototype.onerror=function(t){"no-speech"==t.error&&$("#user-is-typing-"+this.chat_id).html("No speech was detected.").css("visibility","visible"),"audio-capture"==t.error&&$("#user-is-typing-"+this.chat_id).html("No microphone was found.").css("visibility","visible"),"not-allowed"==t.error&&$("#user-is-typing-"+this.chat_id).html("Permission to use microphone was denied.").css("visibility","visible")},t.prototype.onresult=function(t){if(this.startOnEnd===!1){for(var i="",e=t.resultIndex;e<t.results.length;++e)t.results[e].isFinal?this.final_transcript+=t.results[e][0].transcript:i+=t.results[e][0].transcript;""!=i?$("#user-is-typing-"+this.chat_id).html(i).css("visibility","visible"):$("#user-is-typing-"+this.chat_id).html("").css("visibility","hidden"),$("#CSChatMessage-"+this.chat_id).val(this.originText+this.final_transcript+i).focus(),lhinst.operatorTypingCallback(this.chat_id)}},t}();t.exports=function(){function t(){"webkitSpeechRecognition"in window?(this.recognizing=!1,this.browserSupported=!0,this.final_transcript="",this.chat_id=!1,this.chatDialect=[]):(alert("Sorry but only chrome is supported"),this.browserSupported=!1)}return t.prototype.stopSpeech=function(){this.browserSupported===!0&&this.recognizing===!0&&(this.recognizing=!1,this.recognition.stop())},t.prototype.messageSend=function(){this.browserSupported===!0&&(this.recognition.callbackHandler.startOnEnd=!0,this.recognition.stop())},t.prototype.setChatDialect=function(t,i){this.chatDialect[t]=i},t.prototype.getChatDialectAndStart=function(){var t=this;$.getJSON(WWW_DIR_JAVASCRIPT+"speech/getchatdialect/"+this.chat_id,function(i){i.error===!1?(t.chatDialect[t.chat_id]=i.dialect,t.recognition.lang=t.chatDialect[t.chat_id],t.recognition.start()):alert(i.result)})},t.prototype.getDialect=function(t){$.get(WWW_DIR_JAVASCRIPT+"speech/getdialect/"+t.val(),function(t){$("#id_select_dialect").replaceWith(t)})},t.prototype.setChatLanguageRecognition=function(t){return $.postJSON(WWW_DIR_JAVASCRIPT+"speech/setchatspeechlanguage/"+t.chat_id,{select_language:$("#id_select_language").val(),select_dialect:$("#id_select_dialect").val()},function(i){"false"==i.error&&(t.lhinst.speechHandler!==!1&&t.lhinst.speechHandler.setChatDialect(t.chat_id,i.dialect),$("#myModal").modal("hide"))}),!1},t.prototype.listen=function(t){if(this.browserSupported===!0)if(this.chat_id!==!1&&this.chat_id!=t.chat_id&&this.stopSpeech(),this.chat_id=t.chat_id,this.recognizing===!1){this.recognition=new webkitSpeechRecognition,this.recognition.continuous=!0,this.recognition.interimResults=!0;var e=new i({chat_id:this.chat_id,recognition:this.recognition});this.recognition.onresult=function(t){e.onresult(t)},this.recognition.onstart=function(){e.onstart()},this.recognition.onend=function(){e.onend()},this.recognition.onerror=function(t){e.onerror(t)},this.recognition.callbackHandler=e,this.recognizing=!0,void 0!=this.chatDialect[this.chat_id]?(this.recognition.lang=this.chatDialect[this.chat_id],this.recognition.start()):this.getChatDialectAndStart()}else this.stopSpeech()},new t}()},function(t){t.exports=function(){function t(){}return t.prototype.startTranslation=function(t){t.btn.prop("disabled","disabled"),t.btn.button("loading"),jQuery.getJSON(WWW_DIR_JAVASCRIPT+"translation/starttranslation/"+t.chat_id+"/"+jQuery("#id_chat_locale_"+t.chat_id).val()+"/"+jQuery("#id_chat_locale_to_"+t.chat_id).val(),function(i){jQuery("#main-user-info-translation-"+t.chat_id+" > div.alert").remove(),jQuery("#main-user-info-translation-"+t.chat_id).prepend(i.result),i.error===!1?i.translation_status===!0?(jQuery("#id_chat_locale_"+t.chat_id+' option[value="'+i.chat_locale+'"]').prop("selected",!0),jQuery("#id_chat_locale_to_"+t.chat_id+' option[value="'+i.chat_locale_to+'"]').prop("selected",!0),jQuery("#messagesBlock-"+t.chat_id).html(""),lhinst.updateChatLastMessageID(t.chat_id,0),lhinst.syncadmincall(),jQuery(".translate-button-"+t.chat_id).addClass("btn-success")):(jQuery(".translate-button-"+t.chat_id).removeClass("btn-success"),jQuery("#id_chat_locale_"+t.chat_id+' option[value="0"]').prop("selected",!0),jQuery("#id_chat_locale_to_"+t.chat_id+' option[value="0"]').prop("selected",!0)):jQuery("#chat-tab-items-"+t.chat_id+' a[href="#main-user-info-translation-'+t.chat_id+'"]').tab("show"),t.btn.button("reset"),t.btn.prop("disabled","")})},new t}()}]);
\ No newline at end of file
+webpackJsonp([2],[,,function(t,i,e){function a(t){return e(n(t))}function n(t){return o[t]||function(){throw new Error("Cannot find module '"+t+"'.")}()}var o={"./lhc.speak.js":4,"./lhc.translation.js":5};a.keys=function(){return Object.keys(o)},a.resolve=n,t.exports=a,a.id=2},,function(t){var i=function(){function t(t){this.recognizing=!1,this.startOnEnd=!1,this.final_transcript="",this.chat_id=t.chat_id,this.recognition=t.recognition,this.originText=""!=$("#CSChatMessage-"+this.chat_id).val()?$("#CSChatMessage-"+this.chat_id).val()+" ":""}return t.prototype.onstart=function(){$("#CSChatMessage-"+this.chat_id).addClass("admin-chat-mic"),$("#user-chat-status-"+this.chat_id).removeClass("icon-user").addClass("icon-mic"),$("#mic-chat-"+this.chat_id).addClass("icon-mic-recording").html(this.recognition.lang),$("#user-is-typing-"+this.chat_id).html("Speak now.").css("visibility","visible")},t.prototype.onend=function(){$("#user-chat-status-"+this.chat_id).addClass("icon-user").removeClass("icon-mic"),$("#CSChatMessage-"+this.chat_id).removeClass("admin-chat-mic"),$("#mic-chat-"+this.chat_id).removeClass("icon-mic-recording").html(""),$("#user-is-typing-"+this.chat_id).html(""),this.startOnEnd===!0&&(this.originText="",this.final_transcript="",this.startOnEnd=!1,this.recognition.start())},t.prototype.onerror=function(t){"no-speech"==t.error&&$("#user-is-typing-"+this.chat_id).html("No speech was detected.").css("visibility","visible"),"audio-capture"==t.error&&$("#user-is-typing-"+this.chat_id).html("No microphone was found.").css("visibility","visible"),"not-allowed"==t.error&&$("#user-is-typing-"+this.chat_id).html("Permission to use microphone was denied.").css("visibility","visible")},t.prototype.onresult=function(t){if(this.startOnEnd===!1){for(var i="",e=t.resultIndex;e<t.results.length;++e)t.results[e].isFinal?this.final_transcript+=t.results[e][0].transcript:i+=t.results[e][0].transcript;""!=i?$("#user-is-typing-"+this.chat_id).html(i).css("visibility","visible"):$("#user-is-typing-"+this.chat_id).html("").css("visibility","hidden"),$("#CSChatMessage-"+this.chat_id).val(this.originText+this.final_transcript+i).focus(),lhinst.operatorTypingCallback(this.chat_id)}},t}();t.exports=function(){function t(){"webkitSpeechRecognition"in window?(this.recognizing=!1,this.browserSupported=!0,this.final_transcript="",this.chat_id=!1,this.chatDialect=[]):(alert("Sorry but only chrome is supported"),this.browserSupported=!1)}return t.prototype.stopSpeech=function(){this.browserSupported===!0&&this.recognizing===!0&&(this.recognizing=!1,this.recognition.stop())},t.prototype.messageSend=function(){this.browserSupported===!0&&(this.recognition.callbackHandler.startOnEnd=!0,this.recognition.stop())},t.prototype.setChatDialect=function(t,i){this.chatDialect[t]=i},t.prototype.getChatDialectAndStart=function(){var t=this;$.getJSON(WWW_DIR_JAVASCRIPT+"speech/getchatdialect/"+this.chat_id,function(i){i.error===!1?(t.chatDialect[t.chat_id]=i.dialect,t.recognition.lang=t.chatDialect[t.chat_id],t.recognition.start()):alert(i.result)})},t.prototype.getDialect=function(t){$.get(WWW_DIR_JAVASCRIPT+"speech/getdialect/"+t.val(),function(t){$("#id_select_dialect").replaceWith(t)})},t.prototype.setChatLanguageRecognition=function(t){return $.postJSON(WWW_DIR_JAVASCRIPT+"speech/setchatspeechlanguage/"+t.chat_id,{select_language:$("#id_select_language").val(),select_dialect:$("#id_select_dialect").val()},function(i){"false"==i.error&&(t.lhinst.speechHandler!==!1&&t.lhinst.speechHandler.setChatDialect(t.chat_id,i.dialect),$("#myModal").modal("hide"))}),!1},t.prototype.listen=function(t){if(this.browserSupported===!0)if(this.chat_id!==!1&&this.chat_id!=t.chat_id&&this.stopSpeech(),this.chat_id=t.chat_id,this.recognizing===!1){this.recognition=new webkitSpeechRecognition,this.recognition.continuous=!0,this.recognition.interimResults=!0;var e=new i({chat_id:this.chat_id,recognition:this.recognition});this.recognition.onresult=function(t){e.onresult(t)},this.recognition.onstart=function(){e.onstart()},this.recognition.onend=function(){e.onend()},this.recognition.onerror=function(t){e.onerror(t)},this.recognition.callbackHandler=e,this.recognizing=!0,void 0!=this.chatDialect[this.chat_id]?(this.recognition.lang=this.chatDialect[this.chat_id],this.recognition.start()):this.getChatDialectAndStart()}else this.stopSpeech()},new t}()},function(t){t.exports=function(){function t(){}return t.prototype.startTranslation=function(t){t.btn.prop("disabled","disabled"),t.btn.button("loading"),jQuery.getJSON(WWW_DIR_JAVASCRIPT+"translation/starttranslation/"+t.chat_id+"/"+jQuery("#id_chat_locale_"+t.chat_id).val()+"/"+jQuery("#id_chat_locale_to_"+t.chat_id).val(),function(i){jQuery("#main-user-info-translation-"+t.chat_id+" > div.alert").remove(),jQuery("#main-user-info-translation-"+t.chat_id).prepend(i.result),i.error===!1?i.translation_status===!0?(jQuery("#id_chat_locale_"+t.chat_id+' option[value="'+i.chat_locale+'"]').prop("selected",!0),jQuery("#id_chat_locale_to_"+t.chat_id+' option[value="'+i.chat_locale_to+'"]').prop("selected",!0),jQuery("#messagesBlock-"+t.chat_id).html(""),lhinst.updateChatLastMessageID(t.chat_id,0),lhinst.syncadmincall(),jQuery(".translate-button-"+t.chat_id).addClass("btn-success")):(jQuery(".translate-button-"+t.chat_id).removeClass("btn-success"),jQuery("#id_chat_locale_"+t.chat_id+' option[value="0"]').prop("selected",!0),jQuery("#id_chat_locale_to_"+t.chat_id+' option[value="0"]').prop("selected",!0)):jQuery("#chat-tab-items-"+t.chat_id+' a[href="#main-user-info-translation-'+t.chat_id+'"]').tab("show"),t.btn.button("reset"),t.btn.prop("disabled","")})},new t}()}]);
\ No newline at end of file
diff --git a/lhc_web/design/defaulttheme/js/lh/dist/bundle.js b/lhc_web/design/defaulttheme/js/lh/dist/bundle.js
index 212900d4b2..5caeab6ec8 100644
--- a/lhc_web/design/defaulttheme/js/lh/dist/bundle.js
+++ b/lhc_web/design/defaulttheme/js/lh/dist/bundle.js
@@ -1 +1 @@
-!function(n){function e(t){if(o[t])return o[t].exports;var a=o[t]={exports:{},id:t,loaded:!1};return n[t].call(a.exports,a,a.exports,e),a.loaded=!0,a.exports}var t=window.webpackJsonp;window.webpackJsonp=function(o,r){for(var i,l,c=0,u=[];c<o.length;c++)l=o[c],a[l]&&u.push.apply(u,a[l]),a[l]=0;for(i in r)n[i]=r[i];for(t&&t(o,r);u.length;)u.shift().call(null,e)};var o={},a={0:0};return e.e=function(n,t){if(0===a[n])return t.call(null,e);if(void 0!==a[n])a[n].push(t);else{a[n]=[t];var o=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.src=e.p+""+({}[n]||n)+"-"+{1:"2f8b94502c46061841b2",2:"9d425e902cb902dd9eb8"}[n]+".js",o.appendChild(r)}},e.m=n,e.c=o,e.p="/",e(0)}([function(n,e,t){n.exports=t(1)},function(n,e,t){(function(n){t.p=window.WWW_DIR_LHC_WEBPACK,function(){n.lhc={previewChat:function(n){this.revealModal({url:WWW_DIR_JAVASCRIPT+"chat/previewchat/"+n})},revealModal:function(n){t.e(1,function(){var e=t(3);e.initializeModal(),e.revealModal(n)})},methodCall:function(n,e,o){t.e(2,function(t){var a=[];(function(){t(2)("./"+n+".js")[e](o)}).apply(null,a)})}}}()}).call(e,function(){return this}())}]);
\ No newline at end of file
+!function(e){function n(t){if(a[t])return a[t].exports;var o=a[t]={exports:{},id:t,loaded:!1};return e[t].call(o.exports,o,o.exports,n),o.loaded=!0,o.exports}var t=window.webpackJsonp;window.webpackJsonp=function(a,r){for(var i,l,c=0,u=[];c<a.length;c++)l=a[c],o[l]&&u.push.apply(u,o[l]),o[l]=0;for(i in r)e[i]=r[i];for(t&&t(a,r);u.length;)u.shift().call(null,n)};var a={},o={0:0};return n.e=function(e,t){if(0===o[e])return t.call(null,n);if(void 0!==o[e])o[e].push(t);else{o[e]=[t];var a=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.src=n.p+""+({}[e]||e)+"-"+{1:"5dae9e1f43c9a11fb867",2:"9d425e902cb902dd9eb8"}[e]+".js",a.appendChild(r)}},n.m=e,n.c=a,n.p="/",n(0)}([function(e,n,t){e.exports=t(1)},function(e,n,t){(function(e){t.p=window.WWW_DIR_LHC_WEBPACK,function(){e.lhc={previewChat:function(e){this.revealModal({url:WWW_DIR_JAVASCRIPT+"chat/previewchat/"+e})},revealModal:function(e){t.e(1,function(){var n=t(3);n.initializeModal(),n.revealModal(e)})},methodCall:function(e,n,a){t.e(2,function(t){var o=[];(function(){t(2)("./"+e+".js")[n](a)}).apply(null,o)})}}}()}).call(n,function(){return this}())}]);
\ No newline at end of file
diff --git a/lhc_web/design/defaulttheme/js/lh/lh-modules/reveal-modal.js b/lhc_web/design/defaulttheme/js/lh/lh-modules/reveal-modal.js
index c07da1cc8e..0e41c2de86 100644
--- a/lhc_web/design/defaulttheme/js/lh/lh-modules/reveal-modal.js
+++ b/lhc_web/design/defaulttheme/js/lh/lh-modules/reveal-modal.js
@@ -6,7 +6,14 @@ var revealM = {
 		initializeModal : function(selector) {		
 			var modelSelector = selector != undefined ? selector : 'myModal';
 			if ($('#'+modelSelector).size() == 0) {
-				$('body').prepend('<div id="'+modelSelector+'" class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true"></div>');		
+				
+				var prependTo = null;
+				if ($('#widget-layout').size() == 0) {
+					prependTo = $('body');
+				} else {
+					prependTo = $('#widget-layout');
+				};
+				prependTo.prepend('<div id="'+modelSelector+'" style="padding-right:0px !important;" class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true"></div>');		
 			};	
 		},
 		
@@ -18,11 +25,29 @@ var revealM = {
 			
 			revealM.initializeModal('myModal');
 			if (typeof params['iframe'] === 'undefined') {				
-				jQuery.get(params['url'], function(data){				
+				jQuery.get(params['url'], function(data){
+					
+					if (typeof params['showcallback'] !== 'undefined') {
+						$('#myModal').on('shown.bs.modal',params['showcallback']);
+					}
+					
+					if (typeof params['hidecallback'] !== 'undefined') {
+						$('#myModal').on('hide.bs.modal',params['hidecallback']);
+					}
+					
 					$('#myModal').html(data).modal('show')	
 				});
 			} else {
-				$('#myModal').html('<div class="modal-dialog modal-lg"><div class="modal-content"><div class="modal-header"><button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button><h4 class="modal-title" id="myModalLabel"><span class="glyphicon glyphicon-info-sign"></span></h4></div><div class="modal-body"><iframe src="'+params['url']+'" frameborder="0" style="width:100%" height="'+params['height']+'" /></div></div></div>').modal('show')	;
+				var header = '';
+				var prependeBody = '';
+				if (typeof params['hideheader'] === 'undefined') {	
+					header = '<div class="modal-header"><button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button><h4 class="modal-title" id="myModalLabel"><span class="glyphicon glyphicon-info-sign"></span>&nbsp;'+(typeof params['title'] === 'undefined' ? '' : params['title'])+'</h4></div>';
+				} else {
+					prependeBody = (typeof params['title'] === 'undefined' ? '' : '<b>'+params['title']+'</b>') + '<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>';
+				}
+				var additionalModalBody = typeof params['modalbodyclass'] === 'undefined' ? '' : ' '+params['modalbodyclass'];
+				
+				$('#myModal').html('<div class="modal-dialog modal-lg"><div class="modal-content">'+header+'<div class="modal-body'+additionalModalBody+'">'+prependeBody+'<iframe src="'+params['url']+'" frameborder="0" style="width:100%" height="'+params['height']+'" /></div></div></div>').modal('show')	;
 			}
 		}		
 };
diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/chat.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/chat.tpl.php
index ca560a9bb9..eb987f1a15 100644
--- a/lhc_web/design/defaulttheme/tpl/lhchat/chat.tpl.php
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/chat.tpl.php
@@ -8,8 +8,7 @@
 			<h4><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/chat','Pending confirm')?></h4>
 		<?php endif; ?>
 		</div>
-		
-		
+				
 		<?php if ( erLhcoreClassModelChatConfig::fetch('reopen_chat_enabled')->current_value == 1 && erLhcoreClassModelChatConfig::fetch('allow_reopen_closed')->current_value == 1 && erLhcoreClassChat::canReopen($chat) ) : ?>
 			<a href="<?php echo erLhcoreClassDesign::baseurl('chat/reopen')?>/<?php echo $chat->id?>/<?php echo $chat->hash?><?php if ( isset($chat_widget_mode) && $chat_widget_mode == true ) : ?>/(mode)/widget<?php endif; ?><?php if ( isset($chat_embed_mode) && $chat_embed_mode == true ) : ?>/(embedmode)/embed<?php endif;?>" class="btn btn-default" ><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/chatnotexists','Resume chat');?></a>
 		<?php endif; ?>
@@ -20,7 +19,7 @@
 		
 	</div>
 
-	<div class="col-xs-3">
+	<div class="col-xs-3 mb5">
 		<?php include(erLhcoreClassDesign::designtpl('lhchat/customer_user_settings.tpl.php'));?>
 	</div>
 
diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/customer_user_settings.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/customer_user_settings.tpl.php
index 77a5303796..20697effc6 100644
--- a/lhc_web/design/defaulttheme/tpl/lhchat/customer_user_settings.tpl.php
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/customer_user_settings.tpl.php
@@ -6,6 +6,8 @@
 
 
   <div class="btn-group pull-right" role="group">
+    <?php include(erLhcoreClassDesign::designtpl('lhchat/customer_user_settings_multiinclude.tpl.php'));?>
+    
     <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
       <i class="icon-tools"></i>
       <span class="caret"></span>
diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/customer_user_settings_multiinclude.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/customer_user_settings_multiinclude.tpl.php
new file mode 100644
index 0000000000..3d44922a34
--- /dev/null
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/customer_user_settings_multiinclude.tpl.php
@@ -0,0 +1,5 @@
+<?php 
+/**
+ * Here you can have custom button in chat window top right corner
+ * */
+?>
\ No newline at end of file
diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/lists/angular_show_list_multiinclude.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/lists/angular_show_list_multiinclude.tpl.php
new file mode 100644
index 0000000000..0ee43337d2
--- /dev/null
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/lists/angular_show_list_multiinclude.tpl.php
@@ -0,0 +1,5 @@
+<?php 
+/**
+ * There can be some conditional check
+ * 
+ * */?>
\ No newline at end of file
diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/lists/right_panel_post_pending_multiinclude.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/lists/right_panel_post_pending_multiinclude.tpl.php
new file mode 100644
index 0000000000..8b31ea0cdd
--- /dev/null
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/lists/right_panel_post_pending_multiinclude.tpl.php
@@ -0,0 +1,5 @@
+<?php 
+/**
+ * There can be custom panel
+ * */
+?>
\ No newline at end of file
diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/offline_form.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/offline_form.tpl.php
index 2b60442af7..71ee949315 100644
--- a/lhc_web/design/defaulttheme/tpl/lhchat/offline_form.tpl.php
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/offline_form.tpl.php
@@ -78,6 +78,7 @@
 
 	<div class="btn-group" role="group" aria-label="...">
   		<input type="submit" class="btn btn-default btn-sm" value="<?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Leave a message');?>" name="StartChatAction" />
+  		<?php include(erLhcoreClassDesign::designtpl('lhchat/part/offline_button_multiinclude.tpl.php'));?>
 		<?php if ( erLhcoreClassModelChatConfig::fetch('reopen_chat_enabled')->current_value == 1 && ($reopenData = erLhcoreClassChat::canReopenDirectly(array('reopen_closed' => erLhcoreClassModelChatConfig::fetch('allow_reopen_closed')->current_value))) !== false ) : ?>
 	  		<input type="button" class="btn btn-default btn-sm"  value="<?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/chatnotexists','Resume chat');?>" onclick="document.location = '<?php echo erLhcoreClassDesign::baseurl('chat/reopen')?>/<?php echo $reopenData['id']?>/<?php echo $reopenData['hash']?>/(mode)/widget<?php if ( isset($append_mode) && $append_mode != '' ) : ?>/(embedmode)/embed<?php endif;?>'">
 	  	<?php endif; ?>
diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/part/offline_button_multiinclude.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/part/offline_button_multiinclude.tpl.php
new file mode 100644
index 0000000000..0d4ab97f66
--- /dev/null
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/part/offline_button_multiinclude.tpl.php
@@ -0,0 +1,6 @@
+<?php 
+/**
+ * You can include your custom offline form buttons
+ * <input type="submit" class="btn btn-default btn-sm" value="<?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Leave a message');?>" name="StartChatAction" />
+ * */
+?>
\ No newline at end of file
diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/part/operator_profile.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/part/operator_profile.tpl.php
index 9bea2a4060..cc05d26bc7 100644
--- a/lhc_web/design/defaulttheme/tpl/lhchat/part/operator_profile.tpl.php
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/part/operator_profile.tpl.php
@@ -6,11 +6,14 @@
      		<i class="icon-user icon-assistant"></i>
      	<?php endif;?>
      </div>
-     <div class="pl10">
+     <div class="pl10">        
 	    <div><strong><?php echo htmlspecialchars($user->name_support)?></strong></div>
 	    <?php if (isset($extraMessage)) : ?>
 	    	<i><?php echo $extraMessage;?></i>
 	    <?php endif;?>
+	    
+	    <?php include(erLhcoreClassDesign::designtpl('lhchat/part/operator_profile_pre.tpl.php'));?>
+	    
 	    <?php if (!isset($hideThumbs) || $hideThumbs == false) : ?>
      	<i class="icon-thumbs-up<?php if ($chat->fbst == 1) : ?> up-voted<?php endif;?>" data-id="1" onclick="lhinst.voteAction($(this))" ></i>
      	<i class="icon-thumbs-down<?php if ($chat->fbst == 2) : ?> down-voted<?php endif;?>" data-id="2" onclick="lhinst.voteAction($(this))"></i>
@@ -20,5 +23,6 @@
      	<?php endif;?>
      	
      	<?php endif;?>
+     	<?php include(erLhcoreClassDesign::designtpl('lhchat/part/operator_profile_post.tpl.php'));?>
      </div>
 </div>
\ No newline at end of file
diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/part/operator_profile_post.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/part/operator_profile_post.tpl.php
new file mode 100644
index 0000000000..11a1db4fc2
--- /dev/null
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/part/operator_profile_post.tpl.php
@@ -0,0 +1,4 @@
+<?php 
+/**
+ * You can include custom buttons here
+*/ ?>
\ No newline at end of file
diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/part/operator_profile_pre.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/part/operator_profile_pre.tpl.php
new file mode 100644
index 0000000000..11a1db4fc2
--- /dev/null
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/part/operator_profile_pre.tpl.php
@@ -0,0 +1,4 @@
+<?php 
+/**
+ * You can include custom buttons here
+*/ ?>
\ No newline at end of file
diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/part/readoperatormessage_button_multiinclude.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/part/readoperatormessage_button_multiinclude.tpl.php
new file mode 100644
index 0000000000..45eeaaab28
--- /dev/null
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/part/readoperatormessage_button_multiinclude.tpl.php
@@ -0,0 +1,5 @@
+<?php 
+/**
+ * here you can include custom buttons for read operator message window
+ * */
+?>
\ No newline at end of file
diff --git a/lhc_web/design/defaulttheme/tpl/lhchat/readoperatormessage.tpl.php b/lhc_web/design/defaulttheme/tpl/lhchat/readoperatormessage.tpl.php
index 821d2bb779..ce65c0475e 100644
--- a/lhc_web/design/defaulttheme/tpl/lhchat/readoperatormessage.tpl.php
+++ b/lhc_web/design/defaulttheme/tpl/lhchat/readoperatormessage.tpl.php
@@ -58,6 +58,8 @@
 <input type="submit" name="askQuestionAction" id="idaskQuestionAction" value="<?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/startchat','Send');?>" class="btn btn-default btn-sm"/>
 <?php endif;?>
 
+<?php include(erLhcoreClassDesign::designtpl('lhchat/part/readoperatormessage_button_multiinclude.tpl.php'));?>
+
 <input type="hidden" name="askQuestion" value="1" />
 <input type="hidden" value="<?php echo htmlspecialchars($input_data->operator);?>" name="operator" />
 
diff --git a/lhc_web/design/defaulttheme/tpl/lhkernel/alert_info.tpl.php b/lhc_web/design/defaulttheme/tpl/lhkernel/alert_info.tpl.php
new file mode 100644
index 0000000000..ec7a3b5e38
--- /dev/null
+++ b/lhc_web/design/defaulttheme/tpl/lhkernel/alert_info.tpl.php
@@ -0,0 +1,7 @@
+<div role="alert" class="alert alert-info alert-dismissible fade in">
+<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <span aria-hidden="true">&times;</span>
+</button>
+<?php echo $msg?>
+</div>
+
diff --git a/lhc_web/design/defaulttheme/tpl/pagelayouts/main.php b/lhc_web/design/defaulttheme/tpl/pagelayouts/main.php
index 701bd73a4a..48e75c6d14 100644
--- a/lhc_web/design/defaulttheme/tpl/pagelayouts/main.php
+++ b/lhc_web/design/defaulttheme/tpl/pagelayouts/main.php
@@ -60,6 +60,8 @@
             </div>
             <?php endif;?>
         
+        <?php include(erLhcoreClassDesign::designtpl('lhchat/lists/right_panel_post_pending_multiinclude.tpl.php'));?>
+        
         	<?php if ($activeTabEnabled == true) : ?> 
             <div class="panel-heading" ng-if="active_chats.list.length > 0"><a href="<?php echo erLhcoreClassDesign::baseurl('chat/activechats')?>"><i class="icon-chat chat-active"></i> <?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('pagelayout/pagelayout','Active chats');?></a></div>
             <div class="panel-body"  id="right-active-chats" ng-show="active_chats.list.length > 0">
diff --git a/lhc_web/lib/core/lhcore/lhsearchhandler.php b/lhc_web/lib/core/lhcore/lhsearchhandler.php
index ad56fec2c6..af5f1730b4 100644
--- a/lhc_web/lib/core/lhcore/lhsearchhandler.php
+++ b/lhc_web/lib/core/lhcore/lhsearchhandler.php
@@ -6,8 +6,12 @@ public static function getParams($params = array() ) {
 
         $uparams = isset($params['uparams']) ? $params['uparams'] : array();
 
-        $fieldsObjects = include('lib/core/lh'.$params['module'].'/searchattr/'.$params['module_file'].'.php');
-
+        if (isset($params['customfilterfile'])) {
+            $fieldsObjects = include($params['customfilterfile']);
+        } else {
+            $fieldsObjects = include('lib/core/lh'.$params['module'].'/searchattr/'.$params['module_file'].'.php');
+        }
+        
         $fields = $fieldsObjects['filterAttributes'];
         $orderOptions = $fieldsObjects['sortAttributes'];
 
diff --git a/lhc_web/modules/lhchat/readoperatormessage.php b/lhc_web/modules/lhchat/readoperatormessage.php
index 3fb33ca21a..44c8a3d7b7 100644
--- a/lhc_web/modules/lhchat/readoperatormessage.php
+++ b/lhc_web/modules/lhchat/readoperatormessage.php
@@ -34,6 +34,10 @@
 $inputData->value_sizes = array();
 $inputData->hattr = array();
 
+if ((string)$Params['user_parameters_unordered']['vid'] != '') {
+    $inputData->vid = (string)$Params['user_parameters_unordered']['vid'];
+}
+
 // Assign department instantly
 if ($inputData->departament_id > 0) {
 	$tpl->set('department',$inputData->departament_id);
diff --git a/lhc_web/modules/lhchat/syncadmininterface.php b/lhc_web/modules/lhchat/syncadmininterface.php
index 89c43067b1..1ed2328457 100644
--- a/lhc_web/modules/lhchat/syncadmininterface.php
+++ b/lhc_web/modules/lhchat/syncadmininterface.php
@@ -130,6 +130,8 @@
 // Update last visit
 $currentUser->updateLastVisit();
 
+erLhcoreClassChatEventDispatcher::getInstance()->dispatch('chat.syncadmininterface',array('lists' => & $ReturnMessages));
+
 echo json_encode(array('error' => 'false', 'result' => $ReturnMessages ));
 exit;
 ?>
\ No newline at end of file
diff --git a/lhc_web/modules/lhcron/util/generate_translation_file_ext.php b/lhc_web/modules/lhcron/util/generate_translation_file_ext.php
new file mode 100644
index 0000000000..703acca2c5
--- /dev/null
+++ b/lhc_web/modules/lhcron/util/generate_translation_file_ext.php
@@ -0,0 +1,95 @@
+<?php
+// php cron.php -s site_admin -c cron/util/generate_translation_file_ext -p extension/icclicktocall
+
+$arrayTranslationsProcess = array();
+
+$filesToCheck = ezcBaseFile::findRecursive('./'.$cronjobPathOption->value,
+array( '@\.php$@' ),
+array( '@/albums|ezcomponents|doc|translations|var|cache|bin|Zend|setttings|pos/@' ));
+
+$locale = 'en_EN';
+
+foreach ($filesToCheck as $filePath)
+{
+    $contentFile = file_get_contents($filePath);
+
+    $Matches = array();
+	preg_match_all('/<\?php echo erTranslationClassLhTranslation::getInstance\(\)->getTranslation\(\'(.*?)\',\'(.*?)\'\)(.*?)\?\>/i',$contentFile,$Matches);
+
+	foreach ($Matches[1] as $key => $section)
+	{
+	    if (!isset($arrayTranslationsProcess[$section])) {
+	        $arrayTranslationsProcess[$section] = array();
+	    }
+
+	    if (!in_array($Matches[2][$key],$arrayTranslationsProcess[$section])){
+	        $arrayTranslationsProcess[$section][] = $Matches[2][$key];
+	    }
+
+	    $contentFile = str_replace($Matches[0][$key],'',$contentFile);
+	}
+
+	$Matches = array();
+	preg_match_all('/erTranslationClassLhTranslation::getInstance\(\)->getTranslation\(\'(.*?)\',\'(.*?)\'\)/i',$contentFile,$Matches);
+
+	foreach ($Matches[1] as $key => $section)
+	{
+	    if (!isset($arrayTranslationsProcess[$section])) {
+	        $arrayTranslationsProcess[$section] = array();
+	    }
+
+	    if (!in_array($Matches[2][$key],$arrayTranslationsProcess[$section])){
+	        $arrayTranslationsProcess[$section][] = $Matches[2][$key];
+	    }
+	}
+}
+
+$reader = new ezcTranslationTsBackend( $cronjobPathOption->value . '/doc' );
+$reader->setOptions( array( 'format' => 'default.ts' ) );
+$reader->initReader( $locale );
+
+$manager = new ezcTranslationManager( $reader );
+
+function translateToLanguage($apiKey,$toLanguage, $string) {
+    return '';
+}
+
+foreach ($arrayTranslationsProcess as $context => $itemsToTranslate)
+{
+    $contextItems = array() ;
+
+    try {
+        $contextItem = $manager->getContext( $locale, $context );
+    } catch (Exception $e) { // Context does not exists
+        $reader->initWriter( $locale );
+        $reader->storeContext( $context, $contextItems );
+        $reader->deinitWriter();
+        $contextItem = $manager->getContext( $locale, $context );
+    }
+
+    foreach ($itemsToTranslate as $string)
+    {
+       if ($locale != 'en_EN') {
+           try {
+                  $originalTranslation = $contextItem->getTranslation($string);
+
+                 if ($originalTranslation != ''){
+                    $contextItems[] = new ezcTranslationData( $string, $originalTranslation, NULL, ezcTranslationData::TRANSLATED );
+                 } else {
+                    $contextItems[] = new ezcTranslationData( $string, translateToLanguage($apiKey,substr($locale,0,2),$string), NULL, ezcTranslationData::UNFINISHED );
+                 }
+
+           } catch (Exception $e) { // Translation does not exist
+                $contextItems[] = new ezcTranslationData( $string, translateToLanguage($apiKey,substr($locale,0,2),$string), NULL, ezcTranslationData::UNFINISHED );
+           }
+       } else {
+           $contextItems[] = new ezcTranslationData( $string, '', NULL, ezcTranslationData::UNFINISHED );
+       }
+    }
+
+    $reader->initWriter( $locale );
+    $reader->storeContext( $context, $contextItems );
+    $reader->deinitWriter();
+}
+
+