Skip to content

Commit b97dd63

Browse files
Merge pull request #2431 from rhamilto/issue-2428
Automatic merge from submit-queue. Remove breadcrumbs from catalog, create, and next-steps pages Fixes #2428 ![screen shot 2017-11-01 at 4 34 51 pm](https://user-images.githubusercontent.com/895728/32296686-477b8226-bf23-11e7-9fa5-4b8de1861777.PNG) ![screen shot 2017-11-01 at 4 34 37 pm](https://user-images.githubusercontent.com/895728/32296688-4789ea46-bf23-11e7-8cf4-552bff4705a1.PNG) ![screen shot 2017-11-01 at 4 34 24 pm](https://user-images.githubusercontent.com/895728/32296690-479503ae-bf23-11e7-964f-cd649f1dd8b7.PNG) ![screen shot 2017-11-01 at 4 33 55 pm](https://user-images.githubusercontent.com/895728/32296691-479f5372-bf23-11e7-9090-5eac668a09cc.PNG) ![screen shot 2017-11-01 at 4 33 44 pm](https://user-images.githubusercontent.com/895728/32296692-47b9b8f2-bf23-11e7-8c8a-7ae1c3d80e7a.PNG) ![screen shot 2017-11-01 at 4 33 39 pm](https://user-images.githubusercontent.com/895728/32296693-47c51c24-bf23-11e7-9f11-7e3abdf63ebe.PNG)
2 parents 7fdc29a + 1aaa100 commit b97dd63

11 files changed

+48
-169
lines changed

app/scripts/controllers/create.js

-6
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ angular.module('openshiftConsole')
2626

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

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

app/scripts/controllers/create/browseCategory.js

-22
Original file line numberDiff line numberDiff line change
@@ -59,28 +59,6 @@ angular.module('openshiftConsole')
5959

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

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

app/scripts/controllers/create/createFromImage.js

+1-16
Original file line numberDiff line numberDiff line change
@@ -41,22 +41,8 @@ angular.module("openshiftConsole")
4141
return;
4242
}
4343

44-
var breadcrumbTitle = $routeParams.displayName || imageName;
4544
$scope.displayName = $routeParams.displayName;
4645
$scope.advancedOptions = $routeParams.advanced === 'true';
47-
$scope.breadcrumbs = [
48-
{
49-
title: "Add to Project",
50-
link: "project/" + $scope.projectName + "/create"
51-
},
52-
{
53-
title: "Catalog",
54-
link: "project/" + $scope.projectName + "/create?tab=fromCatalog"
55-
},
56-
{
57-
title: breadcrumbTitle
58-
}
59-
];
6046

6147
var appLabel = {name: 'app', value: ''};
6248

@@ -324,8 +310,7 @@ angular.module("openshiftConsole")
324310
return d.promise;
325311
});
326312
Navigate.toNextSteps($scope.name, $scope.projectName, {
327-
usingSampleRepo: $scope.usingSampleRepo(),
328-
breadcrumbTitle: breadcrumbTitle
313+
usingSampleRepo: $scope.usingSampleRepo()
329314
});
330315
};
331316

app/scripts/controllers/create/nextSteps.js

+1-15
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,7 @@ angular.module("openshiftConsole")
3333

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

5238
ProjectsService
5339
.get($routeParams.project)

app/scripts/controllers/newfromtemplate.js

-15
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,6 @@ angular.module('openshiftConsole')
3434
return;
3535
}
3636

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

app/views/create.html

+2-3
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>Browse Catalog</uib-tab-heading>
1110
<catalog

app/views/create/fromimage.html

+1-2
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">
6+
<div ng-hide="imageStream" class="mar-top-lg">
87
Loading...
98
</div>
109
<div class="osc-form" ng-show="imageStream">

app/views/create/next-steps.html

+1-4
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

+1-2
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">
6+
<div ng-hide="template" class="mar-top-lg">
87
Loading...
98
</div>
109
<div ng-if="template" class="row osc-form">

0 commit comments

Comments
 (0)