-
Notifications
You must be signed in to change notification settings - Fork 230
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
Follow-on updates from jennyhaines #2400
Merged
openshift-merge-robot
merged 1 commit into
openshift:master
from
sg00dwin:env-from-cleanup
Nov 1, 2017
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 |
---|---|---|
|
@@ -2,20 +2,17 @@ | |
<div | ||
ng-if="$ctrl.showHeader" | ||
class="environment-from-entry environment-from-editor-entry-header"> | ||
<div class="form-group environment-from-editor-header value-header"> | ||
<div class="input-group"> | ||
<div class="environment-from-editor-header config-map-header"> | ||
Config Map/Secret | ||
</div> | ||
</div> | ||
<div class="form-group environment-from-editor-header value-header"> | ||
<div class="input-group" | ||
ng-if="!$ctrl.isEnvFromReadonly() && $ctrl.hasOptions()"> | ||
<div | ||
class="environment-from-editor-header prefix-header" | ||
ng-if="!$ctrl.isEnvFromReadonly() && $ctrl.hasOptions()"> | ||
Prefix | ||
<small class="pficon pficon-help" | ||
<small class="pficon pficon-help tooltip-default-icon" | ||
aria-hidden="true" | ||
data-toggle="tooltip" | ||
data-original-title="Optional prefix added to each environment variable name."></small> | ||
</div> | ||
data-original-title="Optional prefix added to each environment variable name. A valid prefix is an alphanumeric (a-z and 0-9) string beginning with a letter that may contain underscores."></small> | ||
</div> | ||
</div> | ||
|
||
|
@@ -27,7 +24,12 @@ | |
ng-repeat="entry in $ctrl.envFromEntries" | ||
as-sortable-item> | ||
|
||
<div class="form-group environment-from-input"> | ||
<div class="environment-from-input"> | ||
<div class="environment-from-editor-entry-header"> | ||
<div class="environment-from-editor-header config-map-header config-map-header-mobile"> | ||
Config Map/Secret | ||
</div> | ||
</div> | ||
<div ng-if="$ctrl.isEnvFromReadonly(entry) || !$ctrl.hasOptions()" class="faux-input-group"> | ||
<div ng-if="!entry.configMapRef.name && !entry.secretRef.name"> | ||
No config maps or secrets have been added as Environment From. | ||
|
@@ -62,7 +64,16 @@ | |
</div> | ||
</div> | ||
|
||
<div class="form-group environment-from-input prefix"> | ||
<div class="environment-from-input prefix"> | ||
<div | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ideally this is a |
||
class="environment-from-editor-header prefix-header prefix-header-mobile" | ||
ng-if="!$ctrl.isEnvFromReadonly() && $ctrl.hasOptions()"> | ||
Prefix | ||
<small class="pficon pficon-help tooltip-default-icon" | ||
aria-hidden="true" | ||
data-toggle="tooltip" | ||
data-original-title="Optional prefix added to each environment variable name. A valid prefix is an alphanumeric (a-z and 0-9) string beginning with a letter that may contain underscores."></small> | ||
</div> | ||
<div class="environment-from-input" | ||
ng-if="!$ctrl.isEnvFromReadonly(entry) && $ctrl.hasOptions()" | ||
ng-class="{ 'has-error': ($ctrl.editEnvironmentFromForm['envfrom-prefix-'+$index].$invalid && $ctrl.editEnvironmentFromForm['envfrom-prefix-'+$index].$touched) }"> | ||
|
@@ -79,15 +90,6 @@ | |
<span class="help-block key-validation-error" | ||
ng-show="$ctrl.editEnvironmentFromForm['envfrom-prefix-'+$index].$error.pattern"> | ||
<span class="validation-text">Please enter a valid prefix.</span> | ||
<span class="help action-inline"> | ||
<a | ||
aria-hidden="true" | ||
data-toggle="tooltip" | ||
data-placement="top" | ||
data-original-title="A valid prefix is an alphanumeric (a-z and 0-9) string beginning with a letter that may contain underscores."> | ||
<span class="pficon pficon-help"></span> | ||
</a> | ||
</span> | ||
</span> | ||
</span> | ||
</div> | ||
|
@@ -118,7 +120,7 @@ | |
</div> | ||
</div> | ||
|
||
<div class="environment-from-entry form-group" ng-if="!$ctrl.isEnvFromReadonly() && $ctrl.hasOptions()"> | ||
<div class="environment-from-entry" ng-if="!$ctrl.isEnvFromReadonly() && $ctrl.hasOptions()"> | ||
<a | ||
href="" | ||
class="add-row-link" | ||
|
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should add a style to switch the cursor to the help icon on hover like other tooltips.