Merge pull request #46 from jmeas/categories-admin Adds categories/preferences admin section.
Project: http://git-wip-us.apache.org/repos/asf/rave/repo Commit: http://git-wip-us.apache.org/repos/asf/rave/commit/b5e81f4b Tree: http://git-wip-us.apache.org/repos/asf/rave/tree/b5e81f4b Diff: http://git-wip-us.apache.org/repos/asf/rave/diff/b5e81f4b Branch: refs/heads/angular Commit: b5e81f4b008605bf9265b2a4a0a0586aaf63e570 Parents: 4361034 c855ead Author: James Smith <[email protected]> Authored: Fri Aug 8 15:40:08 2014 -0400 Committer: James Smith <[email protected]> Committed: Fri Aug 8 15:40:08 2014 -0400 ---------------------------------------------------------------------- rave-portal-ng/mock-api/bootstrap.js | 5 +- .../mock-api/database/import-data/categories.js | 20 ++-- .../database/import-data/preferences.js | 36 +++--- .../mock-api/modules/categories/get.js | 2 +- .../mock-api/modules/categories/post.js | 21 ++-- .../mock-api/modules/category/delete.js | 2 +- rave-portal-ng/mock-api/modules/category/get.js | 2 +- rave-portal-ng/mock-api/modules/category/put.js | 4 +- .../mock-api/modules/preference/get.js | 46 -------- .../mock-api/modules/preference/put.js | 76 ------------ .../mock-api/modules/preferences/get.js | 14 +-- .../mock-api/modules/preferences/put.js | 56 +++++++++ rave-portal-ng/src/less/brand/brand.less | 4 - rave-portal-ng/src/subapps/admin/admin.js | 26 +++- .../subapps/admin/categories/categories.html | 104 ++++++++-------- .../admin/categories/category/category.html | 34 +++--- .../admin/categories/controllers/categories.js | 20 ++++ .../admin/categories/controllers/category.js | 38 ++++++ .../admin/categories/resources/categories.js | 26 ++++ .../admin/categories/resources/category.js | 28 +++++ .../src/subapps/admin/categories/routes.js | 2 +- .../preferences/controllers/preferences.js | 47 ++++++++ .../admin/preferences/detail/detail.html | 80 ------------- .../subapps/admin/preferences/preferences.html | 118 ++++++++++--------- .../admin/preferences/resources/preferences.js | 25 ++++ .../src/subapps/admin/preferences/routes.js | 5 - .../controllers/create-account.js | 1 - 27 files changed, 458 insertions(+), 384 deletions(-) ----------------------------------------------------------------------
