diff --git a/layouts/v7/modules/Calendar/resources/Calendar.js b/layouts/v7/modules/Calendar/resources/Calendar.js
index 763b18daaf25021deb71762fb030bb511a4cd3fd..9c62c6162c9e29b1dbffb031f4cf29844ce578e1 100644
--- a/layouts/v7/modules/Calendar/resources/Calendar.js
+++ b/layouts/v7/modules/Calendar/resources/Calendar.js
@@ -1073,7 +1073,7 @@ Vtiger.Class("Calendar_Calendar_Js", {
},
showCreateModal: function (moduleName, startDateTime) {
var isAllowed = jQuery('#is_record_creation_allowed').val();
- if (isAllowed) {
+ if (isAllowed) {
var thisInstance = this;
var quickCreateNode = jQuery('#quickCreateModules').find('[data-name="' + moduleName + '"]');
if (quickCreateNode.length <= 0) {
@@ -1173,7 +1173,11 @@ Vtiger.Class("Calendar_Calendar_Js", {
performDayClickAction: function (date, jsEvent, view) {
if (!this.performingDayClickOperation) {
this.performingDayClickOperation = true;
- this.showCreateEventModal(date);
+ if (date.hasTime() || view.type == 'month') {
+ this.showCreateEventModal(date);
+ } else {
+ this.showCreateModal('Calendar', date);
+ }
}
},
daysOfWeek: {
diff --git a/layouts/v7/modules/Users/ListViewContents.tpl b/layouts/v7/modules/Users/ListViewContents.tpl
index be5e162413bbc719d9159e6fa366ebf6ecb1f1d8..d0e37a7258810e76ecbb45d78cc677bbe535cc63 100644
--- a/layouts/v7/modules/Users/ListViewContents.tpl
+++ b/layouts/v7/modules/Users/ListViewContents.tpl
@@ -122,13 +122,7 @@
<td class="{$WIDTHTYPE}" nowrap>
<span class="fieldValue">
<span class="value textOverflowEllipsis">
- {if $LISTVIEW_HEADER->getName() eq 'is_owner'}
- {if $LISTVIEW_ENTRY->get($LISTVIEW_HEADERNAME) eq 1}
- {vtranslate('LBL_YES')}
- {/if}
- {else}
- {$LISTVIEW_ENTRY->get($LISTVIEW_HEADERNAME)}
- {/if}
+ {$LISTVIEW_ENTRY->get($LISTVIEW_HEADERNAME)}
</span>
</span>
</td>
diff --git a/layouts/v7/modules/Users/Login.tpl b/layouts/v7/modules/Users/Login.tpl
index 10005f03859ecbd6b5a547d8aff7f6838ed8fe82..211864aa38d809a7d93a99e898e48adf6690fefe 100644
--- a/layouts/v7/modules/Users/Login.tpl
+++ b/layouts/v7/modules/Users/Login.tpl
@@ -10,58 +10,6 @@
{strip}
<style>
- .container {
- width: 380px;
- height: 420px;
- margin: 0 auto;
- }
- .loginDiv {
- border-radius: 4px;
- box-shadow: 0 0 10px gray;
- background-color: #FFFFFF;
- }
- .inActiveImgDiv {
- padding: 5px;
- text-align: center;
- margin: 30px 0px;
- }
- .user-logo {
- height: 110px;
- margin: 0 auto;
- padding-top: 40px;
- padding-bottom: 20px;
- }
- .failureMessage {
- color: red;
- display: block;
- text-align: center;
- padding: 0px 0px 10px;
- }
- .successMessage {
- color: green;
- display: block;
- text-align: center;
- padding: 0px 0px 10px;
- }
- .app-footer p {
- margin-top: 0px;
- padding-bottom: 0px !important;
- }
- .footer {
- background-color: #fbfbfb;
- height:26px;
- }
- .marketingDiv {
- padding-right: 100px;
- color: white;
- }
- .blockLink {
- border: 1px solid white;
- padding: 3px 5px;
- }
- #page {
- padding-top: 100px;
- }
body {
background: url(layouts/v7/resources/Images/login-background.jpg);
background-position: center;
@@ -70,21 +18,19 @@
height: 100%;
background-repeat: no-repeat;
}
- h3 {
- margin-top: 10px;
+ hr {
+ margin-top: 15px;
+ background-color: #7C7C7C;
+ height: 2px;
+ border-width: 0;
}
- h4 {
+ h3, h4 {
margin-top: 0px;
}
- //New
hgroup {
text-align:center;
margin-top: 4em;
}
- .group {
- position: relative;
- margin: 10px 10px 40px;
- }
input {
font-size: 16px;
padding: 10px 10px 10px 0px;
@@ -114,6 +60,72 @@
left: -12px;
font-size: 18px;
}
+ input:focus ~ .bar:before, input:focus ~ .bar:after {
+ width: 50%;
+ }
+ #page {
+ padding-top: 6%;
+ }
+ .widgetHeight {
+ height: 410px;
+ margin-top: 20px !important;
+ }
+ .loginDiv {
+ width: 380px;
+ margin: 0 auto;
+ border-radius: 4px;
+ box-shadow: 0 0 10px gray;
+ background-color: #FFFFFF;
+ }
+ .marketingDiv {
+ color: #303030;
+ padding: 10px 20px;
+ }
+ .separatorDiv {
+ background-color: #7C7C7C;
+ width: 2px;
+ height: 460px;
+ margin-left: 20px;
+ }
+ .user-logo {
+ height: 110px;
+ margin: 0 auto;
+ padding-top: 40px;
+ padding-bottom: 20px;
+ }
+ .blockLink {
+ border: 1px solid #303030;
+ padding: 3px 5px;
+ }
+ .group {
+ position: relative;
+ margin: 20px 20px 40px;
+ }
+ .failureMessage {
+ color: red;
+ display: block;
+ text-align: center;
+ padding: 0px 0px 10px;
+ }
+ .successMessage {
+ color: green;
+ display: block;
+ text-align: center;
+ padding: 0px 0px 10px;
+ }
+ .inActiveImgDiv {
+ padding: 5px;
+ text-align: center;
+ margin: 30px 0px;
+ }
+ .app-footer p {
+ margin-top: 0px;
+ padding-bottom: 0px !important;
+ }
+ .footer {
+ background-color: #fbfbfb;
+ height:26px;
+ }
.bar {
position: relative;
display: block;
@@ -134,9 +146,6 @@
.bar:after {
right: 50%;
}
- input:focus ~ .bar:before, input:focus ~ .bar:after {
- width: 50%;
- }
.button {
position: relative;
display: inline-block;
@@ -198,8 +207,8 @@
<span class="app-nav"></span>
<div class="col-lg-12">
- <div class="col-lg-6">
- <div class="container loginDiv">
+ <div class="col-lg-5">
+ <div class="loginDiv widgetHeight">
<img class="img-responsive user-logo" src="layouts/v7/resources/Images/vtiger.png">
<div>
<span class="{if !$ERROR}hide{/if} failureMessage" id="validationMessage">{$MESSAGE}</span>
@@ -247,43 +256,55 @@
</div>
</div>
</div>
- <div class="col-lg-6">
- <div class="marketingDiv">
+
+ <div class="col-lg-1">
+ <div class="separatorDiv"></div>
+ </div>
+
+ <div class="col-lg-5">
+ <div class="marketingDiv widgetHeight">
{if $JSON_DATA}
+ {assign var=COUNTER value=0}
{foreach key=BLOCK_NAME item=BLOCKS_DATA from=$JSON_DATA}
- <div>
- {if $BLOCKS_DATA}
- <h3><b>{$BLOCKS_DATA[0].heading}</b></h3>
+ {if $BLOCKS_DATA}
+ <div>
+ {assign var=COUNTER value=$COUNTER+1}
+ <h4>{$BLOCKS_DATA[0].heading}</h4>
{foreach item=BLOCK_DATA from=$BLOCKS_DATA}
<div class="row">
{if $BLOCK_DATA.image}
- <div class="col-lg-3" style="min-height: 100px;"><img src="{$BLOCK_DATA.image}" style="width: 100%;height: 100%;"/></div>
- <div class="col-lg-9">
+ <div class="col-lg-4" style="min-height: 100px;"><img src="{$BLOCK_DATA.image}" style="width: 100%;height: 100%;margin-top: 10px;"/></div>
+ <div class="col-lg-8">
{else}
<div class="col-lg-12">
{/if}
<div title="{$BLOCK_DATA.summary}">
- <h4>{$BLOCK_DATA.displayTitle}</h4>
+ <h3><b>{$BLOCK_DATA.displayTitle}</b></h3>
{$BLOCK_DATA.displaySummary}<br><br>
</div>
- <span class="blockLink">
- <a href="{$BLOCK_DATA.url}" target="_blank">{$BLOCK_DATA.urlalt}</a>
- </span>
- </div>
+ <a href="{$BLOCK_DATA.url}" target="_blank"><u>{$BLOCK_DATA.urlalt}</u></a>
+ {if $BLOCK_DATA.image}
+ </div>
+ {else}
+ </div>
+ {/if}
</div>
{/foreach}
- {/if}
- <br>
- {/foreach}
- {else}
- <div class="inActiveImgDiv">
- <div>
- <h4>Get more out of Vtiger with extensions from</h4>
- <h4>Vtiger Marketplace</h4>
</div>
- <a href="https://marketplace.vtiger.com/app/listings" target="_blank" style="margin-right: 25px;"><img src="layouts/v7/resources/Images/extensionstore.png" style="width: 85%; height: 100%; margin-top: 25px;"/></a>
+ {if $COUNTER neq $DATA_COUNT}
+ <hr>
+ {/if}
+ {/if}
+ {/foreach}
+ {else}
+ <div class="inActiveImgDiv">
+ <div>
+ <h4>Get more out of Vtiger with extensions from</h4>
+ <h4>Vtiger Marketplace</h4>
</div>
- {/if}
+ <a href="https://marketplace.vtiger.com/app/listings" target="_blank" style="margin-right: 25px;"><img src="layouts/v7/resources/Images/extensionstore.png" style="width: 85%; height: 100%; margin-top: 25px;"/></a>
+ </div>
+ {/if}
</div>
</div>
</div>
diff --git a/layouts/v7/modules/Vtiger/FindDuplicateContents.tpl b/layouts/v7/modules/Vtiger/FindDuplicateContents.tpl
index 774e17279894a8f65a5987b1e713a7ecf867a1b4..b4d8eee92f22cd5565578cca6cba004d193da764 100644
--- a/layouts/v7/modules/Vtiger/FindDuplicateContents.tpl
+++ b/layouts/v7/modules/Vtiger/FindDuplicateContents.tpl
@@ -10,72 +10,98 @@
{* START YOUR IMPLEMENTATION FROM BELOW. Use {debug} for information *}
<div>
- {include file="FindDuplicateHeader.tpl"|vtemplate_path:$MODULE}
+ {include file="FindDuplicateHeader.tpl"|vtemplate_path:$MODULE}
</div>
<div id="findDuplicateContents" class="container-fluid" style="padding-top:5px;">
- <div class="row">
- <div class="col-lg-12">
- <input type="hidden" id="listViewEntriesCount" value="{$LISTVIEW_ENTRIES_COUNT}" />
- <input type="hidden" id="pageStartRange" value="{$PAGING_MODEL->getRecordStartRange()}" />
- <input type="hidden" id="pageEndRange" value="{$PAGING_MODEL->getRecordEndRange()}" />
- <input type="hidden" id="previousPageExist" value="{$PAGING_MODEL->isPrevPageExists()}" />
- <input type="hidden" id="nextPageExist" value="{$PAGING_MODEL->isNextPageExists()}" />
- <input type="hidden" id="pageNumber" value= "{$PAGE_NUMBER}"/>
- <input type="hidden" id="pageLimit" value= "{$PAGING_MODEL->getPageLimit()}" />
- <input type="hidden" id="noOfEntries" value= "{$LISTVIEW_ENTRIES_COUNT}" />
- <input type="hidden" id="duplicateSearchFields" value={Zend_Json::encode($DUPLICATE_SEARCH_FIELDS)} />
- <input type="hidden" id="viewName" value="{$VIEW_NAME}" />
- <input type="hidden" id="totalCount" value="{$TOTAL_COUNT}" />
- <input type='hidden' id='ignoreEmpty' value="{$IGNORE_EMPTY}" />
- <input type="hidden" id="mergeSelectedIds" />
- <table id="listview-table" class="listview-table table table-bordered">
- <thead>
- <tr class="listViewContentHeader">
- <th>
- <center><input type="checkbox" class="listViewEntriesMainCheckBox" /></center>
- </th>
- {foreach item=LISTVIEW_HEADER from=$LISTVIEW_HEADERS}
- <th>
- <center>{vtranslate($LISTVIEW_HEADER->get('label'), $MODULE)}</center>
- </th>
- {/foreach}
- <th> <center>{vtranslate('LBL_MERGE_SELECT', $MODULE)}</center></th>
- <th> <center>{vtranslate('LBL_ACTION', $MODULE)}</center></th>
- </tr>
- </thead>
- {foreach item=LISTVIEW_ENTRY key=GROUP_NAME from=$LISTVIEW_ENTRIES}
- {assign var=groupCount value=$LISTVIEW_ENTRY|@sizeof}
- {assign var=recordCount value=0}
- {foreach item=RECORD from=$LISTVIEW_ENTRY name=listview}
- <tr class="listViewEntries" data-id='{$RECORD.recordid}' id="{$MODULE}_listView_row_{$smarty.foreach.listview.index+1}">
- <td>
- <center><input type="checkbox" value="{$RECORD.recordid}" class="listViewEntriesCheckBox"/></center>
- </td>
- {assign var=sameRowValues value=true}
- {foreach item=LISTVIEW_HEADER from=$LISTVIEW_HEADERS}
- {if $LISTVIEW_HEADER->get('name') eq 'recordid'}
- <td nowrap>
- <center><a href="{$MODULE_MODEL->getDetailViewUrl($RECORD.recordid)}">{$RECORD[$LISTVIEW_HEADER->get('name')]}</a></center>
- </td>
- {else}
- <td name="{$LISTVIEW_HEADER->get('name')}" nowrap style='border-bottom:1px solid #DDD;' data-value="{strip_tags($LISTVIEW_HEADER->getDisplayValue($RECORD[$LISTVIEW_HEADER->get('column')], $RECORD.recordid))}">
- <center>{$LISTVIEW_HEADER->getDisplayValue($RECORD[$LISTVIEW_HEADER->get('column')], $RECORD.recordid)}</center>
- </td>
- {/if}
- {/foreach}
- <td>
- <center><input type="checkbox" data-id='{$RECORD.recordid}' name="mergeRecord" data-group="{$GROUP_NAME}"/></center>
- </td>
- {if $recordCount eq 0}
- <td rowspan="{$groupCount}" style="vertical-align: middle;">
- <center><input type="button" value="{vtranslate('Merge', $MODULE)}" name="merge" class="btn btn-success" data-group="{$GROUP_NAME}"></center>
- </td>
- {/if}
- {assign var=recordCount value=$recordCount+1}
- </tr>
- {/foreach}
- {/foreach}
- </table>
- </div>
- </div>
+ <div class="row">
+ <div class="col-lg-12">
+ <input type="hidden" id="listViewEntriesCount" value="{$LISTVIEW_ENTRIES_COUNT}" />
+ <input type="hidden" id="pageStartRange" value="{$PAGING_MODEL->getRecordStartRange()}" />
+ <input type="hidden" id="pageEndRange" value="{$PAGING_MODEL->getRecordEndRange()}" />
+ <input type="hidden" id="previousPageExist" value="{$PAGING_MODEL->isPrevPageExists()}" />
+ <input type="hidden" id="nextPageExist" value="{$PAGING_MODEL->isNextPageExists()}" />
+ <input type="hidden" id="pageNumber" value= "{$PAGE_NUMBER}"/>
+ <input type="hidden" id="pageLimit" value= "{$PAGING_MODEL->getPageLimit()}" />
+ <input type="hidden" id="noOfEntries" value= "{$LISTVIEW_ENTRIES_COUNT}" />
+ <input type="hidden" id="duplicateSearchFields" value={Zend_Json::encode($DUPLICATE_SEARCH_FIELDS)} />
+ <input type="hidden" id="viewName" value="{$VIEW_NAME}" />
+ <input type="hidden" id="totalCount" value="{$TOTAL_COUNT}" />
+ <input type='hidden' id='ignoreEmpty' value="{$IGNORE_EMPTY}" />
+ <input type="hidden" id="mergeSelectedIds" />
+ {assign var=IS_EDITABLE value=$CURRENT_USER_PRIVILAGES_MODEL->hasModuleActionPermission($MODULE_MODEL->getId(), 'EditView')}
+ {assign var=IS_DELETABLE value=$CURRENT_USER_PRIVILAGES_MODEL->hasModuleActionPermission($MODULE_MODEL->getId(), 'Delete')}
+
+ <table id="listview-table" class="listview-table table table-bordered" style="border-top:1px solid #ddd;">
+ <thead>
+ <tr class="listViewContentHeader">
+ {if $IS_DELETABLE}
+ <th>
+ <center><input type="checkbox" class="listViewEntriesMainCheckBox" /></center>
+ </th>
+ {/if}
+ {foreach item=LISTVIEW_HEADER from=$LISTVIEW_HEADERS}
+ <th>
+ <center>{vtranslate($LISTVIEW_HEADER->get('label'), $MODULE)}</center>
+ </th>
+ {/foreach}
+ {if $IS_EDITABLE && $IS_DELETABLE}
+ <th> <center>{vtranslate('LBL_MERGE_SELECT', $MODULE)}</center></th>
+ <th> <center>{vtranslate('LBL_ACTION', $MODULE)}</center></th>
+ {/if}
+ </tr>
+ </thead>
+ {foreach item=LISTVIEW_ENTRY key=GROUP_NAME from=$LISTVIEW_ENTRIES}
+ {assign var=groupCount value=$LISTVIEW_ENTRY|@sizeof}
+ {assign var=recordCount value=0}
+ {foreach item=RECORD from=$LISTVIEW_ENTRY name=listview}
+ <tr class="listViewEntries" data-id='{$RECORD.recordid}' id="{$MODULE}_listView_row_{$smarty.foreach.listview.index+1}">
+ {if $IS_DELETABLE}
+ <td>
+ <center><input type="checkbox" value="{$RECORD.recordid}" class="listViewEntriesCheckBox"/></center>
+ </td>
+ {/if}
+ {assign var=sameRowValues value=true}
+ {foreach item=LISTVIEW_HEADER from=$LISTVIEW_HEADERS}
+ {if $LISTVIEW_HEADER->get('name') eq 'recordid'}
+ <td nowrap>
+ <center><a href="{$MODULE_MODEL->getDetailViewUrl($RECORD.recordid)}">{$RECORD[$LISTVIEW_HEADER->get('name')]}</a></center>
+ </td>
+ {else}
+ <td name="{$LISTVIEW_HEADER->get('name')}" nowrap style='border-bottom:1px solid #DDD;' data-value="{strip_tags($LISTVIEW_HEADER->getDisplayValue($RECORD[$LISTVIEW_HEADER->get('column')], $RECORD.recordid))}">
+ <center>{strip_tags($LISTVIEW_HEADER->getDisplayValue($RECORD[$LISTVIEW_HEADER->get('column')], $RECORD.recordid))}</center>
+ </td>
+ {/if}
+ {/foreach}
+ {if $IS_EDITABLE && $IS_DELETABLE}
+ <td>
+ <center><input type="checkbox" data-id='{$RECORD.recordid}' name="mergeRecord" data-group="{$GROUP_NAME}"/></center>
+ </td>
+ {if $recordCount eq 0}
+ <td rowspan="{$groupCount}" style="vertical-align: middle;">
+ <center><input type="button" value="{vtranslate('Merge', $MODULE)}" name="merge" class="btn btn-success" data-group="{$GROUP_NAME}"></center>
+ </td>
+ {/if}
+ {/if}
+ {assign var=recordCount value=$recordCount+1}
+ </tr>
+ {/foreach}
+ {/foreach}
+ </table>
+ {if $recordCount eq 0}
+ <div class="col-md-12 col-sm-12 col-xs-12 col-lg-12 listViewContentDiv list-table-wrapper" id="listViewContents">
+ <table class="emptyRecordsDiv">
+ <tbody class="overflow-y">
+ <tr class="emptyRecordDiv">
+ <td colspan="8">
+ <div class="emptyRecordsContent portal-empty-records-content">
+ {vtranslate('LBL_NO_DUPLICATED_FOUND')}.
+ </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ {/if}
+ </div>
+ </div>
</div>
\ No newline at end of file
diff --git a/layouts/v7/modules/Vtiger/FindDuplicateHeader.tpl b/layouts/v7/modules/Vtiger/FindDuplicateHeader.tpl
index 079a7bc8c561cbef343e07431fdb83b11afa45ff..d54ca5f82ca165879fffa70574e611ae4d5fdb25 100644
--- a/layouts/v7/modules/Vtiger/FindDuplicateHeader.tpl
+++ b/layouts/v7/modules/Vtiger/FindDuplicateHeader.tpl
@@ -8,43 +8,45 @@
************************************************************************************}
<div class="container-fluid">
- <div class="row">
- {assign var=HEADER_TITLE value={vtranslate('LBL_DUPLICATE')|cat:' '|cat:vtranslate($MODULE, $MODULE)}}
- <h3>
- <div class="col-lg-7">
- {$HEADER_TITLE}
- </div>
- <div class="col-lg-5">
- <div class="alert alert-static">
- <span class="fa fa-info-circle icon"></span>
- <span class="message">{vJsTranslate('JS_ALLOWED_TO_SELECT_MAX_OF_THREE_RECORDS',$MODULE)}</span>
- </div>
- </div>
- </h3>
- </div>
- <div class="row">
- <div class="col-lg-1">
- {foreach item=LISTVIEW_BASICACTION from=$LISTVIEW_LINKS}
- <button id="{$MODULE}_listView_basicAction_{Vtiger_Util_Helper::replaceSpaceWithUnderScores($LISTVIEW_BASICACTION->getLabel())}" class="btn btn-danger pull-left"
- {if stripos($LISTVIEW_BASICACTION->getUrl(), 'javascript:')===0} onclick='{$LISTVIEW_BASICACTION->getUrl()|substr:strlen("javascript:")};'{else} onclick='window.location.href="{$LISTVIEW_BASICACTION->getUrl()}"'{/if}>
- <strong>{vtranslate($LISTVIEW_BASICACTION->getLabel(), $MODULE)}</strong>
- </button>
- {/foreach}
- </div>
- <div class="col-lg-11">
- <div class="col-lg-1">
-
- </div>
- <div class="col-lg-9 select-deselect-container" >
- <div class="hide messageContainer" style = "height:30px;">
- <center><a id="selectAllMsgDiv" href="#">{vtranslate('LBL_SELECT_ALL',$MODULE)} {vtranslate($MODULE ,$MODULE)} (<span id="totalRecordsCount" value=""></span>)</a></center>
- </div>
- <div class="hide messageContainer" style = "height:30px;">
- <center><a id="deSelectAllMsgDiv" href="#">{vtranslate('LBL_DESELECT_ALL_RECORDS',$MODULE)}</a></center>
- </div>
- </div>
- {assign var=RECORD_COUNT value=$LISTVIEW_ENTRIES_COUNT}
+ <div class="row">
+ {assign var=HEADER_TITLE value={vtranslate('LBL_DUPLICATE')|cat:' '|cat:vtranslate($MODULE, $MODULE)}}
+ <h3>
+ <div class="col-lg-7">
+ {$HEADER_TITLE}
+ </div>
+ <div class="col-lg-5">
+ <div class="alert alert-static">
+ <span class="fa fa-info-circle icon"></span>
+ <span class="message">{vJsTranslate('JS_ALLOWED_TO_SELECT_MAX_OF_THREE_RECORDS',$MODULE)}</span>
+ </div>
+ </div>
+ </h3>
+ </div>
+ <div class="row">
+ <div class="col-lg-1">
+ {if $LISTVIEW_ENTRIES_COUNT > 0}
+ {foreach item=LISTVIEW_BASICACTION from=$LISTVIEW_LINKS}
+ <button id="{$MODULE}_listView_basicAction_{Vtiger_Util_Helper::replaceSpaceWithUnderScores($LISTVIEW_BASICACTION->getLabel())}" class="btn btn-danger pull-left"
+ {if stripos($LISTVIEW_BASICACTION->getUrl(), 'javascript:')===0} onclick='{$LISTVIEW_BASICACTION->getUrl()|substr:strlen("javascript:")};'{else} onclick='window.location.href="{$LISTVIEW_BASICACTION->getUrl()}"'{/if}>
+ <strong>{vtranslate($LISTVIEW_BASICACTION->getLabel(), $MODULE)}</strong>
+ </button>
+ {/foreach}
+ {/if}
+ </div>
+ <div class="col-lg-11">
+ <div class="col-lg-1">
+
+ </div>
+ <div class="col-lg-9 select-deselect-container" >
+ <div class="hide messageContainer" style = "height:30px;">
+ <center><a id="selectAllMsgDiv" href="#">{vtranslate('LBL_SELECT_ALL',$MODULE)} {vtranslate($MODULE ,$MODULE)} (<span id="totalRecordsCount" value=""></span>)</a></center>
+ </div>
+ <div class="hide messageContainer" style = "height:30px;">
+ <center><a id="deSelectAllMsgDiv" href="#">{vtranslate('LBL_DESELECT_ALL_RECORDS',$MODULE)}</a></center>
+ </div>
+ </div>
+ {assign var=RECORD_COUNT value=$LISTVIEW_ENTRIES_COUNT}
{include file="Pagination.tpl"|vtemplate_path:$MODULE SHOWPAGEJUMP=true}
- </div>
- </div>
+ </div>
+ </div>
</div>
\ No newline at end of file
diff --git a/layouts/v7/modules/Vtiger/MergeRecords.tpl b/layouts/v7/modules/Vtiger/MergeRecords.tpl
index 5cf0d83bd6a388a39049b226369dbf74054fd844..50ceef09b1513f53d43cd7c8803c8d95f931b610 100644
--- a/layouts/v7/modules/Vtiger/MergeRecords.tpl
+++ b/layouts/v7/modules/Vtiger/MergeRecords.tpl
@@ -36,7 +36,7 @@
<div class="checkbox">
<label>
<input {if $smarty.foreach.recordList.index eq 0}checked{/if} type=radio value="{$RECORD->getId()}" name="primaryRecord"/>
- {vtranslate('LBL_RECORD')} #{$smarty.foreach.recordList.index+1}
+ {vtranslate('LBL_RECORD')} <a href="{$RECORD->getDetailViewUrl()}" target="_blank" style="color: #15c;">#{$RECORD->getId()}</a>
</label>
</div>
</th>
diff --git a/modules/Users/Users.php b/modules/Users/Users.php
index 52e13414afe8371c156bc3f32feec6d54c004371..40edb728e2c46f27075f0065e8d3a1320955bcfb 100755
--- a/modules/Users/Users.php
+++ b/modules/Users/Users.php
@@ -97,8 +97,7 @@ class Users extends CRMEntity {
'Email'=>Array('vtiger_users'=>'email1'),
'Email2'=>Array('vtiger_users'=>'email2'),
'Admin'=>Array('vtiger_users'=>'is_admin'),
- 'Phone'=>Array('vtiger_users'=>'phone_work'),
- 'Owner'=>Array('vtiger_users'=>'is_owner')
+ 'Phone'=>Array('vtiger_users'=>'phone_work')
);
var $list_fields_name = Array(
'Last Name'=>'last_name',
@@ -109,8 +108,7 @@ class Users extends CRMEntity {
'Email'=>'email1',
'Email2'=>'email2',
'Admin'=>'is_admin',
- 'Phone'=>'phone_work',
- 'Owner'=>'is_owner'
+ 'Phone'=>'phone_work'
);
//Default Fields for Email Templates -- Pavani
diff --git a/modules/Users/views/Login.php b/modules/Users/views/Login.php
index cc50daae17a6259986933c407d7c5960bb8d4510..657843a6ce9143f42212b841691ac59fcc934bab 100644
--- a/modules/Users/views/Login.php
+++ b/modules/Users/views/Login.php
@@ -52,7 +52,7 @@ class Users_Login_View extends Vtiger_View_Controller {
vglobal('listview_max_textlength', '80');
$blockData['displayTitle'] = textlength_check($blockData['title']);
- vglobal('listview_max_textlength', '340');
+ vglobal('listview_max_textlength', '200');
$blockData['displaySummary'] = textlength_check($blockData['summary']);
$finalJsonData[$blockData['type']][] = $blockData;
}
@@ -60,6 +60,7 @@ class Users_Login_View extends Vtiger_View_Controller {
}
$viewer = $this->getViewer($request);
+ $viewer->assign('DATA_COUNT', count($jsonData));
$viewer->assign('JSON_DATA', $finalJsonData);
$mailStatus = $request->get('mailStatus');
diff --git a/modules/Vtiger/views/FindDuplicates.php b/modules/Vtiger/views/FindDuplicates.php
index 007822e3a820f87202e13f6b22f64765db4a62b3..1f994c947d7761dcd05cb5d1cb1d513be1492790 100644
--- a/modules/Vtiger/views/FindDuplicates.php
+++ b/modules/Vtiger/views/FindDuplicates.php
@@ -60,13 +60,19 @@ class Vtiger_FindDuplicates_View extends Vtiger_List_View {
$module = $request->getModule();
$moduleModel = Vtiger_Module_Model::getInstance($module);
- $massActionLink = array(
- 'linktype' => 'LISTVIEWBASIC',
- 'linklabel' => 'LBL_DELETE',
- 'linkurl' => 'Javascript:Vtiger_FindDuplicates_Js.massDeleteRecords("index.php?module='.$module.'&action=MassDelete");',
- 'linkicon' => ''
- );
- $massActionLinks[] = Vtiger_Link_Model::getInstanceFromValues($massActionLink);
+ $massActionLinks = array();
+ $userPrivilegesModel = Users_Privileges_Model::getCurrentUserPrivilegesModel();
+ if ($userPrivilegesModel->hasModuleActionPermission($moduleModel->getId(), 'Delete')) {
+ $massActionLink = array(
+ 'linktype' => 'LISTVIEWBASIC',
+ 'linklabel' => 'LBL_DELETE',
+ 'linkurl' => 'Javascript:Vtiger_FindDuplicates_Js.massDeleteRecords("index.php?module='.$module.'&action=MassDelete");',
+ 'linkicon' => ''
+ );
+ $massActionLinks[] = Vtiger_Link_Model::getInstanceFromValues($massActionLink);
+ }
+
+ $viewer->assign('CURRENT_USER_PRIVILAGES_MODEL', $userPrivilegesModel);
$viewer->assign('LISTVIEW_LINKS', $massActionLinks);
$viewer->assign('MODULE_MODEL', $moduleModel);