From b82808c6dfdec532959ff50e4e5b86efc8b5870e Mon Sep 17 00:00:00 2001 From: Joseph Ramos Date: Fri, 1 Aug 2014 16:56:59 -0500 Subject: [PATCH 1/5] Added empty templates for list page and panel #128 --- applications/default/public/js/controllers.js | 3 +++ applications/default/public/templates/empty.html | 1 + applications/default/public/templates/list-group.html | 2 ++ applications/default/public/templates/simple.html | 2 ++ 4 files changed, 8 insertions(+) create mode 100644 applications/default/public/templates/empty.html diff --git a/applications/default/public/js/controllers.js b/applications/default/public/js/controllers.js index ebd35df..4f8470e 100644 --- a/applications/default/public/js/controllers.js +++ b/applications/default/public/js/controllers.js @@ -304,6 +304,9 @@ function ViewController($scope, $location, $http, applicationState, Choko) { Choko.get({type: $scope.view.itemType}, function(response) { $scope.items = response; + $scope.items.$empty = Object.keys($scope.items).filter(function (key) { + return key.indexOf('$') != 0; + }).length ? false : true; }); if (!$scope.view.template && $scope.view.listStyle) { diff --git a/applications/default/public/templates/empty.html b/applications/default/public/templates/empty.html new file mode 100644 index 0000000..5cb6b16 --- /dev/null +++ b/applications/default/public/templates/empty.html @@ -0,0 +1 @@ +

Not exist elements!

\ No newline at end of file diff --git a/applications/default/public/templates/list-group.html b/applications/default/public/templates/list-group.html index c8afa54..981125a 100644 --- a/applications/default/public/templates/list-group.html +++ b/applications/default/public/templates/list-group.html @@ -1,3 +1,5 @@
+ +
diff --git a/applications/default/public/templates/simple.html b/applications/default/public/templates/simple.html index 8f87364..722d44b 100644 --- a/applications/default/public/templates/simple.html +++ b/applications/default/public/templates/simple.html @@ -1 +1,3 @@
+ +
From e3e3ea468cd7fb7510140ec2d552b7955be0acbf Mon Sep 17 00:00:00 2001 From: Joseph Ramos Date: Tue, 5 Aug 2014 15:24:47 -0500 Subject: [PATCH 2/5] Change all sugestion --- applications/default/public/templates/empty.html | 2 +- applications/default/public/templates/list-group.html | 2 +- applications/default/public/templates/simple.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/applications/default/public/templates/empty.html b/applications/default/public/templates/empty.html index 5cb6b16..dcdc4fd 100644 --- a/applications/default/public/templates/empty.html +++ b/applications/default/public/templates/empty.html @@ -1 +1 @@ -

Not exist elements!

\ No newline at end of file +

No items found.

\ No newline at end of file diff --git a/applications/default/public/templates/list-group.html b/applications/default/public/templates/list-group.html index 981125a..a073db6 100644 --- a/applications/default/public/templates/list-group.html +++ b/applications/default/public/templates/list-group.html @@ -1,5 +1,5 @@
-
+
diff --git a/applications/default/public/templates/simple.html b/applications/default/public/templates/simple.html index 722d44b..7e487a9 100644 --- a/applications/default/public/templates/simple.html +++ b/applications/default/public/templates/simple.html @@ -1,3 +1,3 @@
-
+
From f4db89da40b1a3e8e51d963df11f7b86c10dbc8e Mon Sep 17 00:00:00 2001 From: Joseph Ramos Date: Fri, 1 Aug 2014 16:56:59 -0500 Subject: [PATCH 3/5] Added empty templates for list page and panel #128 --- .../extensions/display/public/templates/list-group.html | 1 + applications/default/public/js/controllers.js | 3 +++ applications/default/public/templates/empty.html | 1 + applications/default/public/templates/simple.html | 2 ++ 4 files changed, 7 insertions(+) create mode 100644 applications/default/public/templates/empty.html diff --git a/applications/default/extensions/display/public/templates/list-group.html b/applications/default/extensions/display/public/templates/list-group.html index 453bb50..8d8b5a3 100644 --- a/applications/default/extensions/display/public/templates/list-group.html +++ b/applications/default/extensions/display/public/templates/list-group.html @@ -1,3 +1,4 @@
+
diff --git a/applications/default/public/js/controllers.js b/applications/default/public/js/controllers.js index b8c49ed..89a8f99 100644 --- a/applications/default/public/js/controllers.js +++ b/applications/default/public/js/controllers.js @@ -185,6 +185,9 @@ angular.module('choko') if ($scope.view.template) { Choko.get(query, function(response) { $scope.items = response; + $scope.items.$empty = Object.keys($scope.items).filter(function(key) { + return key.indexOf('$') !== 0; + }).length ? false : true; }); } diff --git a/applications/default/public/templates/empty.html b/applications/default/public/templates/empty.html new file mode 100644 index 0000000..5cb6b16 --- /dev/null +++ b/applications/default/public/templates/empty.html @@ -0,0 +1 @@ +

Not exist elements!

\ No newline at end of file diff --git a/applications/default/public/templates/simple.html b/applications/default/public/templates/simple.html index 8f87364..722d44b 100644 --- a/applications/default/public/templates/simple.html +++ b/applications/default/public/templates/simple.html @@ -1 +1,3 @@
+ +
From 916fe00c84a1ec5b679fe49a379b95e62d024bfa Mon Sep 17 00:00:00 2001 From: Joseph Ramos Date: Tue, 5 Aug 2014 15:24:47 -0500 Subject: [PATCH 4/5] Change all sugestion --- applications/default/public/templates/empty.html | 2 +- applications/default/public/templates/simple.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/default/public/templates/empty.html b/applications/default/public/templates/empty.html index 5cb6b16..dcdc4fd 100644 --- a/applications/default/public/templates/empty.html +++ b/applications/default/public/templates/empty.html @@ -1 +1 @@ -

Not exist elements!

\ No newline at end of file +

No items found.

\ No newline at end of file diff --git a/applications/default/public/templates/simple.html b/applications/default/public/templates/simple.html index 722d44b..7e487a9 100644 --- a/applications/default/public/templates/simple.html +++ b/applications/default/public/templates/simple.html @@ -1,3 +1,3 @@
-
+
From 6f0dc52673ea44b0ccfb0faffbda5deafd0721f4 Mon Sep 17 00:00:00 2001 From: Joseph Ramos Date: Wed, 29 Jul 2015 16:08:17 -0500 Subject: [PATCH 5/5] Improving code style. --- applications/default/public/templates/empty.html | 2 +- applications/default/public/templates/simple.html | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/applications/default/public/templates/empty.html b/applications/default/public/templates/empty.html index dcdc4fd..00dd7bb 100644 --- a/applications/default/public/templates/empty.html +++ b/applications/default/public/templates/empty.html @@ -1 +1 @@ -

No items found.

\ No newline at end of file +

No items found.

diff --git a/applications/default/public/templates/simple.html b/applications/default/public/templates/simple.html index 7e487a9..5c68e89 100644 --- a/applications/default/public/templates/simple.html +++ b/applications/default/public/templates/simple.html @@ -1,3 +1,2 @@
-