From cbfad8eb79915c6fb31405f5f59cd0cf559bcfa9 Mon Sep 17 00:00:00 2001 From: yuri Date: Wed, 18 Mar 2015 10:37:22 +0200 Subject: [PATCH] dashboard changes --- application/Espo/Repositories/Preferences.php | 2 +- .../metadata/app/defaultDashboardLayout.json | 22 -------------- .../metadata/app/defaultDashboardLayouts.json | 29 +++++++++++++++++++ frontend/client/res/templates/dashboard.tpl | 20 +++++++------ .../res/templates/modals/add-dashlet.tpl | 2 +- .../client/src/views/modals/add-dashlet.js | 12 ++++---- frontend/less/espo/custom.less | 5 +++- 7 files changed, 53 insertions(+), 39 deletions(-) delete mode 100644 application/Espo/Resources/metadata/app/defaultDashboardLayout.json create mode 100644 application/Espo/Resources/metadata/app/defaultDashboardLayouts.json diff --git a/application/Espo/Repositories/Preferences.php b/application/Espo/Repositories/Preferences.php index 3b1da68126..6047c1ab05 100644 --- a/application/Espo/Repositories/Preferences.php +++ b/application/Espo/Repositories/Preferences.php @@ -88,7 +88,7 @@ class Preferences extends \Espo\Core\ORM\Repository } else { $fields = $this->getMetadata()->get('entityDefs.Preferences.fields'); $defaults = array(); - $defaults['dashboardLayout'] = $this->getMetadata()->get('app.defaultDashboardLayout'); + $defaults['dashboardLayout'] = $this->getMetadata()->get('app.defaultDashboardLayouts.Standard'); foreach ($fields as $field => $d) { if (array_key_exists('default', $d)) { $defaults[$field] = $d['default']; diff --git a/application/Espo/Resources/metadata/app/defaultDashboardLayout.json b/application/Espo/Resources/metadata/app/defaultDashboardLayout.json deleted file mode 100644 index f4c139490d..0000000000 --- a/application/Espo/Resources/metadata/app/defaultDashboardLayout.json +++ /dev/null @@ -1,22 +0,0 @@ -[ - [ - { - "name": "Stream", - "id": "d4" - }, - { - "name": "Calls", - "id": "d1" - } - ], - [ - { - "name": "Tasks", - "id": "d3" - }, - { - "name": "Meetings", - "id": "d2" - } - ] -] diff --git a/application/Espo/Resources/metadata/app/defaultDashboardLayouts.json b/application/Espo/Resources/metadata/app/defaultDashboardLayouts.json new file mode 100644 index 0000000000..0f61ec222c --- /dev/null +++ b/application/Espo/Resources/metadata/app/defaultDashboardLayouts.json @@ -0,0 +1,29 @@ +{ + "Standard": [ + { + "name": "My Espo", + "layout": [ + [ + { + "name": "Stream", + "id": "d0004" + }, + { + "name": "Calls", + "id": "d0001" + } + ], + [ + { + "name": "Tasks", + "id": "d0003" + }, + { + "name": "Meetings", + "id": "d0002" + } + ] + ] + } + ] +} diff --git a/frontend/client/res/templates/dashboard.tpl b/frontend/client/res/templates/dashboard.tpl index 1cca053e1d..98267df21a 100644 --- a/frontend/client/res/templates/dashboard.tpl +++ b/frontend/client/res/templates/dashboard.tpl @@ -1,20 +1,22 @@ -
+
-
+
{{#if displayTitle}}

{{translate 'Dashboard' category='scopeNames'}}

{{/if}}
-
-
- {{#ifNotEqual dashboardLayout.length 1}} - {{#each dashboardLayout}} - - {{/each}} - {{/ifNotEqual}} +
+
+ {{#ifNotEqual dashboardLayout.length 1}} +
+ {{#each dashboardLayout}} + + {{/each}} +
+ {{/ifNotEqual}}
diff --git a/frontend/client/res/templates/modals/add-dashlet.tpl b/frontend/client/res/templates/modals/add-dashlet.tpl index d6e1df1569..3a23ba8249 100644 --- a/frontend/client/res/templates/modals/add-dashlet.tpl +++ b/frontend/client/res/templates/modals/add-dashlet.tpl @@ -2,7 +2,7 @@ {{#each dashletList}}
  • {{translate this category="dashlets"}} - +
    • {{/each}} diff --git a/frontend/client/src/views/modals/add-dashlet.js b/frontend/client/src/views/modals/add-dashlet.js index 1f43236c6f..c0d995671e 100644 --- a/frontend/client/src/views/modals/add-dashlet.js +++ b/frontend/client/src/views/modals/add-dashlet.js @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with EspoCRM. If not, see http://www.gnu.org/licenses/. - ************************************************************************/ + ************************************************************************/ Espo.define('Views.Modals.AddDashlet', 'Views.Modal', function (Dep) { @@ -37,7 +37,7 @@ Espo.define('Views.Modals.AddDashlet', 'Views.Modal', function (Dep) { events: { 'click button.add': function (e) { var name = $(e.currentTarget).data('name'); - this.getParentView().addDashlet(name); + this.getParentView().addDashlet(name); this.close(); }, }, @@ -52,10 +52,12 @@ Espo.define('Views.Modals.AddDashlet', 'Views.Modal', function (Dep) { } } ]; - + this.header = this.translate('Add Dashlet'); - - this.dashletList = Object.keys(this.getMetadata().get('dashlets') || {}); + + this.dashletList = Object.keys(this.getMetadata().get('dashlets') || {}).sort(function (v1, v2) { + return this.translate(v1, 'dashlets').localeCompare(this.translate(v2, 'dashlets')); + }.bind(this)); }, }); }); diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less index a3ec314fa8..37db200ec7 100644 --- a/frontend/less/espo/custom.less +++ b/frontend/less/espo/custom.less @@ -436,6 +436,10 @@ select[multiple].input-sm { overflow: visible; } +.dashboard-header .dashboard-buttons { + margin-left: 10px; +} + .panel.dashlet > .panel-heading > .menu-container { margin-top: -8px; right: -10px; @@ -445,7 +449,6 @@ select[multiple].input-sm { cursor: default; } - .panel.dashlet > .panel-body { height: 295px; overflow-y: auto;