Skip to content

Commit 4d8109e

Browse files
rhamiltof0x11
authored andcommitted
Remove breadcrumbs from catalog, create, and next-steps pages
Fixes openshift#2428
1 parent acc09d4 commit 4d8109e

File tree

11 files changed

+54
-165
lines changed

11 files changed

+54
-165
lines changed

app/scripts/controllers/create.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@ angular.module('openshiftConsole')
2727

2828
$scope.alerts = $scope.alerts || {};
2929

30-
$scope.breadcrumbs = [
31-
{
32-
title: "Add to Project"
33-
}
34-
];
35-
3630
ProjectsService
3731
.get($routeParams.project)
3832
.then(_.spread(function(project, context) {

app/scripts/controllers/create/browseCategory.js

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -60,28 +60,6 @@ angular.module('openshiftConsole')
6060

6161
$scope.alerts = $scope.alerts || {};
6262

63-
$scope.breadcrumbs = [
64-
{
65-
title: "Add to Project",
66-
link: "project/" + $scope.projectName + "/create"
67-
},
68-
{
69-
title: gettext("Catalog"),
70-
link: "project/" + $scope.projectName + "/create?tab=fromCatalog"
71-
}
72-
];
73-
74-
if (parentCategory) {
75-
$scope.breadcrumbs.push({
76-
title: parentCategory.label,
77-
link: "project/" + $scope.projectName + "/create/category/" + parentCategory.id
78-
});
79-
}
80-
81-
$scope.breadcrumbs.push({
82-
title: $scope.category.label
83-
});
84-
8563
ProjectsService
8664
.get($routeParams.project)
8765
.then(_.spread(function(project, context) {

app/scripts/controllers/create/createFromImage.js

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,8 @@ angular.module("openshiftConsole")
4343
return;
4444
}
4545

46-
var breadcrumbTitle = $routeParams.displayName || imageName;
4746
$scope.displayName = $routeParams.displayName;
4847
$scope.advancedOptions = $routeParams.advanced === 'true';
49-
$scope.breadcrumbs = [
50-
{
51-
title: "Add to Project",
52-
link: "project/" + $scope.projectName + "/create"
53-
},
54-
{
55-
title: gettext("Catalog"),
56-
link: "project/" + $scope.projectName + "/create?tab=fromCatalog"
57-
},
58-
{
59-
title: breadcrumbTitle
60-
}
61-
];
6248

6349
var appLabel = {name: 'app', value: ''};
6450

@@ -335,8 +321,7 @@ angular.module("openshiftConsole")
335321
return d.promise;
336322
});
337323
Navigate.toNextSteps($scope.name, $scope.projectName, {
338-
usingSampleRepo: $scope.usingSampleRepo(),
339-
breadcrumbTitle: breadcrumbTitle
324+
usingSampleRepo: $scope.usingSampleRepo()
340325
});
341326
};
342327

app/scripts/controllers/create/nextSteps.js

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,7 @@ angular.module("openshiftConsole")
3434

3535
$scope.projectName = $routeParams.project;
3636
$scope.fromSampleRepo = $routeParams.fromSample;
37-
$scope.name = $routeParams.breadcrumbTitle || $routeParams.name;
38-
39-
$scope.breadcrumbs = [
40-
{
41-
title: "Add to Project",
42-
link: "project/" + $scope.projectName + "/create"
43-
},
44-
{
45-
// Make history back the default by leaving off the link.
46-
title: $routeParams.breadcrumbTitle || $routeParams.name
47-
},
48-
{
49-
title: gettext("Next Steps")
50-
}
51-
];
37+
$scope.name = $routeParams.name;
5238

5339
ProjectsService
5440
.get($routeParams.project)

app/scripts/controllers/newfromtemplate.js

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,6 @@ angular.module('openshiftConsole')
3535
return;
3636
}
3737

38-
$scope.breadcrumbs = [
39-
{
40-
title: "Add to Project",
41-
link: "project/" + $routeParams.project + "/create"
42-
},
43-
{
44-
title: gettext("Catalog"),
45-
link: "project/" + $routeParams.project + "/create?tab=fromCatalog"
46-
},
47-
{
48-
title: name
49-
}
50-
];
51-
5238
var getValidTemplateParamsMap = function() {
5339
try {
5440
return JSON.parse($routeParams.templateParamsMap);
@@ -196,7 +182,6 @@ angular.module('openshiftConsole')
196182
DataService.get("templates", name, {namespace: (namespace || $scope.project.metadata.name)}).then(
197183
function(template) {
198184
$scope.template = template;
199-
$scope.breadcrumbs[2].title = $filter('displayName')(template);
200185
findTemplateImages(template);
201186
var imageUsesParameters = function(image) {
202187
return !_.isEmpty(image.usesParameters);

app/views/create.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<div class="add-to-project middle surface-shaded">
22
<div class="middle-content" persist-tab-state>
33
<div class="container-fluid">
4-
<breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
5-
<alerts alerts="alerts"></alerts>
4+
<alerts alerts="alerts" class="mar-top-md"></alerts>
65
<div class="row">
76
<div class="col-md-12">
8-
<uib-tabset class="mar-top-none" ng-if="project">
7+
<uib-tabset class="mar-top-md" ng-if="project">
98
<uib-tab active="selectedTab.fromCatalog">
109
<uib-tab-heading translate>Browse Catalog</uib-tab-heading>
1110
<catalog

app/views/create/fromimage.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
<div class="container-fluid">
44
<div class="row">
55
<div class="col-md-12">
6-
<breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
7-
<div ng-hide="imageStream" translate>
6+
<div ng-hide="imageStream" class="mar-top-lg" translate>
87
Loading...
98
</div>
109
<div class="osc-form" ng-show="imageStream">

app/views/create/next-steps.html

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
<div class="middle surface-shaded">
22
<div class="middle-content">
3-
<div class="container-fluid next-steps">
4-
<breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
5-
3+
<div class="container-fluid next-steps pad-top-xl">
64
<next-steps
75
project="project"
86
project-name="projectName"
97
login-base-url="loginBaseUrl"
108
from-sample-repo="fromSampleRepo"
119
created-build-config="createdBuildConfig"
1210
name="name"></next-steps>
13-
1411
</div>
1512
</div><!-- /middle-content -->
1613
</div><!-- /middle -->

app/views/newfromtemplate.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
<div class="container-fluid">
44
<div class="row">
55
<div class="col-md-12">
6-
<breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
7-
<div ng-hide="template" translate>
6+
<div ng-hide="template" class="mar-top-lg" translate>
87
Loading...
98
</div>
109
<div ng-if="template" class="row osc-form">

0 commit comments

Comments
 (0)