Moves controllers to router. Nested routes will call the controller of their parent if the controllers are in the DOM. Placing them in the router ties them to the state, which is what we want.
Project: http://git-wip-us.apache.org/repos/asf/rave/repo Commit: http://git-wip-us.apache.org/repos/asf/rave/commit/3f50d69d Tree: http://git-wip-us.apache.org/repos/asf/rave/tree/3f50d69d Diff: http://git-wip-us.apache.org/repos/asf/rave/diff/3f50d69d Branch: refs/heads/angular Commit: 3f50d69d68d71e4f32dbda190bafd64beceae19c Parents: 9069be5 Author: Jmeas <[email protected]> Authored: Fri Aug 8 16:31:17 2014 -0400 Committer: Jmeas <[email protected]> Committed: Fri Aug 8 16:32:59 2014 -0400 ---------------------------------------------------------------------- .../subapps/admin/categories/categories.html | 100 +++++++++---------- .../admin/categories/category/category.html | 2 +- .../src/subapps/admin/categories/routes.js | 8 +- .../subapps/admin/preferences/preferences.html | 2 +- .../src/subapps/admin/preferences/routes.js | 4 +- .../src/subapps/admin/users/routes.js | 4 +- .../src/subapps/admin/users/users.html | 92 +++++++++-------- 7 files changed, 108 insertions(+), 104 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/rave/blob/3f50d69d/rave-portal-ng/src/subapps/admin/categories/categories.html ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/categories/categories.html b/rave-portal-ng/src/subapps/admin/categories/categories.html index 5f82188..7b47c21 100644 --- a/rave-portal-ng/src/subapps/admin/categories/categories.html +++ b/rave-portal-ng/src/subapps/admin/categories/categories.html @@ -1,56 +1,54 @@ <article ui-view> - <div ng-controller="categoriesCtrl"> - <h2>Categories</h2> - <table id="categoryList" class="table table-striped table-bordered table-condensed"> - <thead> - <tr> - <th>Text</th> - <th>Created By</th> - <th>Date Created</th> - <th>Modified By</th> - <th>Date Modified</th> - </tr> - </thead> - <tbody> - <tr ng-repeat="category in categories"> - <td> - <a ui-sref="portal.admin.categories.category({id: category.ID})"> - {{ category.text }} - </a> - </td> - <td> - {{ category.createdUserName }} - </td> - <td> - {{ category.createdDate | date:'short' }} - </td> - <td> - {{ category.lastModifiedUserName }} - </td> - <td> - {{ category.lastModifiedDate | date:'short' }} - </td> - </tr> - </tbody> - </table> - <div> - <form id="createCategory" class="form-inline"> - <fieldset> - <legend> - Create Category - </legend> - <div class="control-group"> - <label class="control-label" for="text"> - Text: - </label> - <div class="controls"> - <input id="text" name="text" autofocus="autofocus" required="required" type="text" value="" ng-model="newText"> - <button class="btn btn-primary" ng-click="onCreate()">Create Category</button> - </div> + <h2>Categories</h2> + <table id="categoryList" class="table table-striped table-bordered table-condensed"> + <thead> + <tr> + <th>Text</th> + <th>Created By</th> + <th>Date Created</th> + <th>Modified By</th> + <th>Date Modified</th> + </tr> + </thead> + <tbody> + <tr ng-repeat="category in categories"> + <td> + <a ui-sref="portal.admin.categories.category({id: category.ID})"> + {{ category.text }} + </a> + </td> + <td> + {{ category.createdUserName }} + </td> + <td> + {{ category.createdDate | date:'short' }} + </td> + <td> + {{ category.lastModifiedUserName }} + </td> + <td> + {{ category.lastModifiedDate | date:'short' }} + </td> + </tr> + </tbody> + </table> + <div> + <form id="createCategory" class="form-inline"> + <fieldset> + <legend> + Create Category + </legend> + <div class="control-group"> + <label class="control-label" for="text"> + Text: + </label> + <div class="controls"> + <input id="text" name="text" autofocus="autofocus" required="required" type="text" value="" ng-model="newText"> + <button class="btn btn-primary" ng-click="onCreate()">Create Category</button> </div> - </fieldset> - </form> - </div> + </div> + </fieldset> + </form> </div> </article> http://git-wip-us.apache.org/repos/asf/rave/blob/3f50d69d/rave-portal-ng/src/subapps/admin/categories/category/category.html ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/categories/category/category.html b/rave-portal-ng/src/subapps/admin/categories/category/category.html index ea4a829..585590c 100644 --- a/rave-portal-ng/src/subapps/admin/categories/category/category.html +++ b/rave-portal-ng/src/subapps/admin/categories/category/category.html @@ -1,4 +1,4 @@ -<div ng-controller="categoryCtrl"> +<div> <a ui-sref="portal.admin.categories">« Back to Categories</a> <h2>Category â "{{ category.text }}"</h2> <div class="well"> http://git-wip-us.apache.org/repos/asf/rave/blob/3f50d69d/rave-portal-ng/src/subapps/admin/categories/routes.js ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/categories/routes.js b/rave-portal-ng/src/subapps/admin/categories/routes.js index cb1cf9f..19bc73b 100644 --- a/rave-portal-ng/src/subapps/admin/categories/routes.js +++ b/rave-portal-ng/src/subapps/admin/categories/routes.js @@ -1,6 +1,8 @@ define(function(require) { require('../admin'); var angular = require('angular'); + var categoriesCtrl = require('./controllers/categories'); + var categoryCtrl = require('./controllers/category'); angular.module('admin').config([ '$stateProvider', '$urlRouterProvider', @@ -9,12 +11,14 @@ define(function(require) { .state('portal.admin.categories', { url: '/categories', templateUrl: '/subapps/admin/categories/categories.html', - authenticate: true + authenticate: true, + controller: categoriesCtrl }) .state('portal.admin.categories.category', { url: '/categories/category-:id', templateUrl: '/subapps/admin/categories/category/category.html', - authenticate: true + authenticate: true, + controller: categoryCtrl }); } ]); http://git-wip-us.apache.org/repos/asf/rave/blob/3f50d69d/rave-portal-ng/src/subapps/admin/preferences/preferences.html ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/preferences/preferences.html b/rave-portal-ng/src/subapps/admin/preferences/preferences.html index 9c7027d..cf81711 100644 --- a/rave-portal-ng/src/subapps/admin/preferences/preferences.html +++ b/rave-portal-ng/src/subapps/admin/preferences/preferences.html @@ -1,6 +1,6 @@ <article ui-view> <h2>Preferences</h2> - <form id="preferenceForm" class="form-horizontal" ng-controller="preferencesCtrl"> + <form id="preferenceForm" class="form-horizontal"> <p>Field marked with * are required</p> <div class="control-group"> <label for="titleSuffix.value" class="control-label"> http://git-wip-us.apache.org/repos/asf/rave/blob/3f50d69d/rave-portal-ng/src/subapps/admin/preferences/routes.js ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/preferences/routes.js b/rave-portal-ng/src/subapps/admin/preferences/routes.js index 1fc9768..2ce7dda 100644 --- a/rave-portal-ng/src/subapps/admin/preferences/routes.js +++ b/rave-portal-ng/src/subapps/admin/preferences/routes.js @@ -1,6 +1,7 @@ define(function(require) { require('../admin'); var angular = require('angular'); + var preferencesCtrl = require('./controllers/preferences'); angular.module('admin').config([ '$stateProvider', '$urlRouterProvider', @@ -9,7 +10,8 @@ define(function(require) { .state('portal.admin.preferences', { url: '/preferences', templateUrl: '/subapps/admin/preferences/preferences.html', - authenticate: true + authenticate: true, + controller: preferencesCtrl }); } ]); http://git-wip-us.apache.org/repos/asf/rave/blob/3f50d69d/rave-portal-ng/src/subapps/admin/users/routes.js ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/users/routes.js b/rave-portal-ng/src/subapps/admin/users/routes.js index 947f508..aa7a837 100644 --- a/rave-portal-ng/src/subapps/admin/users/routes.js +++ b/rave-portal-ng/src/subapps/admin/users/routes.js @@ -1,6 +1,7 @@ define(function(require) { require('../admin'); var angular = require('angular'); + var usersCtrl = require('./controllers/users'); angular.module('admin').config([ '$stateProvider', '$urlRouterProvider', @@ -9,7 +10,8 @@ define(function(require) { .state('portal.admin.users', { url: '/users?page', templateUrl: '/subapps/admin/users/users.html', - authenticate: true + authenticate: true, + controller: usersCtrl }) .state('portal.admin.users.detail', { url: '/users/detail-:id', http://git-wip-us.apache.org/repos/asf/rave/blob/3f50d69d/rave-portal-ng/src/subapps/admin/users/users.html ---------------------------------------------------------------------- diff --git a/rave-portal-ng/src/subapps/admin/users/users.html b/rave-portal-ng/src/subapps/admin/users/users.html index c750200..97c1898 100644 --- a/rave-portal-ng/src/subapps/admin/users/users.html +++ b/rave-portal-ng/src/subapps/admin/users/users.html @@ -1,51 +1,8 @@ <article ui-view> - <div ng-controller="usersCtrl"> - <h2> - Showing {{ firstItem() }} - {{ lastItem() }} of {{ users.length }} results - </h2> - <div class="searchHeading paginationHeading"> - <div class="pagination"> - <ul> - <li ng-class="prevPageDisabled()"> - <a ui-sref="portal.admin.users({page:currentPage-1})"><</a> - </li> - <li ng-repeat="n in paginationPages(currentPage, pageCount)" ng-class="{ active: n == currentPage }"> - <a ui-sref="portal.admin.users({page:n})">{{ n }}</a> - </li> - <li ng-class="nextPageDisabled()"> - <a ui-sref="portal.admin.users({page:currentPage+1})">></a> - </li> - </ul> - </div> - <form class="form-horizontal search-form" action="/portal/app/admin/users/search" method="get"> - <fieldset> - <div class="input-append"> - <input class="input-medium" type="search" id="searchTerm" name="searchTerm" value="" placeholder="Search Users"> - <button class="btn btn-primary" type="submit" value="Search">Search</button> - </div> - </fieldset> - </form> - </div> - <table class="table table-striped table-bordered table-condensed"> - <thead> - <tr> - <th>Username</th> - <th>Email</th> - <th>Account Enabled</th> - </tr> - </thead> - <tbody> - <tr ng-repeat="user in users"> - <td> - <a ui-sref="portal.admin.users.detail"> - Username - </a> - </td> - <td>OpenSocial</td> - <td>published</td> - </tr> - </tbody> - </table> + <h2> + Showing {{ firstItem() }} - {{ lastItem() }} of {{ users.length }} results + </h2> + <div class="searchHeading paginationHeading"> <div class="pagination"> <ul> <li ng-class="prevPageDisabled()"> @@ -59,4 +16,45 @@ </li> </ul> </div> + <form class="form-horizontal search-form" action="/portal/app/admin/users/search" method="get"> + <fieldset> + <div class="input-append"> + <input class="input-medium" type="search" id="searchTerm" name="searchTerm" value="" placeholder="Search Users"> + <button class="btn btn-primary" type="submit" value="Search">Search</button> + </div> + </fieldset> + </form> + </div> + <table class="table table-striped table-bordered table-condensed"> + <thead> + <tr> + <th>Username</th> + <th>Email</th> + <th>Account Enabled</th> + </tr> + </thead> + <tbody> + <tr ng-repeat="user in users"> + <td> + <a ui-sref="portal.admin.users.detail"> + Username + </a> + </td> + <td>OpenSocial</td> + <td>published</td> + </tr> + </tbody> + </table> + <div class="pagination"> + <ul> + <li ng-class="prevPageDisabled()"> + <a ui-sref="portal.admin.users({page:currentPage-1})"><</a> + </li> + <li ng-repeat="n in paginationPages(currentPage, pageCount)" ng-class="{ active: n == currentPage }"> + <a ui-sref="portal.admin.users({page:n})">{{ n }}</a> + </li> + <li ng-class="nextPageDisabled()"> + <a ui-sref="portal.admin.users({page:currentPage+1})">></a> + </li> + </ul> </article>
