diff --git a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Call.json b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Call.json index 70ac5e1508..4dc93644f3 100644 --- a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Call.json +++ b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Call.json @@ -14,7 +14,8 @@ "name":"attendees", "label":"Attendees", "view":"crm:views/meeting/record/panels/attendees", - "sticked": true + "sticked": true, + "isForm": true } ], "detailSmall":[ @@ -22,7 +23,8 @@ "name":"attendees", "label":"Attendees", "view":"crm:views/meeting/record/panels/attendees", - "sticked": true + "sticked": true, + "isForm": true } ], "edit":[ @@ -30,7 +32,8 @@ "name":"attendees", "label":"Attendees", "view":"crm:views/meeting/record/panels/attendees", - "sticked": true + "sticked": true, + "isForm": true } ], "editSmall":[ @@ -38,7 +41,8 @@ "name":"attendees", "label":"Attendees", "view":"crm:views/meeting/record/panels/attendees", - "sticked": true + "sticked": true, + "isForm": true } ] }, diff --git a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Campaign.json b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Campaign.json index 25c6faafc6..0a3faeccfa 100644 --- a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Campaign.json +++ b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Campaign.json @@ -39,7 +39,8 @@ "name":"statistics", "label":"Statistics", "view":"crm:views/campaign/record/panels/campaign-stats", - "hidden": false + "hidden": false, + "isForm": true } ] }, diff --git a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Lead.json b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Lead.json index f8c5b6417d..62790305ee 100644 --- a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Lead.json +++ b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Lead.json @@ -36,7 +36,8 @@ "view":"crm:views/lead/record/panels/converted-to", "notRefreshable":true, "hidden":true, - "style":"success" + "style":"success", + "isForm": true }, { "name":"activities", @@ -64,7 +65,8 @@ "view":"crm:views/lead/record/panels/converted-to", "notRefreshable":true, "hidden":true, - "style":"success" + "style":"success", + "isForm": true } ], "detailSmall":[ @@ -74,7 +76,8 @@ "view":"crm:views/lead/record/panels/converted-to", "notRefreshable":true, "hidden":true, - "style":"success" + "style":"success", + "isForm": true }, { "name":"activities", @@ -102,7 +105,8 @@ "view":"crm:views/lead/record/panels/converted-to", "notRefreshable":true, "hidden":true, - "style":"success" + "style":"success", + "isForm": true } ] }, diff --git a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Meeting.json b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Meeting.json index 786fc583cb..9c4889e7ae 100644 --- a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Meeting.json +++ b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Meeting.json @@ -21,7 +21,8 @@ "leads" ] }, - "sticked": true + "sticked": true, + "isForm": true } ], "detailSmall":[ @@ -29,7 +30,8 @@ "name":"attendees", "label":"Attendees", "view":"crm:views/meeting/record/panels/attendees", - "sticked": true + "sticked": true, + "isForm": true } ], "edit":[ @@ -37,7 +39,8 @@ "name":"attendees", "label":"Attendees", "view":"crm:views/meeting/record/panels/attendees", - "sticked": true + "sticked": true, + "isForm": true } ], "editSmall":[ @@ -45,7 +48,8 @@ "name":"attendees", "label":"Attendees", "view":"crm:views/meeting/record/panels/attendees", - "sticked": true + "sticked": true, + "isForm": true } ] }, diff --git a/application/Espo/Resources/metadata/clientDefs/User.json b/application/Espo/Resources/metadata/clientDefs/User.json index 955b858b68..1e3d11d3b9 100644 --- a/application/Espo/Resources/metadata/clientDefs/User.json +++ b/application/Espo/Resources/metadata/clientDefs/User.json @@ -18,22 +18,26 @@ "detail": { "name": "default", "label": false, - "view": "views/user/record/panels/default-side" + "view": "views/user/record/panels/default-side", + "isForm": true }, "detailSmall": { "name": "default", "label": false, - "view": "views/user/record/panels/default-side" + "view": "views/user/record/panels/default-side", + "isForm": true }, "edit": { "name": "default", "label": false, - "view": "views/user/record/panels/default-side" + "view": "views/user/record/panels/default-side", + "isForm": true }, "editSmall": { "name": "default", "label": false, - "view": "views/user/record/panels/default-side" + "view": "views/user/record/panels/default-side", + "isForm": true } }, "defaultSidePanelFieldLists": { diff --git a/client/res/layout-types/record.tpl b/client/res/layout-types/record.tpl index 10b317b7d7..e3311977d9 100644 --- a/client/res/layout-types/record.tpl +++ b/client/res/layout-types/record.tpl @@ -15,7 +15,7 @@ <% if (panelLabelString) { %>

<%= panelLabelString %>

<% } %> -
+
<% _.each(panel.rows, function (row, rowNumber) { %>
<% _.each(row, function (cell, cellNumber) { %> diff --git a/client/res/templates/record/bottom.tpl b/client/res/templates/record/bottom.tpl index 5fd8f7ca93..9c79ef2823 100644 --- a/client/res/templates/record/bottom.tpl +++ b/client/res/templates/record/bottom.tpl @@ -32,9 +32,8 @@ {{/unless}}
-
+
{{{var name ../this}}}
{{/each}} - diff --git a/client/res/templates/record/side.tpl b/client/res/templates/record/side.tpl index 0822a706ed..8124213456 100644 --- a/client/res/templates/record/side.tpl +++ b/client/res/templates/record/side.tpl @@ -34,7 +34,7 @@
{{/if}} -
+
{{{var name ../this}}}
diff --git a/client/src/views/record/detail-side.js b/client/src/views/record/detail-side.js index 7d86064119..a77dc94ef0 100644 --- a/client/src/views/record/detail-side.js +++ b/client/src/views/record/detail-side.js @@ -46,6 +46,7 @@ Espo.define('views/record/detail-side', 'view', function (Dep) { name: 'default', label: false, view: 'views/record/panels/default-side', + isForm: true, options: { fieldList: [ { @@ -334,4 +335,3 @@ Espo.define('views/record/detail-side', 'view', function (Dep) { }); }); - diff --git a/client/src/views/record/edit-side.js b/client/src/views/record/edit-side.js index 6d14fb4777..6461eb4232 100644 --- a/client/src/views/record/edit-side.js +++ b/client/src/views/record/edit-side.js @@ -36,6 +36,7 @@ Espo.define('views/record/edit-side', 'views/record/detail-side', function (Dep) name: 'default', label: false, view: 'views/record/panels/side', + isForm: true, options: { fieldList: [ { @@ -52,5 +53,3 @@ Espo.define('views/record/edit-side', 'views/record/detail-side', function (Dep) }); }); - - diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less index ae9761f010..7477f3bdc6 100644 --- a/frontend/less/espo/custom.less +++ b/frontend/less/espo/custom.less @@ -2,10 +2,6 @@ border-radius: @button-radius; } -.panel-heading { - padding: 6px 10px; -} - .panel-body { padding: @panel-padding; .clearfix(); @@ -72,10 +68,6 @@ blockquote { font-weight: normal; } -.form-group { - margin-bottom: 12px; -} - .form-group.hidden-cell { margin-bottom: 0; } @@ -326,6 +318,10 @@ ul.dropdown-menu > li.checkbox:last-child { margin-bottom: -1px; } +.panel > .panel-body.panel-body-form { + padding-bottom: @panel-padding - @form-group-margin-bottom; +} + .panel-body .field > .link-container > .list-group-item { background-color: @panel-bg; } @@ -1251,7 +1247,7 @@ table.table td.cell .complex-text { .popup-notification { width: 400px; - padding: 14px; + padding: @panel-padding; background-color: @panel-bg; border: 2px solid @main-gray; margin-top: 10px; diff --git a/frontend/less/espo/variables.less b/frontend/less/espo/variables.less index 5ace5b1650..b731744069 100644 --- a/frontend/less/espo/variables.less +++ b/frontend/less/espo/variables.less @@ -19,6 +19,7 @@ @container-lg: @container-large-desktop; @panel-padding: 14px; +@panel-heading-padding: 6px 10px; @container-padding: 15px; @@ -133,3 +134,5 @@ @panel-border-width: 2px; @navbar-panel-body-max-height: 350px; + +@form-group-margin-bottom: 12px;