diff --git a/app/scripts/directives/processTemplateDialog.js b/app/scripts/directives/processTemplateDialog.js index d092341ccb..c64bb7d83e 100644 --- a/app/scripts/directives/processTemplateDialog.js +++ b/app/scripts/directives/processTemplateDialog.js @@ -45,6 +45,16 @@ onShow: showSelect }; + ctrl.infoStep = { + id: 'info', + label: 'Information', + view: 'views/directives/process-template-dialog/process-template-info.html', + allowed: true, + valid: true, + allowClickNav: true, + onShow: showInfo + }; + ctrl.configStep = { id: 'configuration', label: 'Configuration', @@ -157,6 +167,7 @@ ctrl.selectedTemplate = template; ctrl.template = _.get(template, 'resource'); ctrl.selectStep.valid = !!template; + ctrl.iconClass = getIconClass(); }; ctrl.templateProjectChange = function () { @@ -191,7 +202,7 @@ function initializeSteps() { if (!ctrl.steps) { - ctrl.steps = [ctrl.selectStep, ctrl.configStep, ctrl.resultsStep]; + ctrl.steps = [ctrl.selectStep, ctrl.infoStep, ctrl.configStep, ctrl.resultsStep]; } } @@ -202,7 +213,17 @@ } } + function showInfo() { + ctrl.infoStep.selected = true; + ctrl.selectStep.selected = false; + ctrl.configStep.selected = false; + ctrl.resultsStep.selected = false; + ctrl.nextTitle = "Next >"; + clearValidityWatcher(); + } + function showSelect() { + ctrl.infoStep.selected = false; ctrl.selectStep.selected = true; ctrl.configStep.selected = false; ctrl.resultsStep.selected = false; @@ -212,6 +233,7 @@ } function showConfig() { + ctrl.infoStep.selected = false; ctrl.selectStep.selected = false; ctrl.configStep.selected = true; ctrl.resultsStep.selected = false; @@ -225,6 +247,7 @@ } function showResults() { + ctrl.infoStep.selected = false; ctrl.selectStep.selected = false; ctrl.configStep.selected = false; ctrl.resultsStep.selected = true; diff --git a/app/styles/_catalog.less b/app/styles/_catalog.less index cb285f5924..010f0c3f62 100644 --- a/app/styles/_catalog.less +++ b/app/styles/_catalog.less @@ -1,26 +1,6 @@ @bind-service-page-height: 310px; -@bind-service-wizard-min-external-height: 300px; @landing-search-area-height: 52px; -.bind-service-config { - padding: 0 (@grid-gutter-width / 2); - width: 100%; - @media (min-width: @screen-sm-min) { - margin-bottom: -(@grid-gutter-width / 2); - margin-top: -(@grid-gutter-width / 2); - overflow-y: auto; - padding-right: 0; - .scroll-shadows-vertical(65%, 0.25); - _::-webkit-full-page-media, _:future, :root & { // only target Safari - .scroll-shadows-vertical-with-covers(65%, 0.25); - } - - .form-horizontal .control-label { - padding-right: 0; - } - } -} - .landing { @media(min-width: @screen-sm-min) { top: (@navbar-os-header-height-desktop + @landing-search-area-height); @@ -34,16 +14,9 @@ } } -.wizard-pf-footer.wizard-pf-position-override { - position: relative; -} - .wizard-pf-main.bind-service-wizard-step { @media (min-width: @screen-sm-min) { height: @bind-service-page-height + @grid-gutter-width; - max-height: calc(100vh ~"-" @bind-service-wizard-min-external-height); - min-height: 200px; - overflow-y: auto; } } diff --git a/app/styles/_overlay-forms.less b/app/styles/_overlay-forms.less index 5d5d6cfdfe..0e822d78e2 100644 --- a/app/styles/_overlay-forms.less +++ b/app/styles/_overlay-forms.less @@ -1,19 +1,12 @@ -.order-service-config-single-column { - width: 100%; - @media (min-width: 768px) { - padding-left: 0; - } -} - .wizard-pf-main { .ace_editor.editor { - height: 285px; + height: 265px; .landing-page & { - height: 220px; + height: 200px; } } .deploy-image .empty-state-message { - margin: 30px auto; + margin: 30px auto 0; } } diff --git a/app/views/directives/bind-service.html b/app/views/directives/bind-service.html index 8785367aa1..3d1972d64e 100644 --- a/app/views/directives/bind-service.html +++ b/app/views/directives/bind-service.html @@ -1,6 +1,6 @@