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

Show linux add custom on windows envs

This commit is contained in:
Vincent Fiduccia 2017-02-10 15:06:18 -07:00
parent 6f7311de26
commit acea4eb49c
No known key found for this signature in database
GPG Key ID: 2B29AD6BB2BB2582
2 changed files with 76 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/components/machine/driver-custom/template.hbs
View File

@ -1,8 +1,8 @@
<section> {{#if projects.current.isWindows}}
<section>
<h3>{{t 'machine.driverCustom.windows.windowsHeader'}}</h3>
<div class="container-fluid"> <div class="container-fluid">
<div class="row inline-form"> <div class="row inline-form">
{{#if projects.current.isWindows}}
{{!-- <div class="col span-8 offset-2"> --}}
<ol> <ol>
<li> <li>
{{format-html-message 'machine.driverCustom.windows.step1'}} {{format-html-message 'machine.driverCustom.windows.step1'}}
@ -25,9 +25,17 @@
{{t 'machine.driverCustom.step5Close.part1'}} {{#link-to "hosts"}}{{t 'machine.driverCustom.step5Close.link'}}{{/link-to}} {{t 'machine.driverCustom.step5Close.part2'}} {{t 'machine.driverCustom.step5Close.part1'}} {{#link-to "hosts"}}{{t 'machine.driverCustom.step5Close.link'}}{{/link-to}} {{t 'machine.driverCustom.step5Close.part2'}}
</li> </li>
</ol> </ol>
{{!-- </div> --}} </div>
{{else}} </div>
{{!-- <div class="col span-8 offset-2"> --}} </section>
{{/if}}
<section>
<div class="container-fluid">
{{#if projects.current.isWindows}}
<h3>{{t 'machine.driverCustom.windows.linuxHeader'}}</h3>
{{/if}}
<div class="row inline-form">
<ol> <ol>
<li> <li>
{{format-html-message 'machine.driverCustom.step1' docsBase=settings.docsBase}} {{format-html-message 'machine.driverCustom.step1' docsBase=settings.docsBase}}
@ -65,11 +73,11 @@
{{t 'machine.driverCustom.step5Close.part1'}} {{#link-to "hosts"}}{{t 'machine.driverCustom.step5Close.link'}}{{/link-to}} {{t 'machine.driverCustom.step5Close.part2'}} {{t 'machine.driverCustom.step5Close.part1'}} {{#link-to "hosts"}}{{t 'machine.driverCustom.step5Close.link'}}{{/link-to}} {{t 'machine.driverCustom.step5Close.part2'}}
</li> </li>
</ol> </ol>
{{!-- </div> --}}
{{/if}}
</div> </div>
</div> </div>
</section>
<section>
<div class="footer-actions"> <div class="footer-actions">
<button {{action "cancel"}} class="btn bg-primary">{{t 'machine.driverCustom.close'}}</button> <button {{action "cancel"}} class="btn bg-primary">{{t 'machine.driverCustom.close'}}</button>
</div> </div>

2
translations/en-us.yaml
View File

@ -2477,6 +2477,8 @@ machine:
part2: screen within a minute. part2: screen within a minute.
close: Close close: Close
windows: windows:
windowsHeader: Windows Host
linuxHeader: Linux Host
step1: Start up a Windows Server 2016 machine somewhere and install the latest version of <a href="https://msdn.microsoft.com/en-us/virtualization/windowscontainers/quick_start/quick_start_windows_server" target="_blank" rel="noreferrer nofollow">Docker</a> on it. step1: Start up a Windows Server 2016 machine somewhere and install the latest version of <a href="https://msdn.microsoft.com/en-us/virtualization/windowscontainers/quick_start/quick_start_windows_server" target="_blank" rel="noreferrer nofollow">Docker</a> on it.
step2: "Create a transparent Docker Network:" step2: "Create a transparent Docker Network:"
step2Copy: docker network create -d transparent transparent step2Copy: docker network create -d transparent transparent