diff --git a/.gitignore b/.gitignore index aee91b995f..720080a145 100644 --- a/.gitignore +++ b/.gitignore @@ -6,15 +6,14 @@ /data/config.php /build /node_modules -/client /test.php /main.html -/frontend/client/css/espo.css -/frontend/client/css/espo-vertical.css -/frontend/client/css/sakura.css -/frontend/client/css/sakura-vertical.css -/frontend/client/css/violet.css -/frontend/client/css/violet-vertical.css +/client/css/espo.css +/client/css/espo-vertical.css +/client/css/sakura.css +/client/css/sakura-vertical.css +/client/css/violet.css +/client/css/violet-vertical.css /tests/testData/cache/* composer.phar vendor/ diff --git a/Gruntfile.js b/Gruntfile.js index cc3fbbe9bf..cc6482de4a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -65,7 +65,7 @@ module.exports = function (grunt) { yuicompress: true, }, files: { - 'frontend/client/css/espo.css': 'frontend/less/espo/main.less', + 'client/css/espo.css': 'frontend/less/espo/main.less', } }, espoVertical: { @@ -73,7 +73,7 @@ module.exports = function (grunt) { yuicompress: true, }, files: { - 'frontend/client/css/espo-vertical.css': 'frontend/less/espo-vertical/main.less', + 'client/css/espo-vertical.css': 'frontend/less/espo-vertical/main.less', } }, sakura: { @@ -81,7 +81,7 @@ module.exports = function (grunt) { yuicompress: true, }, files: { - 'frontend/client/css/sakura.css': 'frontend/less/sakura/main.less', + 'client/css/sakura.css': 'frontend/less/sakura/main.less', } }, sakuraVertical: { @@ -89,7 +89,7 @@ module.exports = function (grunt) { yuicompress: true, }, files: { - 'frontend/client/css/sakura-vertical.css': 'frontend/less/sakura-vertical/main.less', + 'client/css/sakura-vertical.css': 'frontend/less/sakura-vertical/main.less', } }, violet: { @@ -97,7 +97,7 @@ module.exports = function (grunt) { yuicompress: true, }, files: { - 'frontend/client/css/violet.css': 'frontend/less/violet/main.less', + 'client/css/violet.css': 'frontend/less/violet/main.less', } }, violetVertical: { @@ -105,7 +105,7 @@ module.exports = function (grunt) { yuicompress: true, }, files: { - 'frontend/client/css/violet-vertical.css': 'frontend/less/violet-vertical/main.less', + 'client/css/violet-vertical.css': 'frontend/less/violet-vertical/main.less', } } }, @@ -113,7 +113,7 @@ module.exports = function (grunt) { minify: { files: { 'build/tmp/client/css/espo.css': [ - 'frontend/client/css/espo.css', + 'client/css/espo.css', ] } }, @@ -124,13 +124,13 @@ module.exports = function (grunt) { banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n', }, 'build/tmp/client/espo.min.js': jsFilesToMinify.map(function (item) { - return 'frontend/' + item; + return '' + item; }) }, copy: { frontendFolders: { expand: true, - cwd: 'frontend/client', + cwd: 'client', src: [ 'src/**', 'res/**', @@ -151,7 +151,7 @@ module.exports = function (grunt) { frontendLib: { expand: true, dot: true, - cwd: 'frontend/client/lib', + cwd: 'client/lib', src: '**', dest: 'build/tmp/client/lib/', }, diff --git a/README.md b/README.md index 985bbe75f9..f87a6985a4 100644 --- a/README.md +++ b/README.md @@ -28,12 +28,8 @@ Never update composer dependencies if you are going to contribute code back. Now you can build. Build will create compiled css files. -If your repository is accessible via a web server then you can run EspoCRM by url `http://PROJECT_URL/frontend`. - To compose a proper config.php and populate database you can run install by opening `http(s)://{YOUR_CRM_URL}/install` location in a browser. Then open `data/config.php` file and add `isDeveloperMode => true`. - - ### How to build You need to have nodejs and Grunt CLI installed. diff --git a/application/Espo/Core/Utils/ClientManager.php b/application/Espo/Core/Utils/ClientManager.php index ecb0d10d60..f11e22ba05 100644 --- a/application/Espo/Core/Utils/ClientManager.php +++ b/application/Espo/Core/Utils/ClientManager.php @@ -66,6 +66,8 @@ class ClientManager $htmlFilePath = $this->mainHtmlFilePath; } + $basePath = ''; + if ($this->getConfig()->get('isDeveloperMode')) { if (file_exists('frontend/' . $htmlFilePath)) { $htmlFilePath = 'frontend/' . $htmlFilePath; @@ -80,6 +82,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); echo $html; exit; diff --git a/frontend/client/cfg/pre-load.json b/client/cfg/pre-load.json similarity index 100% rename from frontend/client/cfg/pre-load.json rename to client/cfg/pre-load.json diff --git a/frontend/client/css/bootstrap.css b/client/css/bootstrap.css similarity index 100% rename from frontend/client/css/bootstrap.css rename to client/css/bootstrap.css diff --git a/frontend/client/css/cropper.css b/client/css/cropper.css similarity index 100% rename from frontend/client/css/cropper.css rename to client/css/cropper.css diff --git a/frontend/client/css/font-awesome.min.css b/client/css/font-awesome.min.css similarity index 100% rename from frontend/client/css/font-awesome.min.css rename to client/css/font-awesome.min.css diff --git a/frontend/client/css/gridstack.min.css b/client/css/gridstack.min.css similarity index 100% rename from frontend/client/css/gridstack.min.css rename to client/css/gridstack.min.css diff --git a/frontend/client/css/iframe.css b/client/css/iframe.css similarity index 100% rename from frontend/client/css/iframe.css rename to client/css/iframe.css diff --git a/frontend/client/css/sacura-vertical.css b/client/css/sacura-vertical.css similarity index 100% rename from frontend/client/css/sacura-vertical.css rename to client/css/sacura-vertical.css diff --git a/frontend/client/css/sacura.css b/client/css/sacura.css similarity index 100% rename from frontend/client/css/sacura.css rename to client/css/sacura.css diff --git a/frontend/client/css/select2-bootstrap.css b/client/css/select2-bootstrap.css similarity index 100% rename from frontend/client/css/select2-bootstrap.css rename to client/css/select2-bootstrap.css diff --git a/frontend/client/css/select2.css b/client/css/select2.css similarity index 100% rename from frontend/client/css/select2.css rename to client/css/select2.css diff --git a/frontend/client/custom/.gitignore b/client/custom/.gitignore similarity index 100% rename from frontend/client/custom/.gitignore rename to client/custom/.gitignore diff --git a/frontend/client/fonts/FontAwesome.otf b/client/fonts/FontAwesome.otf similarity index 100% rename from frontend/client/fonts/FontAwesome.otf rename to client/fonts/FontAwesome.otf diff --git a/frontend/client/fonts/fontawesome-webfont.eot b/client/fonts/fontawesome-webfont.eot similarity index 100% rename from frontend/client/fonts/fontawesome-webfont.eot rename to client/fonts/fontawesome-webfont.eot diff --git a/frontend/client/fonts/fontawesome-webfont.svg b/client/fonts/fontawesome-webfont.svg similarity index 100% rename from frontend/client/fonts/fontawesome-webfont.svg rename to client/fonts/fontawesome-webfont.svg diff --git a/frontend/client/fonts/fontawesome-webfont.ttf b/client/fonts/fontawesome-webfont.ttf similarity index 100% rename from frontend/client/fonts/fontawesome-webfont.ttf rename to client/fonts/fontawesome-webfont.ttf diff --git a/frontend/client/fonts/fontawesome-webfont.woff b/client/fonts/fontawesome-webfont.woff similarity index 100% rename from frontend/client/fonts/fontawesome-webfont.woff rename to client/fonts/fontawesome-webfont.woff diff --git a/frontend/client/fonts/glyphicons-halflings-regular.eot b/client/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from frontend/client/fonts/glyphicons-halflings-regular.eot rename to client/fonts/glyphicons-halflings-regular.eot diff --git a/frontend/client/fonts/glyphicons-halflings-regular.svg b/client/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from frontend/client/fonts/glyphicons-halflings-regular.svg rename to client/fonts/glyphicons-halflings-regular.svg diff --git a/frontend/client/fonts/glyphicons-halflings-regular.ttf b/client/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from frontend/client/fonts/glyphicons-halflings-regular.ttf rename to client/fonts/glyphicons-halflings-regular.ttf diff --git a/frontend/client/fonts/glyphicons-halflings-regular.woff b/client/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from frontend/client/fonts/glyphicons-halflings-regular.woff rename to client/fonts/glyphicons-halflings-regular.woff diff --git a/frontend/client/fonts/glyphicons-halflings-regular.woff2 b/client/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from frontend/client/fonts/glyphicons-halflings-regular.woff2 rename to client/fonts/glyphicons-halflings-regular.woff2 diff --git a/frontend/client/fonts/open-sans-regular.eot b/client/fonts/open-sans-regular.eot similarity index 100% rename from frontend/client/fonts/open-sans-regular.eot rename to client/fonts/open-sans-regular.eot diff --git a/frontend/client/fonts/open-sans-regular.svg b/client/fonts/open-sans-regular.svg similarity index 100% rename from frontend/client/fonts/open-sans-regular.svg rename to client/fonts/open-sans-regular.svg diff --git a/frontend/client/fonts/open-sans-regular.ttf b/client/fonts/open-sans-regular.ttf similarity index 100% rename from frontend/client/fonts/open-sans-regular.ttf rename to client/fonts/open-sans-regular.ttf diff --git a/frontend/client/fonts/open-sans-regular.woff b/client/fonts/open-sans-regular.woff similarity index 100% rename from frontend/client/fonts/open-sans-regular.woff rename to client/fonts/open-sans-regular.woff diff --git a/frontend/client/img/favicon.ico b/client/img/favicon.ico similarity index 100% rename from frontend/client/img/favicon.ico rename to client/img/favicon.ico diff --git a/frontend/client/img/logo.png b/client/img/logo.png similarity index 100% rename from frontend/client/img/logo.png rename to client/img/logo.png diff --git a/frontend/client/img/select2.png b/client/img/select2.png similarity index 100% rename from frontend/client/img/select2.png rename to client/img/select2.png diff --git a/frontend/client/lib/backbone-min.js b/client/lib/backbone-min.js similarity index 100% rename from frontend/client/lib/backbone-min.js rename to client/lib/backbone-min.js diff --git a/frontend/client/lib/base64.js b/client/lib/base64.js similarity index 100% rename from frontend/client/lib/base64.js rename to client/lib/base64.js diff --git a/frontend/client/lib/bootstrap-datepicker.js b/client/lib/bootstrap-datepicker.js similarity index 100% rename from frontend/client/lib/bootstrap-datepicker.js rename to client/lib/bootstrap-datepicker.js diff --git a/frontend/client/lib/bootstrap.min.js b/client/lib/bootstrap.min.js similarity index 100% rename from frontend/client/lib/bootstrap.min.js rename to client/lib/bootstrap.min.js diff --git a/frontend/client/lib/bull.min.js b/client/lib/bull.min.js similarity index 100% rename from frontend/client/lib/bull.min.js rename to client/lib/bull.min.js diff --git a/frontend/client/lib/cropper.min.js b/client/lib/cropper.min.js similarity index 100% rename from frontend/client/lib/cropper.min.js rename to client/lib/cropper.min.js diff --git a/frontend/client/lib/es6-promise.min.js b/client/lib/es6-promise.min.js similarity index 100% rename from frontend/client/lib/es6-promise.min.js rename to client/lib/es6-promise.min.js diff --git a/frontend/client/lib/flotr2.min.js b/client/lib/flotr2.min.js similarity index 100% rename from frontend/client/lib/flotr2.min.js rename to client/lib/flotr2.min.js diff --git a/frontend/client/lib/gridstack.min.js b/client/lib/gridstack.min.js similarity index 100% rename from frontend/client/lib/gridstack.min.js rename to client/lib/gridstack.min.js diff --git a/frontend/client/lib/handlebars.js b/client/lib/handlebars.js similarity index 100% rename from frontend/client/lib/handlebars.js rename to client/lib/handlebars.js diff --git a/frontend/client/lib/jquery-2.1.4.min.js b/client/lib/jquery-2.1.4.min.js similarity index 100% rename from frontend/client/lib/jquery-2.1.4.min.js rename to client/lib/jquery-2.1.4.min.js diff --git a/frontend/client/lib/jquery-ui.min.js b/client/lib/jquery-ui.min.js similarity index 100% rename from frontend/client/lib/jquery-ui.min.js rename to client/lib/jquery-ui.min.js diff --git a/frontend/client/lib/jquery.autocomplete.js b/client/lib/jquery.autocomplete.js similarity index 100% rename from frontend/client/lib/jquery.autocomplete.js rename to client/lib/jquery.autocomplete.js diff --git a/frontend/client/lib/jquery.textcomplete.js b/client/lib/jquery.textcomplete.js similarity index 100% rename from frontend/client/lib/jquery.textcomplete.js rename to client/lib/jquery.textcomplete.js diff --git a/frontend/client/lib/jquery.timepicker.min.js b/client/lib/jquery.timepicker.min.js similarity index 100% rename from frontend/client/lib/jquery.timepicker.min.js rename to client/lib/jquery.timepicker.min.js diff --git a/frontend/client/lib/moment-timezone-with-data.min.js b/client/lib/moment-timezone-with-data.min.js similarity index 100% rename from frontend/client/lib/moment-timezone-with-data.min.js rename to client/lib/moment-timezone-with-data.min.js diff --git a/frontend/client/lib/moment.min.js b/client/lib/moment.min.js similarity index 100% rename from frontend/client/lib/moment.min.js rename to client/lib/moment.min.js diff --git a/frontend/client/lib/select2.min.js b/client/lib/select2.min.js similarity index 100% rename from frontend/client/lib/select2.min.js rename to client/lib/select2.min.js diff --git a/frontend/client/lib/selectize.min.js b/client/lib/selectize.min.js similarity index 100% rename from frontend/client/lib/selectize.min.js rename to client/lib/selectize.min.js diff --git a/frontend/client/lib/summernote.min.js b/client/lib/summernote.min.js similarity index 100% rename from frontend/client/lib/summernote.min.js rename to client/lib/summernote.min.js diff --git a/frontend/client/lib/underscore-min.js b/client/lib/underscore-min.js similarity index 100% rename from frontend/client/lib/underscore-min.js rename to client/lib/underscore-min.js diff --git a/frontend/client/modules/crm/css/calendar.css b/client/modules/crm/css/calendar.css similarity index 100% rename from frontend/client/modules/crm/css/calendar.css rename to client/modules/crm/css/calendar.css diff --git a/frontend/client/modules/crm/css/fullcalendar.css b/client/modules/crm/css/fullcalendar.css similarity index 100% rename from frontend/client/modules/crm/css/fullcalendar.css rename to client/modules/crm/css/fullcalendar.css diff --git a/frontend/client/modules/crm/css/fullcalendar.print.css b/client/modules/crm/css/fullcalendar.print.css similarity index 100% rename from frontend/client/modules/crm/css/fullcalendar.print.css rename to client/modules/crm/css/fullcalendar.print.css diff --git a/frontend/client/modules/crm/lib/fullcalendar.min.js b/client/modules/crm/lib/fullcalendar.min.js similarity index 100% rename from frontend/client/modules/crm/lib/fullcalendar.min.js rename to client/modules/crm/lib/fullcalendar.min.js diff --git a/frontend/client/modules/crm/res/templates/calendar/calendar-page.tpl b/client/modules/crm/res/templates/calendar/calendar-page.tpl similarity index 100% rename from frontend/client/modules/crm/res/templates/calendar/calendar-page.tpl rename to client/modules/crm/res/templates/calendar/calendar-page.tpl diff --git a/frontend/client/modules/crm/res/templates/calendar/calendar.tpl b/client/modules/crm/res/templates/calendar/calendar.tpl similarity index 100% rename from frontend/client/modules/crm/res/templates/calendar/calendar.tpl rename to client/modules/crm/res/templates/calendar/calendar.tpl diff --git a/frontend/client/modules/crm/res/templates/calendar/modals/edit.tpl b/client/modules/crm/res/templates/calendar/modals/edit.tpl similarity index 100% rename from frontend/client/modules/crm/res/templates/calendar/modals/edit.tpl rename to client/modules/crm/res/templates/calendar/modals/edit.tpl diff --git a/frontend/client/modules/crm/res/templates/campaign-log-record/fields/data/detail.tpl b/client/modules/crm/res/templates/campaign-log-record/fields/data/detail.tpl similarity index 100% rename from frontend/client/modules/crm/res/templates/campaign-log-record/fields/data/detail.tpl rename to client/modules/crm/res/templates/campaign-log-record/fields/data/detail.tpl diff --git a/frontend/client/modules/crm/res/templates/campaign/record/panels/statistics.tpl b/client/modules/crm/res/templates/campaign/record/panels/statistics.tpl similarity index 100% rename from frontend/client/modules/crm/res/templates/campaign/record/panels/statistics.tpl rename to client/modules/crm/res/templates/campaign/record/panels/statistics.tpl diff --git a/frontend/client/modules/crm/res/templates/document/list.tpl b/client/modules/crm/res/templates/document/list.tpl similarity index 100% rename from frontend/client/modules/crm/res/templates/document/list.tpl rename to client/modules/crm/res/templates/document/list.tpl diff --git a/frontend/client/modules/crm/res/templates/document/modals/select-records.tpl b/client/modules/crm/res/templates/document/modals/select-records.tpl similarity index 100% rename from frontend/client/modules/crm/res/templates/document/modals/select-records.tpl rename to client/modules/crm/res/templates/document/modals/select-records.tpl diff --git a/frontend/client/modules/crm/res/templates/knowledge-base-article/list.tpl b/client/modules/crm/res/templates/knowledge-base-article/list.tpl similarity index 100% rename from frontend/client/modules/crm/res/templates/knowledge-base-article/list.tpl rename to client/modules/crm/res/templates/knowledge-base-article/list.tpl diff --git a/frontend/client/modules/crm/res/templates/knowledge-base-article/modals/select-records.tpl b/client/modules/crm/res/templates/knowledge-base-article/modals/select-records.tpl similarity index 100% rename from frontend/client/modules/crm/res/templates/knowledge-base-article/modals/select-records.tpl rename to client/modules/crm/res/templates/knowledge-base-article/modals/select-records.tpl diff --git a/frontend/client/modules/crm/res/templates/lead/convert.tpl b/client/modules/crm/res/templates/lead/convert.tpl similarity index 100% rename from frontend/client/modules/crm/res/templates/lead/convert.tpl rename to client/modules/crm/res/templates/lead/convert.tpl diff --git a/frontend/client/modules/crm/res/templates/mass-email/modals/send-test.tpl b/client/modules/crm/res/templates/mass-email/modals/send-test.tpl similarity index 100% rename from frontend/client/modules/crm/res/templates/mass-email/modals/send-test.tpl rename to client/modules/crm/res/templates/mass-email/modals/send-test.tpl diff --git a/frontend/client/modules/crm/res/templates/meeting/fields/reminders/detail.tpl b/client/modules/crm/res/templates/meeting/fields/reminders/detail.tpl similarity index 100% rename from frontend/client/modules/crm/res/templates/meeting/fields/reminders/detail.tpl rename to client/modules/crm/res/templates/meeting/fields/reminders/detail.tpl diff --git a/frontend/client/modules/crm/res/templates/meeting/fields/reminders/edit.tpl b/client/modules/crm/res/templates/meeting/fields/reminders/edit.tpl similarity index 100% rename from frontend/client/modules/crm/res/templates/meeting/fields/reminders/edit.tpl rename to client/modules/crm/res/templates/meeting/fields/reminders/edit.tpl diff --git a/frontend/client/modules/crm/res/templates/meeting/popup-notification.tpl b/client/modules/crm/res/templates/meeting/popup-notification.tpl similarity index 100% rename from frontend/client/modules/crm/res/templates/meeting/popup-notification.tpl rename to client/modules/crm/res/templates/meeting/popup-notification.tpl diff --git a/frontend/client/modules/crm/res/templates/record/panels/activities.tpl b/client/modules/crm/res/templates/record/panels/activities.tpl similarity index 100% rename from frontend/client/modules/crm/res/templates/record/panels/activities.tpl rename to client/modules/crm/res/templates/record/panels/activities.tpl diff --git a/frontend/client/modules/crm/res/templates/record/panels/tasks.tpl b/client/modules/crm/res/templates/record/panels/tasks.tpl similarity index 100% rename from frontend/client/modules/crm/res/templates/record/panels/tasks.tpl rename to client/modules/crm/res/templates/record/panels/tasks.tpl diff --git a/frontend/client/modules/crm/res/templates/target-list/record/panels/opted-out.tpl b/client/modules/crm/res/templates/target-list/record/panels/opted-out.tpl similarity index 100% rename from frontend/client/modules/crm/res/templates/target-list/record/panels/opted-out.tpl rename to client/modules/crm/res/templates/target-list/record/panels/opted-out.tpl diff --git a/frontend/client/modules/crm/res/templates/task/fields/date-end/detail.tpl b/client/modules/crm/res/templates/task/fields/date-end/detail.tpl similarity index 100% rename from frontend/client/modules/crm/res/templates/task/fields/date-end/detail.tpl rename to client/modules/crm/res/templates/task/fields/date-end/detail.tpl diff --git a/frontend/client/modules/crm/src/acl-portal/account.js b/client/modules/crm/src/acl-portal/account.js similarity index 100% rename from frontend/client/modules/crm/src/acl-portal/account.js rename to client/modules/crm/src/acl-portal/account.js diff --git a/frontend/client/modules/crm/src/acl-portal/contact.js b/client/modules/crm/src/acl-portal/contact.js similarity index 100% rename from frontend/client/modules/crm/src/acl-portal/contact.js rename to client/modules/crm/src/acl-portal/contact.js diff --git a/frontend/client/modules/crm/src/acl/campaign-tracking-url.js b/client/modules/crm/src/acl/campaign-tracking-url.js similarity index 100% rename from frontend/client/modules/crm/src/acl/campaign-tracking-url.js rename to client/modules/crm/src/acl/campaign-tracking-url.js diff --git a/frontend/client/modules/crm/src/acl/mass-email.js b/client/modules/crm/src/acl/mass-email.js similarity index 100% rename from frontend/client/modules/crm/src/acl/mass-email.js rename to client/modules/crm/src/acl/mass-email.js diff --git a/frontend/client/modules/crm/src/controllers/calendar.js b/client/modules/crm/src/controllers/calendar.js similarity index 100% rename from frontend/client/modules/crm/src/controllers/calendar.js rename to client/modules/crm/src/controllers/calendar.js diff --git a/frontend/client/modules/crm/src/controllers/lead.js b/client/modules/crm/src/controllers/lead.js similarity index 100% rename from frontend/client/modules/crm/src/controllers/lead.js rename to client/modules/crm/src/controllers/lead.js diff --git a/frontend/client/modules/crm/src/views/account/detail.js b/client/modules/crm/src/views/account/detail.js similarity index 100% rename from frontend/client/modules/crm/src/views/account/detail.js rename to client/modules/crm/src/views/account/detail.js diff --git a/frontend/client/modules/crm/src/views/account/fields/shipping-address.js b/client/modules/crm/src/views/account/fields/shipping-address.js similarity index 100% rename from frontend/client/modules/crm/src/views/account/fields/shipping-address.js rename to client/modules/crm/src/views/account/fields/shipping-address.js diff --git a/frontend/client/modules/crm/src/views/calendar/calendar-page.js b/client/modules/crm/src/views/calendar/calendar-page.js similarity index 100% rename from frontend/client/modules/crm/src/views/calendar/calendar-page.js rename to client/modules/crm/src/views/calendar/calendar-page.js diff --git a/frontend/client/modules/crm/src/views/calendar/calendar.js b/client/modules/crm/src/views/calendar/calendar.js similarity index 100% rename from frontend/client/modules/crm/src/views/calendar/calendar.js rename to client/modules/crm/src/views/calendar/calendar.js diff --git a/frontend/client/modules/crm/src/views/calendar/modals/edit.js b/client/modules/crm/src/views/calendar/modals/edit.js similarity index 100% rename from frontend/client/modules/crm/src/views/calendar/modals/edit.js rename to client/modules/crm/src/views/calendar/modals/edit.js diff --git a/frontend/client/modules/crm/src/views/call/detail.js b/client/modules/crm/src/views/call/detail.js similarity index 100% rename from frontend/client/modules/crm/src/views/call/detail.js rename to client/modules/crm/src/views/call/detail.js diff --git a/frontend/client/modules/crm/src/views/call/record/detail.js b/client/modules/crm/src/views/call/record/detail.js similarity index 100% rename from frontend/client/modules/crm/src/views/call/record/detail.js rename to client/modules/crm/src/views/call/record/detail.js diff --git a/frontend/client/modules/crm/src/views/call/record/list-expanded.js b/client/modules/crm/src/views/call/record/list-expanded.js similarity index 100% rename from frontend/client/modules/crm/src/views/call/record/list-expanded.js rename to client/modules/crm/src/views/call/record/list-expanded.js diff --git a/frontend/client/modules/crm/src/views/call/record/list.js b/client/modules/crm/src/views/call/record/list.js similarity index 100% rename from frontend/client/modules/crm/src/views/call/record/list.js rename to client/modules/crm/src/views/call/record/list.js diff --git a/frontend/client/modules/crm/src/views/call/record/row-actions/dashlet.js b/client/modules/crm/src/views/call/record/row-actions/dashlet.js similarity index 100% rename from frontend/client/modules/crm/src/views/call/record/row-actions/dashlet.js rename to client/modules/crm/src/views/call/record/row-actions/dashlet.js diff --git a/frontend/client/modules/crm/src/views/call/record/row-actions/default.js b/client/modules/crm/src/views/call/record/row-actions/default.js similarity index 100% rename from frontend/client/modules/crm/src/views/call/record/row-actions/default.js rename to client/modules/crm/src/views/call/record/row-actions/default.js diff --git a/frontend/client/modules/crm/src/views/campaign-log-record/fields/data.js b/client/modules/crm/src/views/campaign-log-record/fields/data.js similarity index 100% rename from frontend/client/modules/crm/src/views/campaign-log-record/fields/data.js rename to client/modules/crm/src/views/campaign-log-record/fields/data.js diff --git a/frontend/client/modules/crm/src/views/campaign/detail.js b/client/modules/crm/src/views/campaign/detail.js similarity index 100% rename from frontend/client/modules/crm/src/views/campaign/detail.js rename to client/modules/crm/src/views/campaign/detail.js diff --git a/frontend/client/modules/crm/src/views/campaign/fields/int-with-percentage.js b/client/modules/crm/src/views/campaign/fields/int-with-percentage.js similarity index 100% rename from frontend/client/modules/crm/src/views/campaign/fields/int-with-percentage.js rename to client/modules/crm/src/views/campaign/fields/int-with-percentage.js diff --git a/frontend/client/modules/crm/src/views/campaign/record/detail-bottom.js b/client/modules/crm/src/views/campaign/record/detail-bottom.js similarity index 100% rename from frontend/client/modules/crm/src/views/campaign/record/detail-bottom.js rename to client/modules/crm/src/views/campaign/record/detail-bottom.js diff --git a/frontend/client/modules/crm/src/views/campaign/record/detail.js b/client/modules/crm/src/views/campaign/record/detail.js similarity index 100% rename from frontend/client/modules/crm/src/views/campaign/record/detail.js rename to client/modules/crm/src/views/campaign/record/detail.js diff --git a/frontend/client/modules/crm/src/views/campaign/record/panels/campaign-log-records.js b/client/modules/crm/src/views/campaign/record/panels/campaign-log-records.js similarity index 100% rename from frontend/client/modules/crm/src/views/campaign/record/panels/campaign-log-records.js rename to client/modules/crm/src/views/campaign/record/panels/campaign-log-records.js diff --git a/frontend/client/modules/crm/src/views/campaign/record/panels/statistics.js b/client/modules/crm/src/views/campaign/record/panels/statistics.js similarity index 100% rename from frontend/client/modules/crm/src/views/campaign/record/panels/statistics.js rename to client/modules/crm/src/views/campaign/record/panels/statistics.js diff --git a/frontend/client/modules/crm/src/views/case/fields/contact.js b/client/modules/crm/src/views/case/fields/contact.js similarity index 100% rename from frontend/client/modules/crm/src/views/case/fields/contact.js rename to client/modules/crm/src/views/case/fields/contact.js diff --git a/frontend/client/modules/crm/src/views/case/fields/contacts.js b/client/modules/crm/src/views/case/fields/contacts.js similarity index 100% rename from frontend/client/modules/crm/src/views/case/fields/contacts.js rename to client/modules/crm/src/views/case/fields/contacts.js diff --git a/frontend/client/modules/crm/src/views/case/record/detail.js b/client/modules/crm/src/views/case/record/detail.js similarity index 100% rename from frontend/client/modules/crm/src/views/case/record/detail.js rename to client/modules/crm/src/views/case/record/detail.js diff --git a/frontend/client/modules/crm/src/views/case/record/panels/activities.js b/client/modules/crm/src/views/case/record/panels/activities.js similarity index 100% rename from frontend/client/modules/crm/src/views/case/record/panels/activities.js rename to client/modules/crm/src/views/case/record/panels/activities.js diff --git a/frontend/client/modules/crm/src/views/contact/detail.js b/client/modules/crm/src/views/contact/detail.js similarity index 100% rename from frontend/client/modules/crm/src/views/contact/detail.js rename to client/modules/crm/src/views/contact/detail.js diff --git a/frontend/client/modules/crm/src/views/contact/fields/accounts.js b/client/modules/crm/src/views/contact/fields/accounts.js similarity index 100% rename from frontend/client/modules/crm/src/views/contact/fields/accounts.js rename to client/modules/crm/src/views/contact/fields/accounts.js diff --git a/frontend/client/modules/crm/src/views/dashlets/abstract/chart.js b/client/modules/crm/src/views/dashlets/abstract/chart.js similarity index 100% rename from frontend/client/modules/crm/src/views/dashlets/abstract/chart.js rename to client/modules/crm/src/views/dashlets/abstract/chart.js diff --git a/frontend/client/modules/crm/src/views/dashlets/activities.js b/client/modules/crm/src/views/dashlets/activities.js similarity index 100% rename from frontend/client/modules/crm/src/views/dashlets/activities.js rename to client/modules/crm/src/views/dashlets/activities.js diff --git a/frontend/client/modules/crm/src/views/dashlets/calendar.js b/client/modules/crm/src/views/dashlets/calendar.js similarity index 100% rename from frontend/client/modules/crm/src/views/dashlets/calendar.js rename to client/modules/crm/src/views/dashlets/calendar.js diff --git a/frontend/client/modules/crm/src/views/dashlets/calls.js b/client/modules/crm/src/views/dashlets/calls.js similarity index 100% rename from frontend/client/modules/crm/src/views/dashlets/calls.js rename to client/modules/crm/src/views/dashlets/calls.js diff --git a/frontend/client/modules/crm/src/views/dashlets/meetings.js b/client/modules/crm/src/views/dashlets/meetings.js similarity index 100% rename from frontend/client/modules/crm/src/views/dashlets/meetings.js rename to client/modules/crm/src/views/dashlets/meetings.js diff --git a/frontend/client/modules/crm/src/views/dashlets/opportunities-by-lead-source.js b/client/modules/crm/src/views/dashlets/opportunities-by-lead-source.js similarity index 100% rename from frontend/client/modules/crm/src/views/dashlets/opportunities-by-lead-source.js rename to client/modules/crm/src/views/dashlets/opportunities-by-lead-source.js diff --git a/frontend/client/modules/crm/src/views/dashlets/opportunities-by-stage.js b/client/modules/crm/src/views/dashlets/opportunities-by-stage.js similarity index 100% rename from frontend/client/modules/crm/src/views/dashlets/opportunities-by-stage.js rename to client/modules/crm/src/views/dashlets/opportunities-by-stage.js diff --git a/frontend/client/modules/crm/src/views/dashlets/sales-by-month.js b/client/modules/crm/src/views/dashlets/sales-by-month.js similarity index 100% rename from frontend/client/modules/crm/src/views/dashlets/sales-by-month.js rename to client/modules/crm/src/views/dashlets/sales-by-month.js diff --git a/frontend/client/modules/crm/src/views/dashlets/sales-pipeline.js b/client/modules/crm/src/views/dashlets/sales-pipeline.js similarity index 100% rename from frontend/client/modules/crm/src/views/dashlets/sales-pipeline.js rename to client/modules/crm/src/views/dashlets/sales-pipeline.js diff --git a/frontend/client/modules/crm/src/views/dashlets/tasks.js b/client/modules/crm/src/views/dashlets/tasks.js similarity index 100% rename from frontend/client/modules/crm/src/views/dashlets/tasks.js rename to client/modules/crm/src/views/dashlets/tasks.js diff --git a/frontend/client/modules/crm/src/views/document/fields/file.js b/client/modules/crm/src/views/document/fields/file.js similarity index 88% rename from frontend/client/modules/crm/src/views/document/fields/file.js rename to client/modules/crm/src/views/document/fields/file.js index b6b4fe5f3d..5045e00866 100644 --- a/frontend/client/modules/crm/src/views/document/fields/file.js +++ b/client/modules/crm/src/views/document/fields/file.js @@ -26,7 +26,7 @@ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. ************************************************************************/ -Espo.define('Crm:Views.Document.Fields.File', 'Views.Fields.File', function (Dep) { +Espo.define('crm:views/document/fields/file', 'views/fields/file', function (Dep) { return Dep.extend({ @@ -40,7 +40,7 @@ Espo.define('Crm:Views.Document.Fields.File', 'Views.Fields.File', function (Dep return false; } - return ''; + return ''; } else { return Dep.prototype.getValueForDisplay.call(this); } diff --git a/frontend/client/modules/crm/src/views/document/fields/name.js b/client/modules/crm/src/views/document/fields/name.js similarity index 100% rename from frontend/client/modules/crm/src/views/document/fields/name.js rename to client/modules/crm/src/views/document/fields/name.js diff --git a/frontend/client/modules/crm/src/views/document/list.js b/client/modules/crm/src/views/document/list.js similarity index 100% rename from frontend/client/modules/crm/src/views/document/list.js rename to client/modules/crm/src/views/document/list.js diff --git a/frontend/client/modules/crm/src/views/document/modals/select-records.js b/client/modules/crm/src/views/document/modals/select-records.js similarity index 100% rename from frontend/client/modules/crm/src/views/document/modals/select-records.js rename to client/modules/crm/src/views/document/modals/select-records.js diff --git a/frontend/client/modules/crm/src/views/email-queue-item/list.js b/client/modules/crm/src/views/email-queue-item/list.js similarity index 100% rename from frontend/client/modules/crm/src/views/email-queue-item/list.js rename to client/modules/crm/src/views/email-queue-item/list.js diff --git a/frontend/client/modules/crm/src/views/email-queue-item/record/list.js b/client/modules/crm/src/views/email-queue-item/record/list.js similarity index 100% rename from frontend/client/modules/crm/src/views/email-queue-item/record/list.js rename to client/modules/crm/src/views/email-queue-item/record/list.js diff --git a/frontend/client/modules/crm/src/views/fields/ico.js b/client/modules/crm/src/views/fields/ico.js similarity index 100% rename from frontend/client/modules/crm/src/views/fields/ico.js rename to client/modules/crm/src/views/fields/ico.js diff --git a/frontend/client/modules/crm/src/views/knowledge-base-article/fields/language.js b/client/modules/crm/src/views/knowledge-base-article/fields/language.js similarity index 100% rename from frontend/client/modules/crm/src/views/knowledge-base-article/fields/language.js rename to client/modules/crm/src/views/knowledge-base-article/fields/language.js diff --git a/frontend/client/modules/crm/src/views/knowledge-base-article/fields/status.js b/client/modules/crm/src/views/knowledge-base-article/fields/status.js similarity index 100% rename from frontend/client/modules/crm/src/views/knowledge-base-article/fields/status.js rename to client/modules/crm/src/views/knowledge-base-article/fields/status.js diff --git a/frontend/client/modules/crm/src/views/knowledge-base-article/list.js b/client/modules/crm/src/views/knowledge-base-article/list.js similarity index 100% rename from frontend/client/modules/crm/src/views/knowledge-base-article/list.js rename to client/modules/crm/src/views/knowledge-base-article/list.js diff --git a/frontend/client/modules/crm/src/views/knowledge-base-article/modals/select-records.js b/client/modules/crm/src/views/knowledge-base-article/modals/select-records.js similarity index 100% rename from frontend/client/modules/crm/src/views/knowledge-base-article/modals/select-records.js rename to client/modules/crm/src/views/knowledge-base-article/modals/select-records.js diff --git a/frontend/client/modules/crm/src/views/knowledge-base-article/record/detail-quick.js b/client/modules/crm/src/views/knowledge-base-article/record/detail-quick.js similarity index 100% rename from frontend/client/modules/crm/src/views/knowledge-base-article/record/detail-quick.js rename to client/modules/crm/src/views/knowledge-base-article/record/detail-quick.js diff --git a/frontend/client/modules/crm/src/views/knowledge-base-article/record/edit-quick.js b/client/modules/crm/src/views/knowledge-base-article/record/edit-quick.js similarity index 100% rename from frontend/client/modules/crm/src/views/knowledge-base-article/record/edit-quick.js rename to client/modules/crm/src/views/knowledge-base-article/record/edit-quick.js diff --git a/frontend/client/modules/crm/src/views/lead/convert.js b/client/modules/crm/src/views/lead/convert.js similarity index 100% rename from frontend/client/modules/crm/src/views/lead/convert.js rename to client/modules/crm/src/views/lead/convert.js diff --git a/frontend/client/modules/crm/src/views/lead/detail.js b/client/modules/crm/src/views/lead/detail.js similarity index 100% rename from frontend/client/modules/crm/src/views/lead/detail.js rename to client/modules/crm/src/views/lead/detail.js diff --git a/frontend/client/modules/crm/src/views/lead/record/detail-side.js b/client/modules/crm/src/views/lead/record/detail-side.js similarity index 100% rename from frontend/client/modules/crm/src/views/lead/record/detail-side.js rename to client/modules/crm/src/views/lead/record/detail-side.js diff --git a/frontend/client/modules/crm/src/views/lead/record/detail.js b/client/modules/crm/src/views/lead/record/detail.js similarity index 100% rename from frontend/client/modules/crm/src/views/lead/record/detail.js rename to client/modules/crm/src/views/lead/record/detail.js diff --git a/frontend/client/modules/crm/src/views/lead/record/panels/converted-to.js b/client/modules/crm/src/views/lead/record/panels/converted-to.js similarity index 100% rename from frontend/client/modules/crm/src/views/lead/record/panels/converted-to.js rename to client/modules/crm/src/views/lead/record/panels/converted-to.js diff --git a/frontend/client/modules/crm/src/views/mass-email/detail.js b/client/modules/crm/src/views/mass-email/detail.js similarity index 100% rename from frontend/client/modules/crm/src/views/mass-email/detail.js rename to client/modules/crm/src/views/mass-email/detail.js diff --git a/frontend/client/modules/crm/src/views/mass-email/fields/email-template.js b/client/modules/crm/src/views/mass-email/fields/email-template.js similarity index 100% rename from frontend/client/modules/crm/src/views/mass-email/fields/email-template.js rename to client/modules/crm/src/views/mass-email/fields/email-template.js diff --git a/frontend/client/modules/crm/src/views/mass-email/fields/from-address.js b/client/modules/crm/src/views/mass-email/fields/from-address.js similarity index 100% rename from frontend/client/modules/crm/src/views/mass-email/fields/from-address.js rename to client/modules/crm/src/views/mass-email/fields/from-address.js diff --git a/frontend/client/modules/crm/src/views/mass-email/modals/send-test.js b/client/modules/crm/src/views/mass-email/modals/send-test.js similarity index 100% rename from frontend/client/modules/crm/src/views/mass-email/modals/send-test.js rename to client/modules/crm/src/views/mass-email/modals/send-test.js diff --git a/frontend/client/modules/crm/src/views/mass-email/record/detail-bottom.js b/client/modules/crm/src/views/mass-email/record/detail-bottom.js similarity index 100% rename from frontend/client/modules/crm/src/views/mass-email/record/detail-bottom.js rename to client/modules/crm/src/views/mass-email/record/detail-bottom.js diff --git a/frontend/client/modules/crm/src/views/mass-email/record/detail.js b/client/modules/crm/src/views/mass-email/record/detail.js similarity index 100% rename from frontend/client/modules/crm/src/views/mass-email/record/detail.js rename to client/modules/crm/src/views/mass-email/record/detail.js diff --git a/frontend/client/modules/crm/src/views/mass-email/record/list-for-campaign.js b/client/modules/crm/src/views/mass-email/record/list-for-campaign.js similarity index 100% rename from frontend/client/modules/crm/src/views/mass-email/record/list-for-campaign.js rename to client/modules/crm/src/views/mass-email/record/list-for-campaign.js diff --git a/frontend/client/modules/crm/src/views/mass-email/record/row-actions/for-campaign.js b/client/modules/crm/src/views/mass-email/record/row-actions/for-campaign.js similarity index 100% rename from frontend/client/modules/crm/src/views/mass-email/record/row-actions/for-campaign.js rename to client/modules/crm/src/views/mass-email/record/row-actions/for-campaign.js diff --git a/frontend/client/modules/crm/src/views/meeting/detail.js b/client/modules/crm/src/views/meeting/detail.js similarity index 100% rename from frontend/client/modules/crm/src/views/meeting/detail.js rename to client/modules/crm/src/views/meeting/detail.js diff --git a/frontend/client/modules/crm/src/views/meeting/fields/attendees.js b/client/modules/crm/src/views/meeting/fields/attendees.js similarity index 100% rename from frontend/client/modules/crm/src/views/meeting/fields/attendees.js rename to client/modules/crm/src/views/meeting/fields/attendees.js diff --git a/frontend/client/modules/crm/src/views/meeting/fields/contacts.js b/client/modules/crm/src/views/meeting/fields/contacts.js similarity index 100% rename from frontend/client/modules/crm/src/views/meeting/fields/contacts.js rename to client/modules/crm/src/views/meeting/fields/contacts.js diff --git a/frontend/client/modules/crm/src/views/meeting/fields/reminders.js b/client/modules/crm/src/views/meeting/fields/reminders.js similarity index 100% rename from frontend/client/modules/crm/src/views/meeting/fields/reminders.js rename to client/modules/crm/src/views/meeting/fields/reminders.js diff --git a/frontend/client/modules/crm/src/views/meeting/fields/users.js b/client/modules/crm/src/views/meeting/fields/users.js similarity index 100% rename from frontend/client/modules/crm/src/views/meeting/fields/users.js rename to client/modules/crm/src/views/meeting/fields/users.js diff --git a/frontend/client/modules/crm/src/views/meeting/popup-notification.js b/client/modules/crm/src/views/meeting/popup-notification.js similarity index 100% rename from frontend/client/modules/crm/src/views/meeting/popup-notification.js rename to client/modules/crm/src/views/meeting/popup-notification.js diff --git a/frontend/client/modules/crm/src/views/meeting/record/detail.js b/client/modules/crm/src/views/meeting/record/detail.js similarity index 100% rename from frontend/client/modules/crm/src/views/meeting/record/detail.js rename to client/modules/crm/src/views/meeting/record/detail.js diff --git a/frontend/client/modules/crm/src/views/meeting/record/list-expanded.js b/client/modules/crm/src/views/meeting/record/list-expanded.js similarity index 100% rename from frontend/client/modules/crm/src/views/meeting/record/list-expanded.js rename to client/modules/crm/src/views/meeting/record/list-expanded.js diff --git a/frontend/client/modules/crm/src/views/meeting/record/list.js b/client/modules/crm/src/views/meeting/record/list.js similarity index 100% rename from frontend/client/modules/crm/src/views/meeting/record/list.js rename to client/modules/crm/src/views/meeting/record/list.js diff --git a/frontend/client/modules/crm/src/views/meeting/record/panels/attendees.js b/client/modules/crm/src/views/meeting/record/panels/attendees.js similarity index 100% rename from frontend/client/modules/crm/src/views/meeting/record/panels/attendees.js rename to client/modules/crm/src/views/meeting/record/panels/attendees.js diff --git a/frontend/client/modules/crm/src/views/meeting/record/row-actions/dashlet.js b/client/modules/crm/src/views/meeting/record/row-actions/dashlet.js similarity index 100% rename from frontend/client/modules/crm/src/views/meeting/record/row-actions/dashlet.js rename to client/modules/crm/src/views/meeting/record/row-actions/dashlet.js diff --git a/frontend/client/modules/crm/src/views/meeting/record/row-actions/default.js b/client/modules/crm/src/views/meeting/record/row-actions/default.js similarity index 100% rename from frontend/client/modules/crm/src/views/meeting/record/row-actions/default.js rename to client/modules/crm/src/views/meeting/record/row-actions/default.js diff --git a/frontend/client/modules/crm/src/views/opportunity/detail.js b/client/modules/crm/src/views/opportunity/detail.js similarity index 100% rename from frontend/client/modules/crm/src/views/opportunity/detail.js rename to client/modules/crm/src/views/opportunity/detail.js diff --git a/frontend/client/modules/crm/src/views/opportunity/fields/contacts.js b/client/modules/crm/src/views/opportunity/fields/contacts.js similarity index 100% rename from frontend/client/modules/crm/src/views/opportunity/fields/contacts.js rename to client/modules/crm/src/views/opportunity/fields/contacts.js diff --git a/frontend/client/modules/crm/src/views/opportunity/fields/lead-source.js b/client/modules/crm/src/views/opportunity/fields/lead-source.js similarity index 100% rename from frontend/client/modules/crm/src/views/opportunity/fields/lead-source.js rename to client/modules/crm/src/views/opportunity/fields/lead-source.js diff --git a/frontend/client/modules/crm/src/views/opportunity/fields/stage.js b/client/modules/crm/src/views/opportunity/fields/stage.js similarity index 100% rename from frontend/client/modules/crm/src/views/opportunity/fields/stage.js rename to client/modules/crm/src/views/opportunity/fields/stage.js diff --git a/frontend/client/modules/crm/src/views/record/panels/activities.js b/client/modules/crm/src/views/record/panels/activities.js similarity index 100% rename from frontend/client/modules/crm/src/views/record/panels/activities.js rename to client/modules/crm/src/views/record/panels/activities.js diff --git a/frontend/client/modules/crm/src/views/record/panels/history.js b/client/modules/crm/src/views/record/panels/history.js similarity index 100% rename from frontend/client/modules/crm/src/views/record/panels/history.js rename to client/modules/crm/src/views/record/panels/history.js diff --git a/frontend/client/modules/crm/src/views/record/panels/tasks.js b/client/modules/crm/src/views/record/panels/tasks.js similarity index 100% rename from frontend/client/modules/crm/src/views/record/panels/tasks.js rename to client/modules/crm/src/views/record/panels/tasks.js diff --git a/frontend/client/modules/crm/src/views/record/row-actions/activities.js b/client/modules/crm/src/views/record/row-actions/activities.js similarity index 100% rename from frontend/client/modules/crm/src/views/record/row-actions/activities.js rename to client/modules/crm/src/views/record/row-actions/activities.js diff --git a/frontend/client/modules/crm/src/views/record/row-actions/history.js b/client/modules/crm/src/views/record/row-actions/history.js similarity index 100% rename from frontend/client/modules/crm/src/views/record/row-actions/history.js rename to client/modules/crm/src/views/record/row-actions/history.js diff --git a/frontend/client/modules/crm/src/views/record/row-actions/tasks.js b/client/modules/crm/src/views/record/row-actions/tasks.js similarity index 100% rename from frontend/client/modules/crm/src/views/record/row-actions/tasks.js rename to client/modules/crm/src/views/record/row-actions/tasks.js diff --git a/frontend/client/modules/crm/src/views/target-list/record/panels/opted-out.js b/client/modules/crm/src/views/target-list/record/panels/opted-out.js similarity index 100% rename from frontend/client/modules/crm/src/views/target-list/record/panels/opted-out.js rename to client/modules/crm/src/views/target-list/record/panels/opted-out.js diff --git a/frontend/client/modules/crm/src/views/target-list/record/panels/relationship.js b/client/modules/crm/src/views/target-list/record/panels/relationship.js similarity index 100% rename from frontend/client/modules/crm/src/views/target-list/record/panels/relationship.js rename to client/modules/crm/src/views/target-list/record/panels/relationship.js diff --git a/frontend/client/modules/crm/src/views/target-list/record/row-actions/default.js b/client/modules/crm/src/views/target-list/record/row-actions/default.js similarity index 100% rename from frontend/client/modules/crm/src/views/target-list/record/row-actions/default.js rename to client/modules/crm/src/views/target-list/record/row-actions/default.js diff --git a/frontend/client/modules/crm/src/views/target-list/record/row-actions/opted-out.js b/client/modules/crm/src/views/target-list/record/row-actions/opted-out.js similarity index 100% rename from frontend/client/modules/crm/src/views/target-list/record/row-actions/opted-out.js rename to client/modules/crm/src/views/target-list/record/row-actions/opted-out.js diff --git a/frontend/client/modules/crm/src/views/target/detail.js b/client/modules/crm/src/views/target/detail.js similarity index 100% rename from frontend/client/modules/crm/src/views/target/detail.js rename to client/modules/crm/src/views/target/detail.js diff --git a/frontend/client/modules/crm/src/views/task/detail.js b/client/modules/crm/src/views/task/detail.js similarity index 100% rename from frontend/client/modules/crm/src/views/task/detail.js rename to client/modules/crm/src/views/task/detail.js diff --git a/frontend/client/modules/crm/src/views/task/fields/date-end.js b/client/modules/crm/src/views/task/fields/date-end.js similarity index 100% rename from frontend/client/modules/crm/src/views/task/fields/date-end.js rename to client/modules/crm/src/views/task/fields/date-end.js diff --git a/frontend/client/modules/crm/src/views/task/fields/is-overdue.js b/client/modules/crm/src/views/task/fields/is-overdue.js similarity index 100% rename from frontend/client/modules/crm/src/views/task/fields/is-overdue.js rename to client/modules/crm/src/views/task/fields/is-overdue.js diff --git a/frontend/client/modules/crm/src/views/task/list.js b/client/modules/crm/src/views/task/list.js similarity index 100% rename from frontend/client/modules/crm/src/views/task/list.js rename to client/modules/crm/src/views/task/list.js diff --git a/frontend/client/modules/crm/src/views/task/record/detail.js b/client/modules/crm/src/views/task/record/detail.js similarity index 100% rename from frontend/client/modules/crm/src/views/task/record/detail.js rename to client/modules/crm/src/views/task/record/detail.js diff --git a/frontend/client/modules/crm/src/views/task/record/list-expanded.js b/client/modules/crm/src/views/task/record/list-expanded.js similarity index 100% rename from frontend/client/modules/crm/src/views/task/record/list-expanded.js rename to client/modules/crm/src/views/task/record/list-expanded.js diff --git a/frontend/client/modules/crm/src/views/task/record/list.js b/client/modules/crm/src/views/task/record/list.js similarity index 100% rename from frontend/client/modules/crm/src/views/task/record/list.js rename to client/modules/crm/src/views/task/record/list.js diff --git a/frontend/client/modules/crm/src/views/task/record/row-actions/dashlet.js b/client/modules/crm/src/views/task/record/row-actions/dashlet.js similarity index 100% rename from frontend/client/modules/crm/src/views/task/record/row-actions/dashlet.js rename to client/modules/crm/src/views/task/record/row-actions/dashlet.js diff --git a/frontend/client/modules/crm/src/views/task/record/row-actions/default.js b/client/modules/crm/src/views/task/record/row-actions/default.js similarity index 100% rename from frontend/client/modules/crm/src/views/task/record/row-actions/default.js rename to client/modules/crm/src/views/task/record/row-actions/default.js diff --git a/frontend/client/res/layout-types/columns-2.tpl b/client/res/layout-types/columns-2.tpl similarity index 100% rename from frontend/client/res/layout-types/columns-2.tpl rename to client/res/layout-types/columns-2.tpl diff --git a/frontend/client/res/layout-types/default.tpl b/client/res/layout-types/default.tpl similarity index 100% rename from frontend/client/res/layout-types/default.tpl rename to client/res/layout-types/default.tpl diff --git a/frontend/client/res/layout-types/list-row-expanded.tpl b/client/res/layout-types/list-row-expanded.tpl similarity index 100% rename from frontend/client/res/layout-types/list-row-expanded.tpl rename to client/res/layout-types/list-row-expanded.tpl diff --git a/frontend/client/res/layout-types/list-row.tpl b/client/res/layout-types/list-row.tpl similarity index 100% rename from frontend/client/res/layout-types/list-row.tpl rename to client/res/layout-types/list-row.tpl diff --git a/frontend/client/res/layout-types/record.tpl b/client/res/layout-types/record.tpl similarity index 100% rename from frontend/client/res/layout-types/record.tpl rename to client/res/layout-types/record.tpl diff --git a/frontend/client/res/templates/about.tpl b/client/res/templates/about.tpl similarity index 100% rename from frontend/client/res/templates/about.tpl rename to client/res/templates/about.tpl diff --git a/frontend/client/res/templates/admin/entity-manager/index.tpl b/client/res/templates/admin/entity-manager/index.tpl similarity index 100% rename from frontend/client/res/templates/admin/entity-manager/index.tpl rename to client/res/templates/admin/entity-manager/index.tpl diff --git a/frontend/client/res/templates/admin/entity-manager/modals/edit-entity.tpl b/client/res/templates/admin/entity-manager/modals/edit-entity.tpl similarity index 100% rename from frontend/client/res/templates/admin/entity-manager/modals/edit-entity.tpl rename to client/res/templates/admin/entity-manager/modals/edit-entity.tpl diff --git a/frontend/client/res/templates/admin/extensions/done.tpl b/client/res/templates/admin/extensions/done.tpl similarity index 100% rename from frontend/client/res/templates/admin/extensions/done.tpl rename to client/res/templates/admin/extensions/done.tpl diff --git a/frontend/client/res/templates/admin/extensions/index.tpl b/client/res/templates/admin/extensions/index.tpl similarity index 100% rename from frontend/client/res/templates/admin/extensions/index.tpl rename to client/res/templates/admin/extensions/index.tpl diff --git a/frontend/client/res/templates/admin/extensions/ready.tpl b/client/res/templates/admin/extensions/ready.tpl similarity index 100% rename from frontend/client/res/templates/admin/extensions/ready.tpl rename to client/res/templates/admin/extensions/ready.tpl diff --git a/frontend/client/res/templates/admin/field-manager/edit.tpl b/client/res/templates/admin/field-manager/edit.tpl similarity index 100% rename from frontend/client/res/templates/admin/field-manager/edit.tpl rename to client/res/templates/admin/field-manager/edit.tpl diff --git a/frontend/client/res/templates/admin/field-manager/index.tpl b/client/res/templates/admin/field-manager/index.tpl similarity index 100% rename from frontend/client/res/templates/admin/field-manager/index.tpl rename to client/res/templates/admin/field-manager/index.tpl diff --git a/frontend/client/res/templates/admin/field-manager/list.tpl b/client/res/templates/admin/field-manager/list.tpl similarity index 100% rename from frontend/client/res/templates/admin/field-manager/list.tpl rename to client/res/templates/admin/field-manager/list.tpl diff --git a/frontend/client/res/templates/admin/index.tpl b/client/res/templates/admin/index.tpl similarity index 100% rename from frontend/client/res/templates/admin/index.tpl rename to client/res/templates/admin/index.tpl diff --git a/frontend/client/res/templates/admin/integrations/edit.tpl b/client/res/templates/admin/integrations/edit.tpl similarity index 100% rename from frontend/client/res/templates/admin/integrations/edit.tpl rename to client/res/templates/admin/integrations/edit.tpl diff --git a/frontend/client/res/templates/admin/integrations/index.tpl b/client/res/templates/admin/integrations/index.tpl similarity index 100% rename from frontend/client/res/templates/admin/integrations/index.tpl rename to client/res/templates/admin/integrations/index.tpl diff --git a/frontend/client/res/templates/admin/integrations/oauth2.tpl b/client/res/templates/admin/integrations/oauth2.tpl similarity index 100% rename from frontend/client/res/templates/admin/integrations/oauth2.tpl rename to client/res/templates/admin/integrations/oauth2.tpl diff --git a/frontend/client/res/templates/admin/layouts/grid.tpl b/client/res/templates/admin/layouts/grid.tpl similarity index 100% rename from frontend/client/res/templates/admin/layouts/grid.tpl rename to client/res/templates/admin/layouts/grid.tpl diff --git a/frontend/client/res/templates/admin/layouts/index.tpl b/client/res/templates/admin/layouts/index.tpl similarity index 100% rename from frontend/client/res/templates/admin/layouts/index.tpl rename to client/res/templates/admin/layouts/index.tpl diff --git a/frontend/client/res/templates/admin/layouts/record/edit-attributes.tpl b/client/res/templates/admin/layouts/record/edit-attributes.tpl similarity index 100% rename from frontend/client/res/templates/admin/layouts/record/edit-attributes.tpl rename to client/res/templates/admin/layouts/record/edit-attributes.tpl diff --git a/frontend/client/res/templates/admin/layouts/rows.tpl b/client/res/templates/admin/layouts/rows.tpl similarity index 100% rename from frontend/client/res/templates/admin/layouts/rows.tpl rename to client/res/templates/admin/layouts/rows.tpl diff --git a/frontend/client/res/templates/admin/link-manager/index.tpl b/client/res/templates/admin/link-manager/index.tpl similarity index 100% rename from frontend/client/res/templates/admin/link-manager/index.tpl rename to client/res/templates/admin/link-manager/index.tpl diff --git a/frontend/client/res/templates/admin/link-manager/modals/edit.tpl b/client/res/templates/admin/link-manager/modals/edit.tpl similarity index 100% rename from frontend/client/res/templates/admin/link-manager/modals/edit.tpl rename to client/res/templates/admin/link-manager/modals/edit.tpl diff --git a/frontend/client/res/templates/admin/settings/headers/authentication.tpl b/client/res/templates/admin/settings/headers/authentication.tpl similarity index 100% rename from frontend/client/res/templates/admin/settings/headers/authentication.tpl rename to client/res/templates/admin/settings/headers/authentication.tpl diff --git a/frontend/client/res/templates/admin/settings/headers/currency.tpl b/client/res/templates/admin/settings/headers/currency.tpl similarity index 100% rename from frontend/client/res/templates/admin/settings/headers/currency.tpl rename to client/res/templates/admin/settings/headers/currency.tpl diff --git a/frontend/client/res/templates/admin/settings/headers/inbound-emails.tpl b/client/res/templates/admin/settings/headers/inbound-emails.tpl similarity index 100% rename from frontend/client/res/templates/admin/settings/headers/inbound-emails.tpl rename to client/res/templates/admin/settings/headers/inbound-emails.tpl diff --git a/frontend/client/res/templates/admin/settings/headers/notifications.tpl b/client/res/templates/admin/settings/headers/notifications.tpl similarity index 100% rename from frontend/client/res/templates/admin/settings/headers/notifications.tpl rename to client/res/templates/admin/settings/headers/notifications.tpl diff --git a/frontend/client/res/templates/admin/settings/headers/outbound-emails.tpl b/client/res/templates/admin/settings/headers/outbound-emails.tpl similarity index 100% rename from frontend/client/res/templates/admin/settings/headers/outbound-emails.tpl rename to client/res/templates/admin/settings/headers/outbound-emails.tpl diff --git a/frontend/client/res/templates/admin/settings/headers/settings.tpl b/client/res/templates/admin/settings/headers/settings.tpl similarity index 100% rename from frontend/client/res/templates/admin/settings/headers/settings.tpl rename to client/res/templates/admin/settings/headers/settings.tpl diff --git a/frontend/client/res/templates/admin/settings/headers/user-interface.tpl b/client/res/templates/admin/settings/headers/user-interface.tpl similarity index 100% rename from frontend/client/res/templates/admin/settings/headers/user-interface.tpl rename to client/res/templates/admin/settings/headers/user-interface.tpl diff --git a/frontend/client/res/templates/admin/upgrade/done.tpl b/client/res/templates/admin/upgrade/done.tpl similarity index 100% rename from frontend/client/res/templates/admin/upgrade/done.tpl rename to client/res/templates/admin/upgrade/done.tpl diff --git a/frontend/client/res/templates/admin/upgrade/index.tpl b/client/res/templates/admin/upgrade/index.tpl similarity index 100% rename from frontend/client/res/templates/admin/upgrade/index.tpl rename to client/res/templates/admin/upgrade/index.tpl diff --git a/frontend/client/res/templates/admin/upgrade/ready.tpl b/client/res/templates/admin/upgrade/ready.tpl similarity index 100% rename from frontend/client/res/templates/admin/upgrade/ready.tpl rename to client/res/templates/admin/upgrade/ready.tpl diff --git a/frontend/client/res/templates/dashboard.tpl b/client/res/templates/dashboard.tpl similarity index 100% rename from frontend/client/res/templates/dashboard.tpl rename to client/res/templates/dashboard.tpl diff --git a/frontend/client/res/templates/dashlet.tpl b/client/res/templates/dashlet.tpl similarity index 100% rename from frontend/client/res/templates/dashlet.tpl rename to client/res/templates/dashlet.tpl diff --git a/frontend/client/res/templates/dashlets/options/base.tpl b/client/res/templates/dashlets/options/base.tpl similarity index 100% rename from frontend/client/res/templates/dashlets/options/base.tpl rename to client/res/templates/dashlets/options/base.tpl diff --git a/frontend/client/res/templates/dashlets/record-list/options.tpl b/client/res/templates/dashlets/record-list/options.tpl similarity index 100% rename from frontend/client/res/templates/dashlets/record-list/options.tpl rename to client/res/templates/dashlets/record-list/options.tpl diff --git a/frontend/client/res/templates/detail.tpl b/client/res/templates/detail.tpl similarity index 100% rename from frontend/client/res/templates/detail.tpl rename to client/res/templates/detail.tpl diff --git a/frontend/client/res/templates/edit.tpl b/client/res/templates/edit.tpl similarity index 100% rename from frontend/client/res/templates/edit.tpl rename to client/res/templates/edit.tpl diff --git a/frontend/client/res/templates/email-account/fields/folder/edit.tpl b/client/res/templates/email-account/fields/folder/edit.tpl similarity index 100% rename from frontend/client/res/templates/email-account/fields/folder/edit.tpl rename to client/res/templates/email-account/fields/folder/edit.tpl diff --git a/frontend/client/res/templates/email-account/modals/select-folder.tpl b/client/res/templates/email-account/modals/select-folder.tpl similarity index 100% rename from frontend/client/res/templates/email-account/modals/select-folder.tpl rename to client/res/templates/email-account/modals/select-folder.tpl diff --git a/frontend/client/res/templates/email-template/fields/insert-field/detail.tpl b/client/res/templates/email-template/fields/insert-field/detail.tpl similarity index 100% rename from frontend/client/res/templates/email-template/fields/insert-field/detail.tpl rename to client/res/templates/email-template/fields/insert-field/detail.tpl diff --git a/frontend/client/res/templates/email-template/fields/insert-field/edit.tpl b/client/res/templates/email-template/fields/insert-field/edit.tpl similarity index 100% rename from frontend/client/res/templates/email-template/fields/insert-field/edit.tpl rename to client/res/templates/email-template/fields/insert-field/edit.tpl diff --git a/frontend/client/res/templates/email/fields/compose-from-address/edit.tpl b/client/res/templates/email/fields/compose-from-address/edit.tpl similarity index 100% rename from frontend/client/res/templates/email/fields/compose-from-address/edit.tpl rename to client/res/templates/email/fields/compose-from-address/edit.tpl diff --git a/frontend/client/res/templates/email/fields/email-address-varchar/detail.tpl b/client/res/templates/email/fields/email-address-varchar/detail.tpl similarity index 100% rename from frontend/client/res/templates/email/fields/email-address-varchar/detail.tpl rename to client/res/templates/email/fields/email-address-varchar/detail.tpl diff --git a/frontend/client/res/templates/email/fields/email-address-varchar/edit.tpl b/client/res/templates/email/fields/email-address-varchar/edit.tpl similarity index 100% rename from frontend/client/res/templates/email/fields/email-address-varchar/edit.tpl rename to client/res/templates/email/fields/email-address-varchar/edit.tpl diff --git a/frontend/client/res/templates/email/fields/from-email-address/detail.tpl b/client/res/templates/email/fields/from-email-address/detail.tpl similarity index 100% rename from frontend/client/res/templates/email/fields/from-email-address/detail.tpl rename to client/res/templates/email/fields/from-email-address/detail.tpl diff --git a/frontend/client/res/templates/email/fields/icon/detail.tpl b/client/res/templates/email/fields/icon/detail.tpl similarity index 100% rename from frontend/client/res/templates/email/fields/icon/detail.tpl rename to client/res/templates/email/fields/icon/detail.tpl diff --git a/frontend/client/res/templates/email/fields/select-template/edit.tpl b/client/res/templates/email/fields/select-template/edit.tpl similarity index 100% rename from frontend/client/res/templates/email/fields/select-template/edit.tpl rename to client/res/templates/email/fields/select-template/edit.tpl diff --git a/frontend/client/res/templates/email/fields/subject/list-link.tpl b/client/res/templates/email/fields/subject/list-link.tpl similarity index 100% rename from frontend/client/res/templates/email/fields/subject/list-link.tpl rename to client/res/templates/email/fields/subject/list-link.tpl diff --git a/frontend/client/res/templates/errors/403.tpl b/client/res/templates/errors/403.tpl similarity index 100% rename from frontend/client/res/templates/errors/403.tpl rename to client/res/templates/errors/403.tpl diff --git a/frontend/client/res/templates/errors/404.tpl b/client/res/templates/errors/404.tpl similarity index 100% rename from frontend/client/res/templates/errors/404.tpl rename to client/res/templates/errors/404.tpl diff --git a/frontend/client/res/templates/external-account/index.tpl b/client/res/templates/external-account/index.tpl similarity index 100% rename from frontend/client/res/templates/external-account/index.tpl rename to client/res/templates/external-account/index.tpl diff --git a/frontend/client/res/templates/external-account/oauth2.tpl b/client/res/templates/external-account/oauth2.tpl similarity index 100% rename from frontend/client/res/templates/external-account/oauth2.tpl rename to client/res/templates/external-account/oauth2.tpl diff --git a/frontend/client/res/templates/fields/address/detail.tpl b/client/res/templates/fields/address/detail.tpl similarity index 100% rename from frontend/client/res/templates/fields/address/detail.tpl rename to client/res/templates/fields/address/detail.tpl diff --git a/frontend/client/res/templates/fields/address/edit.tpl b/client/res/templates/fields/address/edit.tpl similarity index 100% rename from frontend/client/res/templates/fields/address/edit.tpl rename to client/res/templates/fields/address/edit.tpl diff --git a/frontend/client/res/templates/fields/address/search.tpl b/client/res/templates/fields/address/search.tpl similarity index 100% rename from frontend/client/res/templates/fields/address/search.tpl rename to client/res/templates/fields/address/search.tpl diff --git a/frontend/client/res/templates/fields/array/detail.tpl b/client/res/templates/fields/array/detail.tpl similarity index 100% rename from frontend/client/res/templates/fields/array/detail.tpl rename to client/res/templates/fields/array/detail.tpl diff --git a/frontend/client/res/templates/fields/array/edit.tpl b/client/res/templates/fields/array/edit.tpl similarity index 100% rename from frontend/client/res/templates/fields/array/edit.tpl rename to client/res/templates/fields/array/edit.tpl diff --git a/frontend/client/res/templates/fields/array/search.tpl b/client/res/templates/fields/array/search.tpl similarity index 100% rename from frontend/client/res/templates/fields/array/search.tpl rename to client/res/templates/fields/array/search.tpl diff --git a/frontend/client/res/templates/fields/attachments-multiple/detail.tpl b/client/res/templates/fields/attachments-multiple/detail.tpl similarity index 100% rename from frontend/client/res/templates/fields/attachments-multiple/detail.tpl rename to client/res/templates/fields/attachments-multiple/detail.tpl diff --git a/frontend/client/res/templates/fields/attachments-multiple/edit.tpl b/client/res/templates/fields/attachments-multiple/edit.tpl similarity index 100% rename from frontend/client/res/templates/fields/attachments-multiple/edit.tpl rename to client/res/templates/fields/attachments-multiple/edit.tpl diff --git a/frontend/client/res/templates/fields/base/detail.tpl b/client/res/templates/fields/base/detail.tpl similarity index 100% rename from frontend/client/res/templates/fields/base/detail.tpl rename to client/res/templates/fields/base/detail.tpl diff --git a/frontend/client/res/templates/fields/base/edit.tpl b/client/res/templates/fields/base/edit.tpl similarity index 100% rename from frontend/client/res/templates/fields/base/edit.tpl rename to client/res/templates/fields/base/edit.tpl diff --git a/frontend/client/res/templates/fields/base/list-link.tpl b/client/res/templates/fields/base/list-link.tpl similarity index 100% rename from frontend/client/res/templates/fields/base/list-link.tpl rename to client/res/templates/fields/base/list-link.tpl diff --git a/frontend/client/res/templates/fields/base/list.tpl b/client/res/templates/fields/base/list.tpl similarity index 100% rename from frontend/client/res/templates/fields/base/list.tpl rename to client/res/templates/fields/base/list.tpl diff --git a/frontend/client/res/templates/fields/base/search.tpl b/client/res/templates/fields/base/search.tpl similarity index 100% rename from frontend/client/res/templates/fields/base/search.tpl rename to client/res/templates/fields/base/search.tpl diff --git a/frontend/client/res/templates/fields/bool/detail.tpl b/client/res/templates/fields/bool/detail.tpl similarity index 100% rename from frontend/client/res/templates/fields/bool/detail.tpl rename to client/res/templates/fields/bool/detail.tpl diff --git a/frontend/client/res/templates/fields/bool/edit.tpl b/client/res/templates/fields/bool/edit.tpl similarity index 100% rename from frontend/client/res/templates/fields/bool/edit.tpl rename to client/res/templates/fields/bool/edit.tpl diff --git a/frontend/client/res/templates/fields/bool/search.tpl b/client/res/templates/fields/bool/search.tpl similarity index 100% rename from frontend/client/res/templates/fields/bool/search.tpl rename to client/res/templates/fields/bool/search.tpl diff --git a/frontend/client/res/templates/fields/currency/detail.tpl b/client/res/templates/fields/currency/detail.tpl similarity index 100% rename from frontend/client/res/templates/fields/currency/detail.tpl rename to client/res/templates/fields/currency/detail.tpl diff --git a/frontend/client/res/templates/fields/currency/edit.tpl b/client/res/templates/fields/currency/edit.tpl similarity index 100% rename from frontend/client/res/templates/fields/currency/edit.tpl rename to client/res/templates/fields/currency/edit.tpl diff --git a/frontend/client/res/templates/fields/date/edit.tpl b/client/res/templates/fields/date/edit.tpl similarity index 100% rename from frontend/client/res/templates/fields/date/edit.tpl rename to client/res/templates/fields/date/edit.tpl diff --git a/frontend/client/res/templates/fields/date/search.tpl b/client/res/templates/fields/date/search.tpl similarity index 100% rename from frontend/client/res/templates/fields/date/search.tpl rename to client/res/templates/fields/date/search.tpl diff --git a/frontend/client/res/templates/fields/datetime/edit.tpl b/client/res/templates/fields/datetime/edit.tpl similarity index 100% rename from frontend/client/res/templates/fields/datetime/edit.tpl rename to client/res/templates/fields/datetime/edit.tpl diff --git a/frontend/client/res/templates/fields/duration/edit.tpl b/client/res/templates/fields/duration/edit.tpl similarity index 100% rename from frontend/client/res/templates/fields/duration/edit.tpl rename to client/res/templates/fields/duration/edit.tpl diff --git a/frontend/client/res/templates/fields/email/detail.tpl b/client/res/templates/fields/email/detail.tpl similarity index 100% rename from frontend/client/res/templates/fields/email/detail.tpl rename to client/res/templates/fields/email/detail.tpl diff --git a/frontend/client/res/templates/fields/email/edit.tpl b/client/res/templates/fields/email/edit.tpl similarity index 100% rename from frontend/client/res/templates/fields/email/edit.tpl rename to client/res/templates/fields/email/edit.tpl diff --git a/frontend/client/res/templates/fields/email/list.tpl b/client/res/templates/fields/email/list.tpl similarity index 100% rename from frontend/client/res/templates/fields/email/list.tpl rename to client/res/templates/fields/email/list.tpl diff --git a/frontend/client/res/templates/fields/email/search.tpl b/client/res/templates/fields/email/search.tpl similarity index 100% rename from frontend/client/res/templates/fields/email/search.tpl rename to client/res/templates/fields/email/search.tpl diff --git a/frontend/client/res/templates/fields/enum-styled/detail.tpl b/client/res/templates/fields/enum-styled/detail.tpl similarity index 100% rename from frontend/client/res/templates/fields/enum-styled/detail.tpl rename to client/res/templates/fields/enum-styled/detail.tpl diff --git a/frontend/client/res/templates/fields/enum/detail.tpl b/client/res/templates/fields/enum/detail.tpl similarity index 100% rename from frontend/client/res/templates/fields/enum/detail.tpl rename to client/res/templates/fields/enum/detail.tpl diff --git a/frontend/client/res/templates/fields/enum/edit.tpl b/client/res/templates/fields/enum/edit.tpl similarity index 100% rename from frontend/client/res/templates/fields/enum/edit.tpl rename to client/res/templates/fields/enum/edit.tpl diff --git a/frontend/client/res/templates/fields/enum/search.tpl b/client/res/templates/fields/enum/search.tpl similarity index 100% rename from frontend/client/res/templates/fields/enum/search.tpl rename to client/res/templates/fields/enum/search.tpl diff --git a/frontend/client/res/templates/fields/file/detail.tpl b/client/res/templates/fields/file/detail.tpl similarity index 100% rename from frontend/client/res/templates/fields/file/detail.tpl rename to client/res/templates/fields/file/detail.tpl diff --git a/frontend/client/res/templates/fields/file/edit.tpl b/client/res/templates/fields/file/edit.tpl similarity index 100% rename from frontend/client/res/templates/fields/file/edit.tpl rename to client/res/templates/fields/file/edit.tpl diff --git a/frontend/client/res/templates/fields/float/edit.tpl b/client/res/templates/fields/float/edit.tpl similarity index 100% rename from frontend/client/res/templates/fields/float/edit.tpl rename to client/res/templates/fields/float/edit.tpl diff --git a/frontend/client/res/templates/fields/int/detail.tpl b/client/res/templates/fields/int/detail.tpl similarity index 100% rename from frontend/client/res/templates/fields/int/detail.tpl rename to client/res/templates/fields/int/detail.tpl diff --git a/frontend/client/res/templates/fields/int/edit.tpl b/client/res/templates/fields/int/edit.tpl similarity index 100% rename from frontend/client/res/templates/fields/int/edit.tpl rename to client/res/templates/fields/int/edit.tpl diff --git a/frontend/client/res/templates/fields/int/search.tpl b/client/res/templates/fields/int/search.tpl similarity index 100% rename from frontend/client/res/templates/fields/int/search.tpl rename to client/res/templates/fields/int/search.tpl diff --git a/frontend/client/res/templates/fields/json-object/detail.tpl b/client/res/templates/fields/json-object/detail.tpl similarity index 100% rename from frontend/client/res/templates/fields/json-object/detail.tpl rename to client/res/templates/fields/json-object/detail.tpl diff --git a/frontend/client/res/templates/fields/link-multiple/detail.tpl b/client/res/templates/fields/link-multiple/detail.tpl similarity index 100% rename from frontend/client/res/templates/fields/link-multiple/detail.tpl rename to client/res/templates/fields/link-multiple/detail.tpl diff --git a/frontend/client/res/templates/fields/link-multiple/edit.tpl b/client/res/templates/fields/link-multiple/edit.tpl similarity index 100% rename from frontend/client/res/templates/fields/link-multiple/edit.tpl rename to client/res/templates/fields/link-multiple/edit.tpl diff --git a/frontend/client/res/templates/fields/link-multiple/search.tpl b/client/res/templates/fields/link-multiple/search.tpl similarity index 100% rename from frontend/client/res/templates/fields/link-multiple/search.tpl rename to client/res/templates/fields/link-multiple/search.tpl diff --git a/frontend/client/res/templates/fields/link-parent/edit.tpl b/client/res/templates/fields/link-parent/edit.tpl similarity index 100% rename from frontend/client/res/templates/fields/link-parent/edit.tpl rename to client/res/templates/fields/link-parent/edit.tpl diff --git a/frontend/client/res/templates/fields/link-parent/search.tpl b/client/res/templates/fields/link-parent/search.tpl similarity index 100% rename from frontend/client/res/templates/fields/link-parent/search.tpl rename to client/res/templates/fields/link-parent/search.tpl diff --git a/frontend/client/res/templates/fields/link/detail.tpl b/client/res/templates/fields/link/detail.tpl similarity index 100% rename from frontend/client/res/templates/fields/link/detail.tpl rename to client/res/templates/fields/link/detail.tpl diff --git a/frontend/client/res/templates/fields/link/edit.tpl b/client/res/templates/fields/link/edit.tpl similarity index 100% rename from frontend/client/res/templates/fields/link/edit.tpl rename to client/res/templates/fields/link/edit.tpl diff --git a/frontend/client/res/templates/fields/link/list.tpl b/client/res/templates/fields/link/list.tpl similarity index 100% rename from frontend/client/res/templates/fields/link/list.tpl rename to client/res/templates/fields/link/list.tpl diff --git a/frontend/client/res/templates/fields/link/search.tpl b/client/res/templates/fields/link/search.tpl similarity index 100% rename from frontend/client/res/templates/fields/link/search.tpl rename to client/res/templates/fields/link/search.tpl diff --git a/frontend/client/res/templates/fields/map/detail.tpl b/client/res/templates/fields/map/detail.tpl similarity index 100% rename from frontend/client/res/templates/fields/map/detail.tpl rename to client/res/templates/fields/map/detail.tpl diff --git a/frontend/client/res/templates/fields/multi-enum/edit.tpl b/client/res/templates/fields/multi-enum/edit.tpl similarity index 100% rename from frontend/client/res/templates/fields/multi-enum/edit.tpl rename to client/res/templates/fields/multi-enum/edit.tpl diff --git a/frontend/client/res/templates/fields/password/detail.tpl b/client/res/templates/fields/password/detail.tpl similarity index 100% rename from frontend/client/res/templates/fields/password/detail.tpl rename to client/res/templates/fields/password/detail.tpl diff --git a/frontend/client/res/templates/fields/password/edit.tpl b/client/res/templates/fields/password/edit.tpl similarity index 100% rename from frontend/client/res/templates/fields/password/edit.tpl rename to client/res/templates/fields/password/edit.tpl diff --git a/frontend/client/res/templates/fields/person-name/detail.tpl b/client/res/templates/fields/person-name/detail.tpl similarity index 100% rename from frontend/client/res/templates/fields/person-name/detail.tpl rename to client/res/templates/fields/person-name/detail.tpl diff --git a/frontend/client/res/templates/fields/person-name/edit.tpl b/client/res/templates/fields/person-name/edit.tpl similarity index 100% rename from frontend/client/res/templates/fields/person-name/edit.tpl rename to client/res/templates/fields/person-name/edit.tpl diff --git a/frontend/client/res/templates/fields/phone/detail.tpl b/client/res/templates/fields/phone/detail.tpl similarity index 100% rename from frontend/client/res/templates/fields/phone/detail.tpl rename to client/res/templates/fields/phone/detail.tpl diff --git a/frontend/client/res/templates/fields/phone/edit.tpl b/client/res/templates/fields/phone/edit.tpl similarity index 100% rename from frontend/client/res/templates/fields/phone/edit.tpl rename to client/res/templates/fields/phone/edit.tpl diff --git a/frontend/client/res/templates/fields/phone/list.tpl b/client/res/templates/fields/phone/list.tpl similarity index 100% rename from frontend/client/res/templates/fields/phone/list.tpl rename to client/res/templates/fields/phone/list.tpl diff --git a/frontend/client/res/templates/fields/phone/search.tpl b/client/res/templates/fields/phone/search.tpl similarity index 100% rename from frontend/client/res/templates/fields/phone/search.tpl rename to client/res/templates/fields/phone/search.tpl diff --git a/frontend/client/res/templates/fields/range-currency/edit.tpl b/client/res/templates/fields/range-currency/edit.tpl similarity index 100% rename from frontend/client/res/templates/fields/range-currency/edit.tpl rename to client/res/templates/fields/range-currency/edit.tpl diff --git a/frontend/client/res/templates/fields/range-int/detail.tpl b/client/res/templates/fields/range-int/detail.tpl similarity index 100% rename from frontend/client/res/templates/fields/range-int/detail.tpl rename to client/res/templates/fields/range-int/detail.tpl diff --git a/frontend/client/res/templates/fields/range-int/edit.tpl b/client/res/templates/fields/range-int/edit.tpl similarity index 100% rename from frontend/client/res/templates/fields/range-int/edit.tpl rename to client/res/templates/fields/range-int/edit.tpl diff --git a/frontend/client/res/templates/fields/text/detail.tpl b/client/res/templates/fields/text/detail.tpl similarity index 100% rename from frontend/client/res/templates/fields/text/detail.tpl rename to client/res/templates/fields/text/detail.tpl diff --git a/frontend/client/res/templates/fields/text/edit.tpl b/client/res/templates/fields/text/edit.tpl similarity index 100% rename from frontend/client/res/templates/fields/text/edit.tpl rename to client/res/templates/fields/text/edit.tpl diff --git a/frontend/client/res/templates/fields/text/search.tpl b/client/res/templates/fields/text/search.tpl similarity index 100% rename from frontend/client/res/templates/fields/text/search.tpl rename to client/res/templates/fields/text/search.tpl diff --git a/frontend/client/res/templates/fields/url/detail.tpl b/client/res/templates/fields/url/detail.tpl similarity index 100% rename from frontend/client/res/templates/fields/url/detail.tpl rename to client/res/templates/fields/url/detail.tpl diff --git a/frontend/client/res/templates/fields/url/list.tpl b/client/res/templates/fields/url/list.tpl similarity index 100% rename from frontend/client/res/templates/fields/url/list.tpl rename to client/res/templates/fields/url/list.tpl diff --git a/frontend/client/res/templates/fields/user-with-avatar/detail.tpl b/client/res/templates/fields/user-with-avatar/detail.tpl similarity index 100% rename from frontend/client/res/templates/fields/user-with-avatar/detail.tpl rename to client/res/templates/fields/user-with-avatar/detail.tpl diff --git a/frontend/client/res/templates/fields/user/search.tpl b/client/res/templates/fields/user/search.tpl similarity index 100% rename from frontend/client/res/templates/fields/user/search.tpl rename to client/res/templates/fields/user/search.tpl diff --git a/frontend/client/res/templates/fields/varchar/search.tpl b/client/res/templates/fields/varchar/search.tpl similarity index 100% rename from frontend/client/res/templates/fields/varchar/search.tpl rename to client/res/templates/fields/varchar/search.tpl diff --git a/frontend/client/res/templates/fields/wysiwyg/detail.tpl b/client/res/templates/fields/wysiwyg/detail.tpl similarity index 100% rename from frontend/client/res/templates/fields/wysiwyg/detail.tpl rename to client/res/templates/fields/wysiwyg/detail.tpl diff --git a/frontend/client/res/templates/fields/wysiwyg/edit.tpl b/client/res/templates/fields/wysiwyg/edit.tpl similarity index 100% rename from frontend/client/res/templates/fields/wysiwyg/edit.tpl rename to client/res/templates/fields/wysiwyg/edit.tpl diff --git a/frontend/client/res/templates/global-search/global-search.tpl b/client/res/templates/global-search/global-search.tpl similarity index 100% rename from frontend/client/res/templates/global-search/global-search.tpl rename to client/res/templates/global-search/global-search.tpl diff --git a/frontend/client/res/templates/global-search/name-field.tpl b/client/res/templates/global-search/name-field.tpl similarity index 100% rename from frontend/client/res/templates/global-search/name-field.tpl rename to client/res/templates/global-search/name-field.tpl diff --git a/frontend/client/res/templates/global-search/panel.tpl b/client/res/templates/global-search/panel.tpl similarity index 100% rename from frontend/client/res/templates/global-search/panel.tpl rename to client/res/templates/global-search/panel.tpl diff --git a/frontend/client/res/templates/global-search/scope-badge.tpl b/client/res/templates/global-search/scope-badge.tpl similarity index 100% rename from frontend/client/res/templates/global-search/scope-badge.tpl rename to client/res/templates/global-search/scope-badge.tpl diff --git a/frontend/client/res/templates/header.tpl b/client/res/templates/header.tpl similarity index 100% rename from frontend/client/res/templates/header.tpl rename to client/res/templates/header.tpl diff --git a/frontend/client/res/templates/home.tpl b/client/res/templates/home.tpl similarity index 100% rename from frontend/client/res/templates/home.tpl rename to client/res/templates/home.tpl diff --git a/frontend/client/res/templates/import/index.tpl b/client/res/templates/import/index.tpl similarity index 100% rename from frontend/client/res/templates/import/index.tpl rename to client/res/templates/import/index.tpl diff --git a/frontend/client/res/templates/import/step-1.tpl b/client/res/templates/import/step-1.tpl similarity index 100% rename from frontend/client/res/templates/import/step-1.tpl rename to client/res/templates/import/step-1.tpl diff --git a/frontend/client/res/templates/import/step-2.tpl b/client/res/templates/import/step-2.tpl similarity index 100% rename from frontend/client/res/templates/import/step-2.tpl rename to client/res/templates/import/step-2.tpl diff --git a/frontend/client/res/templates/inbound-email/fields/folder/edit.tpl b/client/res/templates/inbound-email/fields/folder/edit.tpl similarity index 100% rename from frontend/client/res/templates/inbound-email/fields/folder/edit.tpl rename to client/res/templates/inbound-email/fields/folder/edit.tpl diff --git a/frontend/client/res/templates/inbound-email/modals/select-folder.tpl b/client/res/templates/inbound-email/modals/select-folder.tpl similarity index 100% rename from frontend/client/res/templates/inbound-email/modals/select-folder.tpl rename to client/res/templates/inbound-email/modals/select-folder.tpl diff --git a/frontend/client/res/templates/list.tpl b/client/res/templates/list.tpl similarity index 100% rename from frontend/client/res/templates/list.tpl rename to client/res/templates/list.tpl diff --git a/frontend/client/res/templates/login.tpl b/client/res/templates/login.tpl similarity index 100% rename from frontend/client/res/templates/login.tpl rename to client/res/templates/login.tpl diff --git a/frontend/client/res/templates/merge.tpl b/client/res/templates/merge.tpl similarity index 100% rename from frontend/client/res/templates/merge.tpl rename to client/res/templates/merge.tpl diff --git a/frontend/client/res/templates/modals/add-dashlet.tpl b/client/res/templates/modals/add-dashlet.tpl similarity index 100% rename from frontend/client/res/templates/modals/add-dashlet.tpl rename to client/res/templates/modals/add-dashlet.tpl diff --git a/frontend/client/res/templates/modals/array-field-add.tpl b/client/res/templates/modals/array-field-add.tpl similarity index 100% rename from frontend/client/res/templates/modals/array-field-add.tpl rename to client/res/templates/modals/array-field-add.tpl diff --git a/frontend/client/res/templates/modals/change-password.tpl b/client/res/templates/modals/change-password.tpl similarity index 100% rename from frontend/client/res/templates/modals/change-password.tpl rename to client/res/templates/modals/change-password.tpl diff --git a/frontend/client/res/templates/modals/detail.tpl b/client/res/templates/modals/detail.tpl similarity index 100% rename from frontend/client/res/templates/modals/detail.tpl rename to client/res/templates/modals/detail.tpl diff --git a/frontend/client/res/templates/modals/duplicate.tpl b/client/res/templates/modals/duplicate.tpl similarity index 100% rename from frontend/client/res/templates/modals/duplicate.tpl rename to client/res/templates/modals/duplicate.tpl diff --git a/frontend/client/res/templates/modals/edit-dashboard.tpl b/client/res/templates/modals/edit-dashboard.tpl similarity index 100% rename from frontend/client/res/templates/modals/edit-dashboard.tpl rename to client/res/templates/modals/edit-dashboard.tpl diff --git a/frontend/client/res/templates/modals/edit.tpl b/client/res/templates/modals/edit.tpl similarity index 100% rename from frontend/client/res/templates/modals/edit.tpl rename to client/res/templates/modals/edit.tpl diff --git a/frontend/client/res/templates/modals/image-crop.tpl b/client/res/templates/modals/image-crop.tpl similarity index 100% rename from frontend/client/res/templates/modals/image-crop.tpl rename to client/res/templates/modals/image-crop.tpl diff --git a/client/res/templates/modals/image-preview.tpl b/client/res/templates/modals/image-preview.tpl new file mode 100644 index 0000000000..3960ec0033 --- /dev/null +++ b/client/res/templates/modals/image-preview.tpl @@ -0,0 +1,7 @@ +
+ +
+ +
+{{translate 'Original'}}: {{name}} +
diff --git a/frontend/client/res/templates/modals/mass-update.tpl b/client/res/templates/modals/mass-update.tpl similarity index 100% rename from frontend/client/res/templates/modals/mass-update.tpl rename to client/res/templates/modals/mass-update.tpl diff --git a/frontend/client/res/templates/modals/password-change-request.tpl b/client/res/templates/modals/password-change-request.tpl similarity index 100% rename from frontend/client/res/templates/modals/password-change-request.tpl rename to client/res/templates/modals/password-change-request.tpl diff --git a/frontend/client/res/templates/modals/save-filters.tpl b/client/res/templates/modals/save-filters.tpl similarity index 100% rename from frontend/client/res/templates/modals/save-filters.tpl rename to client/res/templates/modals/save-filters.tpl diff --git a/frontend/client/res/templates/modals/select-records.tpl b/client/res/templates/modals/select-records.tpl similarity index 100% rename from frontend/client/res/templates/modals/select-records.tpl rename to client/res/templates/modals/select-records.tpl diff --git a/frontend/client/res/templates/notification/badge.tpl b/client/res/templates/notification/badge.tpl similarity index 100% rename from frontend/client/res/templates/notification/badge.tpl rename to client/res/templates/notification/badge.tpl diff --git a/frontend/client/res/templates/notification/fields/container.tpl b/client/res/templates/notification/fields/container.tpl similarity index 100% rename from frontend/client/res/templates/notification/fields/container.tpl rename to client/res/templates/notification/fields/container.tpl diff --git a/frontend/client/res/templates/notification/fields/read-with-menu.tpl b/client/res/templates/notification/fields/read-with-menu.tpl similarity index 100% rename from frontend/client/res/templates/notification/fields/read-with-menu.tpl rename to client/res/templates/notification/fields/read-with-menu.tpl diff --git a/frontend/client/res/templates/notification/fields/read.tpl b/client/res/templates/notification/fields/read.tpl similarity index 100% rename from frontend/client/res/templates/notification/fields/read.tpl rename to client/res/templates/notification/fields/read.tpl diff --git a/frontend/client/res/templates/notification/items/assign.tpl b/client/res/templates/notification/items/assign.tpl similarity index 100% rename from frontend/client/res/templates/notification/items/assign.tpl rename to client/res/templates/notification/items/assign.tpl diff --git a/frontend/client/res/templates/notification/items/email-received.tpl b/client/res/templates/notification/items/email-received.tpl similarity index 100% rename from frontend/client/res/templates/notification/items/email-received.tpl rename to client/res/templates/notification/items/email-received.tpl diff --git a/frontend/client/res/templates/notification/items/entity-removed.tpl b/client/res/templates/notification/items/entity-removed.tpl similarity index 100% rename from frontend/client/res/templates/notification/items/entity-removed.tpl rename to client/res/templates/notification/items/entity-removed.tpl diff --git a/frontend/client/res/templates/notification/items/message.tpl b/client/res/templates/notification/items/message.tpl similarity index 100% rename from frontend/client/res/templates/notification/items/message.tpl rename to client/res/templates/notification/items/message.tpl diff --git a/frontend/client/res/templates/notification/items/system.tpl b/client/res/templates/notification/items/system.tpl similarity index 100% rename from frontend/client/res/templates/notification/items/system.tpl rename to client/res/templates/notification/items/system.tpl diff --git a/frontend/client/res/templates/notification/list.tpl b/client/res/templates/notification/list.tpl similarity index 100% rename from frontend/client/res/templates/notification/list.tpl rename to client/res/templates/notification/list.tpl diff --git a/frontend/client/res/templates/notification/panel.tpl b/client/res/templates/notification/panel.tpl similarity index 100% rename from frontend/client/res/templates/notification/panel.tpl rename to client/res/templates/notification/panel.tpl diff --git a/frontend/client/res/templates/preferences/fields/smtp-email-address/detail.tpl b/client/res/templates/preferences/fields/smtp-email-address/detail.tpl similarity index 100% rename from frontend/client/res/templates/preferences/fields/smtp-email-address/detail.tpl rename to client/res/templates/preferences/fields/smtp-email-address/detail.tpl diff --git a/frontend/client/res/templates/record/bottom.tpl b/client/res/templates/record/bottom.tpl similarity index 100% rename from frontend/client/res/templates/record/bottom.tpl rename to client/res/templates/record/bottom.tpl diff --git a/frontend/client/res/templates/record/detail.tpl b/client/res/templates/record/detail.tpl similarity index 100% rename from frontend/client/res/templates/record/detail.tpl rename to client/res/templates/record/detail.tpl diff --git a/frontend/client/res/templates/record/edit.tpl b/client/res/templates/record/edit.tpl similarity index 100% rename from frontend/client/res/templates/record/edit.tpl rename to client/res/templates/record/edit.tpl diff --git a/frontend/client/res/templates/record/list-checkbox.tpl b/client/res/templates/record/list-checkbox.tpl similarity index 100% rename from frontend/client/res/templates/record/list-checkbox.tpl rename to client/res/templates/record/list-checkbox.tpl diff --git a/frontend/client/res/templates/record/list-expanded.tpl b/client/res/templates/record/list-expanded.tpl similarity index 100% rename from frontend/client/res/templates/record/list-expanded.tpl rename to client/res/templates/record/list-expanded.tpl diff --git a/frontend/client/res/templates/record/list-pagination.tpl b/client/res/templates/record/list-pagination.tpl similarity index 100% rename from frontend/client/res/templates/record/list-pagination.tpl rename to client/res/templates/record/list-pagination.tpl diff --git a/frontend/client/res/templates/record/list-tree-item.tpl b/client/res/templates/record/list-tree-item.tpl similarity index 100% rename from frontend/client/res/templates/record/list-tree-item.tpl rename to client/res/templates/record/list-tree-item.tpl diff --git a/frontend/client/res/templates/record/list-tree.tpl b/client/res/templates/record/list-tree.tpl similarity index 100% rename from frontend/client/res/templates/record/list-tree.tpl rename to client/res/templates/record/list-tree.tpl diff --git a/frontend/client/res/templates/record/list.tpl b/client/res/templates/record/list.tpl similarity index 100% rename from frontend/client/res/templates/record/list.tpl rename to client/res/templates/record/list.tpl diff --git a/frontend/client/res/templates/record/merge.tpl b/client/res/templates/record/merge.tpl similarity index 100% rename from frontend/client/res/templates/record/merge.tpl rename to client/res/templates/record/merge.tpl diff --git a/frontend/client/res/templates/record/panels/default-side.tpl b/client/res/templates/record/panels/default-side.tpl similarity index 100% rename from frontend/client/res/templates/record/panels/default-side.tpl rename to client/res/templates/record/panels/default-side.tpl diff --git a/frontend/client/res/templates/record/panels/relationship.tpl b/client/res/templates/record/panels/relationship.tpl similarity index 100% rename from frontend/client/res/templates/record/panels/relationship.tpl rename to client/res/templates/record/panels/relationship.tpl diff --git a/frontend/client/res/templates/record/panels/side.tpl b/client/res/templates/record/panels/side.tpl similarity index 100% rename from frontend/client/res/templates/record/panels/side.tpl rename to client/res/templates/record/panels/side.tpl diff --git a/frontend/client/res/templates/record/row-actions/default.tpl b/client/res/templates/record/row-actions/default.tpl similarity index 100% rename from frontend/client/res/templates/record/row-actions/default.tpl rename to client/res/templates/record/row-actions/default.tpl diff --git a/frontend/client/res/templates/record/search.tpl b/client/res/templates/record/search.tpl similarity index 100% rename from frontend/client/res/templates/record/search.tpl rename to client/res/templates/record/search.tpl diff --git a/frontend/client/res/templates/record/side.tpl b/client/res/templates/record/side.tpl similarity index 100% rename from frontend/client/res/templates/record/side.tpl rename to client/res/templates/record/side.tpl diff --git a/frontend/client/res/templates/role/modals/add-field.tpl b/client/res/templates/role/modals/add-field.tpl similarity index 100% rename from frontend/client/res/templates/role/modals/add-field.tpl rename to client/res/templates/role/modals/add-field.tpl diff --git a/frontend/client/res/templates/role/record/panels/side.tpl b/client/res/templates/role/record/panels/side.tpl similarity index 100% rename from frontend/client/res/templates/role/record/panels/side.tpl rename to client/res/templates/role/record/panels/side.tpl diff --git a/frontend/client/res/templates/role/table-edit.tpl b/client/res/templates/role/table-edit.tpl similarity index 100% rename from frontend/client/res/templates/role/table-edit.tpl rename to client/res/templates/role/table-edit.tpl diff --git a/frontend/client/res/templates/role/table.tpl b/client/res/templates/role/table.tpl similarity index 100% rename from frontend/client/res/templates/role/table.tpl rename to client/res/templates/role/table.tpl diff --git a/frontend/client/res/templates/scheduled-job/cronjob.tpl b/client/res/templates/scheduled-job/cronjob.tpl similarity index 100% rename from frontend/client/res/templates/scheduled-job/cronjob.tpl rename to client/res/templates/scheduled-job/cronjob.tpl diff --git a/frontend/client/res/templates/search/filter.tpl b/client/res/templates/search/filter.tpl similarity index 100% rename from frontend/client/res/templates/search/filter.tpl rename to client/res/templates/search/filter.tpl diff --git a/frontend/client/res/templates/settings/fields/currency-rates/edit.tpl b/client/res/templates/settings/fields/currency-rates/edit.tpl similarity index 100% rename from frontend/client/res/templates/settings/fields/currency-rates/edit.tpl rename to client/res/templates/settings/fields/currency-rates/edit.tpl diff --git a/frontend/client/res/templates/settings/fields/dashboard-layout/detail.tpl b/client/res/templates/settings/fields/dashboard-layout/detail.tpl similarity index 100% rename from frontend/client/res/templates/settings/fields/dashboard-layout/detail.tpl rename to client/res/templates/settings/fields/dashboard-layout/detail.tpl diff --git a/frontend/client/res/templates/settings/fields/dashboard-layout/edit.tpl b/client/res/templates/settings/fields/dashboard-layout/edit.tpl similarity index 100% rename from frontend/client/res/templates/settings/fields/dashboard-layout/edit.tpl rename to client/res/templates/settings/fields/dashboard-layout/edit.tpl diff --git a/frontend/client/res/templates/site/footer.tpl b/client/res/templates/site/footer.tpl similarity index 100% rename from frontend/client/res/templates/site/footer.tpl rename to client/res/templates/site/footer.tpl diff --git a/frontend/client/res/templates/site/header.tpl b/client/res/templates/site/header.tpl similarity index 100% rename from frontend/client/res/templates/site/header.tpl rename to client/res/templates/site/header.tpl diff --git a/frontend/client/res/templates/site/master.tpl b/client/res/templates/site/master.tpl similarity index 100% rename from frontend/client/res/templates/site/master.tpl rename to client/res/templates/site/master.tpl diff --git a/frontend/client/res/templates/site/navbar.tpl b/client/res/templates/site/navbar.tpl similarity index 100% rename from frontend/client/res/templates/site/navbar.tpl rename to client/res/templates/site/navbar.tpl diff --git a/frontend/client/res/templates/stream.tpl b/client/res/templates/stream.tpl similarity index 100% rename from frontend/client/res/templates/stream.tpl rename to client/res/templates/stream.tpl diff --git a/frontend/client/res/templates/stream/notes/assign.tpl b/client/res/templates/stream/notes/assign.tpl similarity index 100% rename from frontend/client/res/templates/stream/notes/assign.tpl rename to client/res/templates/stream/notes/assign.tpl diff --git a/frontend/client/res/templates/stream/notes/create-related.tpl b/client/res/templates/stream/notes/create-related.tpl similarity index 100% rename from frontend/client/res/templates/stream/notes/create-related.tpl rename to client/res/templates/stream/notes/create-related.tpl diff --git a/frontend/client/res/templates/stream/notes/create.tpl b/client/res/templates/stream/notes/create.tpl similarity index 100% rename from frontend/client/res/templates/stream/notes/create.tpl rename to client/res/templates/stream/notes/create.tpl diff --git a/frontend/client/res/templates/stream/notes/email-received.tpl b/client/res/templates/stream/notes/email-received.tpl similarity index 100% rename from frontend/client/res/templates/stream/notes/email-received.tpl rename to client/res/templates/stream/notes/email-received.tpl diff --git a/frontend/client/res/templates/stream/notes/email-sent.tpl b/client/res/templates/stream/notes/email-sent.tpl similarity index 100% rename from frontend/client/res/templates/stream/notes/email-sent.tpl rename to client/res/templates/stream/notes/email-sent.tpl diff --git a/frontend/client/res/templates/stream/notes/post.tpl b/client/res/templates/stream/notes/post.tpl similarity index 100% rename from frontend/client/res/templates/stream/notes/post.tpl rename to client/res/templates/stream/notes/post.tpl diff --git a/frontend/client/res/templates/stream/notes/status.tpl b/client/res/templates/stream/notes/status.tpl similarity index 100% rename from frontend/client/res/templates/stream/notes/status.tpl rename to client/res/templates/stream/notes/status.tpl diff --git a/frontend/client/res/templates/stream/notes/update.tpl b/client/res/templates/stream/notes/update.tpl similarity index 100% rename from frontend/client/res/templates/stream/notes/update.tpl rename to client/res/templates/stream/notes/update.tpl diff --git a/frontend/client/res/templates/stream/panel.tpl b/client/res/templates/stream/panel.tpl similarity index 100% rename from frontend/client/res/templates/stream/panel.tpl rename to client/res/templates/stream/panel.tpl diff --git a/frontend/client/res/templates/stream/record/edit.tpl b/client/res/templates/stream/record/edit.tpl similarity index 100% rename from frontend/client/res/templates/stream/record/edit.tpl rename to client/res/templates/stream/record/edit.tpl diff --git a/frontend/client/res/templates/stream/row-actions/default.tpl b/client/res/templates/stream/row-actions/default.tpl similarity index 100% rename from frontend/client/res/templates/stream/row-actions/default.tpl rename to client/res/templates/stream/row-actions/default.tpl diff --git a/frontend/client/res/templates/template/fields/variables/detail.tpl b/client/res/templates/template/fields/variables/detail.tpl similarity index 100% rename from frontend/client/res/templates/template/fields/variables/detail.tpl rename to client/res/templates/template/fields/variables/detail.tpl diff --git a/frontend/client/res/templates/template/fields/variables/edit.tpl b/client/res/templates/template/fields/variables/edit.tpl similarity index 100% rename from frontend/client/res/templates/template/fields/variables/edit.tpl rename to client/res/templates/template/fields/variables/edit.tpl diff --git a/frontend/client/res/templates/user/fields/name/list-link.tpl b/client/res/templates/user/fields/name/list-link.tpl similarity index 100% rename from frontend/client/res/templates/user/fields/name/list-link.tpl rename to client/res/templates/user/fields/name/list-link.tpl diff --git a/frontend/client/res/templates/user/fields/name/list.tpl b/client/res/templates/user/fields/name/list.tpl similarity index 100% rename from frontend/client/res/templates/user/fields/name/list.tpl rename to client/res/templates/user/fields/name/list.tpl diff --git a/frontend/client/res/templates/user/modals/access.tpl b/client/res/templates/user/modals/access.tpl similarity index 100% rename from frontend/client/res/templates/user/modals/access.tpl rename to client/res/templates/user/modals/access.tpl diff --git a/frontend/client/res/templates/user/password-change-request.tpl b/client/res/templates/user/password-change-request.tpl similarity index 100% rename from frontend/client/res/templates/user/password-change-request.tpl rename to client/res/templates/user/password-change-request.tpl diff --git a/frontend/client/sounds/pop_cork.mp3 b/client/sounds/pop_cork.mp3 similarity index 100% rename from frontend/client/sounds/pop_cork.mp3 rename to client/sounds/pop_cork.mp3 diff --git a/frontend/client/sounds/pop_cork.ogg b/client/sounds/pop_cork.ogg similarity index 100% rename from frontend/client/sounds/pop_cork.ogg rename to client/sounds/pop_cork.ogg diff --git a/frontend/client/src/acl-manager.js b/client/src/acl-manager.js similarity index 100% rename from frontend/client/src/acl-manager.js rename to client/src/acl-manager.js diff --git a/frontend/client/src/acl-portal-manager.js b/client/src/acl-portal-manager.js similarity index 100% rename from frontend/client/src/acl-portal-manager.js rename to client/src/acl-portal-manager.js diff --git a/frontend/client/src/acl-portal.js b/client/src/acl-portal.js similarity index 100% rename from frontend/client/src/acl-portal.js rename to client/src/acl-portal.js diff --git a/frontend/client/src/acl-portal/email.js b/client/src/acl-portal/email.js similarity index 100% rename from frontend/client/src/acl-portal/email.js rename to client/src/acl-portal/email.js diff --git a/frontend/client/src/acl-portal/preferences.js b/client/src/acl-portal/preferences.js similarity index 100% rename from frontend/client/src/acl-portal/preferences.js rename to client/src/acl-portal/preferences.js diff --git a/frontend/client/src/acl.js b/client/src/acl.js similarity index 100% rename from frontend/client/src/acl.js rename to client/src/acl.js diff --git a/frontend/client/src/acl/email.js b/client/src/acl/email.js similarity index 100% rename from frontend/client/src/acl/email.js rename to client/src/acl/email.js diff --git a/frontend/client/src/acl/preferences.js b/client/src/acl/preferences.js similarity index 100% rename from frontend/client/src/acl/preferences.js rename to client/src/acl/preferences.js diff --git a/frontend/client/src/app-portal.js b/client/src/app-portal.js similarity index 100% rename from frontend/client/src/app-portal.js rename to client/src/app-portal.js diff --git a/frontend/client/src/app.js b/client/src/app.js similarity index 96% rename from frontend/client/src/app.js rename to client/src/app.js index ee498a6a9f..80b0c5247b 100644 --- a/frontend/client/src/app.js +++ b/client/src/app.js @@ -39,6 +39,7 @@ Espo.define( this.useCache = options.useCache || this.useCache; this.url = options.url || this.url; + this.basePath = options.basePath || ''; this.controllers = {}; @@ -166,7 +167,8 @@ Espo.define( this.viewHelper.layoutManager.userId = this.user.id; if (this.themeManager.isUserTheme()) { - $('#main-stylesheet').attr('href', this.themeManager.getStylesheet()); + var stylesheetPath = this.basePath + this.themeManager.getStylesheet(); + $('#main-stylesheet').attr('href', stylesheetPath); } var promiseList = []; @@ -313,6 +315,7 @@ Espo.define( helper.cache = this.cache; helper.storage = this.storage; helper.themeManager = this.themeManager; + helper.basePath = this.basePath; this.viewLoader = function (viewName, callback) { Espo.require(Espo.Utils.composeViewClassName(viewName), callback); @@ -321,15 +324,23 @@ Espo.define( var self = this; var getResourceInnerPath = function (type, name) { + var path = null; switch (type) { case 'template': - return 'res/templates/' + name.split('.').join('/') + '.tpl'; + path = 'res/templates/' + name.split('.').join('/') + '.tpl'; + break; case 'layoutTemplate': - return 'res/layout-types/' + name + '.tpl'; + path = 'res/layout-types/' + name + '.tpl'; + break; case 'layout': - return 'res/layouts/' + name + '.json'; + path = 'res/layouts/' + name + '.json'; + break; } - }; + + path = this.basePath + path; + + return path; + }.bind(this); var getResourcePath = function (type, name) { var path; @@ -345,8 +356,11 @@ Espo.define( } else { path = 'client/' + getResourceInnerPath(type, name); } + + path = this.basePath + path; + return path; - }; + }.bind(this); this.viewFactory = new Bull.Factory({ useCache: false, diff --git a/frontend/client/src/cache.js b/client/src/cache.js similarity index 100% rename from frontend/client/src/cache.js rename to client/src/cache.js diff --git a/frontend/client/src/collection-factory.js b/client/src/collection-factory.js similarity index 100% rename from frontend/client/src/collection-factory.js rename to client/src/collection-factory.js diff --git a/frontend/client/src/collection.js b/client/src/collection.js similarity index 100% rename from frontend/client/src/collection.js rename to client/src/collection.js diff --git a/frontend/client/src/collections/note.js b/client/src/collections/note.js similarity index 100% rename from frontend/client/src/collections/note.js rename to client/src/collections/note.js diff --git a/frontend/client/src/collections/tree.js b/client/src/collections/tree.js similarity index 100% rename from frontend/client/src/collections/tree.js rename to client/src/collections/tree.js diff --git a/frontend/client/src/controller.js b/client/src/controller.js similarity index 100% rename from frontend/client/src/controller.js rename to client/src/controller.js diff --git a/frontend/client/src/controllers/about.js b/client/src/controllers/about.js similarity index 100% rename from frontend/client/src/controllers/about.js rename to client/src/controllers/about.js diff --git a/frontend/client/src/controllers/admin.js b/client/src/controllers/admin.js similarity index 100% rename from frontend/client/src/controllers/admin.js rename to client/src/controllers/admin.js diff --git a/frontend/client/src/controllers/base.js b/client/src/controllers/base.js similarity index 100% rename from frontend/client/src/controllers/base.js rename to client/src/controllers/base.js diff --git a/frontend/client/src/controllers/dashboard.js b/client/src/controllers/dashboard.js similarity index 100% rename from frontend/client/src/controllers/dashboard.js rename to client/src/controllers/dashboard.js diff --git a/frontend/client/src/controllers/email-account.js b/client/src/controllers/email-account.js similarity index 100% rename from frontend/client/src/controllers/email-account.js rename to client/src/controllers/email-account.js diff --git a/frontend/client/src/controllers/external-account.js b/client/src/controllers/external-account.js similarity index 100% rename from frontend/client/src/controllers/external-account.js rename to client/src/controllers/external-account.js diff --git a/frontend/client/src/controllers/home.js b/client/src/controllers/home.js similarity index 100% rename from frontend/client/src/controllers/home.js rename to client/src/controllers/home.js diff --git a/frontend/client/src/controllers/import.js b/client/src/controllers/import.js similarity index 100% rename from frontend/client/src/controllers/import.js rename to client/src/controllers/import.js diff --git a/frontend/client/src/controllers/inbound-email.js b/client/src/controllers/inbound-email.js similarity index 100% rename from frontend/client/src/controllers/inbound-email.js rename to client/src/controllers/inbound-email.js diff --git a/frontend/client/src/controllers/notification.js b/client/src/controllers/notification.js similarity index 100% rename from frontend/client/src/controllers/notification.js rename to client/src/controllers/notification.js diff --git a/frontend/client/src/controllers/page.js b/client/src/controllers/page.js similarity index 100% rename from frontend/client/src/controllers/page.js rename to client/src/controllers/page.js diff --git a/frontend/client/src/controllers/password-change-request.js b/client/src/controllers/password-change-request.js similarity index 100% rename from frontend/client/src/controllers/password-change-request.js rename to client/src/controllers/password-change-request.js diff --git a/frontend/client/src/controllers/portal-role.js b/client/src/controllers/portal-role.js similarity index 100% rename from frontend/client/src/controllers/portal-role.js rename to client/src/controllers/portal-role.js diff --git a/frontend/client/src/controllers/preferences.js b/client/src/controllers/preferences.js similarity index 100% rename from frontend/client/src/controllers/preferences.js rename to client/src/controllers/preferences.js diff --git a/frontend/client/src/controllers/record-tree.js b/client/src/controllers/record-tree.js similarity index 100% rename from frontend/client/src/controllers/record-tree.js rename to client/src/controllers/record-tree.js diff --git a/frontend/client/src/controllers/record.js b/client/src/controllers/record.js similarity index 100% rename from frontend/client/src/controllers/record.js rename to client/src/controllers/record.js diff --git a/frontend/client/src/controllers/role.js b/client/src/controllers/role.js similarity index 100% rename from frontend/client/src/controllers/role.js rename to client/src/controllers/role.js diff --git a/frontend/client/src/controllers/stream.js b/client/src/controllers/stream.js similarity index 100% rename from frontend/client/src/controllers/stream.js rename to client/src/controllers/stream.js diff --git a/frontend/client/src/controllers/team.js b/client/src/controllers/team.js similarity index 100% rename from frontend/client/src/controllers/team.js rename to client/src/controllers/team.js diff --git a/frontend/client/src/controllers/user.js b/client/src/controllers/user.js similarity index 100% rename from frontend/client/src/controllers/user.js rename to client/src/controllers/user.js diff --git a/frontend/client/src/date-time.js b/client/src/date-time.js similarity index 100% rename from frontend/client/src/date-time.js rename to client/src/date-time.js diff --git a/frontend/client/src/email-helper.js b/client/src/email-helper.js similarity index 100% rename from frontend/client/src/email-helper.js rename to client/src/email-helper.js diff --git a/frontend/client/src/exceptions.js b/client/src/exceptions.js similarity index 100% rename from frontend/client/src/exceptions.js rename to client/src/exceptions.js diff --git a/frontend/client/src/field-manager.js b/client/src/field-manager.js similarity index 100% rename from frontend/client/src/field-manager.js rename to client/src/field-manager.js diff --git a/frontend/client/src/language.js b/client/src/language.js similarity index 100% rename from frontend/client/src/language.js rename to client/src/language.js diff --git a/frontend/client/src/layout-manager.js b/client/src/layout-manager.js similarity index 100% rename from frontend/client/src/layout-manager.js rename to client/src/layout-manager.js diff --git a/frontend/client/src/loader.js b/client/src/loader.js similarity index 100% rename from frontend/client/src/loader.js rename to client/src/loader.js diff --git a/frontend/client/src/metadata.js b/client/src/metadata.js similarity index 100% rename from frontend/client/src/metadata.js rename to client/src/metadata.js diff --git a/frontend/client/src/model-factory.js b/client/src/model-factory.js similarity index 100% rename from frontend/client/src/model-factory.js rename to client/src/model-factory.js diff --git a/frontend/client/src/model-offline.js b/client/src/model-offline.js similarity index 100% rename from frontend/client/src/model-offline.js rename to client/src/model-offline.js diff --git a/frontend/client/src/model.js b/client/src/model.js similarity index 100% rename from frontend/client/src/model.js rename to client/src/model.js diff --git a/frontend/client/src/models/email.js b/client/src/models/email.js similarity index 100% rename from frontend/client/src/models/email.js rename to client/src/models/email.js diff --git a/frontend/client/src/models/preferences.js b/client/src/models/preferences.js similarity index 100% rename from frontend/client/src/models/preferences.js rename to client/src/models/preferences.js diff --git a/frontend/client/src/models/settings.js b/client/src/models/settings.js similarity index 100% rename from frontend/client/src/models/settings.js rename to client/src/models/settings.js diff --git a/frontend/client/src/models/user.js b/client/src/models/user.js similarity index 100% rename from frontend/client/src/models/user.js rename to client/src/models/user.js diff --git a/frontend/client/src/multi-collection.js b/client/src/multi-collection.js similarity index 100% rename from frontend/client/src/multi-collection.js rename to client/src/multi-collection.js diff --git a/frontend/client/src/namespace.js b/client/src/namespace.js similarity index 100% rename from frontend/client/src/namespace.js rename to client/src/namespace.js diff --git a/frontend/client/src/pre-loader.js b/client/src/pre-loader.js similarity index 100% rename from frontend/client/src/pre-loader.js rename to client/src/pre-loader.js diff --git a/frontend/client/src/router.js b/client/src/router.js similarity index 100% rename from frontend/client/src/router.js rename to client/src/router.js diff --git a/frontend/client/src/search-manager.js b/client/src/search-manager.js similarity index 100% rename from frontend/client/src/search-manager.js rename to client/src/search-manager.js diff --git a/frontend/client/src/storage.js b/client/src/storage.js similarity index 100% rename from frontend/client/src/storage.js rename to client/src/storage.js diff --git a/frontend/client/src/theme-manager.js b/client/src/theme-manager.js similarity index 100% rename from frontend/client/src/theme-manager.js rename to client/src/theme-manager.js diff --git a/frontend/client/src/ui.js b/client/src/ui.js similarity index 100% rename from frontend/client/src/ui.js rename to client/src/ui.js diff --git a/frontend/client/src/utils.js b/client/src/utils.js similarity index 100% rename from frontend/client/src/utils.js rename to client/src/utils.js diff --git a/frontend/client/src/view-helper.js b/client/src/view-helper.js similarity index 98% rename from frontend/client/src/view-helper.js rename to client/src/view-helper.js index 766d9caf94..f1f7e0664d 100644 --- a/frontend/client/src/view-helper.js +++ b/client/src/view-helper.js @@ -275,6 +275,10 @@ Espo.define('view-helper', [], function () { } return new Handlebars.SafeString(html); }); + + Handlebars.registerHelper('basePath', function () { + return self.basePath || ''; + }); } }); diff --git a/frontend/client/src/view-record-helper.js b/client/src/view-record-helper.js similarity index 100% rename from frontend/client/src/view-record-helper.js rename to client/src/view-record-helper.js diff --git a/frontend/client/src/view.js b/client/src/view.js similarity index 98% rename from frontend/client/src/view.js rename to client/src/view.js index 49ed27993b..7371f12fe6 100644 --- a/frontend/client/src/view.js +++ b/client/src/view.js @@ -173,6 +173,10 @@ Espo.define('view', [], function () { return this.getLanguage().translate(label, category, scope); }, + getBasePath: function () { + return this._helper.basePath || ''; + }, + ajaxRequest: function (url, type, data, options) { var options = options || {}; options.type = type; diff --git a/frontend/client/src/views/about.js b/client/src/views/about.js similarity index 100% rename from frontend/client/src/views/about.js rename to client/src/views/about.js diff --git a/frontend/client/src/views/admin/auth-token/list.js b/client/src/views/admin/auth-token/list.js similarity index 100% rename from frontend/client/src/views/admin/auth-token/list.js rename to client/src/views/admin/auth-token/list.js diff --git a/frontend/client/src/views/admin/auth-token/record/list.js b/client/src/views/admin/auth-token/record/list.js similarity index 100% rename from frontend/client/src/views/admin/auth-token/record/list.js rename to client/src/views/admin/auth-token/record/list.js diff --git a/frontend/client/src/views/admin/authentication.js b/client/src/views/admin/authentication.js similarity index 100% rename from frontend/client/src/views/admin/authentication.js rename to client/src/views/admin/authentication.js diff --git a/frontend/client/src/views/admin/currency.js b/client/src/views/admin/currency.js similarity index 100% rename from frontend/client/src/views/admin/currency.js rename to client/src/views/admin/currency.js diff --git a/frontend/client/src/views/admin/entity-manager/index.js b/client/src/views/admin/entity-manager/index.js similarity index 100% rename from frontend/client/src/views/admin/entity-manager/index.js rename to client/src/views/admin/entity-manager/index.js diff --git a/frontend/client/src/views/admin/entity-manager/modals/edit-entity.js b/client/src/views/admin/entity-manager/modals/edit-entity.js similarity index 100% rename from frontend/client/src/views/admin/entity-manager/modals/edit-entity.js rename to client/src/views/admin/entity-manager/modals/edit-entity.js diff --git a/frontend/client/src/views/admin/extensions/done.js b/client/src/views/admin/extensions/done.js similarity index 100% rename from frontend/client/src/views/admin/extensions/done.js rename to client/src/views/admin/extensions/done.js diff --git a/frontend/client/src/views/admin/extensions/index.js b/client/src/views/admin/extensions/index.js similarity index 100% rename from frontend/client/src/views/admin/extensions/index.js rename to client/src/views/admin/extensions/index.js diff --git a/frontend/client/src/views/admin/extensions/ready.js b/client/src/views/admin/extensions/ready.js similarity index 100% rename from frontend/client/src/views/admin/extensions/ready.js rename to client/src/views/admin/extensions/ready.js diff --git a/frontend/client/src/views/admin/field-manager/edit.js b/client/src/views/admin/field-manager/edit.js similarity index 100% rename from frontend/client/src/views/admin/field-manager/edit.js rename to client/src/views/admin/field-manager/edit.js diff --git a/frontend/client/src/views/admin/field-manager/fields/entity-list.js b/client/src/views/admin/field-manager/fields/entity-list.js similarity index 100% rename from frontend/client/src/views/admin/field-manager/fields/entity-list.js rename to client/src/views/admin/field-manager/fields/entity-list.js diff --git a/frontend/client/src/views/admin/field-manager/fields/options.js b/client/src/views/admin/field-manager/fields/options.js similarity index 100% rename from frontend/client/src/views/admin/field-manager/fields/options.js rename to client/src/views/admin/field-manager/fields/options.js diff --git a/frontend/client/src/views/admin/field-manager/fields/source-list.js b/client/src/views/admin/field-manager/fields/source-list.js similarity index 100% rename from frontend/client/src/views/admin/field-manager/fields/source-list.js rename to client/src/views/admin/field-manager/fields/source-list.js diff --git a/frontend/client/src/views/admin/field-manager/index.js b/client/src/views/admin/field-manager/index.js similarity index 100% rename from frontend/client/src/views/admin/field-manager/index.js rename to client/src/views/admin/field-manager/index.js diff --git a/frontend/client/src/views/admin/field-manager/list.js b/client/src/views/admin/field-manager/list.js similarity index 100% rename from frontend/client/src/views/admin/field-manager/list.js rename to client/src/views/admin/field-manager/list.js diff --git a/frontend/client/src/views/admin/inbound-emails.js b/client/src/views/admin/inbound-emails.js similarity index 100% rename from frontend/client/src/views/admin/inbound-emails.js rename to client/src/views/admin/inbound-emails.js diff --git a/frontend/client/src/views/admin/index.js b/client/src/views/admin/index.js similarity index 100% rename from frontend/client/src/views/admin/index.js rename to client/src/views/admin/index.js diff --git a/frontend/client/src/views/admin/integrations/edit.js b/client/src/views/admin/integrations/edit.js similarity index 100% rename from frontend/client/src/views/admin/integrations/edit.js rename to client/src/views/admin/integrations/edit.js diff --git a/frontend/client/src/views/admin/integrations/index.js b/client/src/views/admin/integrations/index.js similarity index 100% rename from frontend/client/src/views/admin/integrations/index.js rename to client/src/views/admin/integrations/index.js diff --git a/frontend/client/src/views/admin/integrations/oauth2.js b/client/src/views/admin/integrations/oauth2.js similarity index 100% rename from frontend/client/src/views/admin/integrations/oauth2.js rename to client/src/views/admin/integrations/oauth2.js diff --git a/frontend/client/src/views/admin/job/fields/name.js b/client/src/views/admin/job/fields/name.js similarity index 100% rename from frontend/client/src/views/admin/job/fields/name.js rename to client/src/views/admin/job/fields/name.js diff --git a/frontend/client/src/views/admin/job/list.js b/client/src/views/admin/job/list.js similarity index 100% rename from frontend/client/src/views/admin/job/list.js rename to client/src/views/admin/job/list.js diff --git a/frontend/client/src/views/admin/job/modals/detail.js b/client/src/views/admin/job/modals/detail.js similarity index 100% rename from frontend/client/src/views/admin/job/modals/detail.js rename to client/src/views/admin/job/modals/detail.js diff --git a/frontend/client/src/views/admin/job/record/detail-small.js b/client/src/views/admin/job/record/detail-small.js similarity index 100% rename from frontend/client/src/views/admin/job/record/detail-small.js rename to client/src/views/admin/job/record/detail-small.js diff --git a/frontend/client/src/views/admin/job/record/list.js b/client/src/views/admin/job/record/list.js similarity index 100% rename from frontend/client/src/views/admin/job/record/list.js rename to client/src/views/admin/job/record/list.js diff --git a/frontend/client/src/views/admin/layouts/base.js b/client/src/views/admin/layouts/base.js similarity index 100% rename from frontend/client/src/views/admin/layouts/base.js rename to client/src/views/admin/layouts/base.js diff --git a/frontend/client/src/views/admin/layouts/detail-convert.js b/client/src/views/admin/layouts/detail-convert.js similarity index 100% rename from frontend/client/src/views/admin/layouts/detail-convert.js rename to client/src/views/admin/layouts/detail-convert.js diff --git a/frontend/client/src/views/admin/layouts/detail-small.js b/client/src/views/admin/layouts/detail-small.js similarity index 100% rename from frontend/client/src/views/admin/layouts/detail-small.js rename to client/src/views/admin/layouts/detail-small.js diff --git a/frontend/client/src/views/admin/layouts/detail.js b/client/src/views/admin/layouts/detail.js similarity index 100% rename from frontend/client/src/views/admin/layouts/detail.js rename to client/src/views/admin/layouts/detail.js diff --git a/frontend/client/src/views/admin/layouts/filters.js b/client/src/views/admin/layouts/filters.js similarity index 100% rename from frontend/client/src/views/admin/layouts/filters.js rename to client/src/views/admin/layouts/filters.js diff --git a/frontend/client/src/views/admin/layouts/grid.js b/client/src/views/admin/layouts/grid.js similarity index 100% rename from frontend/client/src/views/admin/layouts/grid.js rename to client/src/views/admin/layouts/grid.js diff --git a/frontend/client/src/views/admin/layouts/index.js b/client/src/views/admin/layouts/index.js similarity index 100% rename from frontend/client/src/views/admin/layouts/index.js rename to client/src/views/admin/layouts/index.js diff --git a/frontend/client/src/views/admin/layouts/list-small.js b/client/src/views/admin/layouts/list-small.js similarity index 100% rename from frontend/client/src/views/admin/layouts/list-small.js rename to client/src/views/admin/layouts/list-small.js diff --git a/frontend/client/src/views/admin/layouts/list.js b/client/src/views/admin/layouts/list.js similarity index 100% rename from frontend/client/src/views/admin/layouts/list.js rename to client/src/views/admin/layouts/list.js diff --git a/frontend/client/src/views/admin/layouts/mass-update.js b/client/src/views/admin/layouts/mass-update.js similarity index 100% rename from frontend/client/src/views/admin/layouts/mass-update.js rename to client/src/views/admin/layouts/mass-update.js diff --git a/frontend/client/src/views/admin/layouts/modals/edit-attributes.js b/client/src/views/admin/layouts/modals/edit-attributes.js similarity index 100% rename from frontend/client/src/views/admin/layouts/modals/edit-attributes.js rename to client/src/views/admin/layouts/modals/edit-attributes.js diff --git a/frontend/client/src/views/admin/layouts/record/edit-attributes.js b/client/src/views/admin/layouts/record/edit-attributes.js similarity index 100% rename from frontend/client/src/views/admin/layouts/record/edit-attributes.js rename to client/src/views/admin/layouts/record/edit-attributes.js diff --git a/frontend/client/src/views/admin/layouts/relationships.js b/client/src/views/admin/layouts/relationships.js similarity index 100% rename from frontend/client/src/views/admin/layouts/relationships.js rename to client/src/views/admin/layouts/relationships.js diff --git a/frontend/client/src/views/admin/layouts/rows.js b/client/src/views/admin/layouts/rows.js similarity index 100% rename from frontend/client/src/views/admin/layouts/rows.js rename to client/src/views/admin/layouts/rows.js diff --git a/frontend/client/src/views/admin/link-manager/index.js b/client/src/views/admin/link-manager/index.js similarity index 100% rename from frontend/client/src/views/admin/link-manager/index.js rename to client/src/views/admin/link-manager/index.js diff --git a/frontend/client/src/views/admin/link-manager/modals/edit.js b/client/src/views/admin/link-manager/modals/edit.js similarity index 100% rename from frontend/client/src/views/admin/link-manager/modals/edit.js rename to client/src/views/admin/link-manager/modals/edit.js diff --git a/frontend/client/src/views/admin/notifications.js b/client/src/views/admin/notifications.js similarity index 100% rename from frontend/client/src/views/admin/notifications.js rename to client/src/views/admin/notifications.js diff --git a/frontend/client/src/views/admin/outbound-emails.js b/client/src/views/admin/outbound-emails.js similarity index 100% rename from frontend/client/src/views/admin/outbound-emails.js rename to client/src/views/admin/outbound-emails.js diff --git a/frontend/client/src/views/admin/settings.js b/client/src/views/admin/settings.js similarity index 100% rename from frontend/client/src/views/admin/settings.js rename to client/src/views/admin/settings.js diff --git a/frontend/client/src/views/admin/upgrade/done.js b/client/src/views/admin/upgrade/done.js similarity index 100% rename from frontend/client/src/views/admin/upgrade/done.js rename to client/src/views/admin/upgrade/done.js diff --git a/frontend/client/src/views/admin/upgrade/index.js b/client/src/views/admin/upgrade/index.js similarity index 100% rename from frontend/client/src/views/admin/upgrade/index.js rename to client/src/views/admin/upgrade/index.js diff --git a/frontend/client/src/views/admin/upgrade/ready.js b/client/src/views/admin/upgrade/ready.js similarity index 100% rename from frontend/client/src/views/admin/upgrade/ready.js rename to client/src/views/admin/upgrade/ready.js diff --git a/frontend/client/src/views/admin/user-interface.js b/client/src/views/admin/user-interface.js similarity index 100% rename from frontend/client/src/views/admin/user-interface.js rename to client/src/views/admin/user-interface.js diff --git a/frontend/client/src/views/base.js b/client/src/views/base.js similarity index 100% rename from frontend/client/src/views/base.js rename to client/src/views/base.js diff --git a/frontend/client/src/views/dashboard.js b/client/src/views/dashboard.js similarity index 100% rename from frontend/client/src/views/dashboard.js rename to client/src/views/dashboard.js diff --git a/frontend/client/src/views/dashlet.js b/client/src/views/dashlet.js similarity index 100% rename from frontend/client/src/views/dashlet.js rename to client/src/views/dashlet.js diff --git a/frontend/client/src/views/dashlets/abstract/base.js b/client/src/views/dashlets/abstract/base.js similarity index 100% rename from frontend/client/src/views/dashlets/abstract/base.js rename to client/src/views/dashlets/abstract/base.js diff --git a/frontend/client/src/views/dashlets/abstract/record-list.js b/client/src/views/dashlets/abstract/record-list.js similarity index 100% rename from frontend/client/src/views/dashlets/abstract/record-list.js rename to client/src/views/dashlets/abstract/record-list.js diff --git a/frontend/client/src/views/dashlets/options/base.js b/client/src/views/dashlets/options/base.js similarity index 100% rename from frontend/client/src/views/dashlets/options/base.js rename to client/src/views/dashlets/options/base.js diff --git a/frontend/client/src/views/dashlets/stream.js b/client/src/views/dashlets/stream.js similarity index 100% rename from frontend/client/src/views/dashlets/stream.js rename to client/src/views/dashlets/stream.js diff --git a/frontend/client/src/views/detail.js b/client/src/views/detail.js similarity index 100% rename from frontend/client/src/views/detail.js rename to client/src/views/detail.js diff --git a/frontend/client/src/views/edit.js b/client/src/views/edit.js similarity index 100% rename from frontend/client/src/views/edit.js rename to client/src/views/edit.js diff --git a/frontend/client/src/views/email-account/fields/email-address.js b/client/src/views/email-account/fields/email-address.js similarity index 100% rename from frontend/client/src/views/email-account/fields/email-address.js rename to client/src/views/email-account/fields/email-address.js diff --git a/frontend/client/src/views/email-account/fields/folder.js b/client/src/views/email-account/fields/folder.js similarity index 100% rename from frontend/client/src/views/email-account/fields/folder.js rename to client/src/views/email-account/fields/folder.js diff --git a/frontend/client/src/views/email-account/fields/folders.js b/client/src/views/email-account/fields/folders.js similarity index 100% rename from frontend/client/src/views/email-account/fields/folders.js rename to client/src/views/email-account/fields/folders.js diff --git a/frontend/client/src/views/email-account/fields/test-connection.js b/client/src/views/email-account/fields/test-connection.js similarity index 100% rename from frontend/client/src/views/email-account/fields/test-connection.js rename to client/src/views/email-account/fields/test-connection.js diff --git a/frontend/client/src/views/email-account/list.js b/client/src/views/email-account/list.js similarity index 100% rename from frontend/client/src/views/email-account/list.js rename to client/src/views/email-account/list.js diff --git a/frontend/client/src/views/email-account/modals/select-folder.js b/client/src/views/email-account/modals/select-folder.js similarity index 100% rename from frontend/client/src/views/email-account/modals/select-folder.js rename to client/src/views/email-account/modals/select-folder.js diff --git a/frontend/client/src/views/email-account/record/detail.js b/client/src/views/email-account/record/detail.js similarity index 100% rename from frontend/client/src/views/email-account/record/detail.js rename to client/src/views/email-account/record/detail.js diff --git a/frontend/client/src/views/email-account/record/edit.js b/client/src/views/email-account/record/edit.js similarity index 100% rename from frontend/client/src/views/email-account/record/edit.js rename to client/src/views/email-account/record/edit.js diff --git a/frontend/client/src/views/email-account/record/list.js b/client/src/views/email-account/record/list.js similarity index 100% rename from frontend/client/src/views/email-account/record/list.js rename to client/src/views/email-account/record/list.js diff --git a/frontend/client/src/views/email-filter/modals/edit.js b/client/src/views/email-filter/modals/edit.js similarity index 100% rename from frontend/client/src/views/email-filter/modals/edit.js rename to client/src/views/email-filter/modals/edit.js diff --git a/frontend/client/src/views/email-template/fields/insert-field.js b/client/src/views/email-template/fields/insert-field.js similarity index 100% rename from frontend/client/src/views/email-template/fields/insert-field.js rename to client/src/views/email-template/fields/insert-field.js diff --git a/frontend/client/src/views/email-template/record/detail.js b/client/src/views/email-template/record/detail.js similarity index 100% rename from frontend/client/src/views/email-template/record/detail.js rename to client/src/views/email-template/record/detail.js diff --git a/frontend/client/src/views/email-template/record/edit-quick.js b/client/src/views/email-template/record/edit-quick.js similarity index 100% rename from frontend/client/src/views/email-template/record/edit-quick.js rename to client/src/views/email-template/record/edit-quick.js diff --git a/frontend/client/src/views/email-template/record/edit.js b/client/src/views/email-template/record/edit.js similarity index 100% rename from frontend/client/src/views/email-template/record/edit.js rename to client/src/views/email-template/record/edit.js diff --git a/frontend/client/src/views/email-template/record/panels/information.js b/client/src/views/email-template/record/panels/information.js similarity index 100% rename from frontend/client/src/views/email-template/record/panels/information.js rename to client/src/views/email-template/record/panels/information.js diff --git a/frontend/client/src/views/email/detail.js b/client/src/views/email/detail.js similarity index 100% rename from frontend/client/src/views/email/detail.js rename to client/src/views/email/detail.js diff --git a/frontend/client/src/views/email/fields/compose-from-address.js b/client/src/views/email/fields/compose-from-address.js similarity index 100% rename from frontend/client/src/views/email/fields/compose-from-address.js rename to client/src/views/email/fields/compose-from-address.js diff --git a/frontend/client/src/views/email/fields/email-address-varchar.js b/client/src/views/email/fields/email-address-varchar.js similarity index 100% rename from frontend/client/src/views/email/fields/email-address-varchar.js rename to client/src/views/email/fields/email-address-varchar.js diff --git a/frontend/client/src/views/email/fields/email-address.js b/client/src/views/email/fields/email-address.js similarity index 100% rename from frontend/client/src/views/email/fields/email-address.js rename to client/src/views/email/fields/email-address.js diff --git a/frontend/client/src/views/email/fields/from-address-varchar.js b/client/src/views/email/fields/from-address-varchar.js similarity index 100% rename from frontend/client/src/views/email/fields/from-address-varchar.js rename to client/src/views/email/fields/from-address-varchar.js diff --git a/frontend/client/src/views/email/fields/from-email-address.js b/client/src/views/email/fields/from-email-address.js similarity index 100% rename from frontend/client/src/views/email/fields/from-email-address.js rename to client/src/views/email/fields/from-email-address.js diff --git a/frontend/client/src/views/email/fields/icon.js b/client/src/views/email/fields/icon.js similarity index 100% rename from frontend/client/src/views/email/fields/icon.js rename to client/src/views/email/fields/icon.js diff --git a/frontend/client/src/views/email/fields/select-template.js b/client/src/views/email/fields/select-template.js similarity index 100% rename from frontend/client/src/views/email/fields/select-template.js rename to client/src/views/email/fields/select-template.js diff --git a/frontend/client/src/views/email/fields/subject.js b/client/src/views/email/fields/subject.js similarity index 100% rename from frontend/client/src/views/email/fields/subject.js rename to client/src/views/email/fields/subject.js diff --git a/frontend/client/src/views/email/list.js b/client/src/views/email/list.js similarity index 100% rename from frontend/client/src/views/email/list.js rename to client/src/views/email/list.js diff --git a/frontend/client/src/views/email/modals/body-plain.js b/client/src/views/email/modals/body-plain.js similarity index 100% rename from frontend/client/src/views/email/modals/body-plain.js rename to client/src/views/email/modals/body-plain.js diff --git a/frontend/client/src/views/email/modals/detail.js b/client/src/views/email/modals/detail.js similarity index 100% rename from frontend/client/src/views/email/modals/detail.js rename to client/src/views/email/modals/detail.js diff --git a/frontend/client/src/views/email/record/compose.js b/client/src/views/email/record/compose.js similarity index 100% rename from frontend/client/src/views/email/record/compose.js rename to client/src/views/email/record/compose.js diff --git a/frontend/client/src/views/email/record/detail-quick.js b/client/src/views/email/record/detail-quick.js similarity index 100% rename from frontend/client/src/views/email/record/detail-quick.js rename to client/src/views/email/record/detail-quick.js diff --git a/frontend/client/src/views/email/record/detail-side.js b/client/src/views/email/record/detail-side.js similarity index 100% rename from frontend/client/src/views/email/record/detail-side.js rename to client/src/views/email/record/detail-side.js diff --git a/frontend/client/src/views/email/record/detail.js b/client/src/views/email/record/detail.js similarity index 100% rename from frontend/client/src/views/email/record/detail.js rename to client/src/views/email/record/detail.js diff --git a/frontend/client/src/views/email/record/edit-quick.js b/client/src/views/email/record/edit-quick.js similarity index 100% rename from frontend/client/src/views/email/record/edit-quick.js rename to client/src/views/email/record/edit-quick.js diff --git a/frontend/client/src/views/email/record/edit.js b/client/src/views/email/record/edit.js similarity index 100% rename from frontend/client/src/views/email/record/edit.js rename to client/src/views/email/record/edit.js diff --git a/frontend/client/src/views/email/record/list.js b/client/src/views/email/record/list.js similarity index 100% rename from frontend/client/src/views/email/record/list.js rename to client/src/views/email/record/list.js diff --git a/frontend/client/src/views/email/record/row-actions/default.js b/client/src/views/email/record/row-actions/default.js similarity index 100% rename from frontend/client/src/views/email/record/row-actions/default.js rename to client/src/views/email/record/row-actions/default.js diff --git a/frontend/client/src/views/extension/record/list.js b/client/src/views/extension/record/list.js similarity index 100% rename from frontend/client/src/views/extension/record/list.js rename to client/src/views/extension/record/list.js diff --git a/frontend/client/src/views/extension/record/row-actions.js b/client/src/views/extension/record/row-actions.js similarity index 100% rename from frontend/client/src/views/extension/record/row-actions.js rename to client/src/views/extension/record/row-actions.js diff --git a/frontend/client/src/views/external-account/index.js b/client/src/views/external-account/index.js similarity index 100% rename from frontend/client/src/views/external-account/index.js rename to client/src/views/external-account/index.js diff --git a/frontend/client/src/views/external-account/oauth2.js b/client/src/views/external-account/oauth2.js similarity index 100% rename from frontend/client/src/views/external-account/oauth2.js rename to client/src/views/external-account/oauth2.js diff --git a/frontend/client/src/views/fields/address.js b/client/src/views/fields/address.js similarity index 100% rename from frontend/client/src/views/fields/address.js rename to client/src/views/fields/address.js diff --git a/frontend/client/src/views/fields/array-int.js b/client/src/views/fields/array-int.js similarity index 100% rename from frontend/client/src/views/fields/array-int.js rename to client/src/views/fields/array-int.js diff --git a/frontend/client/src/views/fields/array.js b/client/src/views/fields/array.js similarity index 100% rename from frontend/client/src/views/fields/array.js rename to client/src/views/fields/array.js diff --git a/frontend/client/src/views/fields/assigned-user.js b/client/src/views/fields/assigned-user.js similarity index 100% rename from frontend/client/src/views/fields/assigned-user.js rename to client/src/views/fields/assigned-user.js diff --git a/frontend/client/src/views/fields/assigned-users.js b/client/src/views/fields/assigned-users.js similarity index 100% rename from frontend/client/src/views/fields/assigned-users.js rename to client/src/views/fields/assigned-users.js diff --git a/frontend/client/src/views/fields/attachment-multiple.js b/client/src/views/fields/attachment-multiple.js similarity index 98% rename from frontend/client/src/views/fields/attachment-multiple.js rename to client/src/views/fields/attachment-multiple.js index 0352b5cf85..f0b4683f30 100644 --- a/frontend/client/src/views/fields/attachment-multiple.js +++ b/client/src/views/fields/attachment-multiple.js @@ -183,7 +183,7 @@ Espo.define('views/fields/attachment-multiple', 'views/fields/base', function (D }, getImageUrl: function (id, size) { - var url = '?entryPoint=image&id=' + id; + var url = this.getBasePath() + '?entryPoint=image&id=' + id; if (size) { url += '&size=' + size; } @@ -194,7 +194,7 @@ Espo.define('views/fields/attachment-multiple', 'views/fields/base', function (D }, getDownloadUrl: function (id) { - var url = '?entryPoint=download&id=' + id; + var url = this.getBasePath() + '?entryPoint=download&id=' + id; if (this.getUser().get('portalId')) { url += '&portalId=' + this.getUser().get('portalId'); } @@ -261,7 +261,7 @@ Espo.define('views/fields/attachment-multiple', 'views/fields/base', function (D } if (link && preview === name) { - preview = '' + preview + ''; + preview = '' + preview + ''; } var $att = $('
').css('display', 'inline-block') @@ -379,7 +379,7 @@ Espo.define('views/fields/attachment-multiple', 'views/fields/base', function (D var preview = name; if (this.isTypeIsImage(type)) { - preview = ''; + preview = ''; } return preview; }, diff --git a/frontend/client/src/views/fields/autoincrement.js b/client/src/views/fields/autoincrement.js similarity index 100% rename from frontend/client/src/views/fields/autoincrement.js rename to client/src/views/fields/autoincrement.js diff --git a/frontend/client/src/views/fields/base.js b/client/src/views/fields/base.js similarity index 100% rename from frontend/client/src/views/fields/base.js rename to client/src/views/fields/base.js diff --git a/frontend/client/src/views/fields/bool.js b/client/src/views/fields/bool.js similarity index 100% rename from frontend/client/src/views/fields/bool.js rename to client/src/views/fields/bool.js diff --git a/frontend/client/src/views/fields/currency-converted.js b/client/src/views/fields/currency-converted.js similarity index 100% rename from frontend/client/src/views/fields/currency-converted.js rename to client/src/views/fields/currency-converted.js diff --git a/frontend/client/src/views/fields/currency.js b/client/src/views/fields/currency.js similarity index 100% rename from frontend/client/src/views/fields/currency.js rename to client/src/views/fields/currency.js diff --git a/frontend/client/src/views/fields/date.js b/client/src/views/fields/date.js similarity index 100% rename from frontend/client/src/views/fields/date.js rename to client/src/views/fields/date.js diff --git a/frontend/client/src/views/fields/datetime-optional.js b/client/src/views/fields/datetime-optional.js similarity index 100% rename from frontend/client/src/views/fields/datetime-optional.js rename to client/src/views/fields/datetime-optional.js diff --git a/frontend/client/src/views/fields/datetime-short.js b/client/src/views/fields/datetime-short.js similarity index 100% rename from frontend/client/src/views/fields/datetime-short.js rename to client/src/views/fields/datetime-short.js diff --git a/frontend/client/src/views/fields/datetime.js b/client/src/views/fields/datetime.js similarity index 100% rename from frontend/client/src/views/fields/datetime.js rename to client/src/views/fields/datetime.js diff --git a/frontend/client/src/views/fields/duration.js b/client/src/views/fields/duration.js similarity index 100% rename from frontend/client/src/views/fields/duration.js rename to client/src/views/fields/duration.js diff --git a/frontend/client/src/views/fields/email.js b/client/src/views/fields/email.js similarity index 100% rename from frontend/client/src/views/fields/email.js rename to client/src/views/fields/email.js diff --git a/frontend/client/src/views/fields/entity-type-list.js b/client/src/views/fields/entity-type-list.js similarity index 100% rename from frontend/client/src/views/fields/entity-type-list.js rename to client/src/views/fields/entity-type-list.js diff --git a/frontend/client/src/views/fields/entity-type.js b/client/src/views/fields/entity-type.js similarity index 100% rename from frontend/client/src/views/fields/entity-type.js rename to client/src/views/fields/entity-type.js diff --git a/frontend/client/src/views/fields/enum-float.js b/client/src/views/fields/enum-float.js similarity index 100% rename from frontend/client/src/views/fields/enum-float.js rename to client/src/views/fields/enum-float.js diff --git a/frontend/client/src/views/fields/enum-int.js b/client/src/views/fields/enum-int.js similarity index 100% rename from frontend/client/src/views/fields/enum-int.js rename to client/src/views/fields/enum-int.js diff --git a/frontend/client/src/views/fields/enum-styled.js b/client/src/views/fields/enum-styled.js similarity index 100% rename from frontend/client/src/views/fields/enum-styled.js rename to client/src/views/fields/enum-styled.js diff --git a/frontend/client/src/views/fields/enum.js b/client/src/views/fields/enum.js similarity index 100% rename from frontend/client/src/views/fields/enum.js rename to client/src/views/fields/enum.js diff --git a/frontend/client/src/views/fields/file.js b/client/src/views/fields/file.js similarity index 97% rename from frontend/client/src/views/fields/file.js rename to client/src/views/fields/file.js index 5b3f6d7a45..c8feb5e3a8 100644 --- a/frontend/client/src/views/fields/file.js +++ b/client/src/views/fields/file.js @@ -147,7 +147,7 @@ Espo.define('views/fields/file', 'views/fields/link', function (Dep) { case 'image/png': case 'image/jpeg': case 'image/gif': - preview = ''; + preview = ''; } return preview; }, @@ -187,7 +187,7 @@ Espo.define('views/fields/file', 'views/fields/link', function (Dep) { }, getImageUrl: function (id, size) { - var url = '?entryPoint=image&id=' + id; + var url = this.getBasePath() + '?entryPoint=image&id=' + id; if (size) { url += '&size=' + size; } @@ -198,7 +198,7 @@ Espo.define('views/fields/file', 'views/fields/link', function (Dep) { }, getDownloadUrl: function (id) { - var url = '?entryPoint=download&id=' + id; + var url = this.getBasePath() + '?entryPoint=download&id=' + id; if (this.getUser().get('portalId')) { url += '&portalId=' + this.getUser().get('portalId'); } diff --git a/frontend/client/src/views/fields/float.js b/client/src/views/fields/float.js similarity index 100% rename from frontend/client/src/views/fields/float.js rename to client/src/views/fields/float.js diff --git a/frontend/client/src/views/fields/followers.js b/client/src/views/fields/followers.js similarity index 100% rename from frontend/client/src/views/fields/followers.js rename to client/src/views/fields/followers.js diff --git a/frontend/client/src/views/fields/foreign.js b/client/src/views/fields/foreign.js similarity index 100% rename from frontend/client/src/views/fields/foreign.js rename to client/src/views/fields/foreign.js diff --git a/frontend/client/src/views/fields/image.js b/client/src/views/fields/image.js similarity index 100% rename from frontend/client/src/views/fields/image.js rename to client/src/views/fields/image.js diff --git a/frontend/client/src/views/fields/int.js b/client/src/views/fields/int.js similarity index 100% rename from frontend/client/src/views/fields/int.js rename to client/src/views/fields/int.js diff --git a/frontend/client/src/views/fields/json-object.js b/client/src/views/fields/json-object.js similarity index 100% rename from frontend/client/src/views/fields/json-object.js rename to client/src/views/fields/json-object.js diff --git a/frontend/client/src/views/fields/link-category-tree.js b/client/src/views/fields/link-category-tree.js similarity index 100% rename from frontend/client/src/views/fields/link-category-tree.js rename to client/src/views/fields/link-category-tree.js diff --git a/frontend/client/src/views/fields/link-multiple-category-tree.js b/client/src/views/fields/link-multiple-category-tree.js similarity index 100% rename from frontend/client/src/views/fields/link-multiple-category-tree.js rename to client/src/views/fields/link-multiple-category-tree.js diff --git a/frontend/client/src/views/fields/link-multiple-with-primary.js b/client/src/views/fields/link-multiple-with-primary.js similarity index 100% rename from frontend/client/src/views/fields/link-multiple-with-primary.js rename to client/src/views/fields/link-multiple-with-primary.js diff --git a/frontend/client/src/views/fields/link-multiple-with-role.js b/client/src/views/fields/link-multiple-with-role.js similarity index 100% rename from frontend/client/src/views/fields/link-multiple-with-role.js rename to client/src/views/fields/link-multiple-with-role.js diff --git a/frontend/client/src/views/fields/link-multiple.js b/client/src/views/fields/link-multiple.js similarity index 100% rename from frontend/client/src/views/fields/link-multiple.js rename to client/src/views/fields/link-multiple.js diff --git a/frontend/client/src/views/fields/link-parent.js b/client/src/views/fields/link-parent.js similarity index 100% rename from frontend/client/src/views/fields/link-parent.js rename to client/src/views/fields/link-parent.js diff --git a/frontend/client/src/views/fields/link.js b/client/src/views/fields/link.js similarity index 100% rename from frontend/client/src/views/fields/link.js rename to client/src/views/fields/link.js diff --git a/frontend/client/src/views/fields/map.js b/client/src/views/fields/map.js similarity index 100% rename from frontend/client/src/views/fields/map.js rename to client/src/views/fields/map.js diff --git a/frontend/client/src/views/fields/multi-enum.js b/client/src/views/fields/multi-enum.js similarity index 100% rename from frontend/client/src/views/fields/multi-enum.js rename to client/src/views/fields/multi-enum.js diff --git a/frontend/client/src/views/fields/password.js b/client/src/views/fields/password.js similarity index 100% rename from frontend/client/src/views/fields/password.js rename to client/src/views/fields/password.js diff --git a/frontend/client/src/views/fields/person-name.js b/client/src/views/fields/person-name.js similarity index 100% rename from frontend/client/src/views/fields/person-name.js rename to client/src/views/fields/person-name.js diff --git a/frontend/client/src/views/fields/phone.js b/client/src/views/fields/phone.js similarity index 100% rename from frontend/client/src/views/fields/phone.js rename to client/src/views/fields/phone.js diff --git a/frontend/client/src/views/fields/range-currency.js b/client/src/views/fields/range-currency.js similarity index 100% rename from frontend/client/src/views/fields/range-currency.js rename to client/src/views/fields/range-currency.js diff --git a/frontend/client/src/views/fields/range-float.js b/client/src/views/fields/range-float.js similarity index 100% rename from frontend/client/src/views/fields/range-float.js rename to client/src/views/fields/range-float.js diff --git a/frontend/client/src/views/fields/range-int.js b/client/src/views/fields/range-int.js similarity index 100% rename from frontend/client/src/views/fields/range-int.js rename to client/src/views/fields/range-int.js diff --git a/frontend/client/src/views/fields/teams.js b/client/src/views/fields/teams.js similarity index 100% rename from frontend/client/src/views/fields/teams.js rename to client/src/views/fields/teams.js diff --git a/frontend/client/src/views/fields/text.js b/client/src/views/fields/text.js similarity index 100% rename from frontend/client/src/views/fields/text.js rename to client/src/views/fields/text.js diff --git a/frontend/client/src/views/fields/url.js b/client/src/views/fields/url.js similarity index 100% rename from frontend/client/src/views/fields/url.js rename to client/src/views/fields/url.js diff --git a/frontend/client/src/views/fields/user-with-avatar.js b/client/src/views/fields/user-with-avatar.js similarity index 95% rename from frontend/client/src/views/fields/user-with-avatar.js rename to client/src/views/fields/user-with-avatar.js index 2908d1023a..0fe178131e 100644 --- a/frontend/client/src/views/fields/user-with-avatar.js +++ b/client/src/views/fields/user-with-avatar.js @@ -53,7 +53,7 @@ Espo.define('views/fields/user-with-avatar', 'views/fields/user', function (Dep) } else { t = Date.now(); } - return ''; + return ''; } }); diff --git a/frontend/client/src/views/fields/user.js b/client/src/views/fields/user.js similarity index 100% rename from frontend/client/src/views/fields/user.js rename to client/src/views/fields/user.js diff --git a/frontend/client/src/views/fields/users.js b/client/src/views/fields/users.js similarity index 100% rename from frontend/client/src/views/fields/users.js rename to client/src/views/fields/users.js diff --git a/frontend/client/src/views/fields/varchar.js b/client/src/views/fields/varchar.js similarity index 100% rename from frontend/client/src/views/fields/varchar.js rename to client/src/views/fields/varchar.js diff --git a/frontend/client/src/views/fields/wysiwyg.js b/client/src/views/fields/wysiwyg.js similarity index 100% rename from frontend/client/src/views/fields/wysiwyg.js rename to client/src/views/fields/wysiwyg.js diff --git a/frontend/client/src/views/global-search/global-search.js b/client/src/views/global-search/global-search.js similarity index 100% rename from frontend/client/src/views/global-search/global-search.js rename to client/src/views/global-search/global-search.js diff --git a/frontend/client/src/views/global-search/name-field.js b/client/src/views/global-search/name-field.js similarity index 100% rename from frontend/client/src/views/global-search/name-field.js rename to client/src/views/global-search/name-field.js diff --git a/frontend/client/src/views/global-search/panel.js b/client/src/views/global-search/panel.js similarity index 100% rename from frontend/client/src/views/global-search/panel.js rename to client/src/views/global-search/panel.js diff --git a/frontend/client/src/views/global-search/scope-badge.js b/client/src/views/global-search/scope-badge.js similarity index 100% rename from frontend/client/src/views/global-search/scope-badge.js rename to client/src/views/global-search/scope-badge.js diff --git a/frontend/client/src/views/header.js b/client/src/views/header.js similarity index 100% rename from frontend/client/src/views/header.js rename to client/src/views/header.js diff --git a/frontend/client/src/views/home.js b/client/src/views/home.js similarity index 100% rename from frontend/client/src/views/home.js rename to client/src/views/home.js diff --git a/frontend/client/src/views/import/detail.js b/client/src/views/import/detail.js similarity index 100% rename from frontend/client/src/views/import/detail.js rename to client/src/views/import/detail.js diff --git a/frontend/client/src/views/import/index.js b/client/src/views/import/index.js similarity index 100% rename from frontend/client/src/views/import/index.js rename to client/src/views/import/index.js diff --git a/frontend/client/src/views/import/list.js b/client/src/views/import/list.js similarity index 100% rename from frontend/client/src/views/import/list.js rename to client/src/views/import/list.js diff --git a/frontend/client/src/views/import/record/detail.js b/client/src/views/import/record/detail.js similarity index 100% rename from frontend/client/src/views/import/record/detail.js rename to client/src/views/import/record/detail.js diff --git a/frontend/client/src/views/import/record/list.js b/client/src/views/import/record/list.js similarity index 100% rename from frontend/client/src/views/import/record/list.js rename to client/src/views/import/record/list.js diff --git a/frontend/client/src/views/import/record/panels/duplicates.js b/client/src/views/import/record/panels/duplicates.js similarity index 100% rename from frontend/client/src/views/import/record/panels/duplicates.js rename to client/src/views/import/record/panels/duplicates.js diff --git a/frontend/client/src/views/import/record/panels/imported.js b/client/src/views/import/record/panels/imported.js similarity index 100% rename from frontend/client/src/views/import/record/panels/imported.js rename to client/src/views/import/record/panels/imported.js diff --git a/frontend/client/src/views/import/record/panels/updated.js b/client/src/views/import/record/panels/updated.js similarity index 100% rename from frontend/client/src/views/import/record/panels/updated.js rename to client/src/views/import/record/panels/updated.js diff --git a/frontend/client/src/views/import/record/row-actions/duplicates.js b/client/src/views/import/record/row-actions/duplicates.js similarity index 100% rename from frontend/client/src/views/import/record/row-actions/duplicates.js rename to client/src/views/import/record/row-actions/duplicates.js diff --git a/frontend/client/src/views/import/step1.js b/client/src/views/import/step1.js similarity index 100% rename from frontend/client/src/views/import/step1.js rename to client/src/views/import/step1.js diff --git a/frontend/client/src/views/import/step2.js b/client/src/views/import/step2.js similarity index 100% rename from frontend/client/src/views/import/step2.js rename to client/src/views/import/step2.js diff --git a/frontend/client/src/views/inbound-email/fields/folder.js b/client/src/views/inbound-email/fields/folder.js similarity index 100% rename from frontend/client/src/views/inbound-email/fields/folder.js rename to client/src/views/inbound-email/fields/folder.js diff --git a/frontend/client/src/views/inbound-email/fields/folders.js b/client/src/views/inbound-email/fields/folders.js similarity index 100% rename from frontend/client/src/views/inbound-email/fields/folders.js rename to client/src/views/inbound-email/fields/folders.js diff --git a/frontend/client/src/views/inbound-email/fields/target-user-position.js b/client/src/views/inbound-email/fields/target-user-position.js similarity index 100% rename from frontend/client/src/views/inbound-email/fields/target-user-position.js rename to client/src/views/inbound-email/fields/target-user-position.js diff --git a/frontend/client/src/views/inbound-email/fields/test-connection.js b/client/src/views/inbound-email/fields/test-connection.js similarity index 100% rename from frontend/client/src/views/inbound-email/fields/test-connection.js rename to client/src/views/inbound-email/fields/test-connection.js diff --git a/frontend/client/src/views/inbound-email/modals/select-folder.js b/client/src/views/inbound-email/modals/select-folder.js similarity index 100% rename from frontend/client/src/views/inbound-email/modals/select-folder.js rename to client/src/views/inbound-email/modals/select-folder.js diff --git a/frontend/client/src/views/inbound-email/record/detail.js b/client/src/views/inbound-email/record/detail.js similarity index 100% rename from frontend/client/src/views/inbound-email/record/detail.js rename to client/src/views/inbound-email/record/detail.js diff --git a/frontend/client/src/views/inbound-email/record/edit.js b/client/src/views/inbound-email/record/edit.js similarity index 100% rename from frontend/client/src/views/inbound-email/record/edit.js rename to client/src/views/inbound-email/record/edit.js diff --git a/frontend/client/src/views/inbound-email/record/list.js b/client/src/views/inbound-email/record/list.js similarity index 100% rename from frontend/client/src/views/inbound-email/record/list.js rename to client/src/views/inbound-email/record/list.js diff --git a/frontend/client/src/views/list-tree.js b/client/src/views/list-tree.js similarity index 100% rename from frontend/client/src/views/list-tree.js rename to client/src/views/list-tree.js diff --git a/frontend/client/src/views/list.js b/client/src/views/list.js similarity index 100% rename from frontend/client/src/views/list.js rename to client/src/views/list.js diff --git a/frontend/client/src/views/login.js b/client/src/views/login.js similarity index 95% rename from frontend/client/src/views/login.js rename to client/src/views/login.js index b547bb369a..e6d4921b78 100644 --- a/frontend/client/src/views/login.js +++ b/client/src/views/login.js @@ -58,9 +58,9 @@ Espo.define('views/login', 'view', function (Dep) { getLogoSrc: function () { var companyLogoId = this.getConfig().get('companyLogoId'); if (!companyLogoId) { - return this.getThemeManager().getParam('logo') || 'client/img/logo.png'; + return this.getBasePath() + (this.getThemeManager().getParam('logo') || 'client/img/logo.png'); } - return '?entryPoint=LogoImage&id='+companyLogoId+'&t=' + companyLogoId; + return this.getBasePath() + '?entryPoint=LogoImage&id='+companyLogoId+'&t=' + companyLogoId; }, login: function () { diff --git a/frontend/client/src/views/main.js b/client/src/views/main.js similarity index 100% rename from frontend/client/src/views/main.js rename to client/src/views/main.js diff --git a/frontend/client/src/views/merge.js b/client/src/views/merge.js similarity index 100% rename from frontend/client/src/views/merge.js rename to client/src/views/merge.js diff --git a/frontend/client/src/views/modal.js b/client/src/views/modal.js similarity index 100% rename from frontend/client/src/views/modal.js rename to client/src/views/modal.js diff --git a/frontend/client/src/views/modals/add-dashlet.js b/client/src/views/modals/add-dashlet.js similarity index 100% rename from frontend/client/src/views/modals/add-dashlet.js rename to client/src/views/modals/add-dashlet.js diff --git a/frontend/client/src/views/modals/array-field-add.js b/client/src/views/modals/array-field-add.js similarity index 100% rename from frontend/client/src/views/modals/array-field-add.js rename to client/src/views/modals/array-field-add.js diff --git a/frontend/client/src/views/modals/change-password.js b/client/src/views/modals/change-password.js similarity index 100% rename from frontend/client/src/views/modals/change-password.js rename to client/src/views/modals/change-password.js diff --git a/frontend/client/src/views/modals/compose-email.js b/client/src/views/modals/compose-email.js similarity index 100% rename from frontend/client/src/views/modals/compose-email.js rename to client/src/views/modals/compose-email.js diff --git a/frontend/client/src/views/modals/detail.js b/client/src/views/modals/detail.js similarity index 100% rename from frontend/client/src/views/modals/detail.js rename to client/src/views/modals/detail.js diff --git a/frontend/client/src/views/modals/duplicate.js b/client/src/views/modals/duplicate.js similarity index 100% rename from frontend/client/src/views/modals/duplicate.js rename to client/src/views/modals/duplicate.js diff --git a/frontend/client/src/views/modals/edit-dashboard.js b/client/src/views/modals/edit-dashboard.js similarity index 100% rename from frontend/client/src/views/modals/edit-dashboard.js rename to client/src/views/modals/edit-dashboard.js diff --git a/frontend/client/src/views/modals/edit.js b/client/src/views/modals/edit.js similarity index 100% rename from frontend/client/src/views/modals/edit.js rename to client/src/views/modals/edit.js diff --git a/frontend/client/src/views/modals/image-crop.js b/client/src/views/modals/image-crop.js similarity index 100% rename from frontend/client/src/views/modals/image-crop.js rename to client/src/views/modals/image-crop.js diff --git a/frontend/client/src/views/modals/image-preview.js b/client/src/views/modals/image-preview.js similarity index 100% rename from frontend/client/src/views/modals/image-preview.js rename to client/src/views/modals/image-preview.js diff --git a/frontend/client/src/views/modals/mass-update.js b/client/src/views/modals/mass-update.js similarity index 100% rename from frontend/client/src/views/modals/mass-update.js rename to client/src/views/modals/mass-update.js diff --git a/frontend/client/src/views/modals/password-change-request.js b/client/src/views/modals/password-change-request.js similarity index 100% rename from frontend/client/src/views/modals/password-change-request.js rename to client/src/views/modals/password-change-request.js diff --git a/frontend/client/src/views/modals/save-filters.js b/client/src/views/modals/save-filters.js similarity index 100% rename from frontend/client/src/views/modals/save-filters.js rename to client/src/views/modals/save-filters.js diff --git a/frontend/client/src/views/modals/select-category-tree-records.js b/client/src/views/modals/select-category-tree-records.js similarity index 100% rename from frontend/client/src/views/modals/select-category-tree-records.js rename to client/src/views/modals/select-category-tree-records.js diff --git a/frontend/client/src/views/modals/select-records.js b/client/src/views/modals/select-records.js similarity index 100% rename from frontend/client/src/views/modals/select-records.js rename to client/src/views/modals/select-records.js diff --git a/frontend/client/src/views/modals/select-template.js b/client/src/views/modals/select-template.js similarity index 100% rename from frontend/client/src/views/modals/select-template.js rename to client/src/views/modals/select-template.js diff --git a/frontend/client/src/views/note/fields/post.js b/client/src/views/note/fields/post.js similarity index 100% rename from frontend/client/src/views/note/fields/post.js rename to client/src/views/note/fields/post.js diff --git a/frontend/client/src/views/note/modals/edit.js b/client/src/views/note/modals/edit.js similarity index 100% rename from frontend/client/src/views/note/modals/edit.js rename to client/src/views/note/modals/edit.js diff --git a/frontend/client/src/views/note/record/edit.js b/client/src/views/note/record/edit.js similarity index 100% rename from frontend/client/src/views/note/record/edit.js rename to client/src/views/note/record/edit.js diff --git a/frontend/client/src/views/notification/badge.js b/client/src/views/notification/badge.js similarity index 100% rename from frontend/client/src/views/notification/badge.js rename to client/src/views/notification/badge.js diff --git a/frontend/client/src/views/notification/fields/container.js b/client/src/views/notification/fields/container.js similarity index 100% rename from frontend/client/src/views/notification/fields/container.js rename to client/src/views/notification/fields/container.js diff --git a/frontend/client/src/views/notification/fields/read-with-menu.js b/client/src/views/notification/fields/read-with-menu.js similarity index 100% rename from frontend/client/src/views/notification/fields/read-with-menu.js rename to client/src/views/notification/fields/read-with-menu.js diff --git a/frontend/client/src/views/notification/fields/read.js b/client/src/views/notification/fields/read.js similarity index 100% rename from frontend/client/src/views/notification/fields/read.js rename to client/src/views/notification/fields/read.js diff --git a/frontend/client/src/views/notification/items/assign.js b/client/src/views/notification/items/assign.js similarity index 100% rename from frontend/client/src/views/notification/items/assign.js rename to client/src/views/notification/items/assign.js diff --git a/frontend/client/src/views/notification/items/base.js b/client/src/views/notification/items/base.js similarity index 96% rename from frontend/client/src/views/notification/items/base.js rename to client/src/views/notification/items/base.js index 7b7bc0667b..1a1437df3d 100644 --- a/frontend/client/src/views/notification/items/base.js +++ b/client/src/views/notification/items/base.js @@ -94,7 +94,7 @@ Espo.define('views/notification/items/base', 'view', function (Dep) { if (!id) { return ''; } - return ''; + return ''; } }); diff --git a/frontend/client/src/views/notification/items/email-received.js b/client/src/views/notification/items/email-received.js similarity index 100% rename from frontend/client/src/views/notification/items/email-received.js rename to client/src/views/notification/items/email-received.js diff --git a/frontend/client/src/views/notification/items/entity-removed.js b/client/src/views/notification/items/entity-removed.js similarity index 100% rename from frontend/client/src/views/notification/items/entity-removed.js rename to client/src/views/notification/items/entity-removed.js diff --git a/frontend/client/src/views/notification/items/message.js b/client/src/views/notification/items/message.js similarity index 100% rename from frontend/client/src/views/notification/items/message.js rename to client/src/views/notification/items/message.js diff --git a/frontend/client/src/views/notification/items/system.js b/client/src/views/notification/items/system.js similarity index 100% rename from frontend/client/src/views/notification/items/system.js rename to client/src/views/notification/items/system.js diff --git a/frontend/client/src/views/notification/list.js b/client/src/views/notification/list.js similarity index 100% rename from frontend/client/src/views/notification/list.js rename to client/src/views/notification/list.js diff --git a/frontend/client/src/views/notification/panel.js b/client/src/views/notification/panel.js similarity index 100% rename from frontend/client/src/views/notification/panel.js rename to client/src/views/notification/panel.js diff --git a/frontend/client/src/views/notification/record/list.js b/client/src/views/notification/record/list.js similarity index 100% rename from frontend/client/src/views/notification/record/list.js rename to client/src/views/notification/record/list.js diff --git a/frontend/client/src/views/outbound-email/fields/test-send.js b/client/src/views/outbound-email/fields/test-send.js similarity index 100% rename from frontend/client/src/views/outbound-email/fields/test-send.js rename to client/src/views/outbound-email/fields/test-send.js diff --git a/frontend/client/src/views/outbound-email/modals/test-send.js b/client/src/views/outbound-email/modals/test-send.js similarity index 100% rename from frontend/client/src/views/outbound-email/modals/test-send.js rename to client/src/views/outbound-email/modals/test-send.js diff --git a/frontend/client/src/views/popup-notification.js b/client/src/views/popup-notification.js similarity index 100% rename from frontend/client/src/views/popup-notification.js rename to client/src/views/popup-notification.js diff --git a/frontend/client/src/views/portal-role/list.js b/client/src/views/portal-role/list.js similarity index 100% rename from frontend/client/src/views/portal-role/list.js rename to client/src/views/portal-role/list.js diff --git a/frontend/client/src/views/portal-role/record/detail.js b/client/src/views/portal-role/record/detail.js similarity index 100% rename from frontend/client/src/views/portal-role/record/detail.js rename to client/src/views/portal-role/record/detail.js diff --git a/frontend/client/src/views/portal-role/record/edit.js b/client/src/views/portal-role/record/edit.js similarity index 100% rename from frontend/client/src/views/portal-role/record/edit.js rename to client/src/views/portal-role/record/edit.js diff --git a/frontend/client/src/views/portal-role/record/list.js b/client/src/views/portal-role/record/list.js similarity index 100% rename from frontend/client/src/views/portal-role/record/list.js rename to client/src/views/portal-role/record/list.js diff --git a/frontend/client/src/views/portal-role/record/table.js b/client/src/views/portal-role/record/table.js similarity index 100% rename from frontend/client/src/views/portal-role/record/table.js rename to client/src/views/portal-role/record/table.js diff --git a/frontend/client/src/views/portal/fields/quick-create-list.js b/client/src/views/portal/fields/quick-create-list.js similarity index 100% rename from frontend/client/src/views/portal/fields/quick-create-list.js rename to client/src/views/portal/fields/quick-create-list.js diff --git a/frontend/client/src/views/portal/fields/tab-list.js b/client/src/views/portal/fields/tab-list.js similarity index 100% rename from frontend/client/src/views/portal/fields/tab-list.js rename to client/src/views/portal/fields/tab-list.js diff --git a/frontend/client/src/views/preferences/edit.js b/client/src/views/preferences/edit.js similarity index 100% rename from frontend/client/src/views/preferences/edit.js rename to client/src/views/preferences/edit.js diff --git a/frontend/client/src/views/preferences/fields/auto-follow-entity-type-list.js b/client/src/views/preferences/fields/auto-follow-entity-type-list.js similarity index 100% rename from frontend/client/src/views/preferences/fields/auto-follow-entity-type-list.js rename to client/src/views/preferences/fields/auto-follow-entity-type-list.js diff --git a/frontend/client/src/views/preferences/fields/date-format.js b/client/src/views/preferences/fields/date-format.js similarity index 100% rename from frontend/client/src/views/preferences/fields/date-format.js rename to client/src/views/preferences/fields/date-format.js diff --git a/frontend/client/src/views/preferences/fields/default-currency.js b/client/src/views/preferences/fields/default-currency.js similarity index 100% rename from frontend/client/src/views/preferences/fields/default-currency.js rename to client/src/views/preferences/fields/default-currency.js diff --git a/frontend/client/src/views/preferences/fields/language.js b/client/src/views/preferences/fields/language.js similarity index 100% rename from frontend/client/src/views/preferences/fields/language.js rename to client/src/views/preferences/fields/language.js diff --git a/frontend/client/src/views/preferences/fields/smtp-email-address.js b/client/src/views/preferences/fields/smtp-email-address.js similarity index 100% rename from frontend/client/src/views/preferences/fields/smtp-email-address.js rename to client/src/views/preferences/fields/smtp-email-address.js diff --git a/frontend/client/src/views/preferences/fields/tab-list.js b/client/src/views/preferences/fields/tab-list.js similarity index 100% rename from frontend/client/src/views/preferences/fields/tab-list.js rename to client/src/views/preferences/fields/tab-list.js diff --git a/frontend/client/src/views/preferences/fields/test-send.js b/client/src/views/preferences/fields/test-send.js similarity index 100% rename from frontend/client/src/views/preferences/fields/test-send.js rename to client/src/views/preferences/fields/test-send.js diff --git a/frontend/client/src/views/preferences/fields/theme.js b/client/src/views/preferences/fields/theme.js similarity index 100% rename from frontend/client/src/views/preferences/fields/theme.js rename to client/src/views/preferences/fields/theme.js diff --git a/frontend/client/src/views/preferences/fields/time-format.js b/client/src/views/preferences/fields/time-format.js similarity index 100% rename from frontend/client/src/views/preferences/fields/time-format.js rename to client/src/views/preferences/fields/time-format.js diff --git a/frontend/client/src/views/preferences/fields/time-zone.js b/client/src/views/preferences/fields/time-zone.js similarity index 100% rename from frontend/client/src/views/preferences/fields/time-zone.js rename to client/src/views/preferences/fields/time-zone.js diff --git a/frontend/client/src/views/preferences/fields/week-start.js b/client/src/views/preferences/fields/week-start.js similarity index 100% rename from frontend/client/src/views/preferences/fields/week-start.js rename to client/src/views/preferences/fields/week-start.js diff --git a/frontend/client/src/views/preferences/record/edit.js b/client/src/views/preferences/record/edit.js similarity index 100% rename from frontend/client/src/views/preferences/record/edit.js rename to client/src/views/preferences/record/edit.js diff --git a/frontend/client/src/views/record/base.js b/client/src/views/record/base.js similarity index 100% rename from frontend/client/src/views/record/base.js rename to client/src/views/record/base.js diff --git a/frontend/client/src/views/record/detail-bottom.js b/client/src/views/record/detail-bottom.js similarity index 100% rename from frontend/client/src/views/record/detail-bottom.js rename to client/src/views/record/detail-bottom.js diff --git a/frontend/client/src/views/record/detail-middle.js b/client/src/views/record/detail-middle.js similarity index 100% rename from frontend/client/src/views/record/detail-middle.js rename to client/src/views/record/detail-middle.js diff --git a/frontend/client/src/views/record/detail-side.js b/client/src/views/record/detail-side.js similarity index 100% rename from frontend/client/src/views/record/detail-side.js rename to client/src/views/record/detail-side.js diff --git a/frontend/client/src/views/record/detail-small.js b/client/src/views/record/detail-small.js similarity index 100% rename from frontend/client/src/views/record/detail-small.js rename to client/src/views/record/detail-small.js diff --git a/frontend/client/src/views/record/detail.js b/client/src/views/record/detail.js similarity index 100% rename from frontend/client/src/views/record/detail.js rename to client/src/views/record/detail.js diff --git a/frontend/client/src/views/record/edit-bottom.js b/client/src/views/record/edit-bottom.js similarity index 100% rename from frontend/client/src/views/record/edit-bottom.js rename to client/src/views/record/edit-bottom.js diff --git a/frontend/client/src/views/record/edit-side.js b/client/src/views/record/edit-side.js similarity index 100% rename from frontend/client/src/views/record/edit-side.js rename to client/src/views/record/edit-side.js diff --git a/frontend/client/src/views/record/edit-small.js b/client/src/views/record/edit-small.js similarity index 100% rename from frontend/client/src/views/record/edit-small.js rename to client/src/views/record/edit-small.js diff --git a/frontend/client/src/views/record/edit.js b/client/src/views/record/edit.js similarity index 100% rename from frontend/client/src/views/record/edit.js rename to client/src/views/record/edit.js diff --git a/frontend/client/src/views/record/list-expanded.js b/client/src/views/record/list-expanded.js similarity index 100% rename from frontend/client/src/views/record/list-expanded.js rename to client/src/views/record/list-expanded.js diff --git a/frontend/client/src/views/record/list-pagination.js b/client/src/views/record/list-pagination.js similarity index 100% rename from frontend/client/src/views/record/list-pagination.js rename to client/src/views/record/list-pagination.js diff --git a/frontend/client/src/views/record/list-tree-item.js b/client/src/views/record/list-tree-item.js similarity index 100% rename from frontend/client/src/views/record/list-tree-item.js rename to client/src/views/record/list-tree-item.js diff --git a/frontend/client/src/views/record/list-tree.js b/client/src/views/record/list-tree.js similarity index 100% rename from frontend/client/src/views/record/list-tree.js rename to client/src/views/record/list-tree.js diff --git a/frontend/client/src/views/record/list.js b/client/src/views/record/list.js similarity index 99% rename from frontend/client/src/views/record/list.js rename to client/src/views/record/list.js index a7fccd72a7..68bf69ae3f 100644 --- a/frontend/client/src/views/record/list.js +++ b/client/src/views/record/list.js @@ -311,7 +311,7 @@ Espo.define('views/record/list', 'view', function (Dep) { data: data, success: function (data) { if ('id' in data) { - window.location = '?entryPoint=download&id=' + data.id; + window.location = this.getBasePath() + '?entryPoint=download&id=' + data.id; } }, }); diff --git a/frontend/client/src/views/record/merge.js b/client/src/views/record/merge.js similarity index 100% rename from frontend/client/src/views/record/merge.js rename to client/src/views/record/merge.js diff --git a/frontend/client/src/views/record/panels/bottom.js b/client/src/views/record/panels/bottom.js similarity index 100% rename from frontend/client/src/views/record/panels/bottom.js rename to client/src/views/record/panels/bottom.js diff --git a/frontend/client/src/views/record/panels/default-side.js b/client/src/views/record/panels/default-side.js similarity index 100% rename from frontend/client/src/views/record/panels/default-side.js rename to client/src/views/record/panels/default-side.js diff --git a/frontend/client/src/views/record/panels/relationship.js b/client/src/views/record/panels/relationship.js similarity index 100% rename from frontend/client/src/views/record/panels/relationship.js rename to client/src/views/record/panels/relationship.js diff --git a/frontend/client/src/views/record/panels/side.js b/client/src/views/record/panels/side.js similarity index 100% rename from frontend/client/src/views/record/panels/side.js rename to client/src/views/record/panels/side.js diff --git a/frontend/client/src/views/record/row-actions/default.js b/client/src/views/record/row-actions/default.js similarity index 100% rename from frontend/client/src/views/record/row-actions/default.js rename to client/src/views/record/row-actions/default.js diff --git a/frontend/client/src/views/record/row-actions/edit-and-remove.js b/client/src/views/record/row-actions/edit-and-remove.js similarity index 100% rename from frontend/client/src/views/record/row-actions/edit-and-remove.js rename to client/src/views/record/row-actions/edit-and-remove.js diff --git a/frontend/client/src/views/record/row-actions/empty.js b/client/src/views/record/row-actions/empty.js similarity index 100% rename from frontend/client/src/views/record/row-actions/empty.js rename to client/src/views/record/row-actions/empty.js diff --git a/frontend/client/src/views/record/row-actions/relationship-edit-and-remove.js b/client/src/views/record/row-actions/relationship-edit-and-remove.js similarity index 100% rename from frontend/client/src/views/record/row-actions/relationship-edit-and-remove.js rename to client/src/views/record/row-actions/relationship-edit-and-remove.js diff --git a/frontend/client/src/views/record/row-actions/relationship-no-remove.js b/client/src/views/record/row-actions/relationship-no-remove.js similarity index 100% rename from frontend/client/src/views/record/row-actions/relationship-no-remove.js rename to client/src/views/record/row-actions/relationship-no-remove.js diff --git a/frontend/client/src/views/record/row-actions/relationship-no-unlink.js b/client/src/views/record/row-actions/relationship-no-unlink.js similarity index 100% rename from frontend/client/src/views/record/row-actions/relationship-no-unlink.js rename to client/src/views/record/row-actions/relationship-no-unlink.js diff --git a/frontend/client/src/views/record/row-actions/relationship-remove-only.js b/client/src/views/record/row-actions/relationship-remove-only.js similarity index 100% rename from frontend/client/src/views/record/row-actions/relationship-remove-only.js rename to client/src/views/record/row-actions/relationship-remove-only.js diff --git a/frontend/client/src/views/record/row-actions/relationship-unlink-only.js b/client/src/views/record/row-actions/relationship-unlink-only.js similarity index 100% rename from frontend/client/src/views/record/row-actions/relationship-unlink-only.js rename to client/src/views/record/row-actions/relationship-unlink-only.js diff --git a/frontend/client/src/views/record/row-actions/relationship-view-and-edit.js b/client/src/views/record/row-actions/relationship-view-and-edit.js similarity index 100% rename from frontend/client/src/views/record/row-actions/relationship-view-and-edit.js rename to client/src/views/record/row-actions/relationship-view-and-edit.js diff --git a/frontend/client/src/views/record/row-actions/relationship-view-and-unlink.js b/client/src/views/record/row-actions/relationship-view-and-unlink.js similarity index 100% rename from frontend/client/src/views/record/row-actions/relationship-view-and-unlink.js rename to client/src/views/record/row-actions/relationship-view-and-unlink.js diff --git a/frontend/client/src/views/record/row-actions/relationship.js b/client/src/views/record/row-actions/relationship.js similarity index 100% rename from frontend/client/src/views/record/row-actions/relationship.js rename to client/src/views/record/row-actions/relationship.js diff --git a/frontend/client/src/views/record/row-actions/remove-only.js b/client/src/views/record/row-actions/remove-only.js similarity index 100% rename from frontend/client/src/views/record/row-actions/remove-only.js rename to client/src/views/record/row-actions/remove-only.js diff --git a/frontend/client/src/views/record/row-actions/view-and-edit.js b/client/src/views/record/row-actions/view-and-edit.js similarity index 100% rename from frontend/client/src/views/record/row-actions/view-and-edit.js rename to client/src/views/record/row-actions/view-and-edit.js diff --git a/frontend/client/src/views/record/row-actions/view-and-remove.js b/client/src/views/record/row-actions/view-and-remove.js similarity index 100% rename from frontend/client/src/views/record/row-actions/view-and-remove.js rename to client/src/views/record/row-actions/view-and-remove.js diff --git a/frontend/client/src/views/record/search.js b/client/src/views/record/search.js similarity index 100% rename from frontend/client/src/views/record/search.js rename to client/src/views/record/search.js diff --git a/frontend/client/src/views/role/list.js b/client/src/views/role/list.js similarity index 100% rename from frontend/client/src/views/role/list.js rename to client/src/views/role/list.js diff --git a/frontend/client/src/views/role/modals/add-field.js b/client/src/views/role/modals/add-field.js similarity index 100% rename from frontend/client/src/views/role/modals/add-field.js rename to client/src/views/role/modals/add-field.js diff --git a/frontend/client/src/views/role/record/detail-side.js b/client/src/views/role/record/detail-side.js similarity index 100% rename from frontend/client/src/views/role/record/detail-side.js rename to client/src/views/role/record/detail-side.js diff --git a/frontend/client/src/views/role/record/detail.js b/client/src/views/role/record/detail.js similarity index 100% rename from frontend/client/src/views/role/record/detail.js rename to client/src/views/role/record/detail.js diff --git a/frontend/client/src/views/role/record/edit.js b/client/src/views/role/record/edit.js similarity index 100% rename from frontend/client/src/views/role/record/edit.js rename to client/src/views/role/record/edit.js diff --git a/frontend/client/src/views/role/record/list.js b/client/src/views/role/record/list.js similarity index 100% rename from frontend/client/src/views/role/record/list.js rename to client/src/views/role/record/list.js diff --git a/frontend/client/src/views/role/record/panels/side.js b/client/src/views/role/record/panels/side.js similarity index 100% rename from frontend/client/src/views/role/record/panels/side.js rename to client/src/views/role/record/panels/side.js diff --git a/frontend/client/src/views/role/record/table.js b/client/src/views/role/record/table.js similarity index 100% rename from frontend/client/src/views/role/record/table.js rename to client/src/views/role/record/table.js diff --git a/frontend/client/src/views/scheduled-job/fields/job.js b/client/src/views/scheduled-job/fields/job.js similarity index 100% rename from frontend/client/src/views/scheduled-job/fields/job.js rename to client/src/views/scheduled-job/fields/job.js diff --git a/frontend/client/src/views/scheduled-job/fields/scheduling.js b/client/src/views/scheduled-job/fields/scheduling.js similarity index 100% rename from frontend/client/src/views/scheduled-job/fields/scheduling.js rename to client/src/views/scheduled-job/fields/scheduling.js diff --git a/frontend/client/src/views/scheduled-job/list.js b/client/src/views/scheduled-job/list.js similarity index 100% rename from frontend/client/src/views/scheduled-job/list.js rename to client/src/views/scheduled-job/list.js diff --git a/frontend/client/src/views/scheduled-job/record/list.js b/client/src/views/scheduled-job/record/list.js similarity index 100% rename from frontend/client/src/views/scheduled-job/record/list.js rename to client/src/views/scheduled-job/record/list.js diff --git a/frontend/client/src/views/search/filter.js b/client/src/views/search/filter.js similarity index 100% rename from frontend/client/src/views/search/filter.js rename to client/src/views/search/filter.js diff --git a/frontend/client/src/views/settings/edit.js b/client/src/views/settings/edit.js similarity index 100% rename from frontend/client/src/views/settings/edit.js rename to client/src/views/settings/edit.js diff --git a/frontend/client/src/views/settings/fields/assignment-email-notifications-entity-list.js b/client/src/views/settings/fields/assignment-email-notifications-entity-list.js similarity index 100% rename from frontend/client/src/views/settings/fields/assignment-email-notifications-entity-list.js rename to client/src/views/settings/fields/assignment-email-notifications-entity-list.js diff --git a/frontend/client/src/views/settings/fields/assignment-notifications-entity-list.js b/client/src/views/settings/fields/assignment-notifications-entity-list.js similarity index 100% rename from frontend/client/src/views/settings/fields/assignment-notifications-entity-list.js rename to client/src/views/settings/fields/assignment-notifications-entity-list.js diff --git a/frontend/client/src/views/settings/fields/currency-rates.js b/client/src/views/settings/fields/currency-rates.js similarity index 100% rename from frontend/client/src/views/settings/fields/currency-rates.js rename to client/src/views/settings/fields/currency-rates.js diff --git a/frontend/client/src/views/settings/fields/dashboard-layout.js b/client/src/views/settings/fields/dashboard-layout.js similarity index 100% rename from frontend/client/src/views/settings/fields/dashboard-layout.js rename to client/src/views/settings/fields/dashboard-layout.js diff --git a/frontend/client/src/views/settings/fields/default-currency.js b/client/src/views/settings/fields/default-currency.js similarity index 100% rename from frontend/client/src/views/settings/fields/default-currency.js rename to client/src/views/settings/fields/default-currency.js diff --git a/frontend/client/src/views/settings/fields/global-search-entity-list.js b/client/src/views/settings/fields/global-search-entity-list.js similarity index 100% rename from frontend/client/src/views/settings/fields/global-search-entity-list.js rename to client/src/views/settings/fields/global-search-entity-list.js diff --git a/frontend/client/src/views/settings/fields/quick-create-list.js b/client/src/views/settings/fields/quick-create-list.js similarity index 100% rename from frontend/client/src/views/settings/fields/quick-create-list.js rename to client/src/views/settings/fields/quick-create-list.js diff --git a/frontend/client/src/views/settings/fields/tab-list.js b/client/src/views/settings/fields/tab-list.js similarity index 100% rename from frontend/client/src/views/settings/fields/tab-list.js rename to client/src/views/settings/fields/tab-list.js diff --git a/frontend/client/src/views/settings/fields/theme.js b/client/src/views/settings/fields/theme.js similarity index 100% rename from frontend/client/src/views/settings/fields/theme.js rename to client/src/views/settings/fields/theme.js diff --git a/frontend/client/src/views/settings/fields/thousand-separator.js b/client/src/views/settings/fields/thousand-separator.js similarity index 100% rename from frontend/client/src/views/settings/fields/thousand-separator.js rename to client/src/views/settings/fields/thousand-separator.js diff --git a/frontend/client/src/views/settings/record/edit.js b/client/src/views/settings/record/edit.js similarity index 100% rename from frontend/client/src/views/settings/record/edit.js rename to client/src/views/settings/record/edit.js diff --git a/frontend/client/src/views/site-portal/header.js b/client/src/views/site-portal/header.js similarity index 100% rename from frontend/client/src/views/site-portal/header.js rename to client/src/views/site-portal/header.js diff --git a/frontend/client/src/views/site-portal/master.js b/client/src/views/site-portal/master.js similarity index 100% rename from frontend/client/src/views/site-portal/master.js rename to client/src/views/site-portal/master.js diff --git a/frontend/client/src/views/site-portal/navbar.js b/client/src/views/site-portal/navbar.js similarity index 89% rename from frontend/client/src/views/site-portal/navbar.js rename to client/src/views/site-portal/navbar.js index 2048c7dc06..6318851ef3 100644 --- a/frontend/client/src/views/site-portal/navbar.js +++ b/client/src/views/site-portal/navbar.js @@ -33,9 +33,9 @@ Espo.define('views/site-portal/navbar', 'views/site/navbar', function (Dep) { getLogoSrc: function () { var companyLogoId = this.getConfig().get('companyLogoId'); if (!companyLogoId) { - return this.getThemeManager().getParam('logo') || 'client/img/logo.png'; + return this.getBasePath() + (this.getThemeManager().getParam('logo') || 'client/img/logo.png'); } - return '?entryPoint=LogoImage&id='+companyLogoId+'&t=' + companyLogoId; + return this.getBasePath() + '?entryPoint=LogoImage&id='+companyLogoId+'&t=' + companyLogoId; }, getTabList: function () { diff --git a/frontend/client/src/views/site/footer.js b/client/src/views/site/footer.js similarity index 100% rename from frontend/client/src/views/site/footer.js rename to client/src/views/site/footer.js diff --git a/frontend/client/src/views/site/header.js b/client/src/views/site/header.js similarity index 100% rename from frontend/client/src/views/site/header.js rename to client/src/views/site/header.js diff --git a/frontend/client/src/views/site/master.js b/client/src/views/site/master.js similarity index 100% rename from frontend/client/src/views/site/master.js rename to client/src/views/site/master.js diff --git a/frontend/client/src/views/site/navbar.js b/client/src/views/site/navbar.js similarity index 98% rename from frontend/client/src/views/site/navbar.js rename to client/src/views/site/navbar.js index c9cf4bedd2..cdbd40a2b1 100644 --- a/frontend/client/src/views/site/navbar.js +++ b/client/src/views/site/navbar.js @@ -81,9 +81,9 @@ Espo.define('views/site/navbar', 'view', function (Dep) { getLogoSrc: function () { var companyLogoId = this.getConfig().get('companyLogoId'); if (!companyLogoId) { - return this.getThemeManager().getParam('logo') || 'client/img/logo.png'; + return this.getBasePath() + (this.getThemeManager().getParam('logo') || 'client/img/logo.png'); } - return '?entryPoint=LogoImage&t=' + companyLogoId; + return this.getBasePath() + '?entryPoint=LogoImage&t=' + companyLogoId; }, getTabList: function () { diff --git a/frontend/client/src/views/stream.js b/client/src/views/stream.js similarity index 100% rename from frontend/client/src/views/stream.js rename to client/src/views/stream.js diff --git a/frontend/client/src/views/stream/fields/attachment-multiple.js b/client/src/views/stream/fields/attachment-multiple.js similarity index 100% rename from frontend/client/src/views/stream/fields/attachment-multiple.js rename to client/src/views/stream/fields/attachment-multiple.js diff --git a/frontend/client/src/views/stream/fields/post.js b/client/src/views/stream/fields/post.js similarity index 100% rename from frontend/client/src/views/stream/fields/post.js rename to client/src/views/stream/fields/post.js diff --git a/frontend/client/src/views/stream/message.js b/client/src/views/stream/message.js similarity index 100% rename from frontend/client/src/views/stream/message.js rename to client/src/views/stream/message.js diff --git a/frontend/client/src/views/stream/modals/create-post.js b/client/src/views/stream/modals/create-post.js similarity index 100% rename from frontend/client/src/views/stream/modals/create-post.js rename to client/src/views/stream/modals/create-post.js diff --git a/frontend/client/src/views/stream/note.js b/client/src/views/stream/note.js similarity index 97% rename from frontend/client/src/views/stream/note.js rename to client/src/views/stream/note.js index 3d12022a46..5b48c9aed5 100644 --- a/frontend/client/src/views/stream/note.js +++ b/client/src/views/stream/note.js @@ -156,7 +156,7 @@ Espo.define('views/stream/note', 'view', function (Dep) { if (this.isSystemAvatar) { id = 'system'; } - return ''; + return ''; } }); diff --git a/frontend/client/src/views/stream/notes/assign.js b/client/src/views/stream/notes/assign.js similarity index 100% rename from frontend/client/src/views/stream/notes/assign.js rename to client/src/views/stream/notes/assign.js diff --git a/frontend/client/src/views/stream/notes/create-related.js b/client/src/views/stream/notes/create-related.js similarity index 100% rename from frontend/client/src/views/stream/notes/create-related.js rename to client/src/views/stream/notes/create-related.js diff --git a/frontend/client/src/views/stream/notes/create.js b/client/src/views/stream/notes/create.js similarity index 100% rename from frontend/client/src/views/stream/notes/create.js rename to client/src/views/stream/notes/create.js diff --git a/frontend/client/src/views/stream/notes/email-received.js b/client/src/views/stream/notes/email-received.js similarity index 100% rename from frontend/client/src/views/stream/notes/email-received.js rename to client/src/views/stream/notes/email-received.js diff --git a/frontend/client/src/views/stream/notes/email-sent.js b/client/src/views/stream/notes/email-sent.js similarity index 100% rename from frontend/client/src/views/stream/notes/email-sent.js rename to client/src/views/stream/notes/email-sent.js diff --git a/frontend/client/src/views/stream/notes/mention-in-post.js b/client/src/views/stream/notes/mention-in-post.js similarity index 100% rename from frontend/client/src/views/stream/notes/mention-in-post.js rename to client/src/views/stream/notes/mention-in-post.js diff --git a/frontend/client/src/views/stream/notes/post.js b/client/src/views/stream/notes/post.js similarity index 100% rename from frontend/client/src/views/stream/notes/post.js rename to client/src/views/stream/notes/post.js diff --git a/frontend/client/src/views/stream/notes/relate.js b/client/src/views/stream/notes/relate.js similarity index 100% rename from frontend/client/src/views/stream/notes/relate.js rename to client/src/views/stream/notes/relate.js diff --git a/frontend/client/src/views/stream/notes/status.js b/client/src/views/stream/notes/status.js similarity index 100% rename from frontend/client/src/views/stream/notes/status.js rename to client/src/views/stream/notes/status.js diff --git a/frontend/client/src/views/stream/notes/update.js b/client/src/views/stream/notes/update.js similarity index 100% rename from frontend/client/src/views/stream/notes/update.js rename to client/src/views/stream/notes/update.js diff --git a/frontend/client/src/views/stream/panel.js b/client/src/views/stream/panel.js similarity index 100% rename from frontend/client/src/views/stream/panel.js rename to client/src/views/stream/panel.js diff --git a/frontend/client/src/views/stream/record/edit.js b/client/src/views/stream/record/edit.js similarity index 100% rename from frontend/client/src/views/stream/record/edit.js rename to client/src/views/stream/record/edit.js diff --git a/frontend/client/src/views/stream/record/list.js b/client/src/views/stream/record/list.js similarity index 100% rename from frontend/client/src/views/stream/record/list.js rename to client/src/views/stream/record/list.js diff --git a/frontend/client/src/views/stream/row-actions/default.js b/client/src/views/stream/row-actions/default.js similarity index 100% rename from frontend/client/src/views/stream/row-actions/default.js rename to client/src/views/stream/row-actions/default.js diff --git a/frontend/client/src/views/team/record/detail.js b/client/src/views/team/record/detail.js similarity index 100% rename from frontend/client/src/views/team/record/detail.js rename to client/src/views/team/record/detail.js diff --git a/frontend/client/src/views/team/record/edit.js b/client/src/views/team/record/edit.js similarity index 100% rename from frontend/client/src/views/team/record/edit.js rename to client/src/views/team/record/edit.js diff --git a/frontend/client/src/views/team/record/list.js b/client/src/views/team/record/list.js similarity index 100% rename from frontend/client/src/views/team/record/list.js rename to client/src/views/team/record/list.js diff --git a/frontend/client/src/views/template/fields/variables.js b/client/src/views/template/fields/variables.js similarity index 100% rename from frontend/client/src/views/template/fields/variables.js rename to client/src/views/template/fields/variables.js diff --git a/frontend/client/src/views/template/record/detail.js b/client/src/views/template/record/detail.js similarity index 100% rename from frontend/client/src/views/template/record/detail.js rename to client/src/views/template/record/detail.js diff --git a/frontend/client/src/views/user/detail.js b/client/src/views/user/detail.js similarity index 100% rename from frontend/client/src/views/user/detail.js rename to client/src/views/user/detail.js diff --git a/frontend/client/src/views/user/fields/auto-follow-entity-type-list.js b/client/src/views/user/fields/auto-follow-entity-type-list.js similarity index 100% rename from frontend/client/src/views/user/fields/auto-follow-entity-type-list.js rename to client/src/views/user/fields/auto-follow-entity-type-list.js diff --git a/frontend/client/src/views/user/fields/avatar.js b/client/src/views/user/fields/avatar.js similarity index 88% rename from frontend/client/src/views/user/fields/avatar.js rename to client/src/views/user/fields/avatar.js index b4f72dbbce..08cb4283f0 100644 --- a/frontend/client/src/views/user/fields/avatar.js +++ b/client/src/views/user/fields/avatar.js @@ -70,18 +70,18 @@ Espo.define('views/user/fields/avatar', 'views/fields/image', function (Dep) { var imgHtml; if (this.mode == 'detail') { - imgHtml = ''; + imgHtml = ''; } else { var cache = this.getCache(); if (cache) { t = cache.get('app', 'timestamp'); } - imgHtml = ''; + imgHtml = ''; return imgHtml; } if (id) { - return '' + imgHtml +' '; + return '' + imgHtml +' '; } else { return imgHtml; } diff --git a/frontend/client/src/views/user/fields/contact.js b/client/src/views/user/fields/contact.js similarity index 100% rename from frontend/client/src/views/user/fields/contact.js rename to client/src/views/user/fields/contact.js diff --git a/frontend/client/src/views/user/fields/generate-password.js b/client/src/views/user/fields/generate-password.js similarity index 100% rename from frontend/client/src/views/user/fields/generate-password.js rename to client/src/views/user/fields/generate-password.js diff --git a/frontend/client/src/views/user/fields/name.js b/client/src/views/user/fields/name.js similarity index 95% rename from frontend/client/src/views/user/fields/name.js rename to client/src/views/user/fields/name.js index 2e05fd11aa..9c84987d41 100644 --- a/frontend/client/src/views/user/fields/name.js +++ b/client/src/views/user/fields/name.js @@ -50,7 +50,7 @@ Espo.define('views/user/fields/name', 'views/fields/person-name', function (Dep) } else { t = Date.now(); } - return ''; + return ''; }, }); diff --git a/frontend/client/src/views/user/fields/teams.js b/client/src/views/user/fields/teams.js similarity index 100% rename from frontend/client/src/views/user/fields/teams.js rename to client/src/views/user/fields/teams.js diff --git a/frontend/client/src/views/user/fields/user-name.js b/client/src/views/user/fields/user-name.js similarity index 100% rename from frontend/client/src/views/user/fields/user-name.js rename to client/src/views/user/fields/user-name.js diff --git a/frontend/client/src/views/user/list.js b/client/src/views/user/list.js similarity index 100% rename from frontend/client/src/views/user/list.js rename to client/src/views/user/list.js diff --git a/frontend/client/src/views/user/modals/access.js b/client/src/views/user/modals/access.js similarity index 100% rename from frontend/client/src/views/user/modals/access.js rename to client/src/views/user/modals/access.js diff --git a/frontend/client/src/views/user/password-change-request.js b/client/src/views/user/password-change-request.js similarity index 100% rename from frontend/client/src/views/user/password-change-request.js rename to client/src/views/user/password-change-request.js diff --git a/frontend/client/src/views/user/record/detail-bottom.js b/client/src/views/user/record/detail-bottom.js similarity index 100% rename from frontend/client/src/views/user/record/detail-bottom.js rename to client/src/views/user/record/detail-bottom.js diff --git a/frontend/client/src/views/user/record/detail-quick-side.js b/client/src/views/user/record/detail-quick-side.js similarity index 100% rename from frontend/client/src/views/user/record/detail-quick-side.js rename to client/src/views/user/record/detail-quick-side.js diff --git a/frontend/client/src/views/user/record/detail-quick.js b/client/src/views/user/record/detail-quick.js similarity index 100% rename from frontend/client/src/views/user/record/detail-quick.js rename to client/src/views/user/record/detail-quick.js diff --git a/frontend/client/src/views/user/record/detail-side.js b/client/src/views/user/record/detail-side.js similarity index 100% rename from frontend/client/src/views/user/record/detail-side.js rename to client/src/views/user/record/detail-side.js diff --git a/frontend/client/src/views/user/record/detail.js b/client/src/views/user/record/detail.js similarity index 100% rename from frontend/client/src/views/user/record/detail.js rename to client/src/views/user/record/detail.js diff --git a/frontend/client/src/views/user/record/edit-side.js b/client/src/views/user/record/edit-side.js similarity index 100% rename from frontend/client/src/views/user/record/edit-side.js rename to client/src/views/user/record/edit-side.js diff --git a/frontend/client/src/views/user/record/edit.js b/client/src/views/user/record/edit.js similarity index 100% rename from frontend/client/src/views/user/record/edit.js rename to client/src/views/user/record/edit.js diff --git a/frontend/client/src/views/user/record/list.js b/client/src/views/user/record/list.js similarity index 100% rename from frontend/client/src/views/user/record/list.js rename to client/src/views/user/record/list.js diff --git a/frontend/client/src/views/user/record/panels/stream.js b/client/src/views/user/record/panels/stream.js similarity index 100% rename from frontend/client/src/views/user/record/panels/stream.js rename to client/src/views/user/record/panels/stream.js diff --git a/diff.js b/diff.js index 28461bfe50..0222d9274b 100644 --- a/diff.js +++ b/diff.js @@ -71,7 +71,7 @@ execute('git diff --name-only ' + versionFrom, function (stdout) { if (file == '') { return; } - fileList.push(file.replace('frontend/', '')); + fileList.push(file); }); fileList.push('client/espo.min.js'); @@ -92,55 +92,55 @@ execute('git diff --name-only ' + versionFrom, function (stdout) { if (file == '') { return; } - deletedFileList.push(file.replace('frontend/', '')); + deletedFileList.push(file); }); execute('xargs -a ' + diffFilePath + ' cp --parents -t ' + upgradePath + '/files ' , function (stdout) { + var d = new Date(); - }); + var monthN = ((d.getMonth() + 1).toString()); + monthN = monthN.length == 1 ? '0' + monthN : monthN; - var d = new Date(); + var dateN = d.getDate().toString(); + dateN = dateN.length == 1 ? '0' + dateN : dateN; - var monthN = ((d.getMonth() + 1).toString()); - monthN = monthN.length == 1 ? '0' + monthN : monthN; + var date = d.getFullYear().toString() + '-' + monthN + '-' + dateN.toString(); - var dateN = d.getDate().toString(); - dateN = dateN.length == 1 ? '0' + dateN : dateN; + execute('git tag', function (stdout) { + var versionList = []; + var occured = false; + tagList = stdout.split('\n').forEach(function (tag) { + if (tag == versionFrom) { + occured = true; + } + if (!tag || tag == version) { + return; + } + if (occured) { + versionList.push(tag); + } + }); - var date = d.getFullYear().toString() + '-' + monthN + '-' + dateN.toString(); - - execute('git tag', function (stdout) { - var versionList = []; - var occured = false; - tagList = stdout.split('\n').forEach(function (tag) { - if (tag == versionFrom) { - occured = true; - } - if (!tag || tag == version) { - return; - } - if (occured) { - versionList.push(tag); + var manifest = { + "name": "EspoCRM Upgrade "+acceptedVersionName+" to "+version, + "type": "upgrade", + "version": version, + "acceptableVersions": versionList, + "releaseDate": date, + "author": "EspoCRM", + "description": "", + "delete": deletedFileList } + + fs.writeFileSync(upgradePath + '/manifest.json', JSON.stringify(manifest, null, ' ')); + }); - var manifest = { - "name": "EspoCRM Upgrade "+acceptedVersionName+" to "+version, - "type": "upgrade", - "version": version, - "acceptableVersions": versionList, - "releaseDate": date, - "author": "EspoCRM", - "description": "", - "delete": deletedFileList - } - - fs.writeFileSync(upgradePath + '/manifest.json', JSON.stringify(manifest, null, ' ')); - + fs.unlinkSync(diffFilePath); }); - fs.unlinkSync(diffFilePath) + }); diff --git a/frontend/client/custom/.data b/frontend/client/custom/.data deleted file mode 100644 index 0519ecba6e..0000000000 --- a/frontend/client/custom/.data +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/frontend/client/res/templates/modals/image-preview.tpl b/frontend/client/res/templates/modals/image-preview.tpl deleted file mode 100644 index fed2b20abf..0000000000 --- a/frontend/client/res/templates/modals/image-preview.tpl +++ /dev/null @@ -1,7 +0,0 @@ -
- -
- -
-{{translate 'Original'}}: {{name}} -
diff --git a/frontend/html/main.html b/frontend/html/main.html index 5d666dd778..2351e5dd9a 100644 --- a/frontend/html/main.html +++ b/frontend/html/main.html @@ -7,30 +7,28 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + - - - - - + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - + + - + + - - - + + - + + - - - + +