rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Stop timeout tweaks

This commit is contained in:
Vincent Fiduccia 2017-09-12 15:22:44 -07:00
parent 1dd9407c18
commit e3493bcc40
No known key found for this signature in database
GPG Key ID: 2B29AD6BB2BB2582
4 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/components/container/form-command/template.hbs
View File

@ -137,6 +137,11 @@
<div class="row"> <div class="row">
<div class="col span-6 box"> <div class="col span-6 box">
<label class="acc-label">{{t 'formCommand.stopSignal.label'}}</label> <label class="acc-label">{{t 'formCommand.stopSignal.label'}}</label>
{{#if customStopSet}}
{{#input-or-display editable=editing value=instance.stopSignal}}
{{input type="text" value=instance.stopSignal classNames="form-control mt-20" placeholder=(t 'formCommand.stopSignal.custom.placeholder')}}
{{/input-or-display}}
{{else}}
{{#input-or-display editable=editing value=instance.stopSignal}} {{#input-or-display editable=editing value=instance.stopSignal}}
{{new-select {{new-select
prompt=(t 'formCommand.stopSignal.prompt') prompt=(t 'formCommand.stopSignal.prompt')
@ -147,16 +152,16 @@
localizedLabel=true localizedLabel=true
}} }}
{{/input-or-display}} {{/input-or-display}}
{{#if customStopSet}}
{{#input-or-display editable=editing value=instance.stopSignal}}
{{input type="text" value=instance.stopSignal classNames="form-control mt-20" placeholder=(t 'formCommand.stopSignal.custom.placeholder')}}
{{/input-or-display}}
{{/if}} {{/if}}
<p class="help-block">{{t 'formCommand.stopSignal.helpText'}}</p>
</div> </div>
<div class="col span-6 box"> <div class="col span-6 box">
<label class="acc-label">{{t 'formCommand.stopTimeout.label'}}</label> <label class="acc-label">{{t 'formCommand.stopTimeout.label'}}</label>
{{#input-or-display editable=editing value=instance.stopTimeout safeStyle="width: 60px; padding: 0 2px; display: inline-block;" }} {{#input-or-display editable=editing value=instance.stopTimeout}}
{{input-integer min=0 safeStyle="width: 60px; padding: 0 2px; display: inline-block;" class="form-control" value=instance.stopTimeout}} <div class="input-group">
{{input-integer min=0 value=instance.stopTimeout}}
<span class="input-group-addon bg-default">{{t 'generic.seconds'}}</span>
</div>
{{/input-or-display}} {{/input-or-display}}
<p class="help-block">{{t 'formCommand.stopTimeout.helpText'}}</p> <p class="help-block">{{t 'formCommand.stopTimeout.helpText'}}</p>
</div> </div>

3
app/components/container/new-edit/template.hbs
View File

@ -198,7 +198,8 @@
{{container/form-security {{container/form-security
instance=launchConfig instance=launchConfig
isService=isService isService=isService
errors=securityErrors editing=true errors=securityErrors
editing=true
initialLabels=launchConfig.labels initialLabels=launchConfig.labels
setLabels=(action 'setLabels' 'security') setLabels=(action 'setLabels' 'security')
expandAll=al.expandAll expandAll=al.expandAll

1
app/components/device-permissions/component.js
View File

@ -8,7 +8,6 @@ export default Ember.Component.extend({
rSelected: false, rSelected: false,
wSelected: false, wSelected: false,
mSelected: false, mSelected: false,
editing: false,
selection: null, selection: null,

7
translations/en-us.yaml
View File

@ -1633,7 +1633,7 @@ formCommand:
always: Always always: Always
logDriver: logDriver:
label: Log Driver label: Log Driver
placeholder: "e.g. syslog; Default: The driver configured on the host daemon" placeholder: "e.g. syslog; Default: The host daemon's configuration"
logConfig: logConfig:
label: Log Options label: Log Options
addActionLabel: Add Option addActionLabel: Add Option
@ -1641,7 +1641,7 @@ formCommand:
valuePlaceholder: e.g. daemon valuePlaceholder: e.g. daemon
stopTimeout: stopTimeout:
label: Stop Timeout label: Stop Timeout
helpText: The container will be forcefully killed if it does not stop within this period of time when requested. helpText: The container will have this long to stop on its own before it is forcefully terminated.
stopSignal: stopSignal:
label: Stop Signal label: Stop Signal
sigup: SIGHUP (1) sigup: SIGHUP (1)
@ -1653,7 +1653,8 @@ formCommand:
sigterm: SIGTERM (15) sigterm: SIGTERM (15)
custom: custom:
label: Custom label: Custom
placeholder: SIGEGV placeholder: e.g. SIGSEGV
helpText: The container will be sent this signal when it should be stopped.
prompt: "Select a Stop Signal:" prompt: "Select a Stop Signal:"