Skip to content

Commit 59d0df1

Browse files
author
OpenShift Bot
authored
Merge pull request #1932 from spadgett/pf-vertical-nav
Merged by openshift-bot
2 parents 4be3793 + bc13e0e commit 59d0df1

File tree

128 files changed

+10342
-11637
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+10342
-11637
lines changed

‎app/images/logo-origin-thin.svg

+33-11
Loading

‎app/index.html

+8-19
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!doctype html>
2-
<html class="no-js layout-pf-alt layout-pf-alt-fixed">
2+
<html class="no-js layout-pf layout-pf-fixed">
33
<head>
44
<meta http-equiv="X-UA-Compatible" content="IE=EDGE" />
55
<meta charset="utf-8">
@@ -35,29 +35,18 @@
3535
<link rel="stylesheet" type="text/css" href="styles/extensions.css">
3636
<style type="text/css">
3737

38-
3938
</style>
4039
</head>
41-
<body class="console-os">
40+
<body class="console-os" ng-class="{ 'has-project-bar': view.hasProject }">
4241
<!-- Add your site or application content here -->
43-
42+
<p ng-if="globalTechPreviewIndicator" ng-cloak class="tech-preview-banner">Technology preview is enabled</p>
43+
<osc-header></osc-header>
4444
<toast-notifications></toast-notifications>
4545
<notification-drawer-wrapper></notification-drawer-wrapper>
46-
47-
<div ng-view>
48-
<!-- Include default simple nav and shaded background as a placeholder until API discovery finishes -->
49-
<nav class="navbar navbar-pf-alt top-header" role="navigation">
50-
<div row>
51-
<div class="navbar-header">
52-
<a class="navbar-brand" id="openshift-logo" href="./">
53-
<div id="header-logo"></div>
54-
</a>
55-
</div>
56-
</div>
57-
</nav>
58-
<div class="wrap no-sidebar">
59-
<div class="middle surface-shaded">
60-
<div class="middle-section">
46+
<div class="container-pf-nav-pf-vertical" ng-class="{ 'collapsed-nav': nav.collapsed }">
47+
<div ng-view class="view">
48+
<div class="middle">
49+
<div class="middle-content">
6150
<div class="empty-state-message">
6251
<h2 class="text-center" id="temporary-loading-message" style="display: none;">Loading...</h2>
6352
<!-- So that we don't get the Loading... message AND the noscript message -->

‎app/scripts/constants.js

