From a510bb4ea0aa01ec4584d540da6be2269a4a97ea Mon Sep 17 00:00:00 2001
From: yuri <yurak@list.ru>
Date: Wed, 1 Jul 2015 16:12:24 +0300
Subject: [PATCH] ddefine

---
 .../Modules/Crm/Resources/metadata/clientDefs/Account.json  | 2 +-
 .../Modules/Crm/Resources/metadata/clientDefs/Call.json     | 2 +-
 .../Modules/Crm/Resources/metadata/clientDefs/Campaign.json | 2 +-
 .../Modules/Crm/Resources/metadata/clientDefs/Case.json     | 2 +-
 .../Modules/Crm/Resources/metadata/clientDefs/Contact.json  | 2 +-
 .../Modules/Crm/Resources/metadata/clientDefs/Document.json | 2 +-
 .../Crm/Resources/metadata/clientDefs/DocumentFolder.json   | 4 ++--
 .../Modules/Crm/Resources/metadata/clientDefs/Lead.json     | 2 +-
 .../Modules/Crm/Resources/metadata/clientDefs/Meeting.json  | 2 +-
 .../Crm/Resources/metadata/clientDefs/Opportunity.json      | 2 +-
 .../Modules/Crm/Resources/metadata/clientDefs/Target.json   | 2 +-
 .../Crm/Resources/metadata/clientDefs/TargetList.json       | 2 +-
 .../Modules/Crm/Resources/metadata/clientDefs/Task.json     | 2 +-
 application/Espo/Resources/metadata/clientDefs/Email.json   | 4 ++--
 .../Espo/Resources/metadata/clientDefs/EmailAccount.json    | 2 +-
 .../Espo/Resources/metadata/clientDefs/EmailTemplate.json   | 2 +-
 .../Espo/Resources/metadata/clientDefs/ExternalAccount.json | 2 +-
 application/Espo/Resources/metadata/clientDefs/Import.json  | 2 +-
 application/Espo/Resources/metadata/clientDefs/Note.json    | 2 +-
 .../metadata/clientDefs/PasswordChangeRequest.json          | 2 +-
 .../Espo/Resources/metadata/clientDefs/Preferences.json     | 2 +-
 application/Espo/Resources/metadata/clientDefs/Role.json    | 2 +-
 .../Espo/Resources/metadata/clientDefs/ScheduledJob.json    | 4 ++--
 .../metadata/clientDefs/ScheduledJobLogRecord.json          | 2 +-
 application/Espo/Resources/metadata/clientDefs/Stream.json  | 2 +-
 .../client/src/views/email-template/fields/insert-field.js  | 6 +++---
 26 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Account.json b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Account.json
