Skip to content

Commit

Permalink
Merge pull request #666 from dtaylor113/sel-proj-divider
Browse files Browse the repository at this point in the history
Show line separator under select-project when ordering/provisioning service catalog items
  • Loading branch information
spadgett authored Mar 27, 2018
2 parents 82de25e + a32dc3d commit 3bf0237
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion dist/origin-web-catalogs.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ webpackJsonp([ 0, 1 ], [ function(e, t) {
}, function(e, t) {
e.exports = '<div class="order-service-config">\n <bind-service-form service-class="$ctrl.serviceClass.resource"\n show-pod-presets="$ctrl.showPodPresets"\n applications="$ctrl.applications"\n form-name="$ctrl.forms.bindForm"\n allow-no-binding="true"\n project-name="$ctrl.projectDisplayName"\n bind-type="$ctrl.bindType"\n app-to-bind="$ctrl.appToBind">\n </bind-service-form>\n</div>\n';
}, function(e, t) {
e.exports = '<div class="order-service-config">\n <div class="config-top">\n <form name="$ctrl.forms.orderConfigureForm" class="config-form">\n <select-project ng-if="!$ctrl.addToProject" selected-project="$ctrl.selectedProject" name-taken="$ctrl.projectNameTaken" show-divider="$ctrl.parameterSchema.properties.length > 0"></select-project>\n <catalog-parameters\n ng-if="$ctrl.parameterSchema.properties && !$ctrl.noProjectsCantCreate"\n model="$ctrl.parameterData"\n parameter-schema="$ctrl.parameterSchema"\n parameter-form-definition="$ctrl.parameterFormDefinition">\n </catalog-parameters>\n </form>\n <div ng-if="$ctrl.error" class="has-error">\n <span class="help-block">{{$ctrl.error}}</span>\n </div>\n </div>\n</div>\n';
e.exports = '<div class="order-service-config">\n <div class="config-top">\n <form name="$ctrl.forms.orderConfigureForm" class="config-form">\n <select-project ng-if="!$ctrl.addToProject"\n selected-project="$ctrl.selectedProject"\n name-taken="$ctrl.projectNameTaken"\n show-divider="$ctrl.parameterSchema.properties | size"></select-project>\n <catalog-parameters\n ng-if="$ctrl.parameterSchema.properties && !$ctrl.noProjectsCantCreate"\n model="$ctrl.parameterData"\n parameter-schema="$ctrl.parameterSchema"\n parameter-form-definition="$ctrl.parameterFormDefinition">\n </catalog-parameters>\n </form>\n <div ng-if="$ctrl.error" class="has-error">\n <span class="help-block">{{$ctrl.error}}</span>\n </div>\n </div>\n</div>\n';
}, function(e, t) {
e.exports = '<div class="order-service-details">\n <div class="order-service-details-top" ng-class="{\'order-service-details-top-icon-top\': $ctrl.serviceClass.vendor || $ctrl.docUrl || $ctrl.supportUrl}">\n <div class="service-icon">\n <span ng-if="!$ctrl.imageUrl" class="icon {{$ctrl.iconClass}}" aria-hidden="true"></span>\n <span ng-if="$ctrl.imageUrl" class="image"><img ng-src="{{$ctrl.imageUrl}}" alt=""></span>\n </div>\n <div class="service-title-area">\n <div class="service-title">\n {{$ctrl.serviceName}}\n </div>\n <div ng-if="$ctrl.serviceClass.vendor" class="service-vendor">\n {{$ctrl.serviceClass.vendor}}\n </div>\n <div ng-if="$ctrl.serviceClass.tags" class="order-service-tags">\n <span ng-repeat="tag in $ctrl.serviceClass.tags" class="tag">\n {{tag}}\n </span>\n </div>\n <ul ng-if="$ctrl.docUrl || $ctrl.supportUrl" class="list-inline order-service-documentation-url">\n <li ng-if="$ctrl.docUrl" >\n <a ng-href="{{$ctrl.docUrl}}" target="_blank" class="learn-more-link">View Documentation <i class="fa fa-external-link" aria-hidden="true"></i></a>\n </li>\n <li ng-if="$ctrl.supportUrl" >\n <a ng-href="{{$ctrl.supportUrl}}" target="_blank" class="learn-more-link">Get Support <i class="fa fa-external-link" aria-hidden="true"></i></a>\n </li>\n </ul>\n </div>\n </div>\n <div class="order-service-description-block">\n <p ng-if="!$ctrl.multipleServicePlans && ($ctrl.selectedPlan.spec.externalMetadata.displayName || $ctrl.selectedPlan.spec.description)">\n <span ng-if="$ctrl.selectedPlan.spec.externalMetadata.displayName">\n Plan {{$ctrl.selectedPlan.spec.externalMetadata.displayName}}\n <span ng-if="$ctrl.selectedPlan.spec.description">&ndash;</span>\n </span>\n <span ng-if="$ctrl.selectedPlan.spec.description">{{$ctrl.selectedPlan.spec.description}}</span>\n </p>\n <p ng-if="!$ctrl.description && !$ctrl.longDescription" class="description">No description provided.</p>\n <p ng-if="$ctrl.description" ng-bind-html="($ctrl.description | linky : \'_blank\')" class="description"></p>\n <p ng-if="$ctrl.longDescription" ng-bind-html="$ctrl.longDescription | linky : \'_blank\'" class="description"></p>\n <div ng-if="$ctrl.imageDependencies.length">\n <div class="order-service-subheading">Image Dependencies</div>\n <div ng-repeat="imageName in $ctrl.imageDependencies" class="order-service-dependent-image">\n <span class="pficon pficon-image" aria-hidden="true"></span>\n <span class="sr-only">Image</span>\n {{imageName}}\n </div>\n </div>\n </div>\n</div>\n';
}, function(e, t) {
Expand Down
5 changes: 4 additions & 1 deletion src/components/order-service/order-service-configure.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
<div class="order-service-config">
<div class="config-top">
<form name="$ctrl.forms.orderConfigureForm" class="config-form">
<select-project ng-if="!$ctrl.addToProject" selected-project="$ctrl.selectedProject" name-taken="$ctrl.projectNameTaken" show-divider="$ctrl.parameterSchema.properties.length > 0"></select-project>
<select-project ng-if="!$ctrl.addToProject"
selected-project="$ctrl.selectedProject"
name-taken="$ctrl.projectNameTaken"
show-divider="$ctrl.parameterSchema.properties | size"></select-project>
<catalog-parameters
ng-if="$ctrl.parameterSchema.properties && !$ctrl.noProjectsCantCreate"
model="$ctrl.parameterData"
Expand Down

0 comments on commit 3bf0237

Please sign in to comment.