Stop timeout tweaks

app/components/container/form-command/template.hbs

@@ -137,26 +137,31 @@
   <div class="row">
     <div class="col span-6 box">
       <label class="acc-label">{{t 'formCommand.stopSignal.label'}}</label>
-      {{#input-or-display editable=editing value=instance.stopSignal}}
-        {{new-select
-            prompt=(t 'formCommand.stopSignal.prompt')
-            value=stopOrCustom
-            content=stopSignals
-            optionValuePath="value"
-            optionLabelPath="label"
-            localizedLabel=true
-        }}
-      {{/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}}
+      {{else}}
+        {{#input-or-display editable=editing value=instance.stopSignal}}
+          {{new-select
+              prompt=(t 'formCommand.stopSignal.prompt')
+              value=stopOrCustom
+              content=stopSignals
+              optionValuePath="value"
+              optionLabelPath="label"
+              localizedLabel=true
+          }}
+        {{/input-or-display}}
       {{/if}}
+      <p class="help-block">{{t 'formCommand.stopSignal.helpText'}}</p>
     </div>
     <div class="col span-6 box">
       <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-integer min=0 safeStyle="width: 60px; padding: 0 2px; display: inline-block;" class="form-control" value=instance.stopTimeout}}
+      {{#input-or-display editable=editing 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}}
       <p class="help-block">{{t 'formCommand.stopTimeout.helpText'}}</p>
     </div>

app/components/container/new-edit/template.hbs

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

app/components/device-permissions/component.js

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

translations/en-us.yaml

@@ -1633,7 +1633,7 @@ formCommand:
     always: Always
   logDriver:
     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:
     label: Log Options
     addActionLabel: Add Option
@@ -1641,7 +1641,7 @@ formCommand:
     valuePlaceholder: e.g. daemon
   stopTimeout:
     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:
     label: Stop Signal
     sigup: SIGHUP (1)
@@ -1653,7 +1653,8 @@ formCommand:
     sigterm: SIGTERM (15)
     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:"