diff --git a/src/messenger/webim/js/164/common.js b/src/messenger/webim/js/164/common.js old mode 100644 new mode 100755 index ce5dac3f..91323fc8 --- a/src/messenger/webim/js/164/common.js +++ b/src/messenger/webim/js/164/common.js @@ -6,20 +6,22 @@ License: http://mibew.org/license.php */ var Class={create:function(){return function(){this.initialize.apply(this,arguments)}},inherit:function(a,b,c){Object.extend(Object.extend(a.prototype,b.prototype),c)}};Object.extend=function(a,b){for(property in b)a[property]=b[property];return a};Object.prototype.extend=function(a){return Object.extend.apply(this,[this,a])};Function.prototype.bind=function(a){var b=this;return function(){return b.apply(a,arguments)}}; -Function.prototype.bindAsEventListener=function(a){var b=this;return function(c){b.call(a,c||window.event)}};Number.prototype.toColorPart=function(){var a=this.toString(16);if(this<16)return"0"+a;return a};var Try={these:function(){for(var a,b=0;bthis?"0"+a:a};var Try={these:function(){for(var a,b=0;b=200&&a.status<300&&(a=a.responseXML)&&a.documentElement)return a.documentElement;return null},getError:function(a){return a.statusText||"connection error N"+a.status},emptyFunction:function(){},Base:function(){}}; -Ajax.Base.prototype={setOptions:function(a){this._options={_method:"post",asynchronous:!0,parameters:""}.extend(a||{})},getStatus:function(){try{return this.transport.status||0}catch(a){return 0}},responseIsSuccess:function(){var a=this.getStatus();return!a||a>=200&&a<300},responseIsFailure:function(){return!this.responseIsSuccess()}};Ajax.Request=Class.create();Ajax.Request.Events=["Uninitialized","Loading","Loaded","Interactive","Complete"]; -Class.inherit(Ajax.Request,Ajax.Base,{initialize:function(a,b){this.transport=Ajax.getTransport();this.setOptions(b);this.transportTimer={};this.finished=!1;this.request(a)},request:function(a){var b=this._options.parameters||"";b.length>0&&(b+="&_=");try{this._options._method=="get"&&b.length>0&&(a+="?"+b);this.transport.open(this._options._method.toUpperCase(),a,this._options.asynchronous);if(this._options.asynchronous&&(this.transport.onreadystatechange=this.onStateChange.bind(this),this._options.timeout))this.transportTimer= -setTimeout(this.handleTimeout.bind(this),this._options.timeout);this.setRequestHeaders();var c=this._options.postBody?this._options.postBody:b;this.transport.send(this._options._method=="post"?c:null)}catch(d){this.dispatchException(d)}},setRequestHeaders:function(){var a=["X-Requested-With","XMLHttpRequest"];this._options._method=="post"&&(a.push("Content-type","application/x-www-form-urlencoded"),this.transport.overrideMimeType&&(navigator.userAgent.match("/Gecko/(d{4})/")||[0,2005])[1]<2005&&a.push("Connection", -"close"));this._options.requestHeaders&&a.push.apply(a,this._options.requestHeaders);for(var b=0;b=200&&a.status<300)if((a=a.responseXML)&&a.documentElement)return a.documentElement;return null},getError:function(a){return a.statusText||"connection error N"+a.status},emptyFunction:function(){},Base:function(){}}; +Ajax.Base.prototype={setOptions:function(a){this._options={_method:"post",asynchronous:true,parameters:""}.extend(a||{})},getStatus:function(){try{return this.transport.status||0}catch(a){return 0}},responseIsSuccess:function(){var a=this.getStatus();return!a||a>=200&&a<300},responseIsFailure:function(){return!this.responseIsSuccess()}};Ajax.Request=Class.create();Ajax.Request.Events=["Uninitialized","Loading","Loaded","Interactive","Complete"]; +Class.inherit(Ajax.Request,Ajax.Base,{initialize:function(a,b){this.transport=Ajax.getTransport();this.setOptions(b);this.transportTimer={};this.finished=false;this.request(a)},request:function(a){var b=this._options.parameters||"";b.length>0&&(b=b+"&_=");try{this._options._method=="get"&&b.length>0&&(a=a+("?"+b));this.transport.open(this._options._method.toUpperCase(),a,this._options.asynchronous);if(this._options.asynchronous){this.transport.onreadystatechange=this.onStateChange.bind(this);if(this._options.timeout)this.transportTimer= +setTimeout(this.handleTimeout.bind(this),this._options.timeout)}this.setRequestHeaders();var c=this._options.postBody?this._options.postBody:b;this.transport.send(this._options._method=="post"?c:null)}catch(d){this.dispatchException(d)}},setRequestHeaders:function(){var a=["X-Requested-With","XMLHttpRequest"];if(this._options._method=="post"){a.push("Content-type","application/x-www-form-urlencoded");this.transport.overrideMimeType&&(navigator.userAgent.match("/Gecko/(d{4})/")||[0,2005])[1]<2005&& +a.push("Connection","close")}this._options.requestHeaders&&a.push.apply(a,this._options.requestHeaders);for(var b=0;b-1){var d=token.split("#"),f=d[0],b=document.getElementById(d[1]);if(b==null||f&&b.nodeName.toLowerCase()!=f)return[];b=Array(b)}else if(token.indexOf(".")>-1){d=token.split(".");f=d[0];d=d[1];f||(f="*");for(var g=[],j=0,n=0;n'}function htmlescape(a){return a.replace("&","&").replace("<","<").replace(">",">").replace('"',""")}; +document.getElementsBySelector=function(a){if(!document.getElementsByTagName)return[];for(var a=a.split(" "),b=Array(document),c=0;c-1){var d=token.split("#"),e=d[0],b=document.getElementById(d[1]);if(b==null||e&&b.nodeName.toLowerCase()!=e)return[];b=Array(b)}else if(token.indexOf(".")>-1){d=token.split(".");e=d[0];d=d[1];e||(e="*");for(var f=[],g=0,j=0;j'}function htmlescape(a){return a.replace("&","&").replace("<","<").replace(">",">").replace('"',""")}var ClientForm=Class.create(); +ClientForm.prototype={initialize:function(a){this.emailPattern=/^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;this.form=a;this.localizedStrings=null},emailIsValid:function(a){return a!=null&&a.value.search(this.emailPattern)==-1?false:true},changeGroup:function(a,b,c){document.getElementById(b).innerHTML=c[a.selectedIndex]},checkFields:function(){return null},localize:function(a){this.localizedStrings= +a},submit:function(){var a=this.checkFields();a===null?this.form.submit():a!=""&&alert(a)}}; \ No newline at end of file diff --git a/src/messenger/webim/js/164/leavemessage.js b/src/messenger/webim/js/164/leavemessage.js new file mode 100644 index 00000000..17d21f05 --- /dev/null +++ b/src/messenger/webim/js/164/leavemessage.js @@ -0,0 +1,8 @@ +/* + This file is part of Mibew Messenger project. + http://mibew.org + + Copyright (c) 2005-2011 Mibew Messenger Community + License: http://mibew.org/license.php +*/ +EventHelper.register(window,"onload",function(){MessageForm=new ClientForm(document.leaveMessageForm)}); \ No newline at end of file diff --git a/src/messenger/webim/js/164/survey.js b/src/messenger/webim/js/164/survey.js index 1cd54f73..bf5105aa 100644 --- a/src/messenger/webim/js/164/survey.js +++ b/src/messenger/webim/js/164/survey.js @@ -5,5 +5,4 @@ Copyright (c) 2005-2011 Mibew Messenger Community License: http://mibew.org/license.php */ -var Survey={checkFields:function(){var a=document.surveyForm.email,b=/^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;return null!=a&&-1==a.value.search(b)?this.localizedStrings.wrongEmail:null},changeGroup:function(){document.getElementById("departmentDescription").childNodes.item(0).data=this.groupDescriptions[document.surveyForm.group.selectedIndex]},submit:function(){var a=this.checkFields(); -null==a?document.surveyForm.submit():alert(a)}};EventHelper.register(window,"onload",function(){Survey.localizedStrings=localizedStrings;"undefined"!=typeof groupDescriptions&&(Survey.groupDescriptions=groupDescriptions)}); \ No newline at end of file +var SurveyForm=Class.create();Class.inherit(SurveyForm,ClientForm,{checkFields:function(){return null==this.form.email||"hidden"==this.form.email.getAttribute("type")?null:!this.emailIsValid(this.form.email)?this.localizedStrings.wrongEmail||"":null}});EventHelper.register(window,"onload",function(){Survey=new SurveyForm(document.surveyForm);Survey.localize(localizedStrings)}); \ No newline at end of file diff --git a/src/messenger/webim/js/source/common.js b/src/messenger/webim/js/source/common.js index 21b55542..07041b48 100755 --- a/src/messenger/webim/js/source/common.js +++ b/src/messenger/webim/js/source/common.js @@ -518,4 +518,43 @@ function playSound(wav_file) { function htmlescape(str) { return str.replace('&','&').replace('<','<').replace('>','>').replace('"','"'); +} + +var ClientForm = Class.create(); +ClientForm.prototype = { + initialize: function(form) { + this.emailPattern = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; + this.form = form; + this.localizedStrings = null; + }, + + emailIsValid: function(emailField) { + if( emailField != null && emailField.value.search(this.emailPattern) == -1 ) { + return false; + } + return true; + }, + + changeGroup: function(groupField, descriptionFieldId, descriptions) { + document.getElementById(descriptionFieldId).innerHTML = descriptions[groupField.selectedIndex]; + }, + + checkFields: function() { + return null; + }, + + localize: function(localizedStrings) { + this.localizedStrings = localizedStrings; + }, + + submit: function() { + var error = this.checkFields(); + if(error === null){ + this.form.submit(); + }else{ + if(error != '') { + alert(error); + } + } + } } \ No newline at end of file diff --git a/src/messenger/webim/js/source/leavemessage.js b/src/messenger/webim/js/source/leavemessage.js new file mode 100644 index 00000000..9d5e9e98 --- /dev/null +++ b/src/messenger/webim/js/source/leavemessage.js @@ -0,0 +1,11 @@ +/** + * @preserve This file is part of Mibew Messenger project. + * http://mibew.org + * + * Copyright (c) 2005-2011 Mibew Messenger Community + * License: http://mibew.org/license.php + */ + +EventHelper.register(window, 'onload', function(){ + MessageForm = new ClientForm(document.leaveMessageForm); +}); \ No newline at end of file diff --git a/src/messenger/webim/js/source/survey.js b/src/messenger/webim/js/source/survey.js index 368aad3e..a4a6ec56 100644 --- a/src/messenger/webim/js/source/survey.js +++ b/src/messenger/webim/js/source/survey.js @@ -6,33 +6,20 @@ * License: http://mibew.org/license.php */ -var Survey = { - checkFields: function(){ - var emailField = document.surveyForm.email; - var emailPattern = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; - if( emailField != null && emailField.value.search(emailPattern) == -1 ){ - return this.localizedStrings.wrongEmail; - } - return null; - }, - - changeGroup: function(){ - document.getElementById('departmentDescription').childNodes.item(0).data = this.groupDescriptions[document.surveyForm.group.selectedIndex]; - }, - - submit: function(){ - var error = this.checkFields(); - if(error == null){ - document.surveyForm.submit(); - }else{ - alert(error); - } - } -} +var SurveyForm = Class.create(); +Class.inherit(SurveyForm, ClientForm, { + checkFields: function() { + if(this.form.email == null || this.form.email.getAttribute('type') == 'hidden') { + return null; + } + if(! this.emailIsValid(this.form.email)){ + return this.localizedStrings.wrongEmail || ''; + } + return null; + } +}); EventHelper.register(window, 'onload', function(){ - Survey.localizedStrings = localizedStrings; - if( typeof groupDescriptions != 'undefined' ){ - Survey.groupDescriptions = groupDescriptions; - } + Survey = new SurveyForm(document.surveyForm); + Survey.localize(localizedStrings); }); \ No newline at end of file diff --git a/src/messenger/webim/leavemessage.php b/src/messenger/webim/leavemessage.php index bf13a34a..3fa42510 100644 --- a/src/messenger/webim/leavemessage.php +++ b/src/messenger/webim/leavemessage.php @@ -112,6 +112,15 @@ $body = getstring2_("leavemail.body", array($visitor_name,$email,$message,$info if (isset($group) && !empty($group['vcemail'])) { $inbox_mail = $group['vcemail']; } else { + if (! is_null($group['parent'])) { + $parentgroup = group_by_id($group['parent']); + if ($parentgroup && !empty($parentgroup['vcemail'])) { + $inbox_mail = $parentgroup['vcemail']; + } + } +} + +if (empty($inbox_mail)) { $inbox_mail = $settings['email']; } diff --git a/src/messenger/webim/libs/chat.php b/src/messenger/webim/libs/chat.php index 4bf8c9c3..6961d907 100644 --- a/src/messenger/webim/libs/chat.php +++ b/src/messenger/webim/libs/chat.php @@ -319,6 +319,16 @@ function setup_leavemessage($name, $email, $message, $groupid, $groupname, $info $page['formgroupname'] = $groupname; $page['forminfo'] = topage($info); $page['referrer'] = urlencode(topage($referrer)); + + if ($settings['enablegroups'] == '1') { + $groups = setup_groups_select($groupid, false); + if ($groups) { + $page['groups'] = $groups['select']; + $page['group.descriptions'] = json_encode($groups['descriptions']); + $page['default.department.description'] = $groups['defaultdescription']; + } + } + } function setup_survey($name, $email, $groupid, $info, $referrer) @@ -331,40 +341,13 @@ function setup_survey($name, $email, $groupid, $info, $referrer) $page['forminfo'] = topage($info); $page['referrer'] = urlencode(topage($referrer)); - $selectedgroupid = $groupid; - if ($settings['enablegroups'] == '1' && $settings["surveyaskgroup"] == "1") { - $link = connect(); - $showgroups = ($groupid == '')?true:group_has_children($groupid, $link); - if ($showgroups) { - $allgroups = get_groups($link, false); - close_connection($link); - $val = ""; - $groupdescriptions = array(); - foreach ($allgroups as $k) { - $groupname = $k['vclocalname']; - if ($k['inumofagents'] == 0 || ($groupid && $k['parent'] != $groupid && $k['groupid'] != $groupid )) { - continue; - } - if ($k['ilastseen'] !== NULL && $k['ilastseen'] < $settings['online_timeout']) { - if (!$selectedgroupid) { - $selectedgroupid = $k['groupid']; // select first online group - } - } else { - $groupname .= " (offline)"; - } - $isselected = $k['groupid'] == $selectedgroupid; - if ($isselected) { - $defaultdescription = $k['vclocaldescription']; - } - $val .= ""; - $groupdescriptions[] = $k['vclocaldescription']; - } - $page['groups'] = $val; - $page['group.descriptions'] = json_encode($groupdescriptions); - $page['default.department.description'] = empty($defaultdescription)?' ':$defaultdescription; + $groups = setup_groups_select($groupid, true); + if ($groups) { + $page['groups'] = $groups['select']; + $page['group.descriptions'] = json_encode($groups['descriptions']); + $page['default.department.description'] = $groups['defaultdescription']; } - close_connection($link); } $page['showemail'] = $settings["surveyaskmail"] == "1" ? "1" : ""; @@ -372,6 +355,54 @@ function setup_survey($name, $email, $groupid, $info, $referrer) $page['showname'] = $settings['usercanchangename'] == "1" ? "1" : ""; } +function setup_groups_select($groupid, $markoffline) +{ + global $settings; + + $link = connect(); + $showgroups = ($groupid == '')?true:group_has_children($groupid, $link); + if (!$showgroups) { + close_connection($link); + return false; + } + + $allgroups = get_groups($link, false); + close_connection($link); + + if (empty($allgroups)) { + return false; + } + + $val = ""; + $selectedgroupid = $groupid; + $groupdescriptions = array(); + foreach ($allgroups as $k) { + $groupname = $k['vclocalname']; + if ($k['inumofagents'] == 0 || ($groupid && $k['parent'] != $groupid && $k['groupid'] != $groupid )) { + continue; + } + if ($k['ilastseen'] !== NULL && $k['ilastseen'] < $settings['online_timeout']) { + if (!$selectedgroupid) { + $selectedgroupid = $k['groupid']; // select first online group + } + } else { + $groupname .= $markoffline?" (offline)":""; + } + $isselected = $k['groupid'] == $selectedgroupid; + if ($isselected) { + $defaultdescription = $k['vclocaldescription']; + } + $val .= ""; + $groupdescriptions[] = $k['vclocaldescription']; + } + + return array( + 'select' => $val, + 'descriptions' => $groupdescriptions, + 'defaultdescription' => $defaultdescription + ); +} + function setup_chatview_for_user($thread, $level) { global $page, $webimroot, $settings; diff --git a/src/messenger/webim/locales/en/properties b/src/messenger/webim/locales/en/properties index c5cb376b..38845101 100644 --- a/src/messenger/webim/locales/en/properties +++ b/src/messenger/webim/locales/en/properties @@ -144,6 +144,8 @@ form.field.ban_comment.description=Reason for block form.field.ban_comment=Comment form.field.ban_days.description=Numbers of days this address is blocked form.field.ban_days=Days +form.field.department=Choose Department: +form.field.department.description=Department description: form.field.email=Your email form.field.groupcommondesc.description=Description in English. form.field.groupcommondesc=International description @@ -423,8 +425,6 @@ permission.takeover=Take over chat thread permission.viewthreads=View another operator's chat thread permissions.intro=Change restrictions and available features for this operator. permissions.title=Permissions -presurvey.department=Choose Department: -presurvey.department.description=Department description: presurvey.error.wrong_email=Wrong email address. presurvey.intro=Thank you for contacting us. Please fill out the form below and click the Start Chat button. presurvey.mail=Email: diff --git a/src/messenger/webim/locales/ru/properties b/src/messenger/webim/locales/ru/properties index 4c8d6edd..e7e07f07 100644 --- a/src/messenger/webim/locales/ru/properties +++ b/src/messenger/webim/locales/ru/properties @@ -142,6 +142,8 @@ form.field.ban_comment.description= form.field.ban_comment=Комментарий form.field.ban_days.description=Количество дней,
на которое будет запрещен адрес form.field.ban_days=Дни +form.field.department=Выберите отдел: +form.field.department.description=Описание отдела: form.field.email=Ваш email form.field.groupcommondesc.description=Описание для посетителей из других стран. form.field.groupcommondesc=Интернациональное описание @@ -421,8 +423,6 @@ permission.takeover= permission.viewthreads=Просматривать диалоги других операторов в режиме реального времени permissions.intro=Здесь вы можете управлять возможностями оператора. permissions.title=Возможности оператора -presurvey.department=Выберите отдел: -presurvey.department.description=Описание отдела: presurvey.error.wrong_email=Неверный адрес электронной почты. presurvey.intro=Спасибо, что связались с нами! Заполните, пожалуйста, небольшую форму и нажмите "Начать диалог". presurvey.mail=E-mail: diff --git a/src/messenger/webim/styles/dialogs/default/templates/leavemessage.tpl b/src/messenger/webim/styles/dialogs/default/templates/leavemessage.tpl index ebe482e3..6c931803 100644 --- a/src/messenger/webim/styles/dialogs/default/templates/leavemessage.tpl +++ b/src/messenger/webim/styles/dialogs/default/templates/leavemessage.tpl @@ -33,6 +33,13 @@ position:relative;top:1px; } + + + @@ -45,7 +52,7 @@ -${if:formgroupid}${endif:formgroupid} +${ifnot:groups}${if:formgroupid}${endif:formgroupid}${endif:groups} + +${if:groups} + + + + + + + + +${endif:groups} + - + - + ${endif:groups} diff --git a/src/messenger/webim/styles/dialogs/original/templates/leavemessage.tpl b/src/messenger/webim/styles/dialogs/original/templates/leavemessage.tpl index 28c6f90a..0f26dfa4 100644 --- a/src/messenger/webim/styles/dialogs/original/templates/leavemessage.tpl +++ b/src/messenger/webim/styles/dialogs/original/templates/leavemessage.tpl @@ -20,6 +20,13 @@ .isubmit { background-position:0px -39px; width: 40px; height: 35px; } .isubmitrest { background-position:-31px -39px; width: 10px; height: 35px;} + + +
@@ -113,6 +120,20 @@ ${endif:errors} ${msg:form.field.name}:
${msg:form.field.department} + +
${msg:form.field.department.description}${page:default.department.description}
${msg:form.field.message}: diff --git a/src/messenger/webim/styles/dialogs/default/templates/survey.tpl b/src/messenger/webim/styles/dialogs/default/templates/survey.tpl index a7bb4390..6674b34d 100644 --- a/src/messenger/webim/styles/dialogs/default/templates/survey.tpl +++ b/src/messenger/webim/styles/dialogs/default/templates/survey.tpl @@ -123,13 +123,13 @@ ${endif:errors} ${if:groups}
${msg:presurvey.department}${msg:form.field.department} - +
${msg:presurvey.department.description}${msg:form.field.department.description} ${page:default.department.description}
@@ -30,7 +37,7 @@ -${if:formgroupid}${endif:formgroupid} +${ifnot:groups}${if:formgroupid}${endif:formgroupid}${endif:groups}
@@ -76,6 +83,24 @@ ${endif:errors} + +${if:groups} + + + + + + + + + + + + +${endif:groups} + diff --git a/src/messenger/webim/styles/dialogs/original/templates/survey.tpl b/src/messenger/webim/styles/dialogs/original/templates/survey.tpl index 627b298e..b1649114 100644 --- a/src/messenger/webim/styles/dialogs/original/templates/survey.tpl +++ b/src/messenger/webim/styles/dialogs/original/templates/survey.tpl @@ -84,15 +84,15 @@ ${endif:errors} ${if:groups} - + - + diff --git a/src/messenger/webim/styles/dialogs/silver/templates/leavemessage.tpl b/src/messenger/webim/styles/dialogs/silver/templates/leavemessage.tpl index fd76406a..4123a86f 100644 --- a/src/messenger/webim/styles/dialogs/silver/templates/leavemessage.tpl +++ b/src/messenger/webim/styles/dialogs/silver/templates/leavemessage.tpl @@ -4,6 +4,13 @@ ${msg:leavemessage.title} + + + @@ -11,7 +18,7 @@ - ${if:formgroupid}${endif:formgroupid} + ${ifnot:groups}${if:formgroupid}${endif:formgroupid}${endif:groups}
+ ${if:groups} + + + + + + + + + ${endif:groups}
${msg:form.field.department} + +
${msg:form.field.department.description}${page:default.department.description}
${msg:form.field.message}:
${msg:presurvey.department}${msg:form.field.department} - +
${msg:presurvey.department.description}${msg:form.field.department.description} ${page:default.department.description}
${msg:form.field.name}:
${msg:form.field.department} + +
${msg:form.field.department.description}${page:default.department.description}
${msg:form.field.message}: diff --git a/src/messenger/webim/styles/dialogs/silver/templates/survey.tpl b/src/messenger/webim/styles/dialogs/silver/templates/survey.tpl index c68e79dd..09aa52ba 100644 --- a/src/messenger/webim/styles/dialogs/silver/templates/survey.tpl +++ b/src/messenger/webim/styles/dialogs/silver/templates/survey.tpl @@ -64,11 +64,11 @@ ${if:groups} - - + + - + ${endif:groups} diff --git a/src/messenger/webim/styles/dialogs/simplicity/templates/leavemessage.tpl b/src/messenger/webim/styles/dialogs/simplicity/templates/leavemessage.tpl index dfd58110..672a63f4 100644 --- a/src/messenger/webim/styles/dialogs/simplicity/templates/leavemessage.tpl +++ b/src/messenger/webim/styles/dialogs/simplicity/templates/leavemessage.tpl @@ -4,6 +4,13 @@ ${msg:leavemessage.title} + + +
@@ -11,7 +18,7 @@ - ${if:formgroupid}${endif:formgroupid} + ${ifnot:groups}${if:formgroupid}${endif:formgroupid}${endif:groups}
${msg:presurvey.department}${msg:form.field.department}
${msg:presurvey.department.description}${msg:form.field.department.description} ${page:default.department.description}
+${if:groups} + + + + + + + + +${endif:groups} diff --git a/src/messenger/webim/styles/dialogs/simplicity/templates/survey.tpl b/src/messenger/webim/styles/dialogs/simplicity/templates/survey.tpl index 784aeb94..db0b3868 100644 --- a/src/messenger/webim/styles/dialogs/simplicity/templates/survey.tpl +++ b/src/messenger/webim/styles/dialogs/simplicity/templates/survey.tpl @@ -55,11 +55,11 @@ ${endif:showemail} ${endif:errors} ${if:groups} - - + + - + ${endif:groups}
@@ -46,6 +53,18 @@ ${msg:form.field.name}:
${msg:form.field.department} + +
${msg:form.field.department.description}${page:default.department.description}
${msg:form.field.message}:
${msg:presurvey.department}${msg:form.field.department}
${msg:presurvey.department.description}${msg:form.field.department.description} ${page:default.department.description}