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)
openshift · Nov 1, 2017 · b97dd63 · b97dd63
2 parents 7fdc29a + 1aaa100
commit b97dd63
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 169 deletions.
diff --git a/app/scripts/controllers/create.js b/app/scripts/controllers/create.js
@@ -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) {

diff --git a/app/scripts/controllers/create/browseCategory.js b/app/scripts/controllers/create/browseCategory.js
@@ -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) {

diff --git a/app/scripts/controllers/create/createFromImage.js b/app/scripts/controllers/create/createFromImage.js
@@ -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: ''};
 
@@ -324,8 +310,7 @@ angular.module("openshiftConsole")
                 return d.promise;
               });
           Navigate.toNextSteps($scope.name, $scope.projectName, {
-            usingSampleRepo: $scope.usingSampleRepo(),
-            breadcrumbTitle: breadcrumbTitle
+            usingSampleRepo: $scope.usingSampleRepo()
           });
         };
 

diff --git a/app/scripts/controllers/create/nextSteps.js b/app/scripts/controllers/create/nextSteps.js
@@ -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)

diff --git a/app/scripts/controllers/newfromtemplate.js b/app/scripts/controllers/newfromtemplate.js
@@ -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);
@@ -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);

diff --git a/app/views/create.html b/app/views/create.html
@@ -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

diff --git a/app/views/create/fromimage.html b/app/views/create/fromimage.html
@@ -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">

diff --git a/app/views/create/next-steps.html b/app/views/create/next-steps.html
@@ -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 -->
diff --git a/app/views/newfromtemplate.html b/app/views/newfromtemplate.html
@@ -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">