Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove breadcrumbs from catalog, create, and next-steps pages #2431

Merged
merged 1 commit into from
Nov 1, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 0 additions & 6 deletions app/scripts/controllers/create.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,6 @@ angular.module('openshiftConsole')

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

$scope.breadcrumbs = [
{
title: "Add to Project"
}
];

ProjectsService
.get($routeParams.project)
.then(_.spread(function(project, context) {
Expand Down
22 changes: 0 additions & 22 deletions app/scripts/controllers/create/browseCategory.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,28 +59,6 @@ angular.module('openshiftConsole')

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

$scope.breadcrumbs = [
{
title: "Add to Project",
link: "project/" + $scope.projectName + "/create"
},
{
title: "Catalog",
link: "project/" + $scope.projectName + "/create?tab=fromCatalog"
}
];

if (parentCategory) {
$scope.breadcrumbs.push({
title: parentCategory.label,
link: "project/" + $scope.projectName + "/create/category/" + parentCategory.id
});
}

$scope.breadcrumbs.push({
title: $scope.category.label
});

ProjectsService
.get($routeParams.project)
.then(_.spread(function(project, context) {
Expand Down
17 changes: 1 addition & 16 deletions app/scripts/controllers/create/createFromImage.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,8 @@ angular.module("openshiftConsole")
return;
}

var breadcrumbTitle = $routeParams.displayName || imageName;
$scope.displayName = $routeParams.displayName;
$scope.advancedOptions = $routeParams.advanced === 'true';
$scope.breadcrumbs = [
{
title: "Add to Project",
link: "project/" + $scope.projectName + "/create"
},
{
title: "Catalog",
link: "project/" + $scope.projectName + "/create?tab=fromCatalog"
},
{
title: breadcrumbTitle
}
];

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

Expand Down Expand Up @@ -324,8 +310,7 @@ angular.module("openshiftConsole")
return d.promise;
});
Navigate.toNextSteps($scope.name, $scope.projectName, {
usingSampleRepo: $scope.usingSampleRepo(),
breadcrumbTitle: breadcrumbTitle
usingSampleRepo: $scope.usingSampleRepo()
});
};

Expand Down
16 changes: 1 addition & 15 deletions app/scripts/controllers/create/nextSteps.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,7 @@ angular.module("openshiftConsole")

$scope.projectName = $routeParams.project;
$scope.fromSampleRepo = $routeParams.fromSample;
$scope.name = $routeParams.breadcrumbTitle || $routeParams.name;

$scope.breadcrumbs = [
{
title: "Add to Project",
link: "project/" + $scope.projectName + "/create"
},
{
// Make history back the default by leaving off the link.
title: $routeParams.breadcrumbTitle || $routeParams.name
},
{
title: "Next Steps"
}
];
$scope.name = $routeParams.name;

ProjectsService
.get($routeParams.project)
Expand Down
15 changes: 0 additions & 15 deletions app/scripts/controllers/newfromtemplate.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,6 @@ angular.module('openshiftConsole')
return;
}

$scope.breadcrumbs = [
{
title: "Add to Project",
link: "project/" + $routeParams.project + "/create"
},
{
title: "Catalog",
link: "project/" + $routeParams.project + "/create?tab=fromCatalog"
},
{
title: name
}
];

var getValidTemplateParamsMap = function() {
try {
return JSON.parse($routeParams.templateParamsMap);
Expand Down Expand Up @@ -195,7 +181,6 @@ angular.module('openshiftConsole')
DataService.get("templates", name, {namespace: (namespace || $scope.project.metadata.name)}).then(
function(template) {
$scope.template = template;
$scope.breadcrumbs[2].title = $filter('displayName')(template);
findTemplateImages(template);
var imageUsesParameters = function(image) {
return !_.isEmpty(image.usesParameters);
Expand Down
5 changes: 2 additions & 3 deletions app/views/create.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<div class="add-to-project middle surface-shaded">
<div class="middle-content" persist-tab-state>
<div class="container-fluid">
<breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
<alerts alerts="alerts"></alerts>
<alerts alerts="alerts" class="mar-top-md"></alerts>
<div class="row">
<div class="col-md-12">
<uib-tabset class="mar-top-none" ng-if="project">
<uib-tabset class="mar-top-md" ng-if="project">
<uib-tab active="selectedTab.fromCatalog">
<uib-tab-heading>Browse Catalog</uib-tab-heading>
<catalog
Expand Down
3 changes: 1 addition & 2 deletions app/views/create/fromimage.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
<div class="container-fluid">
<div class="row">
<div class="col-md-12">
<breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
<div ng-hide="imageStream">
<div ng-hide="imageStream" class="mar-top-lg">
Loading...
</div>
<div class="osc-form" ng-show="imageStream">
Expand Down
5 changes: 1 addition & 4 deletions app/views/create/next-steps.html
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
<div class="middle surface-shaded">
<div class="middle-content">
<div class="container-fluid next-steps">
<breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>

<div class="container-fluid next-steps pad-top-xl">
<next-steps
project="project"
project-name="projectName"
login-base-url="loginBaseUrl"
from-sample-repo="fromSampleRepo"
created-build-config="createdBuildConfig"
name="name"></next-steps>

</div>
</div><!-- /middle-content -->
</div><!-- /middle -->
3 changes: 1 addition & 2 deletions app/views/newfromtemplate.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
<div class="container-fluid">
<div class="row">
<div class="col-md-12">
<breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
<div ng-hide="template">
<div ng-hide="template" class="mar-top-lg">
Loading...
</div>
<div ng-if="template" class="row osc-form">
Expand Down
Loading