From d946eed86a5bf6a643351e3f53518dc6e2d3472a Mon Sep 17 00:00:00 2001 From: yuri Date: Mon, 30 Nov 2015 15:22:52 +0200 Subject: [PATCH] html folder --- Gruntfile.js | 7 ++-- application/Espo/Core/Utils/ClientManager.php | 4 +-- frontend/html/main.html | 28 +++++++++++++--- frontend/html/reset.html | 15 --------- frontend/reset.html | 2 +- html/main.html | 33 +++++++++++++++++++ 6 files changed, 64 insertions(+), 25 deletions(-) delete mode 100644 frontend/html/reset.html create mode 100644 html/main.html diff --git a/Gruntfile.js b/Gruntfile.js index e110c81818..f29d4936a2 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -128,7 +128,7 @@ module.exports = function (grunt) { dest: 'build/tmp/client', }, frontendHtml: { - src: 'frontend/html/reset.html', + src: 'frontend/reset.html', dest: 'build/tmp/reset.html' }, frontendLib: { @@ -148,6 +148,7 @@ module.exports = function (grunt) { 'data/.data', 'install/**', 'vendor/**', + 'html/**', 'bootstrap.php', 'cron.php', 'rebuild.php', @@ -212,8 +213,8 @@ module.exports = function (grunt) { }, files: [ { - src: 'frontend/html/main.html', - dest: 'build/tmp/main.html' + src: 'build/tmp/html/main.html', + dest: 'build/tmp/html/main.html' } ] }, diff --git a/application/Espo/Core/Utils/ClientManager.php b/application/Espo/Core/Utils/ClientManager.php index d9c8671752..1c671892eb 100644 --- a/application/Espo/Core/Utils/ClientManager.php +++ b/application/Espo/Core/Utils/ClientManager.php @@ -35,9 +35,9 @@ class ClientManager private $config; - protected $mainHtmlFilePath = 'main.html'; + protected $mainHtmlFilePath = 'html/main.html'; - protected $htmlFilePathForDeveloperMode = 'frontend/main.html'; + protected $htmlFilePathForDeveloperMode = 'frontend/html/main.html'; protected $runScript = "app.start();"; diff --git a/frontend/html/main.html b/frontend/html/main.html index cf07a566c8..120a774642 100644 --- a/frontend/html/main.html +++ b/frontend/html/main.html @@ -2,21 +2,41 @@ EspoCRM - - + + + + + + + + + + + + + + + + + + + + + + - - diff --git a/frontend/reset.html b/frontend/reset.html index 4fc432c3d6..f8e25ba8e6 100644 --- a/frontend/reset.html +++ b/frontend/reset.html @@ -8,7 +8,7 @@ delete localStorage[i]; } var link = window.location.href.replace('/reset', ''); - + document.write('Local storage has been cleared.

Back to CRM

'); diff --git a/html/main.html b/html/main.html new file mode 100644 index 0000000000..cf07a566c8 --- /dev/null +++ b/html/main.html @@ -0,0 +1,33 @@ + + + + EspoCRM + + + + + + + + + + + + +
+ + +