Adds message when there are no categories.
Project: http://git-wip-us.apache.org/repos/asf/rave/repo Commit: http://git-wip-us.apache.org/repos/asf/rave/commit/31f26bcf Tree: http://git-wip-us.apache.org/repos/asf/rave/tree/31f26bcf Diff: http://git-wip-us.apache.org/repos/asf/rave/diff/31f26bcf Branch: refs/heads/angular Commit: 31f26bcfe04042e10e00ea3e17ce49faf688de4c Parents: 10255d0 Author: Jmeas <[email protected]> Authored: Thu Aug 14 19:12:56 2014 -0400 Committer: Jmeas <[email protected]> Committed: Thu Aug 14 19:12:56 2014 -0400 ---------------------------------------------------------------------- .../src/subapps/admin/categories/controllers/categories.js | 4 ++++ .../subapps/admin/categories/services/categories-messages.js | 6 +++--- .../src/subapps/admin/categories/templates/categories.html | 5 ++++- 3 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/rave/blob/31f26bcf/rave-portal-ng/src/subapps/admin/categories/controllers/categories.js ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/categories/controllers/categories.js b/rave-portal-ng/src/subapps/admin/categories/controllers/categories.js index 2c91c4c..4156a66 100644 --- a/rave-portal-ng/src/subapps/admin/categories/controllers/categories.js +++ b/rave-portal-ng/src/subapps/admin/categories/controllers/categories.js @@ -9,6 +9,10 @@ define(function(require) { function($scope, categoriesResource, $stateParams, $rootScope, categoriesList, categoriesMessages) { $scope.categories = categoriesList; + $scope.showTable = function() { + return $scope.categories.length ? true : false; + }; + $scope.showMessage = categoriesMessages.showMessage; $scope.messageHtml = categoriesMessages.messageHtml; $scope.messageClassName = categoriesMessages.messageClassName; http://git-wip-us.apache.org/repos/asf/rave/blob/31f26bcf/rave-portal-ng/src/subapps/admin/categories/services/categories-messages.js ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/categories/services/categories-messages.js b/rave-portal-ng/src/subapps/admin/categories/services/categories-messages.js index 812b658..c52718c 100644 --- a/rave-portal-ng/src/subapps/admin/categories/services/categories-messages.js +++ b/rave-portal-ng/src/subapps/admin/categories/services/categories-messages.js @@ -13,17 +13,17 @@ define(function() { return { createMessage: function(createdText) { - html = 'Created category "<b>' + createdText + '</b>."'; + html = 'Created category "<b>' + createdText + '</b>"'; className = 'alert-success'; }, updateMessage: function(updateData) { - html = 'Renamed "<b>' + updateData.oldText + '</b>" to "<b>' + updateData.newText + '</b>."'; + html = 'Renamed "<b>' + updateData.oldText + '</b>" to "<b>' + updateData.newText + '</b>"'; className = 'alert-success'; }, deleteMessage: function(deletedText) { - html = 'Deleted "<b>' + deletedText + '</b>".'; + html = 'Deleted "<b>' + deletedText + '</b>"'; className = 'alert-success'; }, http://git-wip-us.apache.org/repos/asf/rave/blob/31f26bcf/rave-portal-ng/src/subapps/admin/categories/templates/categories.html ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/categories/templates/categories.html b/rave-portal-ng/src/subapps/admin/categories/templates/categories.html index 37223d8..73b93b2 100644 --- a/rave-portal-ng/src/subapps/admin/categories/templates/categories.html +++ b/rave-portal-ng/src/subapps/admin/categories/templates/categories.html @@ -1,7 +1,10 @@ <article ui-view> <h2>Categories</h2> <div class="alert" ng-class="messageClassName()" ng-bind-html="messageHtml()" ng-show="showMessage()"></div> - <table id="categoryList" class="table table-striped table-bordered table-condensed"> + <div class="alert alert-info" ng-show="!showTable()"> + There are no categories. Create one using the form below. + </div> + <table id="categoryList" class="table table-striped table-bordered table-condensed" ng-show="showTable()"> <thead> <tr> <th>Text</th>
