From 52652349b1792613f1649e09db42046b73baca1c Mon Sep 17 00:00:00 2001 From: Francois Zaninotto Date: Tue, 2 Jun 2015 08:26:33 +0200 Subject: [PATCH 1/2] Improve first contact: add invite after setup --- .../ng-admin/Crud/delete/DeleteController.js | 1 - .../Main/component/controller/DashboardController.js | 1 + .../ng-admin/Main/component/service/PanelBuilder.js | 4 ++++ src/javascripts/ng-admin/Main/view/dashboard.html | 11 ++++++++++- src/sass/ng-admin.scss | 11 +++++++++++ 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/javascripts/ng-admin/Crud/delete/DeleteController.js b/src/javascripts/ng-admin/Crud/delete/DeleteController.js index eeb91f3b..6376ad59 100644 --- a/src/javascripts/ng-admin/Crud/delete/DeleteController.js +++ b/src/javascripts/ng-admin/Crud/delete/DeleteController.js @@ -15,7 +15,6 @@ define(function () { this.actions = view.actions(); this.entity = view.getEntity(); this.notification = notification; - this.$scope.entry = entry; this.$scope.view = view; $scope.$on('$destroy', this.destroy.bind(this)); diff --git a/src/javascripts/ng-admin/Main/component/controller/DashboardController.js b/src/javascripts/ng-admin/Main/component/controller/DashboardController.js index 7f98473b..563048c1 100644 --- a/src/javascripts/ng-admin/Main/component/controller/DashboardController.js +++ b/src/javascripts/ng-admin/Main/component/controller/DashboardController.js @@ -36,6 +36,7 @@ define(function (require) { this.PanelBuilder.getPanelsData(this.sortField, this.sortDir).then(function (panels) { self.panels = panels; }); + this.hasEntities = this.PanelBuilder.hasEntities(); }; /** diff --git a/src/javascripts/ng-admin/Main/component/service/PanelBuilder.js b/src/javascripts/ng-admin/Main/component/service/PanelBuilder.js index f7bc5962..01297af6 100644 --- a/src/javascripts/ng-admin/Main/component/service/PanelBuilder.js +++ b/src/javascripts/ng-admin/Main/component/service/PanelBuilder.js @@ -15,6 +15,10 @@ function PanelBuilder($q, $location, ReadQueries, Configuration, AdminDescriptio this.Configuration = Configuration(); } +PanelBuilder.prototype.hasEntities = function() { + return this.Configuration.entities.length > 0; +} + /** * Returns all elements of each dashboard panels * diff --git a/src/javascripts/ng-admin/Main/view/dashboard.html b/src/javascripts/ng-admin/Main/view/dashboard.html index 6446b220..d8af669b 100644 --- a/src/javascripts/ng-admin/Main/view/dashboard.html +++ b/src/javascripts/ng-admin/Main/view/dashboard.html @@ -1,4 +1,4 @@ -
+
+ +
+
+
+

All dependencies are set, ng-admin is ready to run!

+

Now you can update the configuration: add entities to the admin, then refresh.

+
+
+
diff --git a/src/sass/ng-admin.scss b/src/sass/ng-admin.scss index c315706b..013528dd 100644 --- a/src/sass/ng-admin.scss +++ b/src/sass/ng-admin.scss @@ -63,6 +63,17 @@ ul.collapsible { } } +.dashboard-invite { + margin: 3em; + padding: 1em; + text-align: center; + background-color: #DFF0D8; + p { + padding: .5em; + margin: 0; + } +} + /** * Grid */ From 36518a95c4a4989927b5f8407041fbbe7fdc8907 Mon Sep 17 00:00:00 2001 From: Francois Zaninotto Date: Thu, 4 Jun 2015 11:24:50 +0200 Subject: [PATCH 2/2] Add link to README --- src/javascripts/ng-admin/Main/view/dashboard.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/javascripts/ng-admin/Main/view/dashboard.html b/src/javascripts/ng-admin/Main/view/dashboard.html index d8af669b..912d958e 100644 --- a/src/javascripts/ng-admin/Main/view/dashboard.html +++ b/src/javascripts/ng-admin/Main/view/dashboard.html @@ -39,7 +39,7 @@

Dashboard

All dependencies are set, ng-admin is ready to run!

-

Now you can update the configuration: add entities to the admin, then refresh.

+

Now you can update the configuration: add entities to the admin, then refresh.