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

inc/js/classes/BxDolGrid.js

@@ -227,7 +227,7 @@ BxDolGrid.prototype.processJson = function (oData, sAction, isDisableLoading) {
         this.loading(false);
 
     if (oData && undefined != oData.grid) {        
-        $('#' + this._sIdContainer).html(oData.grid);
+        $('#' + this._sIdContainer).html($(oData.grid).find('#' + this._sIdContainer).html());
         this._onDataReloaded(true);
     }
     if (oData && undefined != oData.msg) {

modules/boonex/contact/classes/BxContactModule.php

@@ -72,10 +72,9 @@ class BxContactModule extends BxDolModule
                 $sResult = '';
                 $sRecipientEmail = $this->_oConfig->getEmail();
                 $aCustomHeaders = array();
-                if (getParam('bx_contact_send_from_senders_email')) {
+                if (getParam('bx_contact_add_reply_to')) {
                     $aCustomHeaders = array(
-                        'From' => $oForm->getCleanValue('name') . ' <' . bx_process_output($oForm->getCleanValue('email')) . '>',
-                        'Sender' => trim(getParam('bx_smtp_from_email')) ? trim(getParam('bx_smtp_from_email')) : getParam('site_email_notify'),
+                        'Reply-To' => $oForm->getCleanValue('name') . ' <' . bx_process_output($oForm->getCleanValue('email')) . '>',
                     );
                 }
                 

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

@@ -31,7 +31,7 @@
     <string name="_bx_contact_menu_item_title_contact"><![CDATA[Contact]]></string>
 
 	<string name="_bx_contact_option_email"><![CDATA[Email address to receive messages (if empty, site's email will be used)]]></string>
-	<string name="_bx_contact_option_send_from_senders_email"><![CDATA[Send messages from sender's email address]]></string>
+	<string name="_bx_contact_option_add_reply_to"><![CDATA[Assign 'Reply-To' header to sender's email address]]></string>
 
 	<string name="_bx_contact_acl_action_contact"><![CDATA[Contact]]></string>
 

modules/boonex/contact/install/sql/enable.sql

@@ -27,7 +27,7 @@ SET @iCategId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `check`, `check_error`, `extra`, `order`) VALUES
 ('bx_contact_email', '', @iCategId, '_bx_contact_option_email', 'digit', '', '', '', 1),
-('bx_contact_send_from_senders_email', '', @iCategId, '_bx_contact_option_send_from_senders_email', 'checkbox', '', '', '', 20);
+('bx_contact_add_reply_to', '', @iCategId, '_bx_contact_option_add_reply_to', 'checkbox', '', '', '', 20);
 
 
 -- ACL

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

@@ -31,7 +31,7 @@
     <string name="_bx_contact_menu_item_title_contact"><![CDATA[Связь]]></string>
 
     <string name="_bx_contact_option_email"><![CDATA[E-mail для получения сообщений (если пусто, будет использован e-mail сайта)]]></string>
-    <string name="_bx_contact_option_send_from_senders_email"><![CDATA[Отсылать сообщения с e-mail адреса отправителя]]></string>
+    <string name="_bx_contact_option_add_reply_to"><![CDATA[Добавить e-mail адрес отправителя в 'Reply-To' (ответить на адрес) заголовок письма]]></string>
 
 	<string name="_bx_contact_acl_action_contact"><![CDATA[Контакты]]></string>
 

template/css/grid.css

@@ -4,7 +4,7 @@
     border-collapse:collapse;
 }
 .bx-grid-table-wrapper {    
-    overflow-x:scroll;
+    overflow-x:hidden;
     overflow-y:hidden;    
 }
 .bx-grid-table-wrapper2 {
@@ -25,18 +25,25 @@
     z-index:1;
 }
 .bx-grid-table-wrapper2:before {
-    left:0;
+    left:-1px;
     background: linear-gradient(to right, rgba(255,255,255,1) 0%,rgba(255,255,255,0) 100%);
 }
 .bx-grid-table-wrapper2:after {
-    right:0;
+    right:-1px;
     background: linear-gradient(to right, rgba(255,255,255,0) 0%,rgba(255,255,255,1) 100%);
 }
-.bx-grid-header .bx-def-hr, 
 .bx-grid-table-wrapper .bx-def-hr {
     margin:0;
 }
 
+.bx-grid-header-controls-filter {
+    float:left;
+}
+.bx-grid-header-controls-independent {
+    float:right;
+    margin-top:0;
+}
+
 .bx-grid-table .bx-grid-table-row-hr td:first-child,
 .bx-grid-table .bx-grid-table-row-hr td {
     padding:0;

template/css/media-phone.css

@@ -141,11 +141,15 @@ ul.bx-menu-toolbar li a span {
 
 /* grid.css */
 
+html .bx-grid-table-wrapper {
+    overflow-x:scroll;
+}
 html .bx-grid-table {
     min-width:720px;
 }
 html .bx-grid-table-wrapper2:before,
 html .bx-grid-table-wrapper2:after {
     display:block;
+}
 
 } /* @media end */

template/grid.html

@@ -3,12 +3,12 @@
         <div class="bx-grid-header">
         	<div class="bx-grid-header-cnt bx-def-padding-sec-bottom bx-clearfix">
 	            <bx_if:filter>
-	                <div style="float:left;">
+	                <div class="bx-grid-header-controls-filter bx-def-margin-thd-top">
 	                    __controls__
 	                </div>  
 	            </bx_if:filter>
 	            <bx_if:actions_independent>
-	                <div class="bx-def-margin-thd-neg" style="float:right;">
+	                <div class="bx-grid-header-controls-independent bx-def-margin-thd-neg">
 	                    __actions_independent__
 	                </div>
 	            </bx_if:actions_independent>