diff --git a/layouts/v7/modules/Settings/Vtiger/CompanyDetails.tpl b/layouts/v7/modules/Settings/Vtiger/CompanyDetails.tpl
index 4628c5e4222859c7edcee697a44c41230b6298ad..2166b6bf8a10d1be6bd62c822dd5ef46610ff685 100644
--- a/layouts/v7/modules/Settings/Vtiger/CompanyDetails.tpl
+++ b/layouts/v7/modules/Settings/Vtiger/CompanyDetails.tpl
@@ -12,125 +12,118 @@
{strip}
- <div class=" col-lg-12 col-md-12 col-sm-12">
- <input type="hidden" id="supportedImageFormats" value='{ZEND_JSON::encode(Settings_Vtiger_CompanyDetails_Model::$logoSupportedFormats)}' />
- {*<div class="blockData" >
- <h3>{vtranslate('LBL_COMPANY_DETAILS', $QUALIFIED_MODULE)}</h3>
- {if $DESCRIPTION}<span style="font-size:12px;color: black;"> - {vtranslate({$DESCRIPTION}, $QUALIFIED_MODULE)}</span>{/if}
- </div>
- <hr>*}
- <div class="clearfix">
- <div class="btn-group pull-right editbutton-container">
- <button id="updateCompanyDetails" class="btn btn-default ">{vtranslate('LBL_EDIT',$QUALIFIED_MODULE)}</button>
- </div>
- </div>
- {assign var=WIDTHTYPE value=$CURRENT_USER_MODEL->get('rowheight')}
- <div id="CompanyDetailsContainer" class=" detailViewContainer {if !empty($ERROR_MESSAGE)}hide{/if}" >
- <div class="block">
- <div>
- <h4>{vtranslate('LBL_COMPANY_LOGO',$QUALIFIED_MODULE)}</h4>
- </div>
- <hr>
- <div class="blockData">
- <table class="table detailview-table no-border">
- <tbody>
- <tr>
- <td class="fieldLabel">
- <div class="companyLogo">
- {if $MODULE_MODEL->getLogoPath()}
- <img src="{$MODULE_MODEL->getLogoPath()}" class="alignMiddle" style='max-width:700px;'/>
- {else}
- {vtranslate('LBL_NO_LOGO_EDIT_AND_UPLOAD', $QUALIFIED_MODULE)}
- {/if}
- </div>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- <br>
- <div class="block">
- <div>
- <h4>{vtranslate('LBL_COMPANY_INFORMATION',$QUALIFIED_MODULE)}</h4>
- </div>
- <hr>
- <div class="blockData">
- <table class="table detailview-table no-border">
- <tbody>
- {foreach from=$MODULE_MODEL->getFields() item=FIELD_TYPE key=FIELD}
- {if $FIELD neq 'logoname' && $FIELD neq 'logo' }
- <tr>
- <td class="{$WIDTHTYPE} fieldLabel" style="width:25%"><label >{vtranslate($FIELD,$QUALIFIED_MODULE)}</label></td>
- <td class="{$WIDTHTYPE}" style="word-wrap:break-word;">
- {if $FIELD eq 'address'} {decode_html($MODULE_MODEL->get($FIELD))|nl2br} {else} {decode_html($MODULE_MODEL->get($FIELD))} {/if}
- </td>
- </tr>
- {/if}
- {/foreach}
- </tbody>
- </table>
- </div>
- </div>
- </div>
+ <div class=" col-lg-12 col-md-12 col-sm-12">
+ <input type="hidden" id="supportedImageFormats" value='{ZEND_JSON::encode(Settings_Vtiger_CompanyDetails_Model::$logoSupportedFormats)}' />
+ {*<div class="blockData" >
+ <h3>{vtranslate('LBL_COMPANY_DETAILS', $QUALIFIED_MODULE)}</h3>
+ {if $DESCRIPTION}<span style="font-size:12px;color: black;"> - {vtranslate({$DESCRIPTION}, $QUALIFIED_MODULE)}</span>{/if}
+ </div>
+ <hr>*}
+ <div class="clearfix">
+ <div class="btn-group pull-right editbutton-container">
+ <button id="updateCompanyDetails" class="btn btn-default ">{vtranslate('LBL_EDIT',$QUALIFIED_MODULE)}</button>
+ </div>
+ </div>
+ {assign var=WIDTHTYPE value=$CURRENT_USER_MODEL->get('rowheight')}
+ <div id="CompanyDetailsContainer" class=" detailViewContainer {if !empty($ERROR_MESSAGE)}hide{/if}" >
+ <div class="block">
+ <div>
+ <h4>{vtranslate('LBL_COMPANY_LOGO',$QUALIFIED_MODULE)}</h4>
+ </div>
+ <hr>
+ <div class="blockData">
+ <table class="table detailview-table no-border">
+ <tbody>
+ <tr>
+ <td class="fieldLabel">
+ <div class="companyLogo">
+ {if $MODULE_MODEL->getLogoPath()}
+ <img src="{$MODULE_MODEL->getLogoPath()}" class="alignMiddle" style="max-width:700px;"/>
+ {else}
+ {vtranslate('LBL_NO_LOGO_EDIT_AND_UPLOAD', $QUALIFIED_MODULE)}
+ {/if}
+ </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <br>
+ <div class="block">
+ <div>
+ <h4>{vtranslate('LBL_COMPANY_INFORMATION',$QUALIFIED_MODULE)}</h4>
+ </div>
+ <hr>
+ <div class="blockData">
+ <table class="table detailview-table no-border">
+ <tbody>
+ {foreach from=$MODULE_MODEL->getFields() item=FIELD_TYPE key=FIELD}
+ {if $FIELD neq 'logoname' && $FIELD neq 'logo' }
+ <tr>
+ <td class="{$WIDTHTYPE} fieldLabel" style="width:25%"><label >{vtranslate($FIELD,$QUALIFIED_MODULE)}</label></td>
+ <td class="{$WIDTHTYPE}" style="word-wrap:break-word;">
+ {if $FIELD eq 'address'} {decode_html($MODULE_MODEL->get($FIELD))|nl2br} {else} {decode_html($MODULE_MODEL->get($FIELD))} {/if}
+ </td>
+ </tr>
+ {/if}
+ {/foreach}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
- <div class="editViewContainer">
- <form class="form-horizontal {if empty($ERROR_MESSAGE)}hide{/if}" id="updateCompanyDetailsForm" method="post" action="index.php" enctype="multipart/form-data">
- <input type="hidden" name="module" value="Vtiger" />
- <input type="hidden" name="parent" value="Settings" />
- <input type="hidden" name="action" value="CompanyDetailsSave" />
- <div class="form-group companydetailsedit">
- <label class="col-sm-2 fieldLabel control-label"> {vtranslate('LBL_COMPANY_LOGO',$QUALIFIED_MODULE)}</label>
- <div class="fieldValue col-sm-5" >
- <div class="company-logo-content">
- <img src="{$MODULE_MODEL->getLogoPath()}" class="alignMiddle" style='max-width:700px;'/>
- <br><hr>
- <input type="file" name="logo" id="logoFile" />
- </div>
- <br>
- <div class="alert alert-info" >
- {vtranslate('LBL_LOGO_RECOMMENDED_MESSAGE',$QUALIFIED_MODULE)}
- </div>
- </div>
- </div>
+ <div class="editViewContainer">
+ <form class="form-horizontal {if empty($ERROR_MESSAGE)}hide{/if}" id="updateCompanyDetailsForm" method="post" action="index.php" enctype="multipart/form-data">
+ <input type="hidden" name="module" value="Vtiger" />
+ <input type="hidden" name="parent" value="Settings" />
+ <input type="hidden" name="action" value="CompanyDetailsSave" />
+ <div class="form-group companydetailsedit">
+ <label class="col-sm-2 fieldLabel control-label"> {vtranslate('LBL_COMPANY_LOGO',$QUALIFIED_MODULE)}</label>
+ <div class="fieldValue col-sm-5" >
+ <div class="company-logo-content">
+ <img src="{$MODULE_MODEL->getLogoPath()}" class="alignMiddle" style="max-width:700px;"/>
+ <br><hr>
+ <input type="file" name="logo" id="logoFile" />
+ </div>
+ <br>
+ <div class="alert alert-info" >
+ {vtranslate('LBL_LOGO_RECOMMENDED_MESSAGE',$QUALIFIED_MODULE)}
+ </div>
+ </div>
+ </div>
- {foreach from=$MODULE_MODEL->getFields() item=FIELD_TYPE key=FIELD}
- {if $FIELD neq 'logoname' && $FIELD neq 'logo' }
- <div class="form-group companydetailsedit">
- <label class="col-sm-2 fieldLabel control-label ">
- {vtranslate($FIELD,$QUALIFIED_MODULE)}{if $FIELD eq 'organizationname'} <span class="redColor">*</span>{/if}
- </label>
- <div class="fieldValue col-sm-5" >
- {if $FIELD eq 'address'}
- <textarea class="form-control col-sm-6 resize-vertical" rows="2" name="{$FIELD}">{$MODULE_MODEL->get($FIELD)}</textarea>
- {else if $FIELD eq 'website'}
- <input type="text" class="inputElement" data-rule-url="true" name="{$FIELD}" value="{$MODULE_MODEL->get($FIELD)}"/>
- {else if $FIELD eq 'country'}
- <select name="{$FIELD}" class="select2-container inputElement select2" >
- {foreach item=COUNTRY from=$CURRENT_USER_MODEL->getModule()->getCountryList()}
- <option value="{$COUNTRY}" {if $MODULE_MODEL->get($FIELD) eq $COUNTRY} selected="" {/if}>{$COUNTRY}</option>
- {/foreach}
- <option value="Prefer Not to Disclose">{vtranslate('Prefer Not to Disclose',$MODULE)}</option>
- </select>
- {else}
- <input type="text" {if $FIELD eq 'organizationname'} data-rule-required="true" {/if} class="inputElement " name="{$FIELD}" value="{$MODULE_MODEL->get($FIELD)}"/>
- {/if}
- </div>
- </div>
- {/if}
- {/foreach}
+ {foreach from=$MODULE_MODEL->getFields() item=FIELD_TYPE key=FIELD}
+ {if $FIELD neq 'logoname' && $FIELD neq 'logo' }
+ <div class="form-group companydetailsedit">
+ <label class="col-sm-2 fieldLabel control-label ">
+ {vtranslate($FIELD,$QUALIFIED_MODULE)}{if $FIELD eq 'organizationname'} <span class="redColor">*</span>{/if}
+ </label>
+ <div class="fieldValue col-sm-5">
+ {if $FIELD eq 'address'}
+ <textarea class="form-control col-sm-6 resize-vertical" rows="2" name="{$FIELD}">{$MODULE_MODEL->get($FIELD)}</textarea>
+ {else if $FIELD eq 'website'}
+ <input type="text" class="inputElement" data-rule-url="true" name="{$FIELD}" value="{$MODULE_MODEL->get($FIELD)}"/>
+ {else}
+ <input type="text" {if $FIELD eq 'organizationname'} data-rule-required="true" {/if} class="inputElement" name="{$FIELD}" value="{$MODULE_MODEL->get($FIELD)}"/>
+ {/if}
+ </div>
+ </div>
+ {/if}
+ {/foreach}
- <div class='modal-overlay-footer clearfix '>
- <div class="row clearfix">
- <div class='textAlignCenter col-lg-12 col-md-12 col-sm-12'>
- <button type='submit' class='btn btn-success saveButton'>{vtranslate('LBL_SAVE', $MODULE)}</button>
- <a class='cancelLink' data-dismiss="modal" href="#">{vtranslate('LBL_CANCEL', $MODULE)}</a>
- </div>
- </div>
- </div>
- </form>
- </div>
+ <div class="modal-overlay-footer clearfix">
+ <div class="row clearfix">
+ <div class="textAlignCenter col-lg-12 col-md-12 col-sm-12">
+ <button type="submit" class="btn btn-success saveButton">{vtranslate('LBL_SAVE', $MODULE)}</button>
+ <a class="cancelLink" data-dismiss="modal" href="#">{vtranslate('LBL_CANCEL', $MODULE)}</a>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
</div>
</div>
{/strip}
diff --git a/layouts/v7/modules/Settings/Vtiger/resources/Index.js b/layouts/v7/modules/Settings/Vtiger/resources/Index.js
index a8d1a9475426f5f5ebe720b591258a469c5e86c7..d79de78b824e04f43baeb3d23cc1a33aa2a70633 100644
--- a/layouts/v7/modules/Settings/Vtiger/resources/Index.js
+++ b/layouts/v7/modules/Settings/Vtiger/resources/Index.js
@@ -42,7 +42,7 @@ Vtiger_Index_Js("Settings_Vtiger_Index_Js",{
var shortCutActionEle = jQuery(menuItemId);
var imagePath = shortCutActionEle.data('pinimageurl');
shortCutActionEle.attr('src',imagePath).data('action','pin');
- app.helper.showSuccessNotification({'message':''});
+ app.helper.showSuccessNotification({'message':app.vtranslate('JS_SUCCESSFULLY_UNPINNED')});
}
});
e.stopPropagation();
diff --git a/modules/Migration/schema/660_to_700.php b/modules/Migration/schema/660_to_700.php
index 34e76089116fbd0c356f4308b3f43be0a32215e2..9aa09702e45fff75420c4e5bc5e689e39a0339a6 100644
--- a/modules/Migration/schema/660_to_700.php
+++ b/modules/Migration/schema/660_to_700.php
@@ -97,6 +97,12 @@ if(defined('VTIGER_UPGRADE')) {
}
}
+ $fieldInstance = Vtiger_Field_Model::getInstance('language', $moduleInstance);
+ if ($fieldInstance) {
+ $fieldInstance->set('defaultvalue', 'en_us');
+ $fieldInstance->save();
+ }
+
$allUsers = Users_Record_Model::getAll(true);
foreach ($allUsers as $userId => $userModel) {
$db->pquery('UPDATE vtiger_users SET defaultcalendarview=? WHERE id=?', array('MyCalendar', $userId));
diff --git a/modules/Settings/Groups/views/Edit.php b/modules/Settings/Groups/views/Edit.php
index 9d8a40468d6e94ea1d562e15e880e1eb2a199c93..5585b77c12f2056ec3c923b241fb437376b7595e 100644
--- a/modules/Settings/Groups/views/Edit.php
+++ b/modules/Settings/Groups/views/Edit.php
@@ -23,7 +23,7 @@ Class Settings_Groups_Edit_View extends Settings_Vtiger_Index_View {
$recordModel = new Settings_Groups_Record_Model();
$viewer->assign('MODE', '');
}
-
+
$viewer->assign('MEMBER_GROUPS', Settings_Groups_Member_Model::getAll());
$viewer->assign('RECORD_MODEL', $recordModel);
$viewer->assign('RECORD_ID', $record);
@@ -57,15 +57,16 @@ Class Settings_Groups_Edit_View extends Settings_Vtiger_Index_View {
* @param type $moduleModel
*/
public function setModuleInfo($request, $moduleModel){
-
- $viewer = $this->getViewer($request);
- $listViewModel = Settings_Vtiger_ListView_Model::getInstance($request->getModule(false));
- $linkParams = array('MODULE'=>$request->getModule(false), 'ACTION'=>$request->get('view'));
+ $record = $request->get('record');
+ if ($record) {
+ $viewer = $this->getViewer($request);
+ $listViewModel = Settings_Vtiger_ListView_Model::getInstance($request->getModule(false));
+ $linkParams = array('MODULE'=>$request->getModule(false), 'ACTION'=>$request->get('view'));
- if(!$this->listViewLinks){
- $this->listViewLinks = $listViewModel->getListViewLinks($linkParams);
- }
- $viewer->assign('LISTVIEW_LINKS', $this->listViewLinks);
-
+ if(!$this->listViewLinks){
+ $this->listViewLinks = $listViewModel->getListViewLinks($linkParams);
+ }
+ $viewer->assign('LISTVIEW_LINKS', $this->listViewLinks);
+ }
}
}
\ No newline at end of file
diff --git a/modules/Settings/Vtiger/models/CompanyDetails.php b/modules/Settings/Vtiger/models/CompanyDetails.php
index aaf224bf6d1070e0315aca9769e1709c0e69fec5..74a561a957dfff2c87064702ee420138930db209 100644
--- a/modules/Settings/Vtiger/models/CompanyDetails.php
+++ b/modules/Settings/Vtiger/models/CompanyDetails.php
@@ -30,9 +30,6 @@ class Settings_Vtiger_CompanyDetails_Model extends Settings_Vtiger_Module_Model
'phone' => 'text',
'fax' => 'text',
'website' => 'text',
- 'facebook' => 'text',
- 'twitter' => 'text',
- 'linkedin' => 'text'
);
var $companyBasicFields = array(
@@ -50,9 +47,6 @@ class Settings_Vtiger_CompanyDetails_Model extends Settings_Vtiger_Module_Model
var $companySocialLinks = array(
'website' => 'text',
- 'facebook' => 'text',
- 'twitter' => 'text',
- 'linkedin' => 'text'
);
/**
diff --git a/modules/Settings/Vtiger/models/ListView.php b/modules/Settings/Vtiger/models/ListView.php
index 7e0158b5a1581b04b8bff4f8fad96dd9431d5691..13adff8a7f3be35c58bad28829e36a8f3ca0a139 100644
--- a/modules/Settings/Vtiger/models/ListView.php
+++ b/modules/Settings/Vtiger/models/ListView.php
@@ -132,7 +132,7 @@ class Settings_Vtiger_ListView_Model extends Vtiger_Base_Model {
'linktype' => 'LISTVIEWBASIC',
'linklabel' => 'LBL_ADD_RECORD',
'linkurl' => $moduleModel->getCreateRecordUrl(),
- 'linkicon' => ''
+ 'linkicon' => 'fa fa-plus'
);
return $basicLinks;
diff --git a/modules/Users/views/Login.php b/modules/Users/views/Login.php
index 04021842cbfd7ac50e33b1cf47e41e4452b4cb36..d2b012404cb8415e0b0a9abf5df5c092f8be7520 100644
--- a/modules/Users/views/Login.php
+++ b/modules/Users/views/Login.php
@@ -46,4 +46,9 @@ class Users_Login_View extends Vtiger_View_Controller {
$viewer->assign('ACTIVITY_REMINDER', $currentUser->getCurrentUserActivityReminderInSeconds());
$viewer->view('LoginFooter.tpl', $moduleName);
}
+
+ function getPageTitle(Vtiger_Request $request) {
+ $companyDetails = Vtiger_CompanyDetails_Model::getInstanceById();
+ return $companyDetails->get('organizationname');
+ }
}
\ No newline at end of file
diff --git a/modules/Vtiger/models/Field.php b/modules/Vtiger/models/Field.php
index d8a607979a71bfd8dd42834a2683b95c461d6e2a..c838a9b9bf9963d4dc27ed64175c54ea2701b069 100644
--- a/modules/Vtiger/models/Field.php
+++ b/modules/Vtiger/models/Field.php
@@ -164,8 +164,8 @@ class Vtiger_Field_Model extends Vtiger_Field {
$fieldDataType = 'picklist';
} else if($uiType == '55' && stripos($this->getName(), 'firstname') !== false) {
$fieldDataType = 'salutation';
- } else if($uiType == '54') {
- $fieldDataType = 'multiowner';
+ } else if($uiType == '55' && stripos($this->getName(), 'roundrobin_userid') !== false) {
+ $fieldDataType = 'multiowner';
} else {
$webserviceField = $this->getWebserviceFieldObject();
$fieldDataType = $webserviceField->getFieldDataType();
diff --git a/packages/vtiger/mandatory/PBXManager.zip b/packages/vtiger/mandatory/PBXManager.zip
index 0d779b146fb9df94fb141035d71b640e7bb4bd86..f8f566a209efd55447e926e9de8735f490f1e640 100644
Binary files a/packages/vtiger/mandatory/PBXManager.zip and b/packages/vtiger/mandatory/PBXManager.zip differ
diff --git a/packages/vtiger/optional/Webforms.zip b/packages/vtiger/optional/Webforms.zip
index 025dfd643cdc93b1d225b92c72cba63e94030e79..d4fdb86106254bc68575a64a84cf76a067f33f57 100644
Binary files a/packages/vtiger/optional/Webforms.zip and b/packages/vtiger/optional/Webforms.zip differ
diff --git a/pkg/vtiger/modules/PBXManager/layouts/v7/modules/Settings/PBXManager/Edit.tpl b/pkg/vtiger/modules/PBXManager/layouts/v7/modules/Settings/PBXManager/Edit.tpl
index 32902ff6434f33f1077d9268f889b01d55bbfe33..18f34642d2d5e86f00e84ed6cba2fc5b21100fb3 100644
--- a/pkg/vtiger/modules/PBXManager/layouts/v7/modules/Settings/PBXManager/Edit.tpl
+++ b/pkg/vtiger/modules/PBXManager/layouts/v7/modules/Settings/PBXManager/Edit.tpl
@@ -8,49 +8,47 @@
*************************************************************************************}
{strip}
+ <div class="widget_header col-lg-12">
+ <h4>{vtranslate('LBL_PBXMANAGER', $QUALIFIED_MODULE)}</h4>
+ <hr>
+ </div>
<div class="container-fluid">
{assign var=MODULE_MODEL value=Settings_PBXManager_Module_Model::getCleanInstance()}
<form id="MyModal" class="form-horizontal" data-detail-url="{$MODULE_MODEL->getDetailViewUrl()}">
- <div class="widget_header row">
- <div class="col-sm-8"><h3>{vtranslate('LBL_PBXMANAGER', $QUALIFIED_MODULE)}</h3></div>
- <div class="col-sm-4 btn-toolbar">
- <div class="pull-right">
- <button class="btn btn-success saveButton" type="submit" title="{vtranslate('LBL_SAVE', $QUALIFIED_MODULE)}"><strong>{vtranslate('LBL_SAVE', $QUALIFIED_MODULE)}</strong></button>
- <a type="reset" class="cancelLink" title="{vtranslate('LBL_CANCEL', $QUALIFIED_MODULE)}">{vtranslate('LBL_CANCEL', $QUALIFIED_MODULE)}</a>
- </div>
- </div>
- </div>
- <hr>
- <div class="contents row">
- <table class="table table-bordered table-condensed themeTableColor">
- <thead>
- <tr>
- <th colspan="2" class="mediumWidthType">
- <span class="alignMiddle">{vtranslate('LBL_PBXMANAGER_CONFIG', $QUALIFIED_MODULE)}</span>
- </th>
- </tr>
- </thead>
+ <input type="hidden" name="module" value="PBXManager"/>
+ <input type="hidden" name="action" value="SaveAjax"/>
+ <input type="hidden" name="parent" value="Settings"/>
+ <input type="hidden" name="id" value="{$RECORD_ID}">
+ <div class="blockData">
+ <table class="table detailview-table no-border">
<tbody>
{assign var=FIELDS value=PBXManager_PBXManager_Connector::getSettingsParameters()}
{foreach item=FIELD_TYPE key=FIELD_NAME from=$FIELDS}
<tr>
- <td width="25%"><label class="muted pull-right marginRight10px"><span class="redColor">*</span>{vtranslate($FIELD_NAME,$QUALIFIED_MODULE)}</label></td>
- <td style="border-left: none;"><input type="{$FIELD_TYPE}" name="{$FIELD_NAME}" data-validation-engine='validate[required]' value="{$RECORD_MODEL->get($FIELD_NAME)}" /></td>
+ <td class="fieldLabel control-label" style="width:25%"><label>{vtranslate($FIELD_NAME, $QUALIFIED_MODULE)} <span class="redColor">*</span></label></td>
+ <td style="word-wrap:break-word;">
+ <input class="inputElement fieldValue" type="{$FIELD_TYPE}" name="{$FIELD_NAME}" data-rule-required="true" value="{$RECORD_MODEL->get($FIELD_NAME)}" />
+ </td>
</tr>
{/foreach}
- <input type="hidden" name="module" value="PBXManager"/>
- <input type="hidden" name="action" value="SaveAjax"/>
- <input type="hidden" name="parent" value="Settings"/>
- <input type="hidden" name="id" value="{$RECORD_ID}">
</tbody>
</table>
</div>
+ <div class="modal-overlay-footer clearfix">
+ <div class="row clearfix">
+ <div class="textAlignCenter col-lg-12 col-md-12 col-sm-12">
+ <button type="submit" class="btn btn-success saveButton">{vtranslate('LBL_SAVE', $MODULE)}</button>
+ <a class="cancelLink" data-dismiss="modal" href="#">{vtranslate('LBL_CANCEL', $MODULE)}</a>
+ </div>
+ </div>
+ </div>
</form>
- </div><br>
- <div class="col-sm-5 alert alert-info container-fluid">
- {vtranslate('LBL_NOTE', $QUALIFIED_MODULE)}<br>
- {vtranslate('LBL_INFO_WEBAPP_URL', $QUALIFIED_MODULE)}<br>
- {vtranslate('LBL_FORMAT_WEBAPP_URL', $QUALIFIED_MODULE)}<br>
- {vtranslate('LBL_FORMAT_INFO_WEBAPP_URL', $QUALIFIED_MODULE)}
+ </div>
+ <div class="col-lg-12">
+ <div class="col-lg-1"></div>
+ <div class="col-sm-5 alert alert-info container-fluid">
+ <b>{vtranslate('LBL_NOTE', $QUALIFIED_MODULE)}</b> {vtranslate('LBL_INFO_WEBAPP_URL', $QUALIFIED_MODULE)}<br><br>
+ {vtranslate('LBL_FORMAT_WEBAPP_URL', $QUALIFIED_MODULE)} : {vtranslate('LBL_FORMAT_INFO_WEBAPP_URL', $QUALIFIED_MODULE)}
+ </div>
</div>
{/strip}
\ No newline at end of file
diff --git a/pkg/vtiger/modules/PBXManager/layouts/v7/modules/Settings/PBXManager/index.tpl b/pkg/vtiger/modules/PBXManager/layouts/v7/modules/Settings/PBXManager/index.tpl
index 461a5d4cfaf5ec5756392dd8974af6c0635742ae..7156b5731c9c62b9d63347397b9f332fb3024772 100644
--- a/pkg/vtiger/modules/PBXManager/layouts/v7/modules/Settings/PBXManager/index.tpl
+++ b/pkg/vtiger/modules/PBXManager/layouts/v7/modules/Settings/PBXManager/index.tpl
@@ -10,36 +10,43 @@
{strip}
<div class="col-sm-12 col-xs-12">
<div class="container-fluid" id="AsteriskServerDetails">
+ <input type="hidden" name="module" value="PBXManager"/>
+ <input type="hidden" name="action" value="SaveAjax"/>
+ <input type="hidden" name="parent" value="Settings"/>
+ <input type="hidden" class="recordid" name="id" value="{$RECORD_ID}">
<div class="widget_header row">
- <div class="col-sm-8"><h3>{vtranslate('LBL_PBXMANAGER', $QUALIFIED_MODULE)}</h3></div>
+ <div class="col-sm-8"><h4>{vtranslate('LBL_PBXMANAGER', $QUALIFIED_MODULE)}</h4></div>
{assign var=MODULE_MODEL value=Settings_PBXManager_Module_Model::getCleanInstance()}
- <div class="col-sm-4"><div class="pull-right"><button class="btn editButton" data-url='{$MODULE_MODEL->getEditViewUrl()}&mode=showpopup&id={$RECORD_ID}' type="button" title="{vtranslate('LBL_EDIT', $QUALIFIED_MODULE)}"><strong>{vtranslate('LBL_EDIT', $QUALIFIED_MODULE)}</strong></button></div></div>
+ <div class="col-sm-4">
+ <div class="clearfix">
+ <div class="btn-group pull-right editbutton-container">
+ <button class="btn btn-default editButton" data-url="{$MODULE_MODEL->getEditViewUrl()}&mode=showpopup&id={$RECORD_ID}" title="{vtranslate('LBL_EDIT', $QUALIFIED_MODULE)}">{vtranslate('LBL_EDIT',$QUALIFIED_MODULE)}</button>
+ </div>
+ </div>
+ </div>
</div>
<hr>
- <div class="contents row">
- <div class="detailViewInfo">
- {assign var=FIELDS value=PBXManager_PBXManager_Connector::getSettingsParameters()}
+ <div class="contents col-lg-12">
+ <table class="table detailview-table no-border">
+ <tbody>
+ {assign var=FIELDS value=PBXManager_PBXManager_Connector::getSettingsParameters()}
{foreach item=FIELD_TYPE key=FIELD_NAME from=$FIELDS}
- <div class="row form-group">
- <div class="col-lg-4 col-md-4 col-sm-4 fieldLabel">
- <label>{vtranslate($FIELD_NAME,$QUALIFIED_MODULE)}</label>
- </div>
- <div class="col-lg-8 col-md-8 col-sm-8 fieldValue break-word">
- <div>{$RECORD_MODEL->get($FIELD_NAME)}</div>
- </div>
- </div>
+ <tr>
+ <td class="fieldLabel" style="width:25%"><label>{vtranslate($FIELD_NAME, $QUALIFIED_MODULE)}</label></td>
+ <td style="word-wrap:break-word;">{$RECORD_MODEL->get($FIELD_NAME)}</td>
+ </tr>
{/foreach}
- <input type="hidden" name="module" value="PBXManager"/>
- <input type="hidden" name="action" value="SaveAjax"/>
- <input type="hidden" name="parent" value="Settings"/>
- <input type="hidden" class="recordid" name="id" value="{$RECORD_ID}">
- </div>
+ </tbody>
+ </table>
</div>
</div>
- <br>
- <div class="span8 alert alert-danger container-fluid">
- {vtranslate('LBL_NOTE', $QUALIFIED_MODULE)}<br>
- {vtranslate('LBL_PBXMANAGER_INFO', $QUALIFIED_MODULE)}
+ <div class="col-sm-12 col-xs-12">
+ <div class="col-sm-8 col-xs-8">
+ <div class="alert alert-danger container-fluid">
+ <b>{vtranslate('LBL_NOTE', $QUALIFIED_MODULE)}</b>
+ {vtranslate('LBL_PBXMANAGER_INFO', $QUALIFIED_MODULE)}
+ </div>
+ </div>
</div>
</div>
{/strip}
\ No newline at end of file
diff --git a/pkg/vtiger/modules/PBXManager/layouts/v7/modules/Settings/PBXManager/resources/Index.js b/pkg/vtiger/modules/PBXManager/layouts/v7/modules/Settings/PBXManager/resources/Index.js
index 0f00e58932850866996faa2af99bca6fe5c82f76..f8d4c67b286e54cc1ed620c4a62a7496d24cc8f1 100644
--- a/pkg/vtiger/modules/PBXManager/layouts/v7/modules/Settings/PBXManager/resources/Index.js
+++ b/pkg/vtiger/modules/PBXManager/layouts/v7/modules/Settings/PBXManager/resources/Index.js
@@ -23,13 +23,13 @@ Settings_Vtiger_Index_Js("Settings_PBXManager_Index_Js", {}, {
data.parent = app.getParentModuleName();
data.action = 'SaveAjax';
- app.request.post(data).then(
- function (data) {
- if (data['success']) {
+ app.request.post({data:data}).then(
+ function (err, data) {
+ if (data) {
var OutgoingServerDetailUrl = form.data('detailUrl');
//after save, load detail view contents and register events
thisInstance.loadContents(OutgoingServerDetailUrl).then(
- function (data) {
+ function (err, data) {
app.helper.hideProgress();
thisInstance.registerDetailViewEvents();
},
@@ -56,23 +56,22 @@ Settings_Vtiger_Index_Js("Settings_PBXManager_Index_Js", {}, {
//To Auto-Generate Vtiger Secret Key
var url = 'index.php?module=PBXManager&parent=Settings&action=Gateway&mode=getSecretKey';
- app.request.post(url).then(
- function (data) {
- jQuery("input[name='vtigersecretkey']").attr("value", data.result);
+ app.request.post({url:url}).then(
+ function (err, data) {
+ var form = jQuery('#MyModal');
+ jQuery("input[name='vtigersecretkey']").attr("value", data);
}
);
//END
- //register validation engine
- var params = app.validationEngineOptions;
- params.onValidationComplete = function (form, valid) {
- if (valid) {
+ var params = {
+ submitHandler: function (form) {
+ var form = jQuery(form);
+ form.find('[name="saveButton"]').attr('disabled', 'disabled');
thisInstance.saveAsteriskServerDetails(form);
- return valid;
}
}
- form.validationEngine(params);
- //END
+ form.vtValidate(params);
form.submit(function (e) {
e.preventDefault();
@@ -81,12 +80,7 @@ Settings_Vtiger_Index_Js("Settings_PBXManager_Index_Js", {}, {
//register click event for cancelLink
cancelLink.click(function (e) {
var OutgoingServerDetailUrl = form.data('detailUrl');
- var progressIndicatorElement = jQuery.progressIndicator({
- 'position': 'html',
- 'blockInfo': {
- 'enabled': true
- }
- });
+ app.helper.showProgress();
thisInstance.loadContents(OutgoingServerDetailUrl).then(
function (data) {
@@ -115,7 +109,7 @@ Settings_Vtiger_Index_Js("Settings_PBXManager_Index_Js", {}, {
app.helper.showProgress();
thisInstance.loadContents(url).then(
- function (data) {
+ function(err, data) {
//after load the contents register the edit view events
thisInstance.registerEditViewEvents();
app.helper.hideProgress();
@@ -131,9 +125,9 @@ Settings_Vtiger_Index_Js("Settings_PBXManager_Index_Js", {}, {
*/
loadContents: function (url) {
var aDeferred = jQuery.Deferred();
- app.request.pjax(url).then(
- function (data) {
- jQuery('.contentsDiv').html(data);
+ app.request.get({url:url}).then(
+ function (err, data) {
+ jQuery('.settingsPageDiv').html(data);
aDeferred.resolve(data);
},
function (error, err) {
diff --git a/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/FieldsEditView.tpl b/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/FieldsEditView.tpl
index 6d0166abb869ff47e88ade43fd1807e7751d0aca..7e11501586772784b84bb3d4875dba5d7282b6bf 100644
--- a/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/FieldsEditView.tpl
+++ b/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/FieldsEditView.tpl
@@ -13,7 +13,7 @@
<input type="hidden" name="selectedFieldsData" val=""/>
<input type="hidden" name="mode" value="{$MODE}"/>
<input type="hidden" name="targetModule" value="{$SOURCE_MODULE}"/>
- <div class="fieldBlockContainer">
+ <div class="fieldBlockContainer-webform" style="margin-bottom: 0;">
<div class="fieldBlockHeader">
<h4>{vtranslate($SOURCE_MODULE, $SOURCE_MODULE)} {vtranslate('LBL_FIELD_INFORMATION', $MODULE)}</h4>
</div>
@@ -29,8 +29,8 @@
<tr>
<td colspan="5">
<div class="row">
- <div class="col-sm-2 fieldLabel"><div class="marginTop20px textAlignCenter pushDown"><b>{vtranslate('LBL_ADD_FIELDS', $MODULE)}</b></div></div>
- <div class="col-sm-8">
+ <div class="col-sm-2 col-lg-2"><div class="textAlignCenter" style="margin-top:8px;"><b>{vtranslate('LBL_ADD_FIELDS', $MODULE)}</b></div></div>
+ <div class="col-sm-8 col-lg-8">
<select id="fieldsList" multiple="multiple" data-placeholder="{vtranslate('LBL_SELECT_FIELDS_OF_TARGET_MODULE', $MODULE)}" class="select2" style="width:100%">
{foreach key=BLOCK_LABEL item=BLOCK_FIELDS from=$ALL_FIELD_MODELS_LIST name="EditViewBlockLevelLoop"}
{foreach key=FIELD_NAME item=FIELD_MODEL from=$BLOCK_FIELDS name=blockfields}
@@ -46,10 +46,8 @@
{/foreach}
</select>
</div>
- <div class="col-sm-2">
- <div class=" marginTop20px pull-right">
- <button type="button" id="saveFieldsOrder" class="btn btn-success" disabled="disabled">{vtranslate('LBL_SAVE_FIELDS_ORDER', $MODULE)}</button>
- </div>
+ <div class="col-sm-2 col-lg-2" style="margin-top: 2px">
+ <button type="button" id="saveFieldsOrder" class="btn btn-success" disabled="disabled">{vtranslate('LBL_SAVE_FIELDS_ORDER', $MODULE)}</button>
</div>
</div>
</td>
@@ -70,7 +68,7 @@
{assign var=FIELD_MODEL value=$FIELD_MODEL->set('fieldvalue',$SELECETED_FIELD_MODEL->get('fieldvalue'))}
{/if}
<tr data-name="{$FIELD_MODEL->getFieldName()}" class="listViewEntries" data-type="{$FIELD_MODEL->getFieldDataType()}" data-mandatory-field={($FIELD_MODEL->isMandatory(true) eq 1) ? "true":"false"}>
- <td class="textAlignCenter">
+ <td class="textAlignCenter" style="vertical-align: inherit">
{if !empty($SELECETED_FIELD_MODEL)}
<input type="hidden" value="{$SELECETED_FIELD_MODEL->get('sequence')}" class="sequenceNumber" name='selectedFieldsData[{$FIELD_NAME}][sequence]'/>
{else}
@@ -79,17 +77,17 @@
<input type="hidden" value="0" name='selectedFieldsData[{$FIELD_NAME}][required]'/>
<input type="checkbox" {if ($FIELD_MODEL->isMandatory(true) eq 1) or ($SELECETED_FIELD_MODEL->get('required') eq 1)}checked="checked"{/if}
{if $FIELD_MODEL->isMandatory(true) eq 1} onclick="return false;" onkeydown="return false;"{/if}
- name='selectedFieldsData[{$FIELD_NAME}][required]' class="markRequired mandatoryField" value="1" />
+ name='selectedFieldsData[{$FIELD_NAME}][required]' class="markRequired mandatoryField" value="1" style="margin-top: -3px;"/>
</td>
- <td class="textAlignCenter">
+ <td class="textAlignCenter verticalAlignMiddle" style="vertical-align: inherit">
<input type="hidden" value="0" name='selectedFieldsData[{$FIELD_NAME}][hidden]'/>
<input type="checkbox" {if (!empty($SELECETED_FIELD_MODEL)) and ($SELECETED_FIELD_MODEL->get('hidden') eq 1)} checked="checked"{/if}
name="selectedFieldsData[{$FIELD_NAME}][hidden]" class="markRequired hiddenField" value="1"/>
</td>
- <td class="fieldLabel" data-label="{vtranslate($FIELD_MODEL->get('label'), $SOURCE_MODULE)}{if $FIELD_MODEL->isMandatory(true)}*{/if}">
+ <td class="fieldLabel" style="vertical-align: inherit" data-label="{vtranslate($FIELD_MODEL->get('label'), $SOURCE_MODULE)}{if $FIELD_MODEL->isMandatory(true)}*{/if}">
{vtranslate($FIELD_MODEL->get('label'), $SOURCE_MODULE)}{if $FIELD_MODEL->isMandatory(true)}<span class="redColor">*</span>{/if}
</td>
- {assign var=DATATYPEMARGINLEFT value= array("date","currency","percentage","reference")}
+ {assign var=DATATYPEMARGINLEFT value= array("date","currency","percentage","reference","multicurrency")}
{assign var=IS_PARENT_EXISTS value=strpos($MODULE,":")}
{if $IS_PARENT_EXISTS}
{assign var=SPLITTED_MODULE value=":"|explode:$MODULE}
@@ -106,10 +104,10 @@
{/foreach}
</select>
{else if $FIELD_MODEL->getFieldDataType() != 'image'}
- {include file=vtemplate_path($FIELD_MODEL->getUITypeModel()->getTemplateName(), $SOURCE_MODULE) BLOCK_FIELDS=$BLOCK_FIELDS MODULE_NAME=$MODULE FIELD_NAME=$FIELD_MODEL->getFieldName()}
+ {include file=vtemplate_path($FIELD_MODEL->getUITypeModel()->getTemplateName(), $SOURCE_MODULE) BLOCK_FIELDS=$BLOCK_FIELDS MODULE_NAME=$MODULE FIELD_NAME=$FIELD_MODEL->getFieldName() MODE = 'webform'}
{/if}
</td>
- <td>
+ <td style="vertical-align: inherit">
{if Settings_Webforms_Record_Model::isCustomField($FIELD_MODEL->get('name'))}
{vtranslate('LBL_LABEL', $QUALIFIED_MODULE)} : {vtranslate($FIELD_MODEL->get('label'), $SOURCE_MODULE)}
{else}
@@ -128,4 +126,4 @@
</tbody>
</table>
</div>
-{/strip}
\ No newline at end of file
+{/strip}
diff --git a/pkg/vtiger/modules/Webforms/settings/views/Edit.php b/pkg/vtiger/modules/Webforms/settings/views/Edit.php
index 3dbf3e6ef10a0ff194b36a572d88c2698f82f1c7..ad44fd78859a7a520da382067bb2c94250f6ee63 100644
--- a/pkg/vtiger/modules/Webforms/settings/views/Edit.php
+++ b/pkg/vtiger/modules/Webforms/settings/views/Edit.php
@@ -88,4 +88,10 @@ Class Settings_Webforms_Edit_View extends Settings_Vtiger_Index_View {
return $headerScriptInstances;
}
+ public function setModuleInfo($request, $moduleModel){
+ $record = $request->get('record');
+ if ($record) {
+ parent::setModuleInfo($request, $moduleModel);
+ }
+ }
}
\ No newline at end of file