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

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

@ -1,75 +1,83 @@
{{#if projects.current.isWindows}}
<section>
<h3>{{t 'machine.driverCustom.windows.windowsHeader'}}</h3>
<div class="container-fluid">
<div class="row inline-form">
<ol>
<li>
{{format-html-message 'machine.driverCustom.windows.step1'}}
</li>
<li>
{{format-html-message 'machine.driverCustom.windows.step2'}}
<div class="copy-pre">
<pre id="network-command">{{t 'machine.driverCustom.windows.step2Copy'}}</pre>
{{copy-to-clipboard clipboardText=(t 'machine.driverCustom.windows.step2Copy')}}
</div>
</li>
<li>
{{t 'machine.driverCustom.windows.step3' appName=settings.appName}}
<div class="copy-pre">
<pre id="registration-command">{{registrationCommandWindows}}</pre>
{{copy-to-clipboard clipboardText=registrationCommandWindows}}
</div>
</li>
<li>
{{t 'machine.driverCustom.step5Close.part1'}} {{#link-to "hosts"}}{{t 'machine.driverCustom.step5Close.link'}}{{/link-to}} {{t 'machine.driverCustom.step5Close.part2'}}
</li>
</ol>
</div>
</div>
</section>
{{/if}}
<section>
<div class="container-fluid">
{{#if projects.current.isWindows}}
<h3>{{t 'machine.driverCustom.windows.linuxHeader'}}</h3>
{{/if}}
<div class="row inline-form">
{{#if projects.current.isWindows}}
{{!-- <div class="col span-8 offset-2"> --}}
<ol>
<li>
{{format-html-message 'machine.driverCustom.windows.step1'}}
</li>
<li>
{{format-html-message 'machine.driverCustom.windows.step2'}}
<div class="copy-pre">
<pre id="network-command">{{t 'machine.driverCustom.windows.step2Copy'}}</pre>
{{copy-to-clipboard clipboardText=(t 'machine.driverCustom.windows.step2Copy')}}
</div>
</li>
<li>
{{t 'machine.driverCustom.windows.step3' appName=settings.appName}}
<div class="copy-pre">
<pre id="registration-command">{{registrationCommandWindows}}</pre>
{{copy-to-clipboard clipboardText=registrationCommandWindows}}
</div>
</li>
<li>
{{t 'machine.driverCustom.step5Close.part1'}} {{#link-to "hosts"}}{{t 'machine.driverCustom.step5Close.link'}}{{/link-to}} {{t 'machine.driverCustom.step5Close.part2'}}
</li>
</ol>
{{!-- </div> --}}
{{else}}
{{!-- <div class="col span-8 offset-2"> --}}
<ol>
<li>
{{format-html-message 'machine.driverCustom.step1' docsBase=settings.docsBase}}
</li>
<li>
{{t 'machine.driverCustom.step2'}}
<ul>
<li>{{format-html-message 'machine.driverCustom.step2li'}}</li>
</ul>
</li>
<li>
{{t 'machine.driverCustom.step3'}}
<div class="r-mt10">
{{form-user-labels setLabels=(action 'setLabels')}}
</div>
</li>
<li>
{{format-html-message 'machine.driverCustom.step4' rancherImage=settings.rancherImage}}
<div class="checkbox r-mt10">
{{input type="text" value=cattleAgentIp classNames="form-control" placeholder=(t 'machine.driverCustom.agentIp.placeholder')}}
</div>
</li>
<li>
{{t 'machine.driverCustom.step5Copy'}} {{settings.appName}}:
{{#if registrationCommand}}
<div class="copy-pre">
<pre id="registration-command">{{registrationCommand}}</pre>
{{copy-to-clipboard clipboardText=registrationCommand}}
</div>
{{else}}
<div><i class="icon icon-spinner icon-spin"></i> {{t 'machine.driverCustom.generating'}}</div>
{{/if}}
</li>
<li>
{{t 'machine.driverCustom.step5Close.part1'}} {{#link-to "hosts"}}{{t 'machine.driverCustom.step5Close.link'}}{{/link-to}} {{t 'machine.driverCustom.step5Close.part2'}}
</li>
</ol>
{{!-- </div> --}}
{{/if}}
<ol>
<li>
{{format-html-message 'machine.driverCustom.step1' docsBase=settings.docsBase}}
</li>
<li>
{{t 'machine.driverCustom.step2'}}
<ul>
<li>{{format-html-message 'machine.driverCustom.step2li'}}</li>
</ul>
</li>
<li>
{{t 'machine.driverCustom.step3'}}
<div class="r-mt10">
{{form-user-labels setLabels=(action 'setLabels')}}
</div>
</li>
<li>
{{format-html-message 'machine.driverCustom.step4' rancherImage=settings.rancherImage}}
<div class="checkbox r-mt10">
{{input type="text" value=cattleAgentIp classNames="form-control" placeholder=(t 'machine.driverCustom.agentIp.placeholder')}}
</div>
</li>
<li>
{{t 'machine.driverCustom.step5Copy'}} {{settings.appName}}:
{{#if registrationCommand}}
<div class="copy-pre">
<pre id="registration-command">{{registrationCommand}}</pre>
{{copy-to-clipboard clipboardText=registrationCommand}}
</div>
{{else}}
<div><i class="icon icon-spinner icon-spin"></i> {{t 'machine.driverCustom.generating'}}</div>
{{/if}}
</li>
<li>
{{t 'machine.driverCustom.step5Close.part1'}} {{#link-to "hosts"}}{{t 'machine.driverCustom.step5Close.link'}}{{/link-to}} {{t 'machine.driverCustom.step5Close.part2'}}
</li>
</ol>
</div>
</div>
</section>
<section>
<div class="footer-actions">
<button {{action "cancel"}} class="btn bg-primary">{{t 'machine.driverCustom.close'}}</button>
</div>

2
translations/en-us.yaml
View File

@ -2477,6 +2477,8 @@ machine:
part2: screen within a minute.
close: Close
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.
step2: "Create a transparent Docker Network:"
step2Copy: docker network create -d transparent transparent