From 4b4f8d2cc43284bded15e466a57bd9942f108d14 Mon Sep 17 00:00:00 2001
From: yuri <yurak@list.ru>
Date: Fri, 8 Jan 2016 14:50:46 +0200
Subject: [PATCH] dev and fix

---
 application/Espo/Resources/i18n/en_US/Email.json           | 2 +-
 application/Espo/Resources/layouts/Email/composeSmall.json | 6 +++---
 application/Espo/Resources/layouts/Email/detail.json       | 2 +-
 application/Espo/Resources/layouts/Email/detailSmall.json  | 2 +-
 application/Espo/Resources/layouts/Email/list.json         | 2 +-
 application/Espo/Resources/metadata/entityDefs/Email.json  | 3 ++-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/application/Espo/Resources/i18n/en_US/Email.json b/application/Espo/Resources/i18n/en_US/Email.json
index d37df3e489..167f1437b2 100644
--- a/application/Espo/Resources/i18n/en_US/Email.json
+++ b/application/Espo/Resources/i18n/en_US/Email.json
@@ -1,6 +1,6 @@
 {
     "fields": {
-        "name": "Subject",
+        "name": "Name",
         "parent": "Parent",
         "status": "Status",
         "dateSent": "Date Sent",
diff --git a/application/Espo/Resources/layouts/Email/composeSmall.json b/application/Espo/Resources/layouts/Email/composeSmall.json
index 2dfe923734..5a71f40142 100644
--- a/application/Espo/Resources/layouts/Email/composeSmall.json
+++ b/application/Espo/Resources/layouts/Email/composeSmall.json
@@ -5,7 +5,7 @@
             [
                 {
                     "name":"from",
-                    "view": "Email.Fields.ComposeFromAddress"
+                    "view": "views/email/fields/compose-from-address"
                 },
                 {"name":"cc"}
             ],
@@ -19,10 +19,10 @@
                 },
                 {
                     "name":"selectTemplate",
-                    "view":"Email.Fields.SelectTemplate"
+                    "view":"views/email/fields/select-template"
                 }
             ],
-            [{"name":"name","fullWidth":true}],
+            [{"name":"subject","fullWidth":true}],
             [{"name":"body","fullWidth":true}],
             [{"name":"attachments"},{"name":"isHtml"}]
         ]
diff --git a/application/Espo/Resources/layouts/Email/detail.json b/application/Espo/Resources/layouts/Email/detail.json
index 11a3cafc87..4ffffa67f4 100644
--- a/application/Espo/Resources/layouts/Email/detail.json
+++ b/application/Espo/Resources/layouts/Email/detail.json
@@ -6,7 +6,7 @@
             [{"name":"dateSent"}, {"name":"to"}],
             [{"name":"parent"}, {"name":"cc"}],
             [false, {"name":"bcc"}],
-            [{"name":"name","fullWidth":true}],
+            [{"name":"subject","fullWidth":true}],
             [{"name":"body","fullWidth":true}],
             [{"name":"attachments"},{"name":"isHtml"}]
         ]
diff --git a/application/Espo/Resources/layouts/Email/detailSmall.json b/application/Espo/Resources/layouts/Email/detailSmall.json
index dedc091a91..35a0d8814d 100644
--- a/application/Espo/Resources/layouts/Email/detailSmall.json
+++ b/application/Espo/Resources/layouts/Email/detailSmall.json
@@ -6,7 +6,7 @@
             [{"name":"parent"}, {"name":"to"}],
             [false, {"name":"cc"}],
             [false, {"name":"bcc"}],
-            [{"name":"name", "fullWidth": true}],
+            [{"name":"subject", "fullWidth": true}],
             [{"name":"body", "fullWidth": true}],
             [{"name":"attachments", "fullWidth": true}]
         ]
diff --git a/application/Espo/Resources/layouts/Email/list.json b/application/Espo/Resources/layouts/Email/list.json
index a80778bb45..03417a0fc0 100644
--- a/application/Espo/Resources/layouts/Email/list.json
+++ b/application/Espo/Resources/layouts/Email/list.json
@@ -3,5 +3,5 @@
     {"name":"subject","width":35,"link":true,"notSortable": true},
     {"name":"status","notSortable": true, "width":10},
     {"name":"parent","notSortable": true, "width": 16},
-    {"name":"dateSent","view": "Fields.DatetimeShort", "notSortable": true, "width":10, "align": "right"}
+    {"name":"dateSent","view": "views/fields/date-time-short", "notSortable": true, "width":10, "align": "right"}
 ]
diff --git a/application/Espo/Resources/metadata/entityDefs/Email.json b/application/Espo/Resources/metadata/entityDefs/Email.json
index 865ea6d5c0..4dfa53344c 100644
--- a/application/Espo/Resources/metadata/entityDefs/Email.json
+++ b/application/Espo/Resources/metadata/entityDefs/Email.json
@@ -8,7 +8,8 @@
             "type": "varchar",
             "required": true,
             "notStorable": true,
-            "view": "Email.Fields.Subject"
+            "view": "views/email/fields/subject",
+            "disabled": true
         },
         "fromName": {
             "type": "varchar"