espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix deprecated attributes

Browse Source
This commit is contained in:
Yuri Kuznetsov
2023-11-05 13:59:54 +02:00
parent 79268a5d19
commit 0be13f330b
12 changed files with 74 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/res/layout-types/list-row.tpl
+7 -1
View File
@@ -12,7 +12,13 @@
align = defs.options.defs.align || false;
}
%>
<td class="cell" data-name="<%= defs.columnName %>" <% if (width) print(' width="'+width+'"'); if (align) print(' align="'+align+'"'); %>>
<td
class="cell"
data-name="<%= defs.columnName %>"
<% if (width || align) { %>
style="<% if (width) print('width: ' + width); %>;<% if (align) print(' text-align: ' + align);%>"
<% } %>
>
<%
var tag = 'tag' in defs ? defs.tag : false;
if (tag) {
client/res/templates/admin/entity-manager/index.tpl
+2 -2
View File
@@ -55,10 +55,10 @@
{{name}}
{{/if}}
</td>
<td width="33%">
<td style="width: 33%">
{{label}}
</td>
<td width="30%">
<td style="width: 30%">
{{#if type}}
{{translateOption type field='type' scope='EntityManager'}}
{{/if}}
client/res/templates/admin/field-manager/list.tpl
+4 -4
View File
@@ -23,10 +23,10 @@
<table class="table fields-table table-panel table-hover">
<thead>
<th width="35%">{{translate 'Name' scope='FieldManager'}}</th>
<th width="35%">{{translate 'Label' scope='FieldManager'}}</th>
<th width="20%">{{translate 'Type' scope='FieldManager'}}</th>
<th width="10%" align="right"></th>
<th style="width: 35%">{{translate 'Name' scope='FieldManager'}}</th>
<th style="width: 35%">{{translate 'Label' scope='FieldManager'}}</th>
<th style="width: 20%">{{translate 'Type' scope='FieldManager'}}</th>
<th style="width: 10%; text-align: right;"></th>
</thead>
<tbody>
{{#each fieldDefsArray}}
client/res/templates/admin/link-manager/index.tpl
+14 -14
View File
@@ -42,53 +42,53 @@
{{else}}
<thead>
<tr>
<th width="15%" align="left">{{translate 'entity' category='fields' scope='EntityManager'}}</th>
<th width="15%" align="left">{{translate 'linkForeign' category='fields' scope='EntityManager'}}</th>
<th width="10%" align="center" style="text-align: center">
<th style="width: 15%; text-align: left">{{translate 'entity' category='fields' scope='EntityManager'}}</th>
<th style="width: 15%; text-align: left">{{translate 'linkForeign' category='fields' scope='EntityManager'}}</th>
<th style="width: 10%; text-align: center">
{{translate 'linkType' category='fields' scope='EntityManager'}}
</th>
<th width="15%" align="right" style="text-align: right">
<th style="width: 15%; text-align: right">
{{translate 'link' category='fields' scope='EntityManager'}}
</th>
<th width="15%" align="right" style="text-align: right">
<th style="width: 15%; text-align: right">
{{translate 'entityForeign' category='fields' scope='EntityManager'}}
</th>
<th width="10%"></th>
<th width="10%"></th>
<th style="width: 10%"></th>
<th style="width: 10%"></th>
</tr>
</thead>
{{/unless}}
{{#each linkDataList}}
<tr data-link="{{link}}" class="link-row">
<td width="15%" align="left">
<td style="width: 15%; text-align: left">
{{translate entity category='scopeNames'}}
</td>
<td width="15%" align="left">
<td style="width: 15%; text-align: left">
<span title="{{translate linkForeign category='links' scope=entityForeign}}">
{{linkForeign}}
</span>
</td>
<td width="10%" align="center">
<td style="width: 10%; text-align: center">
<strong>
{{translateOption type field='linkType' scope='EntityManager'}}
</strong>
</td>
<td width="15%" align="right">
<td style="width: 15%; text-align: right">
<span title="{{translate link category='links' scope=entity}}">
{{link}}
</span>
</td>
<td width="15%" align="right">
<td style="width: 15%; text-align: right">
{{translate entityForeign category='scopeNames'}}
</td>
<td align="right" width="10%">
<td style="width: 10%; text-align: right">
{{#if isEditable}}
<a role="button" tabindex="0" data-action="editLink" data-link="{{link}}">
{{translate 'Edit'}}
</a>
{{/if}}
</td>
<td align="right" width="10%">
<td style="width: 10%; ; text-align: right">
{{#if isRemovable}}
<a role="button" tabindex="0" data-action="removeLink" data-link="{{link}}">
{{translate 'Remove'}}
client/res/templates/admin/system-requirements/index.tpl
+10 -10
View File
@@ -7,8 +7,8 @@
<thead>
<tr>
<th><h5>{{translate 'PHP Settings' scope='Admin'}}</h5></th>
<th width="24%"></th>
<th width="24%"></th>
<th style="width: 24%"></th>
<th style="width: 24%"></th>
</tr>
</thead>
<tbody>
@@ -37,8 +37,8 @@
<thead>
<tr>
<th><h5>{{translate 'Database Settings' scope='Admin'}}</h5></th>
<th width="24%"></th>
<th width="24%"></th>
<th style="width: 24%"></th>
<th style="width: 24%"></th>
</tr>
</thead>
<tbody>
@@ -47,8 +47,8 @@
<td class="cell">
{{translate @key scope='Admin' category='systemRequirements'}}
</td>
<td class="cell" width="24%">{{actual}}</td>
<td class="cell" width="24%">
<td class="cell" style="width: 24%">{{actual}}</td>
<td class="cell" style="width: 24%">
{{#if acceptable}}
<span class="text-success">{{translate 'Success' scope='Admin'}}</span>
{{else}}
@@ -68,8 +68,8 @@
<thead>
<tr>
<th><h5>{{translate 'Permissions' scope='Admin'}}</h5></th>
<th width="24%"></th>
<th width="24%"></th>
<th style="width: 24%"></th>
<th style="width: 24%"></th>
</tr>
</thead>
<tbody>
@@ -78,8 +78,8 @@
<td class="cell">
{{translate @key scope='Admin' category='systemRequirements'}}
</td>
<td class="cell" width="24%">{{translate type scope='Admin' category='systemRequirements'}}</td>
<td class="cell" width="24%">
<td class="cell" style="width: 24%">{{translate type scope='Admin' category='systemRequirements'}}</td>
<td class="cell" style="width: 24%">
{{#if acceptable}}
<span class="text-success">{{translate 'Success' scope='Admin'}}</span>
{{else}}
client/res/templates/modals/resolve-save-conflict.tpl
+3 -3
View File
@@ -5,8 +5,8 @@
<table class="table" style="table-layout: fixed;">
<thead>
<tr>
<th width="25%">{{translate 'Field'}}</th>
<th width="25%">{{translate 'Resolution'}}</th>
<th style="width: 25%">{{translate 'Field'}}</th>
<th style="width: 25%">{{translate 'Resolution'}}</th>
<th>{{translate 'Value'}}</th>
</tr>
</thead>
@@ -31,4 +31,4 @@
</tr>
{{/each}}
</tbody>
</table>
</table>
client/res/templates/personal-data/record/record.tpl
+3 -3
View File
@@ -3,8 +3,8 @@
<table class="table table-bordered-inside">
{{#if editAccess}}
<tr>
<th width="20"><input type="checkbox" class="checkbox-all form-checkbox"></th>
<th width="30%"></th>
<th style="width: 20px"><input type="checkbox" class="checkbox-all form-checkbox"></th>
<th style="width: 30%"></th>
<th></th>
</tr>
{{/if}}
@@ -12,7 +12,7 @@
<tr>
{{#if ../editAccess}}<td>{{#if editAccess}}
<input type="checkbox" class="checkbox form-checkbox" data-name="{{name}}">{{/if}}</td>{{/if}}
<td width="30%">{{translate name category='fields' scope=../scope}}</td>
<td style="width: 30%">{{translate name category='fields' scope=../scope}}</td>
<td>
<div class="field" data-name="{{name}}">{{{var key ../this}}}</div>
</td>
client/res/templates/record/list.tpl
+5 -3
View File
@@ -132,7 +132,10 @@
<thead>
<tr>
{{#if checkboxes}}
<th width="{{checkboxColumnWidth}}" data-name="r-checkbox">
<th
style="width: {{checkboxColumnWidth}}"
data-name="r-checkbox"
>
<span class="select-all-container"><input type="checkbox" class="select-all form-checkbox form-checkbox-small"></span>
{{#unless checkAllResultDisabled}}
<div class="btn-group checkbox-dropdown">
@@ -159,8 +162,7 @@
{{/if}}
{{#each headerDefs}}
<th
{{#if width}}width="{{width}}"{{/if}}
{{#if align}}style="text-align: {{align}};"{{/if}}
style="{{#if width}}width: {{width}};{{/if}}{{#if align}} text-align: {{align}};{{/if}}"
{{#if className}}class="{{className}}"{{/if}}
{{#if name}}data-name="{{name}}"{{/if}}
>
client/res/templates/record/merge.tpl
+3 -3
View File
@@ -3,9 +3,9 @@
<table class="table table-bordered">
<thead>
<tr>
<th width="20%"></th>
<th style="width: 20%"></th>
{{#each dataList}}
<th width="5%" style="vertical-align: middle;">
<th style="vertical-align: middle; width: 5%">
<input
type="radio"
name="check-all"
@@ -14,7 +14,7 @@
class="pull-right form-radio"
>
</th>
<th width="{{../width}}%">
<th style="width: {{../width}}%">
<a href="#{{../scope}}/view/{{id}}" target="_BLANK" class="text-large">{{name}}</a>
</th>
{{/each}}
client/res/templates/role/table-edit.tpl
+10 -10
View File
@@ -8,9 +8,9 @@
<table class="table table-bordered-inside no-margin scope-level">
<tr>
<th></th>
<th width="20%">{{translate 'Access' scope='Role'}}</th>
<th style="width: 20%">{{translate 'Access' scope='Role'}}</th>
{{#each actionList}}
<th width="11%">{{translate this scope='Role' category='actions'}}</th>
<th style="width: 11%">{{translate this scope='Role' category='actions'}}</th>
{{/each}}
</tr>
{{#each tableDataList}}
@@ -49,9 +49,9 @@
<table class="table borderless no-margin">
<tr>
<th></th>
<th width="20%">{{translate 'Access' scope='Role'}}</th>
<th style="width: 20%">{{translate 'Access' scope='Role'}}</th>
{{#each actionList}}
<th width="11%">{{translate this scope='Role' category='actions'}}</th>
<th style="width: 11%">{{translate this scope='Role' category='actions'}}</th>
{{/each}}
</tr>
</table>
@@ -70,11 +70,11 @@
<table class="table table-bordered-inside no-margin field-level">
<tr>
<th></th>
<th width="20%"></th>
<th style="width: 20%"></th>
{{#each fieldActionList}}
<th width="11%">{{translate this scope='Role' category='actions'}}</th>
<th style="width: 11%">{{translate this scope='Role' category='actions'}}</th>
{{/each}}
<th width="33%"></th>
<th style="width: 33%"></th>
</tr>
{{#each fieldTableDataList}}
<tr>
@@ -124,11 +124,11 @@
<table class="table borderless no-margin">
<tr>
<th></th>
<th width="20%"></th>
<th style="width: 20%"></th>
{{#each fieldActionList}}
<th width="11%">{{translate this scope='Role' category='actions'}}</th>
<th style="width: 11%">{{translate this scope='Role' category='actions'}}</th>
{{/each}}
<th width="33%"></th>
<th style="width: 33%"></th>
</tr>
</table>
</div>
client/res/templates/role/table.tpl
+10 -10
View File
@@ -8,9 +8,9 @@
<table class="table table-bordered-inside no-margin scope-level">
<tr>
<th></th>
<th width="20%">{{translate 'Access' scope='Role'}}</th>
<th style="width: 20%">{{translate 'Access' scope='Role'}}</th>
{{#each actionList}}
<th width="11%">{{translate this scope='Role' category='actions'}}</th>
<th style="width: 11%">{{translate this scope='Role' category='actions'}}</th>
{{/each}}
</tr>
{{#each tableDataList}}
@@ -41,9 +41,9 @@
<table class="table borderless no-margin">
<tr>
<th></th>
<th width="20%">{{translate 'Access' scope='Role'}}</th>
<th style="width: 20%">{{translate 'Access' scope='Role'}}</th>
{{#each actionList}}
<th width="11%">{{translate this scope='Role' category='actions'}}</th>
<th style="width: 11%">{{translate this scope='Role' category='actions'}}</th>
{{/each}}
</tr>
</table>
@@ -63,11 +63,11 @@
<table class="table table-bordered-inside no-margin field-level">
<tr>
<th></th>
<th width="20%"></th>
<th style="width: 20%"></th>
{{#each fieldActionList}}
<th width="11%">{{translate this scope='Role' category='actions'}}</th>
<th style="width: 11%">{{translate this scope='Role' category='actions'}}</th>
{{/each}}
<th width="33%" ></th>
<th style="width: 33%"></th>
</tr>
{{#each fieldTableDataList}}
{{#if list.length}}
@@ -98,11 +98,11 @@
<table class="table borderless no-margin">
<tr>
<th></th>
<th width="20%"></th>
<th style="width: 20%"></th>
{{#each fieldActionList}}
<th width="11%">{{translate this scope='Role' category='actions'}}</th>
<th style="width: 11%">{{translate this scope='Role' category='actions'}}</th>
{{/each}}
<th width="33%"></th>
<th style="width: 33%"></th>
</tr>
</table>
</div>
client/src/views/record/list.js
+3 -3
View File
@@ -980,7 +980,7 @@ class ListRecordView extends View {
this.massActionList || this.buttonList.length || this.dropdownItemList.length,
totalCountFormatted: this.getNumberUtil().formatInt(this.collection.total),
moreCountFormatted: this.getNumberUtil().formatInt(moreCount),
checkboxColumnWidth: this.checkboxColumnWidth,
checkboxColumnWidth: this.checkboxColumnWidth + 'px',
noDataDisabled: noDataDisabled,
};
}
@@ -2381,7 +2381,7 @@ class ListRecordView extends View {
width = this.listLayout[i].width + '%';
}
else if ('widthPx' in this.listLayout[i]) {
width = this.listLayout[i].widthPx;
width = this.listLayout[i].widthPx + 'px';
}
const itemName = this.listLayout[i].name;
@@ -2439,7 +2439,7 @@ class ListRecordView extends View {
}
defs.push({
width: this.rowActionsColumnWidth,
width: this.rowActionsColumnWidth + 'px',
html: html,
className: 'action-cell',
});