mirror of https://github.com/rancher/ui.git
5709 (#822)
* mobile issues * rancher/rancher#5722 * small screen nav tabs * rancher/rancher#5723 * rancher/rancher#5709 * 5709 * rest of 5709
This commit is contained in:
parent
1cece5040d
commit
087e21f469
|
|
@ -68,7 +68,7 @@
|
|||
|
||||
<div class="col-sm-12 col-md-8">
|
||||
{{#input-or-display editable=editing value=dnsDiscovery}}
|
||||
<label class="form-control-static radio small">{{input type="checkbox" checked=dnsDiscovery}}{{t 'formNetwork.dns.enable' appName=settings.appName}}</label>
|
||||
<label class="form-control-static checkbox small r-ml20">{{input type="checkbox" checked=dnsDiscovery}}{{t 'formNetwork.dns.enable' appName=settings.appName}}</label>
|
||||
{{/input-or-display}}
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -45,18 +45,22 @@
|
|||
</div>
|
||||
{{else}}
|
||||
{{#if requestedHostId}}
|
||||
<label class="form-control-static">
|
||||
{{#if isService}}
|
||||
{{#if (eq isVm 'virtual machines')}}
|
||||
{{format-html-message 'formScheduling.canRequestHost.vm'}}
|
||||
{{else}}
|
||||
{{format-html-message 'formScheduling.canRequestHost.containers'}}
|
||||
{{/if~}}
|
||||
{{else}}
|
||||
{{t 'formScheduling.runSpecific'}}
|
||||
{{/if}}
|
||||
</label>
|
||||
<span class="form-static-control">{{selectedChoice.name}}</span>
|
||||
<div class="component-static">
|
||||
<div class="row">
|
||||
<label class="form-control-static">
|
||||
{{#if isService}}
|
||||
{{#if (eq isVm 'virtual machines')}}
|
||||
{{format-html-message 'formScheduling.canRequestHost.vm'}}
|
||||
{{else}}
|
||||
{{format-html-message 'formScheduling.canRequestHost.containers'}}
|
||||
{{/if~}}
|
||||
{{else}}
|
||||
{{t 'formScheduling.runSpecific'}}
|
||||
{{/if}}
|
||||
</label>
|
||||
<span class="form-static-control">{{selectedChoice.name}}</span>
|
||||
</div>
|
||||
</div>
|
||||
{{else}}
|
||||
{{t 'formScheduling.noRules'}}
|
||||
{{/if}}
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@
|
|||
<th width="30"> </th>
|
||||
<th>{{t 'formSecurity.deviceBinding.pathContainer.label'}}</th>
|
||||
<th width="30"> </th>
|
||||
<th width="100">{{t 'formSecurity.deviceBinding.permissions.label'}}</th>
|
||||
<th width="150">{{t 'formSecurity.deviceBinding.permissions.label'}}</th>
|
||||
<th width="30"> </th>
|
||||
</tr>
|
||||
{{#each devicesArray as |device|}}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<div class="row form-group">
|
||||
<div class="col-sm-12 col-md-8 col-md-offset-2">
|
||||
<div class="">
|
||||
<div class="row">
|
||||
<div class="col-md-4">
|
||||
<label>{{t 'formUpgrade.size'}}</label>
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
<div class="col-md-4">
|
||||
<label>{{t 'formUpgrade.behavior'}}</label>
|
||||
<div class="form-control-static">
|
||||
<label style="color: inherit; text-transform: none;">{{input type="checkbox" checked=startFirst}} {{t 'formUpgrade.startStop'}}</label>
|
||||
<label class="checkbox small r-ml20" style="color: inherit; text-transform: none;">{{input type="checkbox" checked=startFirst}} {{t 'formUpgrade.startStop'}}</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
</div>
|
||||
<div class="col-sm-12 col-md-8">
|
||||
{{#each choices as |choice|}}
|
||||
<label class="r-mr10" style="color: inherit; text-transform: none;">{{input type="checkbox" checked=choice.enabled}} {{choice.name}}</label>
|
||||
<label class="checkbox small r-mr10" style="color: inherit; text-transform: none;">{{input type="checkbox" checked=choice.enabled}} {{choice.name}}</label>
|
||||
{{/each}}
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@
|
|||
{{#if (and (not editing) (eq templateBase ""))}}
|
||||
<div class="row r-mt20">
|
||||
<div class="col-md-12">
|
||||
<label>{{input type="checkbox" checked=environmentResource.startOnCreate}} {{t 'newCatalog.startService'}}</label>
|
||||
<label class="checkbox small">{{input type="checkbox" checked=environmentResource.startOnCreate}} {{t 'newCatalog.startService'}}</label>
|
||||
</div>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
|
|
|||
Loading…
Reference in New Issue