Skip to content

Headline case more actions #1015

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.

Sign up for GitHub

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

Merged
openshift-bot merged 1 commit into from
Dec 9, 2016
Merged

Headline case more actions #1015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/views/browse/_replica-set-details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ <h4>Volumes</h4>
</volumes>
<a ng-href="project/{{project.metadata.name}}/attach-pvc?kind=ReplicationController&name={{replicaSet.metadata.name}}">Add Storage</a>
<span class="action-divider" aria-hidden="true">|</span>
<a ng-href="project/{{project.metadata.name}}/add-config-volume?kind=ReplicationController&name={{replicaSet.metadata.name}}">Add config files</a>
<a ng-href="project/{{project.metadata.name}}/add-config-volume?kind=ReplicationController&name={{replicaSet.metadata.name}}">Add Config Files</a>
</div>
<div ng-if="!(resource | canI : 'update')">
<volumes volumes="replicaSet.spec.template.spec.volumes" namespace="project.metadata.name"></volumes>
Expand Down
6 changes: 3 additions & 3 deletions app/views/directives/edit-lifecycle-hook.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
entries="hookParams.execNewPod.env"
key-validator="[a-zA-Z_][a-zA-Z0-9_]*"
key-validator-error-tooltip="A valid environment variable name is an alphanumeric (a-z and 0-9) string beginning with a letter that may contain underscores."
add-row-link="Add environment variable"></key-value-editor>
add-row-link="Add Environment Variable"></key-value-editor>
<div class="help-block">
Environment variables to supply to the hook pod's container.
</div>
Expand Down Expand Up @@ -127,7 +127,7 @@
</div>

<span>
<a href="" role="button" ng-if="!hookParams" ng-click="addHook()">Add {{type}} lifecycle hook</a>
<a href="" role="button" ng-if="hookParams" ng-click="removeHook()">Remove {{type}} lifecycle hook</a>
<a href="" role="button" ng-if="!hookParams" ng-click="addHook()">Add {{type | upperFirst}} Lifecycle Hook</a>
<a href="" role="button" ng-if="hookParams" ng-click="removeHook()">Remove {{type | upperFirst}} Lifecycle Hook</a>
</span>
</ng-form>
4 changes: 2 additions & 2 deletions app/views/directives/edit-webhook-triggers.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ <h5>{{type}} webhooks
</div>
</div>
<span>
<a href="" role="button" ng-click="addWebhookTrigger(type)">Add {{type}} webhook</a>
</span>
<a href="" role="button" ng-click="addWebhookTrigger(type)">Add {{type}} Webhook</a>
</span>
4 changes: 2 additions & 2 deletions app/views/directives/osc-routing.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,10 @@ <h3>Alternate Services</h3>
is-alternate="true"
show-weight="true">
</osc-routing-service>
<a href="" ng-click="route.alternateServices.splice($index, 1)">Remove service</a>
<a href="" ng-click="route.alternateServices.splice($index, 1)">Remove Service</a>
<span ng-if="$last && route.alternateServices.length < alternateServiceOptions.length">
<span class="action-divider">|</span>
<a href="" ng-click="addAlternateService()">Add another service</a>
<a href="" ng-click="addAlternateService()">Add Another Service</a>
</span>
</div>
<div ng-repeat="duplicate in duplicateServices" class="has-error mar-bottom-lg">
Expand Down
4 changes: 2 additions & 2 deletions app/views/edit/deployment-config.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ <h3>Post Lifecycle Hook</h3>
</div>
<div class="mar-top-lg">
<div ng-if="!view.advancedStrategyOptions">To set additional parameters or edit lifecycle hooks, view <a href="" ng-click="view.advancedStrategyOptions = true">advanced strategy options.</a></div>
<a ng-if="view.advancedStrategyOptions" href="" ng-click="view.advancedStrategyOptions = false">Hide strategy advanced options</a>
<a ng-if="view.advancedStrategyOptions" href="" ng-click="view.advancedStrategyOptions = false">Hide Advanced Strategy Options</a>
</div>
</dl>
</div>
Expand Down Expand Up @@ -334,7 +334,7 @@ <h4>Container {{containerName}}</h4>

