Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0bf43d1
Adding route for cf-application and cf-organization
shaoquan-chen-at-hpe Jan 14, 2016
ac0120b
Adding route for cf-application and cf-organization
shaoquan-chen-at-hpe Jan 14, 2016
6790830
Merge branch 'route' of github.com:hpcloud/stratos-ui into route
shaoquan-chen-at-hpe Jan 15, 2016
8a47735
Adding route for cf-application and cf-organization
shaoquan-chen-at-hpe Jan 14, 2016
4e79153
Adding route for cf-application and cf-organization
shaoquan-chen-at-hpe Jan 14, 2016
15c2bab
Merge branch 'route' of github.com:hpcloud/stratos-ui into route
shaoquan-chen-at-hpe Jan 15, 2016
bcb2b11
refectory route
shaoquan-chen-at-hpe Jan 15, 2016
614c9ec
refectory route
shaoquan-chen-at-hpe Jan 15, 2016
ad4d377
Merge branch 'route' of github.com:hpcloud/stratos-ui into route
shaoquan-chen-at-hpe Jan 15, 2016
db349af
Merge branch 'route' of github.com:hpcloud/stratos-ui into route
shaoquan-chen-at-hpe Jan 15, 2016
c133afe
Merge branch 'route' of github.com:hpcloud/stratos-ui into route
shaoquan-chen-at-hpe Jan 15, 2016
217ae52
Merge branch 'plugins' of github.com:hpcloud/stratos-ui into plugins
shaoquan-chen-at-hpe Jan 15, 2016
34697b0
Merge branch 'plugins' of github.com:hpcloud/stratos-ui into plugins
shaoquan-chen-at-hpe Jan 15, 2016
0e33861
Adding route for cf-application and cf-organization
shaoquan-chen-at-hpe Jan 14, 2016
2b3d822
Adding route for cf-application and cf-organization
shaoquan-chen-at-hpe Jan 14, 2016
8aade8b
Adding route for cf-application and cf-organization
shaoquan-chen-at-hpe Jan 14, 2016
623c7b6
refectory route
shaoquan-chen-at-hpe Jan 15, 2016
7dd5f17
Merge branch 'route' of github.com:hpcloud/stratos-ui into route
shaoquan-chen-at-hpe Jan 15, 2016
81f0554
Merge branch 'route' of github.com:hpcloud/stratos-ui into route
shaoquan-chen-at-hpe Jan 15, 2016
afe7cab
Merge branch 'route' of github.com:hpcloud/stratos-ui into route
shaoquan-chen-at-hpe Jan 15, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/view/console/console.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<header top-bar role="banner"></header>
<main content role="main" ui-view></main>
<main role="main" ui-view></main>
<footer bottom-bar></footer>
18 changes: 0 additions & 18 deletions src/app/view/console/content/content.directive.js

This file was deleted.

1 change: 0 additions & 1 deletion src/app/view/console/content/content.html

This file was deleted.

2 changes: 1 addition & 1 deletion src/app/view/console/top-bar/navigation/navigation.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ul>
<li ng-repeat="menuitem in NavigationCtrl.menu">
<a ui-sref="menuitem.href">
<a ui-sref="{{ menuitem.href }}">
{{ menuitem.text }}
</a>
</li>
Expand Down
Empty file removed src/plugins/ci/ci.scss
Empty file.
7 changes: 0 additions & 7 deletions src/plugins/cloud-fondry/view/view.module.js

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
'cloud-foundry.model',
'cloud-foundry.view'
])
.constant('cloud-foundry.basePath', env.plugins.cloudFoundry.basePath)
.run(register);

register.$inject = [
Expand Down Expand Up @@ -40,8 +39,8 @@

registerNavigation: function () {
this.modelManager.retrieve('app.model.navigation')
.addMenuItem('applications', 'applications', gettext('Applications'))
.addMenuItem('organizations', 'organizations', gettext('Organizations'));
.addMenuItem('cf.applications', 'cf.applications', gettext('Applications'))
.addMenuItem('cf.organizations', 'cf.organizations', gettext('Organizations'));
}
});

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<h2>Applications</h2>
22 changes: 22 additions & 0 deletions src/plugins/cloud-foundry/view/applications/applications.module.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
(function () {
'use strict';

angular
.module('cloud-foundry.view.applications', [])
.constant('cloud-foundry.view.applications.basePath',
env.plugins.cloudFoundry.basePath + 'view/applications/')
.config(registerRoute);

registerRoute.$inject = [
'$stateProvider',
'cloud-foundry.view.applications.basePath'
];

function registerRoute($stateProvider, basePath) {
$stateProvider.state('cf.applications', {
url: '/applications',
templateUrl: basePath + 'applications.html'
});
}

})();
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<h2>Organizations</h2>
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
(function () {
'use strict';

angular
.module('cloud-foundry.view.organizations', [])
.constant('cloud-foundry.view.organizations.basePath',
env.plugins.cloudFoundry.basePath + 'view/organizations/')
.config(registerRoute);

registerRoute.$inject = [
'$stateProvider',
'cloud-foundry.view.organizations.basePath'
];

function registerRoute($stateProvider, basePath) {
$stateProvider.state('cf.organizations', {
url: '/organizations',
templateUrl: basePath + 'organizations.html'
});
}
})();
2 changes: 2 additions & 0 deletions src/plugins/cloud-foundry/view/view.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<h1>Cloud Foundry</h1>
<div ui-view></div>
24 changes: 24 additions & 0 deletions src/plugins/cloud-foundry/view/view.module.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
(function () {
'use strict';

angular
.module('cloud-foundry.view', [
'cloud-foundry.view.applications',
'cloud-foundry.view.organizations'
])
.constant('cloud-foundry.view.basePath',
env.plugins.cloudFoundry.basePath + 'view/')
.config(registerRoute);

registerRoute.$inject = [
'$stateProvider',
'cloud-foundry.view.basePath'
];

function registerRoute($stateProvider, basePath) {
$stateProvider.state('cf', {
url: 'cf',
templateUrl: basePath + 'view.html'
});
}
})();
5 changes: 4 additions & 1 deletion tools/gulp.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ module.exports = function () {
paths.dist + 'index.module.js',
paths.dist + 'app/**/*.module.js',
paths.dist + 'app/**/*.js',
paths.dist + 'plugins/**/*.module.js',
paths.dist + 'plugins/**/*.js',
'!' + paths.dist + '**/*.mock.js',
'!' + paths.dist + '**/*.spec.js'
],
Expand All @@ -49,7 +51,8 @@ module.exports = function () {
],

partials: [
paths.src + 'app/**/*.html'
paths.src + 'app/**/*.html',
paths.src + 'plugins/**/*.html'
]
};

Expand Down