From 19c9b38f8245c742747202c97dad4828995d5223 Mon Sep 17 00:00:00 2001
From: yuri <yurak@list.ru>
Date: Mon, 23 May 2016 12:24:18 +0300
Subject: [PATCH] applicationName in settings

---
 application/Espo/Core/Utils/ClientManager.php               | 3 ++-
 application/Espo/Resources/i18n/en_US/Settings.json         | 3 ++-
 .../Espo/Resources/layouts/Settings/userInterface.json      | 6 +++---
 .../Espo/Resources/metadata/entityDefs/Settings.json        | 3 +++
 frontend/html/main.html                                     | 2 +-
 frontend/html/portal.html                                   | 2 +-
 html/main.html                                              | 2 +-
 html/portal.html                                            | 2 +-
 8 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/application/Espo/Core/Utils/ClientManager.php b/application/Espo/Core/Utils/ClientManager.php
index da136d5066..8e25b6a0b3 100644
--- a/application/Espo/Core/Utils/ClientManager.php
+++ b/application/Espo/Core/Utils/ClientManager.php
@@ -96,8 +96,9 @@ class ClientManager
         foreach ($vars as $key => $value) {
             $html = str_replace('{{'.$key.'}}', $value, $html);
         }
+        $html = str_replace('{{applicationName}}', $this->getConfig()->get('applicationName', 'EspoCRM'), $html);
         $html = str_replace('{{cacheTimestamp}}', $this->getCacheTimestamp(), $html);
-        $html = str_replace('{{useCache}}', $this->getConfig()->get('useCache') ? 'true' : 'false' , $html);
+        $html = str_replace('{{useCache}}', $this->getConfig()->get('useCache') ? 'true' : 'false', $html);
         $html = str_replace('{{stylesheet}}', $this->getThemeManager()->getStylesheet(), $html);
         $html = str_replace('{{runScript}}', $runScript , $html);
         $html = str_replace('{{basePath}}', $this->basePath , $html);
diff --git a/application/Espo/Resources/i18n/en_US/Settings.json b/application/Espo/Resources/i18n/en_US/Settings.json
index 7672ef8dce..47b6b170c7 100644
--- a/application/Espo/Resources/i18n/en_US/Settings.json
+++ b/application/Espo/Resources/i18n/en_US/Settings.json
@@ -66,7 +66,8 @@
         "siteUrl": "Site URL",
         "addressPreview": "Address Preview",
         "addressFormat": "Address Format",
-        "notificationSoundsDisabled": "Disable Notification Sounds"
+        "notificationSoundsDisabled": "Disable Notification Sounds",
+        "applicationName": "Application Name"
     },
     "options": {
         "weekStart": {
diff --git a/application/Espo/Resources/layouts/Settings/userInterface.json b/application/Espo/Resources/layouts/Settings/userInterface.json
index 0b441845fd..f84704f4fb 100644
--- a/application/Espo/Resources/layouts/Settings/userInterface.json
+++ b/application/Espo/Resources/layouts/Settings/userInterface.json
@@ -3,9 +3,9 @@
         "label": "Configuration",
         "rows": [
             [{"name": "companyLogo"}, {"name": "theme"}],
-            [{"name": "recordsPerPage"}, {"name": "userThemesDisabled"}],
-            [{"name": "recordsPerPageSmall"},{"name": "displayListViewRecordCount"}],
-            [false, {"name": "avatarsDisabled"}],
+            [{"name": "applicationName"}, {"name": "userThemesDisabled"}],
+            [{"name": "recordsPerPage"},{"name": "displayListViewRecordCount"}],
+            [{"name": "recordsPerPageSmall"}, {"name": "avatarsDisabled"}],
             [{"name": "tabList"},{"name": "quickCreateList"}],
             [{"name": "dashboardLayout", "fullWidth": true}]
         ]
diff --git a/application/Espo/Resources/metadata/entityDefs/Settings.json b/application/Espo/Resources/metadata/entityDefs/Settings.json
index 50b4bced46..4cd8e0a6d4 100644
--- a/application/Espo/Resources/metadata/entityDefs/Settings.json
+++ b/application/Espo/Resources/metadata/entityDefs/Settings.json
@@ -292,6 +292,9 @@
         "siteUrl": {
             "type": "varchar"
         },
+        "applicationName": {
+            "type": "varchar"
+        },
         "readableDateFormatDisabled": {
             "type": "bool"
         },
diff --git a/frontend/html/main.html b/frontend/html/main.html
index 113b411387..8f8e6db65d 100644
--- a/frontend/html/main.html
+++ b/frontend/html/main.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
     <head>
-        <title>EspoCRM</title>
+        <title>{{applicationName}}</title>
         <meta content="text/html;charset=utf-8" http-equiv="Content-Type">
         <meta content="utf-8" http-equiv="encoding">
         <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
diff --git a/frontend/html/portal.html b/frontend/html/portal.html
index 3828ee57f9..cd40162ddc 100644
--- a/frontend/html/portal.html
+++ b/frontend/html/portal.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
     <head>
-        <title>EspoCRM</title>
+        <title>{{applicationName}}</title>
         <meta content="text/html;charset=utf-8" http-equiv="Content-Type">
         <meta content="utf-8" http-equiv="encoding">
         <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
diff --git a/html/main.html b/html/main.html
index b71a8be815..7112b975ea 100644
--- a/html/main.html
+++ b/html/main.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
     <head>
-        <title>EspoCRM</title>
+        <title>{{applicationName}}</title>
         <script type="text/javascript" src="{{basePath}}client/espo.min.js?r=@@timestamp" data-base-path="{{basePath}}"></script>
         <link href="{{basePath}}{{stylesheet}}?r=@@timestamp" rel="stylesheet" id='main-stylesheet'>
         <meta content="text/html;charset=utf-8" http-equiv="Content-Type">
diff --git a/html/portal.html b/html/portal.html
index a64f4dfc31..badd8eaff1 100644
--- a/html/portal.html
+++ b/html/portal.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
     <head>
-        <title>EspoCRM</title>
+        <title>{{applicationName}}</title>
         <script type="text/javascript" src="{{basePath}}client/espo.min.js?r=@@timestamp" data-base-path="{{basePath}}"></script>
         <link href="{{basePath}}{{stylesheet}}?r=@@timestamp" rel="stylesheet" id='main-stylesheet'>
         <meta content="text/html;charset=utf-8" http-equiv="Content-Type">