+21-7
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,16 @@ angular.extend(window.OPENSHIFT_CONSTANTS, {
216216
label: "Deployments",
217217
href: "/browse/deployments",
218218
prefixes: [
219+
"/add-config-volume",
220+
"/attach-pvc",
219221
"/browse/deployment/",
220222
"/browse/dc/",
221223
"/browse/rs/",
222-
"/browse/rc/"
224+
"/browse/rc/",
225+
"/edit/autoscaler",
226+
"/edit/dc/",
227+
"/edit/health-checks",
228+
"/set-limits"
223229
]
224230
},
225231
{
@@ -247,7 +253,9 @@ angular.extend(window.OPENSHIFT_CONSTANTS, {
247253
label: "Routes",
248254
href: "/browse/routes",
249255
prefixes: [
250-
"/browse/routes/"
256+
"/browse/routes/",
257+
"/create-route",
258+
"/edit/routes/"
251259
]
252260
}
253261
]
@@ -265,14 +273,16 @@ angular.extend(window.OPENSHIFT_CONSTANTS, {
265273
href: "/browse/builds",
266274
prefixes: [
267275
"/browse/builds/",
268-
"/browse/builds-noconfig/"
276+
"/browse/builds-noconfig/",
277+
"/edit/builds/"
269278
]
270279
},
271280
{
272281
label: "Pipelines",
273282
href: "/browse/pipelines",
274283
prefixes: [
275-
"/browse/pipelines/"
284+
"/browse/pipelines/",
285+
"/edit/pipelines/"
276286
]
277287
},
278288
{
@@ -309,14 +319,17 @@ angular.extend(window.OPENSHIFT_CONSTANTS, {
309319
label: "Config Maps",
310320
href: "/browse/config-maps",
311321
prefixes: [
312-
"/browse/config-maps/"
322+
"/browse/config-maps/",
323+
"/create-config-map",
324+
"/edit/config-maps/"
313325
]
314326
},
315327
{
316328
label: "Secrets",
317329
href: "/browse/secrets",
318330
prefixes: [
319-
"/browse/secrets/"
331+
"/browse/secrets/",
332+
"/create-secret"
320333
],
321334
canI: {
322335
resource: 'secrets',
@@ -336,7 +349,8 @@ angular.extend(window.OPENSHIFT_CONSTANTS, {
336349
iconClass: "pficon pficon-container-node",
337350
href: "/browse/storage",
338351
prefixes: [
339-
"/browse/storage/"
352+
"/browse/storage/",
353+
"/create-pvc"
340354
]
341355
},
342356
{

‎app/scripts/controllers/addConfigVolume.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ angular.module('openshiftConsole')
5959
name: $routeParams.name,
6060
kind: $routeParams.kind,
6161
namespace: $routeParams.project,
62-
subpage: 'Add Config Files',
63-
includeProject: true
62+
subpage: 'Add Config Files'
6463
});
6564

6665
var humanizeKind = $filter('humanizeKind');
@@ -130,8 +129,7 @@ angular.module('openshiftConsole')
130129
$scope.breadcrumbs = BreadcrumbsService.getBreadcrumbs({
131130
object: object,
132131
project: project,
133-
subpage: 'Add Config Files',
134-
includeProject: true
132+
subpage: 'Add Config Files'
135133
});
136134
},
137135
function(e) {

‎app/scripts/controllers/attachPVC.js

+2-7
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,14 @@ angular.module('openshiftConsole')
6464
name: $routeParams.name,
6565
kind: $routeParams.kind,
6666
namespace: $routeParams.project,
67-
subpage: 'Add Storage',
68-
includeProject: true
67+
subpage: 'Add Storage'
6968
});
7069

7170
ProjectsService
7271
.get($routeParams.project)
7372
.then(_.spread(function(project, context) {
7473
$scope.project = project;
7574

76-
// Update project breadcrumb with display name.
77-
$scope.breadcrumbs[0].title = $filter('displayName')(project);
78-
7975
if (!AuthorizationService.canI(resourceGroupVersion, 'update', $routeParams.project)) {
8076
Navigate.toErrorPage('You do not have authority to update ' +
8177
humanizeKind($routeParams.kind) + ' ' + $routeParams.name + '.', 'access_denied');
@@ -126,8 +122,7 @@ angular.module('openshiftConsole')
126122
$scope.breadcrumbs = BreadcrumbsService.getBreadcrumbs({
127123
object: resource,
128124
project: project,
129-
subpage: 'Add Storage',
130-
includeProject: true
125+
subpage: 'Add Storage'
131126
});
132127
var podTemplate = _.get(resource, 'spec.template');
133128
$scope.existingVolumeNames = StorageService.getVolumeNames(podTemplate);

‎app/scripts/controllers/create.js

-6
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ angular.module('openshiftConsole')
2727
$scope.alerts = $scope.alerts || {};
2828

2929
$scope.breadcrumbs = [
30-
{
31-
title: $scope.projectName,
32-
link: "project/" + $scope.projectName
33-
},
3430
{
3531
title: "Add to Project"
3632
}
@@ -41,8 +37,6 @@ angular.module('openshiftConsole')
4137
.then(_.spread(function(project, context) {
4238
$scope.project = project;
4339
$scope.context = context;
44-
// Update project breadcrumb with display name.
45-
$scope.breadcrumbs[0].title = $filter('displayName')(project);
4640

4741
// List image streams and templates in the both the shared `openshift`
4842
// namespace and the project namespace.

‎app/scripts/controllers/create/browseCategory.js

-6
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,6 @@ angular.module('openshiftConsole')
6060
$scope.alerts = $scope.alerts || {};
6161

6262
$scope.breadcrumbs = [
63-
{
64-
title: $scope.projectName,
65-
link: "project/" + $scope.projectName
66-
},
6763
{
6864
title: "Add to Project",
6965
link: "project/" + $scope.projectName + "/create"
@@ -90,8 +86,6 @@ angular.module('openshiftConsole')
9086
.then(_.spread(function(project, context) {
9187
$scope.project = project;
9288
$scope.context = context;
93-
// Update project breadcrumb with display name.
94-
$scope.breadcrumbs[0].title = $filter('displayName')(project);
9589

9690
// List image streams and templates in the both the shared `openshift`
9791
// namespace and the project namespace.

0 commit comments

Comments
 (0)