garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

open settings and profile on the feeds page

Browse Source
This commit is contained in:
Athou
2013-05-01 16:21:52 +02:00
parent 1e4b01d67d
commit cd10ee2e0a
4 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/webapp/js/main.js
View File

@@ -39,6 +39,16 @@ app.config([ '$routeProvider', '$stateProvider', '$urlRouterProvider',
templateUrl : 'templates/feeds.help.html',
controller : trackCtrl
});
$stateProvider.state('feeds.settings', {
url : '/settings',
templateUrl : 'templates/settings.html',
controller : 'SettingsCtrl'
});
$stateProvider.state('feeds.profile', {
url : '/profile',
templateUrl : 'templates/profile.html',
controller : 'ProfileCtrl'
});
$stateProvider.state('admin', {
'abstract' : true,
@@ -66,18 +76,6 @@ app.config([ '$routeProvider', '$stateProvider', '$urlRouterProvider',
controller : 'ManageSettingsCtrl'
});
$stateProvider.state('settings', {
url : '/settings',
templateUrl : 'templates/settings.html',
controller : 'SettingsCtrl'
});
$stateProvider.state('profile', {
url : '/profile',
templateUrl : 'templates/profile.html',
controller : 'ProfileCtrl'
});
$urlRouterProvider.when('/', '/feeds/view/category/all');
$urlRouterProvider.when('/admin', '/admin/settings');
$urlRouterProvider.otherwise('/');