diff --git a/client/res/layout-types/list-row.tpl b/client/res/layout-types/list-row.tpl
index b9a6f7372b..2e7fe283aa 100644
--- a/client/res/layout-types/list-row.tpl
+++ b/client/res/layout-types/list-row.tpl
@@ -12,7 +12,13 @@
align = defs.options.defs.align || false;
}
%>
-
>
+ |
+ style="<% if (width) print('width: ' + width); %>;<% if (align) print(' text-align: ' + align);%>"
+ <% } %>
+ >
<%
var tag = 'tag' in defs ? defs.tag : false;
if (tag) {
diff --git a/client/res/templates/admin/entity-manager/index.tpl b/client/res/templates/admin/entity-manager/index.tpl
index cb39705a55..974ecee08a 100644
--- a/client/res/templates/admin/entity-manager/index.tpl
+++ b/client/res/templates/admin/entity-manager/index.tpl
@@ -55,10 +55,10 @@
{{name}}
{{/if}}
|
-
+ |
{{label}}
|
-
+ |
{{#if type}}
{{translateOption type field='type' scope='EntityManager'}}
{{/if}}
diff --git a/client/res/templates/admin/field-manager/list.tpl b/client/res/templates/admin/field-manager/list.tpl
index 66ec7a5643..68153b4038 100644
--- a/client/res/templates/admin/field-manager/list.tpl
+++ b/client/res/templates/admin/field-manager/list.tpl
@@ -23,10 +23,10 @@
- | {{translate 'Name' scope='FieldManager'}} |
- {{translate 'Label' scope='FieldManager'}} |
- {{translate 'Type' scope='FieldManager'}} |
- |
+ {{translate 'Name' scope='FieldManager'}} |
+ {{translate 'Label' scope='FieldManager'}} |
+ {{translate 'Type' scope='FieldManager'}} |
+ |
{{#each fieldDefsArray}}
diff --git a/client/res/templates/admin/link-manager/index.tpl b/client/res/templates/admin/link-manager/index.tpl
index 294b425e3e..01c70017e9 100644
--- a/client/res/templates/admin/link-manager/index.tpl
+++ b/client/res/templates/admin/link-manager/index.tpl
@@ -42,53 +42,53 @@
{{else}}
- | {{translate 'entity' category='fields' scope='EntityManager'}} |
- {{translate 'linkForeign' category='fields' scope='EntityManager'}} |
-
+ | {{translate 'entity' category='fields' scope='EntityManager'}} |
+ {{translate 'linkForeign' category='fields' scope='EntityManager'}} |
+
{{translate 'linkType' category='fields' scope='EntityManager'}}
|
-
+ |
{{translate 'link' category='fields' scope='EntityManager'}}
|
-
+ |
{{translate 'entityForeign' category='fields' scope='EntityManager'}}
|
- |
- |
+ |
+ |
{{/unless}}
{{#each linkDataList}}
- |
+ |
{{translate entity category='scopeNames'}}
|
-
+ |
{{linkForeign}}
|
-
+ |
{{translateOption type field='linkType' scope='EntityManager'}}
|
-
+ |
{{link}}
|
-
+ |
{{translate entityForeign category='scopeNames'}}
|
-
+ |
{{#if isEditable}}
{{translate 'Edit'}}
{{/if}}
|
-
+ |
{{#if isRemovable}}
{{translate 'Remove'}}
diff --git a/client/res/templates/admin/system-requirements/index.tpl b/client/res/templates/admin/system-requirements/index.tpl
index d7e546a82c..fa2907b910 100644
--- a/client/res/templates/admin/system-requirements/index.tpl
+++ b/client/res/templates/admin/system-requirements/index.tpl
@@ -7,8 +7,8 @@
{{translate 'PHP Settings' scope='Admin'}} |
- |
- |
+ |
+ |
@@ -37,8 +37,8 @@
{{translate 'Database Settings' scope='Admin'}} |
- |
- |
+ |
+ |
@@ -47,8 +47,8 @@
{{translate @key scope='Admin' category='systemRequirements'}}
|
- {{actual}} |
-
+ | {{actual}} |
+
{{#if acceptable}}
{{translate 'Success' scope='Admin'}}
{{else}}
@@ -68,8 +68,8 @@
{{translate 'Permissions' scope='Admin'}} |
- |
- |
+ |
+ |
|
@@ -78,8 +78,8 @@
{{translate @key scope='Admin' category='systemRequirements'}}
|
- {{translate type scope='Admin' category='systemRequirements'}} |
-
+ | {{translate type scope='Admin' category='systemRequirements'}} |
+
{{#if acceptable}}
{{translate 'Success' scope='Admin'}}
{{else}}
diff --git a/client/res/templates/modals/resolve-save-conflict.tpl b/client/res/templates/modals/resolve-save-conflict.tpl
index cb51c19571..70ab70301c 100644
--- a/client/res/templates/modals/resolve-save-conflict.tpl
+++ b/client/res/templates/modals/resolve-save-conflict.tpl
@@ -5,8 +5,8 @@
- | {{translate 'Field'}} |
- {{translate 'Resolution'}} |
+ {{translate 'Field'}} |
+ {{translate 'Resolution'}} |
{{translate 'Value'}} |
@@ -31,4 +31,4 @@
{{/each}}
-
\ No newline at end of file
+ | |
diff --git a/client/res/templates/personal-data/record/record.tpl b/client/res/templates/personal-data/record/record.tpl
index efa6d4690a..dfb2813283 100644
--- a/client/res/templates/personal-data/record/record.tpl
+++ b/client/res/templates/personal-data/record/record.tpl
@@ -3,8 +3,8 @@
{{#if editAccess}}
- |
- |
+ |
+ |
|
{{/if}}
@@ -12,7 +12,7 @@
{{#if ../editAccess}}| {{#if editAccess}}
{{/if}} | {{/if}}
- {{translate name category='fields' scope=../scope}} |
+ {{translate name category='fields' scope=../scope}} |
{{{var key ../this}}}
|
diff --git a/client/res/templates/record/list.tpl b/client/res/templates/record/list.tpl
index 27ce515aa3..2e921760e4 100644
--- a/client/res/templates/record/list.tpl
+++ b/client/res/templates/record/list.tpl
@@ -132,7 +132,10 @@
{{#if checkboxes}}
- |
+ |
{{#unless checkAllResultDisabled}}
@@ -159,8 +162,7 @@
{{/if}}
{{#each headerDefs}}
diff --git a/client/res/templates/record/merge.tpl b/client/res/templates/record/merge.tpl
index 81be2cb85b..03797f7e04 100644
--- a/client/res/templates/record/merge.tpl
+++ b/client/res/templates/record/merge.tpl
@@ -3,9 +3,9 @@
- |
+ |
{{#each dataList}}
-
+ |
|
-
+ |
{{name}}
|
{{/each}}
diff --git a/client/res/templates/role/table-edit.tpl b/client/res/templates/role/table-edit.tpl
index cbcb964448..859dabab39 100644
--- a/client/res/templates/role/table-edit.tpl
+++ b/client/res/templates/role/table-edit.tpl
@@ -8,9 +8,9 @@
|
- {{translate 'Access' scope='Role'}} |
+ {{translate 'Access' scope='Role'}} |
{{#each actionList}}
- {{translate this scope='Role' category='actions'}} |
+ {{translate this scope='Role' category='actions'}} |
{{/each}}
{{#each tableDataList}}
@@ -49,9 +49,9 @@
|
- {{translate 'Access' scope='Role'}} |
+ {{translate 'Access' scope='Role'}} |
{{#each actionList}}
- {{translate this scope='Role' category='actions'}} |
+ {{translate this scope='Role' category='actions'}} |
{{/each}}
@@ -70,11 +70,11 @@
|
- |
+ |
{{#each fieldActionList}}
- {{translate this scope='Role' category='actions'}} |
+ {{translate this scope='Role' category='actions'}} |
{{/each}}
- |
+ |
{{#each fieldTableDataList}}
@@ -124,11 +124,11 @@
|
- |
+ |
{{#each fieldActionList}}
- {{translate this scope='Role' category='actions'}} |
+ {{translate this scope='Role' category='actions'}} |
{{/each}}
- |
+ |
diff --git a/client/res/templates/role/table.tpl b/client/res/templates/role/table.tpl
index e074fd60df..a0871baddf 100644
--- a/client/res/templates/role/table.tpl
+++ b/client/res/templates/role/table.tpl
@@ -8,9 +8,9 @@
|
- {{translate 'Access' scope='Role'}} |
+ {{translate 'Access' scope='Role'}} |
{{#each actionList}}
- {{translate this scope='Role' category='actions'}} |
+ {{translate this scope='Role' category='actions'}} |
{{/each}}
{{#each tableDataList}}
@@ -41,9 +41,9 @@
|
- {{translate 'Access' scope='Role'}} |
+ {{translate 'Access' scope='Role'}} |
{{#each actionList}}
- {{translate this scope='Role' category='actions'}} |
+ {{translate this scope='Role' category='actions'}} |
{{/each}}
@@ -63,11 +63,11 @@
|
- |
+ |
{{#each fieldActionList}}
- {{translate this scope='Role' category='actions'}} |
+ {{translate this scope='Role' category='actions'}} |
{{/each}}
- |
+ |
{{#each fieldTableDataList}}
{{#if list.length}}
@@ -98,11 +98,11 @@
|
- |
+ |
{{#each fieldActionList}}
- {{translate this scope='Role' category='actions'}} |
+ {{translate this scope='Role' category='actions'}} |
{{/each}}
- |
+ |
diff --git a/client/src/views/record/list.js b/client/src/views/record/list.js
index 4d13418209..f7e616a21b 100644
--- a/client/src/views/record/list.js
+++ b/client/src/views/record/list.js
@@ -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',
});
| | |