Updates delete modal.
Project: http://git-wip-us.apache.org/repos/asf/rave/repo Commit: http://git-wip-us.apache.org/repos/asf/rave/commit/1ea19a28 Tree: http://git-wip-us.apache.org/repos/asf/rave/tree/1ea19a28 Diff: http://git-wip-us.apache.org/repos/asf/rave/diff/1ea19a28 Branch: refs/heads/angular Commit: 1ea19a289cb9337d284f89617ba9b8a61fe732ed Parents: c590b81 Author: Jmeas <[email protected]> Authored: Thu Aug 14 15:48:34 2014 -0400 Committer: Jmeas <[email protected]> Committed: Thu Aug 14 15:54:52 2014 -0400 ---------------------------------------------------------------------- .../subapps/admin/categories/controllers/category.js | 3 +++ .../subapps/admin/categories/templates/category.html | 13 ++++++++++++- .../src/subapps/admin/users/controllers/user.js | 4 ++-- .../src/subapps/admin/users/templates/user.html | 4 ++-- 4 files changed, 19 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/rave/blob/1ea19a28/rave-portal-ng/src/subapps/admin/categories/controllers/category.js ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/categories/controllers/category.js b/rave-portal-ng/src/subapps/admin/categories/controllers/category.js index e8d3e92..b6e3b38 100644 --- a/rave-portal-ng/src/subapps/admin/categories/controllers/category.js +++ b/rave-portal-ng/src/subapps/admin/categories/controllers/category.js @@ -5,6 +5,8 @@ */ define(function(require) { + var $ = require('jquery'); + return ['$scope', 'categoryResource', '$state', '$stateParams', 'category', function($scope, categoryResource, $state, $stateParams, category) { $scope.category = category; @@ -51,6 +53,7 @@ define(function(require) { deletedResource.$promise .then(function() { ctrl.removeFromList(); + $('#confirm-modal').modal('hide'); $state.transitionTo('portal.admin.categories'); }) .catch(function() { http://git-wip-us.apache.org/repos/asf/rave/blob/1ea19a28/rave-portal-ng/src/subapps/admin/categories/templates/category.html ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/categories/templates/category.html b/rave-portal-ng/src/subapps/admin/categories/templates/category.html index 585590c..b179ad6 100644 --- a/rave-portal-ng/src/subapps/admin/categories/templates/category.html +++ b/rave-portal-ng/src/subapps/admin/categories/templates/category.html @@ -7,8 +7,19 @@ <input id="text" name="text" type="text" ng-model="text"> <br><br> <button class="btn" ng-click="onSave()">Save</button> - <button class="btn btn-danger" ng-click="onDelete()">Delete</button> + <button class="btn btn-danger" data-toggle="modal" data-target="#confirm-modal">Delete</button> </section> </div> + <div id="confirm-modal" class="modal hide" tabindex="-1" role="dialog" aria-hidden="true"> + <div class="modal-body"> + <div class="alert alert-danger"> + Are you sure you want to delete the category "<b>{{ category.text }}</b>"? This cannot be undone. + </div> + </div> + <div class="modal-footer"> + <button class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button> + <button class="btn btn-danger" ng-click="onDelete()">Delete Category</button> + </div> + </div> </div> http://git-wip-us.apache.org/repos/asf/rave/blob/1ea19a28/rave-portal-ng/src/subapps/admin/users/controllers/user.js ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/users/controllers/user.js b/rave-portal-ng/src/subapps/admin/users/controllers/user.js index 1d5ba83..afa1e21 100644 --- a/rave-portal-ng/src/subapps/admin/users/controllers/user.js +++ b/rave-portal-ng/src/subapps/admin/users/controllers/user.js @@ -4,9 +4,9 @@ * */ -var $ = require('jquery'); - define(function(require) { + var $ = require('jquery'); + return ['$scope', 'userResource', '$state', '$stateParams', 'user', function($scope, userResource, $state, $stateParams, user) { http://git-wip-us.apache.org/repos/asf/rave/blob/1ea19a28/rave-portal-ng/src/subapps/admin/users/templates/user.html ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/users/templates/user.html b/rave-portal-ng/src/subapps/admin/users/templates/user.html index e20adc5..23fb578 100644 --- a/rave-portal-ng/src/subapps/admin/users/templates/user.html +++ b/rave-portal-ng/src/subapps/admin/users/templates/user.html @@ -59,10 +59,10 @@ <button class="btn" ng-click="onSave()">Update profile</button> <button class="btn btn-danger" data-toggle="modal" data-target="#confirm-modal" ng-disabled="isCurrentUser">Delete User</button> </fieldset> - <div id="confirm-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> + <div id="confirm-modal" class="modal hide" tabindex="-1" role="dialog" aria-hidden="true"> <div class="modal-body"> <div class="alert alert-danger"> - Are you sure? This cannot be undone. + Are you sure you want to delete the user "<b>{{ user.username }}</b>"? This cannot be undone. </div> </div> <div class="modal-footer">
