diff --git a/application/Espo/EntryPoints/Attachment.php b/application/Espo/EntryPoints/Attachment.php
index 4a9fbc33d4..b8ec347028 100644
--- a/application/Espo/EntryPoints/Attachment.php
+++ b/application/Espo/EntryPoints/Attachment.php
@@ -111,6 +111,7 @@ class Attachment implements EntryPoint
$response
->setHeader('Pragma', 'public')
->setHeader('Content-Length', (string) $size)
+ ->setHeader('Content-Security-Policy', "default-src 'self'")
->setBody($stream);
}
diff --git a/application/Espo/Resources/metadata/themes/Espo.json b/application/Espo/Resources/metadata/themes/Espo.json
index cf2f3f4e52..1eaf281194 100644
--- a/application/Espo/Resources/metadata/themes/Espo.json
+++ b/application/Espo/Resources/metadata/themes/Espo.json
@@ -22,8 +22,8 @@
"logo": {
"param": "navbar",
"valueMap": {
- "side": "client/img/logo-39.png",
- "top": "client/img/logo-39.png"
+ "side": "client/img/logo.svg",
+ "top": "client/img/logo.svg"
}
}
},
diff --git a/client/img/logo.svg b/client/img/logo.svg
new file mode 100644
index 0000000000..ba0dff18fc
--- /dev/null
+++ b/client/img/logo.svg
@@ -0,0 +1,22 @@
+
+
diff --git a/client/src/views/login.js b/client/src/views/login.js
index d63b77d0a4..a97c7b2b31 100644
--- a/client/src/views/login.js
+++ b/client/src/views/login.js
@@ -162,7 +162,7 @@ define('views/login', ['view'], function (Dep) {
let companyLogoId = this.getConfig().get('companyLogoId');
if (!companyLogoId) {
- return this.getBasePath() + ('client/img/logo.png');
+ return this.getBasePath() + ('client/img/logo.svg');
}
return this.getBasePath() + '?entryPoint=LogoImage&id=' + companyLogoId;
diff --git a/client/src/views/site-portal/navbar.js b/client/src/views/site-portal/navbar.js
index 3e499d9c4e..7548eb97f6 100644
--- a/client/src/views/site-portal/navbar.js
+++ b/client/src/views/site-portal/navbar.js
@@ -26,14 +26,14 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
-define('views/site-portal/navbar', 'views/site/navbar', function (Dep) {
+define('views/site-portal/navbar', ['views/site/navbar'], function (Dep) {
return Dep.extend({
getLogoSrc: function () {
var companyLogoId = this.getConfig().get('companyLogoId');
if (!companyLogoId) {
- return this.getBasePath() + (this.getThemeManager().getParam('logo') || 'client/img/logo.png');
+ return this.getBasePath() + (this.getThemeManager().getParam('logo') || 'client/img/logo.svg');
}
return this.getBasePath() + '?entryPoint=LogoImage&id='+companyLogoId+'&t=' + companyLogoId;
},
diff --git a/client/src/views/site/navbar.js b/client/src/views/site/navbar.js
index 7db7f44128..aa161a3814 100644
--- a/client/src/views/site/navbar.js
+++ b/client/src/views/site/navbar.js
@@ -334,7 +334,7 @@ define('views/site/navbar', ['view'], function (Dep) {
var companyLogoId = this.getConfig().get('companyLogoId');
if (!companyLogoId) {
- return this.getBasePath() + (this.getThemeManager().getParam('logo') || 'client/img/logo.png');
+ return this.getBasePath() + (this.getThemeManager().getParam('logo') || 'client/img/logo.svg');
}
return this.getBasePath() + '?entryPoint=LogoImage&id='+companyLogoId;
diff --git a/install/core/tpl/header.tpl b/install/core/tpl/header.tpl
index 9e779fddb8..891c1e8975 100644
--- a/install/core/tpl/header.tpl
+++ b/install/core/tpl/header.tpl
@@ -1,5 +1,5 @@
-
+