index 4da4d0e117..b90b2d6658 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Account.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Account.json
@@ -1,5 +1,5 @@
 {
-   "controller": "Controllers.Record",
+   "controller": "controllers/record",
    "views":{
       "detail":"Crm:Account.Detail"
    },
diff --git a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Call.json b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Call.json
index 19929f2e25..73f8a7df66 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Call.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Call.json
@@ -1,5 +1,5 @@
 {
-    "controller": "Controllers.Record",
+    "controller": "controllers/record",
     "views":{
         "detail":"Crm:Call.Detail"
     },
diff --git a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Campaign.json b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Campaign.json
index 592b7dd53a..e52bddcc90 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Campaign.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Campaign.json
@@ -1,5 +1,5 @@
 {
-    "controller": "Controllers.Record",
+    "controller": "controllers/record",
     "menu": {
         "list": {
             "buttons": [
diff --git a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Case.json b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Case.json
index 6f96dd3538..e2f3170a3d 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Case.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Case.json
@@ -1,5 +1,5 @@
 {
-   "controller": "Controllers.Record",
+   "controller": "controllers/record",
    "bottomPanels":{
       "detail":[
       ]
diff --git a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Contact.json b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Contact.json
index a22c37cc9e..55f197dab9 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Contact.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Contact.json
@@ -1,5 +1,5 @@
 {
-   "controller": "Controllers.Record",
+   "controller": "controllers/record",
    "views":{
       "detail":"Crm:Contact.Detail"
    },
diff --git a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Document.json b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Document.json
index 42971893b2..820f755509 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Document.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Document.json
@@ -1,5 +1,5 @@
 {
-    "controller": "Controllers.Record",
+    "controller": "controllers/record",
     "views": {
         "list": "Crm:Document.List"
     },
diff --git a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/DocumentFolder.json b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/DocumentFolder.json
index 2bc4aa625c..279c4160dc 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/DocumentFolder.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/DocumentFolder.json
@@ -1,6 +1,6 @@
 {
-    "controller": "Controllers.RecordTree",
-    "collection": "Collections.Tree",
+    "controller": "controllers/record-tree",
+    "collection": "collections/tree",
     "menu": {
         "listTree": {
             "buttons": [
diff --git a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Lead.json b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Lead.json
index f1d132ad3d..327c76e696 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Lead.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Lead.json
@@ -1,5 +1,5 @@
 {
-   "controller": "Crm:Controllers.Lead",
+   "controller": "crm:controllers/lead",
    "views":{
       "detail":"Crm:Lead.Detail"
    },
diff --git a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Meeting.json b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Meeting.json
index 59e9555ebd..8e4c9eba3e 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Meeting.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Meeting.json
@@ -1,5 +1,5 @@
 {
-    "controller": "Controllers.Record",
+    "controller": "controllers/record",
     "views":{
         "detail":"Crm:Meeting.Detail"
     },
diff --git a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Opportunity.json b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Opportunity.json
index 5a2c7dcdf1..8960ed509c 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Opportunity.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Opportunity.json
@@ -1,5 +1,5 @@
 {
-   "controller": "Controllers.Record",
+   "controller": "controllers/record",
    "views":{
       "detail":"Crm:Opportunity.Detail"
    },
diff --git a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Target.json b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Target.json
index a35b187a63..1c202f8b62 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Target.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Target.json
@@ -1,5 +1,5 @@
 {
-   "controller": "Controllers.Record",
+   "controller": "controllers/record",
    "views":{
       "detail":"Crm:Target.Detail"
    },
diff --git a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/TargetList.json b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/TargetList.json
index 16f74be6e9..0a1c8e37ac 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/TargetList.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/TargetList.json
@@ -1,5 +1,5 @@
 {
-   "controller": "Controllers.Record",
+   "controller": "controllers/record",
    "boolFilterList": ["onlyMy"],
    "sidePanels":{
       "detail":[
diff --git a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Task.json b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Task.json
index 61d61555b6..9e11422944 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Task.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Task.json
@@ -1,5 +1,5 @@
 {
-   "controller": "Controllers.Record",
+   "controller": "controllers/record",
    "recordViews":{
       "list": "Crm:Task.Record.List",
       "detail": "Crm:Task.Record.Detail"
diff --git a/application/Espo/Resources/metadata/clientDefs/Email.json b/application/Espo/Resources/metadata/clientDefs/Email.json
index 59b5629b9c..e4c6f2085f 100644
--- a/application/Espo/Resources/metadata/clientDefs/Email.json
+++ b/application/Espo/Resources/metadata/clientDefs/Email.json
@@ -1,6 +1,6 @@
 {
-   "controller": "Controllers.Record",
-   "model": "Models.Email",
+   "controller": "controllers/record",
+   "model": "models/email",
    "views":{
       "list":"Email.List",
       "detail":"Email.Detail"
diff --git a/application/Espo/Resources/metadata/clientDefs/EmailAccount.json b/application/Espo/Resources/metadata/clientDefs/EmailAccount.json
index d973f45595..3387e010b8 100644
--- a/application/Espo/Resources/metadata/clientDefs/EmailAccount.json
+++ b/application/Espo/Resources/metadata/clientDefs/EmailAccount.json
@@ -1,5 +1,5 @@
 {
-    "controller": "Controllers.EmailAccount",
+    "controller": "controllers/email-account",
     "recordViews": {
         "list":"EmailAccount.Record.List",
         "detail": "EmailAccount.Record.Detail",
diff --git a/application/Espo/Resources/metadata/clientDefs/EmailTemplate.json b/application/Espo/Resources/metadata/clientDefs/EmailTemplate.json
index 33da46216f..de13097e02 100644
--- a/application/Espo/Resources/metadata/clientDefs/EmailTemplate.json
+++ b/application/Espo/Resources/metadata/clientDefs/EmailTemplate.json
@@ -1,5 +1,5 @@
 {
-   "controller": "Controllers.Record",
+   "controller": "controllers/record",
    "recordViews":{
       "edit": "EmailTemplate.Record.Edit",
       "detail": "EmailTemplate.Record.Detail"
diff --git a/application/Espo/Resources/metadata/clientDefs/ExternalAccount.json b/application/Espo/Resources/metadata/clientDefs/ExternalAccount.json
index 3a3b749aef..de6d4a433e 100644
--- a/application/Espo/Resources/metadata/clientDefs/ExternalAccount.json
+++ b/application/Espo/Resources/metadata/clientDefs/ExternalAccount.json
@@ -1,3 +1,3 @@
 {
-  "controller": "Controllers.ExternalAccount"
+  "controller": "controllers/external-account"
 }
diff --git a/application/Espo/Resources/metadata/clientDefs/Import.json b/application/Espo/Resources/metadata/clientDefs/Import.json
index ceefacc991..a34d0e84c7 100644
--- a/application/Espo/Resources/metadata/clientDefs/Import.json
+++ b/application/Espo/Resources/metadata/clientDefs/Import.json
@@ -1,5 +1,5 @@
 {
-    "controller": "Controllers.Import",
+    "controller": "controllers/import",
     "recordViews": {
         "list":"Import.Record.List",
         "detail": "Import.Record.Detail"
diff --git a/application/Espo/Resources/metadata/clientDefs/Note.json b/application/Espo/Resources/metadata/clientDefs/Note.json
index 90932b2772..fd07c8ac4b 100644
--- a/application/Espo/Resources/metadata/clientDefs/Note.json
+++ b/application/Espo/Resources/metadata/clientDefs/Note.json
@@ -1,5 +1,5 @@
 {
-   "collection": "Collections.Note",
+   "collection": "collections/note",
    "recordViews":{
       "edit":"Note.Record.Edit",
       "editQuick":"Note.Record.Edit"
diff --git a/application/Espo/Resources/metadata/clientDefs/PasswordChangeRequest.json b/application/Espo/Resources/metadata/clientDefs/PasswordChangeRequest.json
index bb27e694b2..0c961ef934 100644
--- a/application/Espo/Resources/metadata/clientDefs/PasswordChangeRequest.json
+++ b/application/Espo/Resources/metadata/clientDefs/PasswordChangeRequest.json
@@ -1,3 +1,3 @@
 {
-    "controller": "Controllers.PasswordChangeRequest"
+    "controller": "controllers/password-change-request"
 }
\ No newline at end of file
diff --git a/application/Espo/Resources/metadata/clientDefs/Preferences.json b/application/Espo/Resources/metadata/clientDefs/Preferences.json
index 491d497710..bfbe1f4e0d 100644
--- a/application/Espo/Resources/metadata/clientDefs/Preferences.json
+++ b/application/Espo/Resources/metadata/clientDefs/Preferences.json
@@ -4,5 +4,5 @@
    },
    "views":{
       "edit": "Preferences.Edit"
-   }   
+   }
 }
diff --git a/application/Espo/Resources/metadata/clientDefs/Role.json b/application/Espo/Resources/metadata/clientDefs/Role.json
index ee4f559172..46a0bb7d01 100644
--- a/application/Espo/Resources/metadata/clientDefs/Role.json
+++ b/application/Espo/Resources/metadata/clientDefs/Role.json
@@ -16,6 +16,6 @@
       }
    },
   "views": {
-    "list": "Role.List"      
+    "list": "Role.List"
   }
 }
diff --git a/application/Espo/Resources/metadata/clientDefs/ScheduledJob.json b/application/Espo/Resources/metadata/clientDefs/ScheduledJob.json
index c7a9f06556..5048dac981 100644
--- a/application/Espo/Resources/metadata/clientDefs/ScheduledJob.json
+++ b/application/Espo/Resources/metadata/clientDefs/ScheduledJob.json
@@ -1,5 +1,5 @@
 {
-  "controller": "Controllers.Record",
+  "controller": "controllers/record",
   "relationshipPanels":{
      "log":{
         "readOnly": true
@@ -9,6 +9,6 @@
     "list":"ScheduledJob.Record.List"
   },
   "views": {
-    "list": "ScheduledJob.List"      
+    "list": "ScheduledJob.List"
   }
 }
diff --git a/application/Espo/Resources/metadata/clientDefs/ScheduledJobLogRecord.json b/application/Espo/Resources/metadata/clientDefs/ScheduledJobLogRecord.json
index 3adeb203fc..35398f1ab7 100644
--- a/application/Espo/Resources/metadata/clientDefs/ScheduledJobLogRecord.json
+++ b/application/Espo/Resources/metadata/clientDefs/ScheduledJobLogRecord.json
@@ -1,3 +1,3 @@
 {
-  "controller": "Controllers.Record"
+  "controller": "controllers/record"
 }
diff --git a/application/Espo/Resources/metadata/clientDefs/Stream.json b/application/Espo/Resources/metadata/clientDefs/Stream.json
index 1f528551d8..9e77591c91 100644
--- a/application/Espo/Resources/metadata/clientDefs/Stream.json
+++ b/application/Espo/Resources/metadata/clientDefs/Stream.json
@@ -1,3 +1,3 @@
 {
-   "controller": "Controllers.Stream"
+   "controller": "controllers/stream"
 }
diff --git a/frontend/client/src/views/email-template/fields/insert-field.js b/frontend/client/src/views/email-template/fields/insert-field.js
index 32a5a0cedb..38b125616c 100644
--- a/frontend/client/src/views/email-template/fields/insert-field.js
+++ b/frontend/client/src/views/email-template/fields/insert-field.js
@@ -18,15 +18,15 @@
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
  ************************************************************************/
-Espo.define('Views.EmailTemplate.Fields.InsertField', 'Views.Fields.Base', function (Dep) {
+Espo.define('views/email-template/fields/insert-field', 'views/fields/base', function (Dep) {
 
     return Dep.extend({
 
         inlineEditDisabled: true,
 
-        detailTemplate: 'email-template.fields.insert-field.detail',
+        detailTemplate: 'email-template/fields/insert-field/detail',
 
-        editTemplate: 'email-template.fields.insert-field.edit',
+        editTemplate: 'email-template/fields/insert-field/edit',
 
         data: function () {
             return {