forked from openshift/origin-web-console
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request openshift#2127 from rhamilto/single-column-overlay
Merged by openshift-bot
- Loading branch information
Showing
22 changed files
with
309 additions
and
292 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 6 additions & 4 deletions
10
app/views/directives/process-template-dialog/process-template-config.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| <div class="osc-form"> | ||
| <form name="$ctrl.form"> | ||
| <process-template template="$ctrl.template" project="$ctrl.preSelectedProject" on-project-selected="$ctrl.onProjectSelected" available-projects="$ctrl.unfilteredProjects" is-dialog="true"></process-template> | ||
| </form> | ||
| <div class="order-service-config"> | ||
| <div class="osc-form"> | ||
| <form name="$ctrl.form"> | ||
| <process-template template="$ctrl.template" project="$ctrl.preSelectedProject" on-project-selected="$ctrl.onProjectSelected" available-projects="$ctrl.unfilteredProjects" is-dialog="true"></process-template> | ||
| </form> | ||
| </div> | ||
| </div> |
20 changes: 20 additions & 0 deletions
20
app/views/directives/process-template-dialog/process-template-info.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <div class="order-service-details"> | ||
| <div class="order-service-details-top"> | ||
| <div class="service-icon"> | ||
| <span class="icon {{$ctrl.iconClass}}" aria-hidden="true"></span> | ||
| </div> | ||
| <div class="service-title-area"> | ||
| <div class="service-title"> | ||
| {{$ctrl.template | displayName}} | ||
| </div> | ||
| <div class="order-service-tags"> | ||
| <span ng-repeat="tag in $ctrl.template.metadata.annotations.tags.split(',')" class="tag"> | ||
| {{tag}} | ||
| </span> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="order-service-description-block"> | ||
| <p ng-bind-html="$ctrl.template | description | linky : '_blank'" class="description"></p> | ||
| </div> | ||
| </div> |
14 changes: 8 additions & 6 deletions
14
app/views/directives/process-template-dialog/process-template-results.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,8 @@ | ||
| <next-steps | ||
| project="$ctrl.selectedProject" | ||
| project-name="$ctrl.selectedProject.metadata.name" | ||
| login-base-url="$ctrl.loginBaseUrl" | ||
| on-continue="$ctrl.close"> | ||
| </next-steps> | ||
| <div class="order-service-config"> | ||
| <next-steps | ||
| project="$ctrl.selectedProject" | ||
| project-name="$ctrl.selectedProject.metadata.name" | ||
| login-base-url="$ctrl.loginBaseUrl" | ||
| on-continue="$ctrl.close"> | ||
| </next-steps> | ||
| </div> |
74 changes: 38 additions & 36 deletions
74
app/views/directives/process-template-dialog/process-template-select.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,41 @@ | ||
| <div class="config-top"> | ||
| <div class="select-project-for-template"> | ||
| <h2>Select from Project</h2> | ||
| <ui-select | ||
| name="selectProject" | ||
| ng-model="$ctrl.templateProject" | ||
| ng-change="$ctrl.templateProjectChange()" | ||
| search-enabled="$ctrl.searchEnabled"> | ||
| <ui-select-match placeholder="Select a Project"> | ||
| {{$select.selected | displayName}} | ||
| </ui-select-match> | ||
| <ui-select-choices repeat="project in $ctrl.templateProjects | searchProjects : $select.search track by (project | uid)"> | ||
| <span ng-bind-html="project | displayName | highlightKeywords : $select.search"></span> | ||
| <span ng-if="project | displayName : true" class="small text-muted"> | ||
| <span ng-if="project.metadata.name">–</span> | ||
| <span ng-bind-html="project.metadata.name | highlightKeywords : $select.search"></span> | ||
| </span> | ||
| </ui-select-choices> | ||
| </ui-select> | ||
| </div> | ||
| <pf-empty-state ng-if="!$ctrl.templateProject" config="$ctrl.projectEmptyState"></pf-empty-state> | ||
| <pf-empty-state ng-if="$ctrl.templateProject && !$ctrl.catalogItems.length" config="$ctrl.templatesEmptyState"></pf-empty-state> | ||
| <div class="services-view"> | ||
| <div ng-if="$ctrl.templateProject && $ctrl.catalogItems.length" class="services-items"> | ||
| <pf-filter config="$ctrl.filterConfig" class="services-items-filter order-services-filter"></pf-filter> | ||
| <a href="" class="services-item show-selection" ng-class="{'active': item === $ctrl.selectedTemplate}" ng-repeat="item in $ctrl.filteredItems track by item.resource.metadata.uid" ng-click="$ctrl.templateSelected(item)"> | ||
| <div ng-if="!item.imageUrl" class="services-item-icon"> | ||
| <span class="{{item.iconClass}}"></span> | ||
| </div> | ||
| <div ng-if="item.imageUrl" class="services-item-icon"> | ||
| <img ng-src="{{item.imageUrl}}" alt=""> | ||
| </div> | ||
| <div class="services-item-name" title="{{item.name}}"> | ||
| {{item.name}} | ||
| </div> | ||
| </a> | ||
| <div class="order-service-config"> | ||
| <div class="config-top"> | ||
| <div class="select-project-for-template"> | ||
| <h2>Select from Project</h2> | ||
| <ui-select | ||
| name="selectProject" | ||
| ng-model="$ctrl.templateProject" | ||
| ng-change="$ctrl.templateProjectChange()" | ||
| search-enabled="$ctrl.searchEnabled"> | ||
| <ui-select-match placeholder="Select a Project"> | ||
| {{$select.selected | displayName}} | ||
| </ui-select-match> | ||
| <ui-select-choices repeat="project in $ctrl.templateProjects | searchProjects : $select.search track by (project | uid)"> | ||
| <span ng-bind-html="project | displayName | highlightKeywords : $select.search"></span> | ||
| <span ng-if="project | displayName : true" class="small text-muted"> | ||
| <span ng-if="project.metadata.name">–</span> | ||
| <span ng-bind-html="project.metadata.name | highlightKeywords : $select.search"></span> | ||
| </span> | ||
| </ui-select-choices> | ||
| </ui-select> | ||
| </div> | ||
| <pf-empty-state ng-if="!$ctrl.templateProject" config="$ctrl.projectEmptyState"></pf-empty-state> | ||
| <pf-empty-state ng-if="$ctrl.templateProject && !$ctrl.catalogItems.length" config="$ctrl.templatesEmptyState"></pf-empty-state> | ||
| <div class="services-view"> | ||
| <div ng-if="$ctrl.templateProject && $ctrl.catalogItems.length" class="services-items"> | ||
| <pf-filter config="$ctrl.filterConfig" class="services-items-filter order-services-filter"></pf-filter> | ||
| <a href="" class="services-item show-selection" ng-class="{'active': item === $ctrl.selectedTemplate}" ng-repeat="item in $ctrl.filteredItems track by item.resource.metadata.uid" ng-click="$ctrl.templateSelected(item)"> | ||
| <div ng-if="!item.imageUrl" class="services-item-icon"> | ||
| <span class="{{item.iconClass}}"></span> | ||
| </div> | ||
| <div ng-if="item.imageUrl" class="services-item-icon"> | ||
| <img ng-src="{{item.imageUrl}}" alt=""> | ||
| </div> | ||
| <div class="services-item-name" title="{{item.name}}"> | ||
| {{item.name}} | ||
| </div> | ||
| </a> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.