dashboard changes

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'];

application/Espo/Resources/metadata/app/defaultDashboardLayout.json

@@ -1,22 +0,0 @@
-[
-    [
-        {
-            "name": "Stream",
-            "id": "d4"
-        },
-        {
-            "name": "Calls",
-            "id": "d1"
-        }
-    ],
-    [
-        {
-            "name": "Tasks",
-            "id": "d3"
-        },
-        {
-            "name": "Meetings",
-            "id": "d2"
-        }
-    ]
-]

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"
+			        }
+			    ]
+			]
+		}
+	]
+}

frontend/client/res/templates/dashboard.tpl

@@ -1,20 +1,22 @@
-<div class="page-header">
+<div class="page-header dashboard-header">
     <div class="row">
-        <div class="col-sm-7">
+        <div class="col-sm-5">
             {{#if displayTitle}}
             <h3>{{translate 'Dashboard' category='scopeNames'}}</h3>
             {{/if}}
         </div>
-        <div class="col-sm-5">
-            <div class="btn-group pull-right">
-                {{#ifNotEqual dashboardLayout.length 1}}
-                {{#each dashboardLayout}}
-                    <button class="btn btn-default{{#ifEqual @index ../currentTab}} active{{/ifEqual}}" data-action="selectTab" data-tab="{{@index}}">{{name}}</button>
-                {{/each}}
-                {{/ifNotEqual}}
+        <div class="col-sm-7">
+            <div class="btn-group pull-right dashboard-buttons">
                 <button class="btn btn-default" data-action="editTabs" title="{{translate 'Edit Dashboard'}}"><span class="glyphicon glyphicon-pencil"></span></button>
                 <button class="btn btn-default" data-action="addDashlet" title="{{translate 'Add Dashlet'}}"><span class="glyphicon glyphicon-plus"></span></button>
             </div>
+            {{#ifNotEqual dashboardLayout.length 1}}
+            <div class="btn-group pull-right dashboard-tabs">
+                {{#each dashboardLayout}}
+                    <button class="btn btn-default{{#ifEqual @index ../currentTab}} active{{/ifEqual}}" data-action="selectTab" data-tab="{{@index}}">{{name}}</button>
+                {{/each}}
+            </div>
+            {{/ifNotEqual}}
         </div>
     </div>
 </div>

frontend/client/res/templates/modals/add-dashlet.tpl

@@ -2,7 +2,7 @@
 {{#each dashletList}}
     <li class="list-group-item clearfix">
         {{translate this category="dashlets"}}
-        <button class="btn btn-default pull-right add" data-name="{{./this}}">{{translate 'Add'}}</button>        
+        <button class="btn btn-default pull-right add" data-name="{{./this}}">{{translate 'Add'}}</button>
     </li>
 {{/each}}
 </ul>

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));
         },
     });
 });

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;