<div class="mar-top-lg">
<div ng-if="!view.advancedImageOptions">To set secrets for pulling your images from private image registries, view <a href="" ng-click="view.advancedImageOptions = true">advanced image options.</a></div>
<a ng-if="view.advancedImageOptions" href="" ng-click="view.advancedImageOptions = false">Hide advanced image options</a>
<a ng-if="view.advancedImageOptions" href="" ng-click="view.advancedImageOptions = false">Hide Advanced Image Options</a>
</div>
</dl>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/membership.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ <h3>Roles</h3>
</div>
<div ng-if="mode.edit" class="col-add-role" conceal="tablet" flex-collapse-fix>
<h3>
Add another role
Add Another Role
</h3>
</div>
</div>
Expand Down
20 changes: 10 additions & 10 deletions dist/scripts/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1639,7 +1639,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</volumes>\n" +
"<a ng-href=\"project/{{project.metadata.name}}/attach-pvc?kind=ReplicationController&name={{replicaSet.metadata.name}}\">Add Storage</a>\n" +
"<span class=\"action-divider\" aria-hidden=\"true\">|</span>\n" +
"<a ng-href=\"project/{{project.metadata.name}}/add-config-volume?kind=ReplicationController&name={{replicaSet.metadata.name}}\">Add config files</a>\n" +
"<a ng-href=\"project/{{project.metadata.name}}/add-config-volume?kind=ReplicationController&name={{replicaSet.metadata.name}}\">Add Config Files</a>\n" +
"</div>\n" +
"<div ng-if=\"!(resource | canI : 'update')\">\n" +
"<volumes volumes=\"replicaSet.spec.template.spec.volumes\" namespace=\"project.metadata.name\"></volumes>\n" +
Expand Down Expand Up @@ -6392,7 +6392,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</div>\n" +
"<div class=\"form-group\">\n" +
"<label>Environment Variables</label>\n" +
"<key-value-editor entries=\"hookParams.execNewPod.env\" key-validator=\"[a-zA-Z_][a-zA-Z0-9_]*\" key-validator-error-tooltip=\"A valid environment variable name is an alphanumeric (a-z and 0-9) string beginning with a letter that may contain underscores.\" add-row-link=\"Add environment variable\"></key-value-editor>\n" +
"<key-value-editor entries=\"hookParams.execNewPod.env\" key-validator=\"[a-zA-Z_][a-zA-Z0-9_]*\" key-validator-error-tooltip=\"A valid environment variable name is an alphanumeric (a-z and 0-9) string beginning with a letter that may contain underscores.\" add-row-link=\"Add Environment Variable\"></key-value-editor>\n" +
"<div class=\"help-block\">\n" +
"Environment variables to supply to the hook pod's container.\n" +
"</div>\n" +
Expand Down Expand Up @@ -6456,8 +6456,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</fieldset>\n" +
"</div>\n" +
"<span>\n" +
"<a href=\"\" role=\"button\" ng-if=\"!hookParams\" ng-click=\"addHook()\">Add {{type}} lifecycle hook</a>\n" +
"<a href=\"\" role=\"button\" ng-if=\"hookParams\" ng-click=\"removeHook()\">Remove {{type}} lifecycle hook</a>\n" +
"<a href=\"\" role=\"button\" ng-if=\"!hookParams\" ng-click=\"addHook()\">Add {{type | upperFirst}} Lifecycle Hook</a>\n" +
"<a href=\"\" role=\"button\" ng-if=\"hookParams\" ng-click=\"removeHook()\">Remove {{type | upperFirst}} Lifecycle Hook</a>\n" +
"</span>\n" +
"</ng-form>"
);
Expand Down Expand Up @@ -6494,7 +6494,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</div>\n" +
"</div>\n" +
"<span>\n" +
"<a href=\"\" role=\"button\" ng-click=\"addWebhookTrigger(type)\">Add {{type}} webhook</a>\n" +
"<a href=\"\" role=\"button\" ng-click=\"addWebhookTrigger(type)\">Add {{type}} Webhook</a>\n" +
"</span>"
);

Expand Down Expand Up @@ -7658,10 +7658,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<div ng-repeat=\"alternate in route.alternateServices\" class=\"form-group\">\n" +
"<osc-routing-service model=\"alternate\" services=\"alternateServiceOptions\" is-alternate=\"true\" show-weight=\"true\">\n" +
"</osc-routing-service>\n" +
"<a href=\"\" ng-click=\"route.alternateServices.splice($index, 1)\">Remove service</a>\n" +
"<a href=\"\" ng-click=\"route.alternateServices.splice($index, 1)\">Remove Service</a>\n" +
"<span ng-if=\"$last && route.alternateServices.length < alternateServiceOptions.length\">\n" +
"<span class=\"action-divider\">|</span>\n" +
"<a href=\"\" ng-click=\"addAlternateService()\">Add another service</a>\n" +
"<a href=\"\" ng-click=\"addAlternateService()\">Add Another Service</a>\n" +
"</span>\n" +
"</div>\n" +
"<div ng-repeat=\"duplicate in duplicateServices\" class=\"has-error mar-bottom-lg\">\n" +
Expand Down Expand Up @@ -8847,7 +8847,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</div>\n" +
"<div class=\"mar-top-lg\">\n" +
"<div ng-if=\"!view.advancedStrategyOptions\">To set additional parameters or edit lifecycle hooks, view <a href=\"\" ng-click=\"view.advancedStrategyOptions = true\">advanced strategy options.</a></div>\n" +
"<a ng-if=\"view.advancedStrategyOptions\" href=\"\" ng-click=\"view.advancedStrategyOptions = false\">Hide strategy advanced options</a>\n" +
"<a ng-if=\"view.advancedStrategyOptions\" href=\"\" ng-click=\"view.advancedStrategyOptions = false\">Hide Advanced Strategy Options</a>\n" +
"</div>\n" +
"</dl>\n" +
"</div>\n" +
Expand Down Expand Up @@ -8893,7 +8893,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</div>\n" +
"<div class=\"mar-top-lg\">\n" +
"<div ng-if=\"!view.advancedImageOptions\">To set secrets for pulling your images from private image registries, view <a href=\"\" ng-click=\"view.advancedImageOptions = true\">advanced image options.</a></div>\n" +
"<a ng-if=\"view.advancedImageOptions\" href=\"\" ng-click=\"view.advancedImageOptions = false\">Hide advanced image options</a>\n" +
"<a ng-if=\"view.advancedImageOptions\" href=\"\" ng-click=\"view.advancedImageOptions = false\">Hide Advanced Image Options</a>\n" +
"</div>\n" +
"</dl>\n" +
"</div>\n" +
Expand Down Expand Up @@ -9411,7 +9411,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</div>\n" +
"<div ng-if=\"mode.edit\" class=\"col-add-role\" conceal=\"tablet\" flex-collapse-fix>\n" +
"<h3>\n" +
"Add another role\n" +
"Add Another Role\n" +
"</h3>\n" +
"</div>\n" +
"</div>\n" +
Expand Down