diff --git a/Gruntfile.js b/Gruntfile.js index cc6482de4a..1bb9c4a2e9 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -164,6 +164,7 @@ module.exports = function (grunt) { 'custom/**', 'data/.data', 'install/**', + 'portal/**', 'vendor/**', 'html/**', 'bootstrap.php', diff --git a/application/Espo/Core/Application.php b/application/Espo/Core/Application.php index bd4dd6e4b0..2bd6ec1436 100644 --- a/application/Espo/Core/Application.php +++ b/application/Espo/Core/Application.php @@ -289,5 +289,10 @@ class Application $classLoader->register(true); } + + public function setBasePath($basePath) + { + $this->getContainer()->get('clientManager')->setBasePath($basePath); + } } diff --git a/application/Espo/Core/Utils/ClientManager.php b/application/Espo/Core/Utils/ClientManager.php index f11e22ba05..5476e3644d 100644 --- a/application/Espo/Core/Utils/ClientManager.php +++ b/application/Espo/Core/Utils/ClientManager.php @@ -41,6 +41,8 @@ class ClientManager protected $runScript = "app.start();"; + protected $basePath = ''; + public function __construct(Config $config, ThemeManager $themeManager) { $this->config = $config; @@ -57,6 +59,16 @@ class ClientManager return $this->config; } + public function setBasePath($basePath) + { + $this->basePath = $basePath; + } + + public function getBasePath() + { + return $this->basePath; + } + public function display($runScript = null, $htmlFilePath = null, $vars = array()) { if (is_null($runScript)) { @@ -66,8 +78,6 @@ class ClientManager $htmlFilePath = $this->mainHtmlFilePath; } - $basePath = ''; - if ($this->getConfig()->get('isDeveloperMode')) { if (file_exists('frontend/' . $htmlFilePath)) { $htmlFilePath = 'frontend/' . $htmlFilePath; @@ -82,7 +92,7 @@ class ClientManager $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}}', $basePath , $html); + $html = str_replace('{{basePath}}', $this->basePath , $html); echo $html; exit; diff --git a/application/Espo/EntryPoints/Portal.php b/application/Espo/EntryPoints/Portal.php index d70e0a2cf1..bf85c2d910 100644 --- a/application/Espo/EntryPoints/Portal.php +++ b/application/Espo/EntryPoints/Portal.php @@ -49,6 +49,7 @@ class Portal extends \Espo\Core\EntryPoints\Base } $application = new \Espo\Core\Portal\Application($id); + $application->setBasePath($this->getContainer()->get('clientManager')->getBasePath()); $application->runClient(); } } diff --git a/client/modules/crm/res/templates/calendar/calendar.tpl b/client/modules/crm/res/templates/calendar/calendar.tpl index acfe4fae6b..7e4aa69af2 100644 --- a/client/modules/crm/res/templates/calendar/calendar.tpl +++ b/client/modules/crm/res/templates/calendar/calendar.tpl @@ -1,6 +1,6 @@ - - - + + + {{#if header}}
diff --git a/client/res/templates/dashboard.tpl b/client/res/templates/dashboard.tpl index db2287cb78..c7611d9768 100644 --- a/client/res/templates/dashboard.tpl +++ b/client/res/templates/dashboard.tpl @@ -1,4 +1,4 @@ - +
diff --git a/client/res/templates/fields/wysiwyg/edit.tpl b/client/res/templates/fields/wysiwyg/edit.tpl index 397327104c..f8e684057b 100644 --- a/client/res/templates/fields/wysiwyg/edit.tpl +++ b/client/res/templates/fields/wysiwyg/edit.tpl @@ -1,5 +1,5 @@ - + diff --git a/client/res/templates/modals/image-crop.tpl b/client/res/templates/modals/image-crop.tpl index 63dde9956e..35c57fe724 100644 --- a/client/res/templates/modals/image-crop.tpl +++ b/client/res/templates/modals/image-crop.tpl @@ -1,4 +1,4 @@ - +
diff --git a/client/res/templates/settings/fields/dashboard-layout/detail.tpl b/client/res/templates/settings/fields/dashboard-layout/detail.tpl index da3176db03..bc63d40a30 100644 --- a/client/res/templates/settings/fields/dashboard-layout/detail.tpl +++ b/client/res/templates/settings/fields/dashboard-layout/detail.tpl @@ -1,4 +1,4 @@ - +
{{#ifNotEqual dashboardLayout.length 1}} diff --git a/client/res/templates/settings/fields/dashboard-layout/edit.tpl b/client/res/templates/settings/fields/dashboard-layout/edit.tpl index f350254d4b..4201d2c276 100644 --- a/client/res/templates/settings/fields/dashboard-layout/edit.tpl +++ b/client/res/templates/settings/fields/dashboard-layout/edit.tpl @@ -1,4 +1,4 @@ - +
diff --git a/client/src/app.js b/client/src/app.js index 80b0c5247b..ca05bdb73a 100644 --- a/client/src/app.js +++ b/client/src/app.js @@ -41,6 +41,9 @@ Espo.define( this.url = options.url || this.url; this.basePath = options.basePath || ''; + this.loader = Espo.loader; + this.loader.basePath = this.basePath; + this.controllers = {}; if (this.useCache) { @@ -54,7 +57,6 @@ Espo.define( this.storage = new Storage(); - this.loader = Espo.loader; this.loader.cache = this.cache; this.setupAjax(); @@ -92,7 +94,7 @@ Espo.define( this.initView(); this.initBaseController(); - this.preLoader = new PreLoader(this.cache, this.viewFactory, this.themeManager); + this.preLoader = new PreLoader(this.cache, this.viewFactory, this.basePath); this.preLoad(function () { callback.call(this, this); @@ -168,6 +170,7 @@ Espo.define( if (this.themeManager.isUserTheme()) { var stylesheetPath = this.basePath + this.themeManager.getStylesheet(); + console.log(stylesheetPath); $('#main-stylesheet').attr('href', stylesheetPath); } @@ -336,9 +339,6 @@ Espo.define( path = 'res/layouts/' + name + '.json'; break; } - - path = this.basePath + path; - return path; }.bind(this); @@ -356,9 +356,6 @@ Espo.define( } else { path = 'client/' + getResourceInnerPath(type, name); } - - path = this.basePath + path; - return path; }.bind(this); @@ -467,7 +464,7 @@ Espo.define( var arr = Base64.decode(this.auth).split(':'); var xhr = new XMLHttpRequest(); - xhr.open('GET', this.url + '/', false, arr[0], arr[1]); + xhr.open('GET', this.basePath + this.url + '/', false, arr[0], arr[1]); xhr.send(''); if (callback) { @@ -491,6 +488,10 @@ Espo.define( if (!options.local && self.url) { options.url = Espo.Utils.trimSlash(self.url) + '/' + options.url; } + + if (!options.local && self.basePath !== '') { + options.url = self.basePath + options.url; + } if (self.auth !== null) { xhr.setRequestHeader('Authorization', 'Basic ' + self.auth); xhr.setRequestHeader('Espo-Authorization', self.auth); diff --git a/client/src/loader.js b/client/src/loader.js index 6b09a301e8..359784136d 100644 --- a/client/src/loader.js +++ b/client/src/loader.js @@ -33,6 +33,8 @@ var Espo = Espo || {classMap:{}}; var root = this; Espo.Loader = function (cache, cacheTimestamp) { + this.basePath = document.currentScript.dataset.basePath || ''; + this.cache = cache || null; this._loadCallbacks = {}; @@ -296,7 +298,7 @@ var Espo = Espo || {classMap:{}}; cache: useCache, dataType: 'text', local: true, - url: path, + url: this.basePath + path, success: function (response) { if (this.cache) { this.cache.set(type, name, response); @@ -347,7 +349,7 @@ var Espo = Espo || {classMap:{}}; } $.ajax({ - url: url, + url: this.basePath + url, type: 'GET', dataType: 'script', local: true, @@ -365,7 +367,7 @@ var Espo = Espo || {classMap:{}}; loadLibsConfig: function (callback) { $.ajax({ - url: this.libsConfigUrl, + url: this.basePath + this.libsConfigUrl, dataType: 'json', local: true, success: function (data) { diff --git a/client/src/pre-loader.js b/client/src/pre-loader.js index 1dfde33926..e683ed397e 100644 --- a/client/src/pre-loader.js +++ b/client/src/pre-loader.js @@ -28,9 +28,10 @@ Espo.define('pre-loader', [], function () { - var PreLoader = function (cache, viewFactory) { + var PreLoader = function (cache, viewFactory, basePath) { this.cache = cache; this.viewFactory = viewFactory; + this.basePath = basePath || ''; } _.extend(PreLoader.prototype, { @@ -120,7 +121,7 @@ Espo.define('pre-loader', [], function () { }; $.ajax({ - url: this.configUrl, + url: this.basePath + this.configUrl, dataType: 'json', local: true, success: function (data) { diff --git a/client/src/views/fields/wysiwyg.js b/client/src/views/fields/wysiwyg.js index cedeed7285..c707e0bbd7 100644 --- a/client/src/views/fields/wysiwyg.js +++ b/client/src/views/fields/wysiwyg.js @@ -32,9 +32,9 @@ Espo.define('views/fields/wysiwyg', ['views/fields/text', 'lib!Summernote'], fun type: 'wysiwyg', - detailTemplate: 'fields.wysiwyg.detail', + detailTemplate: 'fields/wysiwyg/detail', - editTemplate: 'fields.wysiwyg.edit', + editTemplate: 'fields/wysiwyg/edit', height: 250, @@ -132,7 +132,7 @@ Espo.define('views/fields/wysiwyg', ['views/fields/text', 'lib!Summernote'], fun var doc = iframe.contentWindow.document; - var link = ''; + var link = ''; doc.open('text/html', 'replace'); var body = this.model.get(this.name) || ''; diff --git a/frontend/html/main.html b/frontend/html/main.html index 2351e5dd9a..0a102aff26 100644 --- a/frontend/html/main.html +++ b/frontend/html/main.html @@ -22,7 +22,7 @@ - + diff --git a/frontend/html/portal.html b/frontend/html/portal.html index e90a29c1b2..e57b87f2ee 100644 --- a/frontend/html/portal.html +++ b/frontend/html/portal.html @@ -7,28 +7,28 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + - - - + + + + diff --git a/html/portal.html b/html/portal.html index 562aa8012d..f459c138ba 100644 --- a/html/portal.html +++ b/html/portal.html @@ -2,7 +2,7 @@ EspoCRM - + diff --git a/portal/index.php b/portal/index.php new file mode 100644 index 0000000000..59c2869e23 --- /dev/null +++ b/portal/index.php @@ -0,0 +1,47 @@ +isInstalled()) { + exit; +} + +if (!empty($_GET['entryPoint'])) { + if (!empty($_GET['portalId'])) { + $app = new \Espo\Core\Portal\Application($_GET['portalId']); + } + $app->setBasePath('../'); + $app->runEntryPoint($_GET['entryPoint']); + exit; +} + +$app->setBasePath('../'); +$app->runEntryPoint('portal');