Merge branch 'feature/v3.1.0-macos' of github.com:tp4a/teleport into feature/v3.1.0-macos

pull/130/head
Apex Liu 2018-11-07 00:55:27 +08:00
commit 92c6265c72
2 changed files with 53 additions and 12 deletions

1
.gitignore vendored
View File

@ -50,7 +50,6 @@ __pycache__
/client/tools/putty /client/tools/putty
/client/tools/winscp /client/tools/winscp
# for dist folder # for dist folder
**/_tmp_ **/_tmp_
/dist/server/data /dist/server/data

View File

@ -48,22 +48,34 @@
<hr/> <hr/>
<p class="cfg-title">本地 SSH 客户端配置</p> <p class="cfg-title">本地 SSH 客户端配置</p>
<div class="form-horizontal"> <div class="form-horizontal">
<div class="form-group form-group-sm"> <div class="form-group form-group-sm">
<label for="term-type" class="col-sm-1 control-label"><strong>端:</strong></label> <label for="scp-type" class="col-sm-2 control-label"><strong>客户端:</strong></label>
<div class="col-sm-3"> <div class="col-sm-4">
<select id="term-type" class="form-control"></select> <select id="scp-type" class="form-control"></select>
</div> </div>
</div> </div>
<div class="form-group form-group-sm"> <div class="form-group form-group-sm">
<label for="term-profile" class="col-sm-1 control-label"><strong>使用配置:</strong></label> <label for="scp-app" class="col-sm-2 control-label"><strong>程序路径:</strong></label>
<div class="col-sm-3"> <div class="col-sm-9">
<input id="term-profile" type="text" class="form-control input-args" /> <div class="input-group">
<input id="scp-app" type="text" class="form-control input-args" placeholder="客户端可执行程序文件路径" readonly="readonly">
<span class="input-group-btn"><button class="btn btn-sm btn-primary" type="button" id="scp-select-app">选择...</button></span>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group form-group-sm">
<label for="scp-cmdline" class="col-sm-2 control-label"><strong>命令参数:</strong></label>
<div class="col-sm-9">
<input id="scp-cmdline" type="text" class="form-control input-args" placeholder="客户端启动所需命令行参数"/>
</div>
</div>
</div>
<hr/> <hr/>
<p class="cfg-title">本地 SFTP 客户端配置</p> <p class="cfg-title">本地 SFTP 客户端配置</p>
@ -125,6 +137,36 @@
</div> </div>
<hr/>
<p class="cfg-title">本地RDP配置</p>
<div class="form-horizontal">
<div class="form-group form-group-sm">
<label for="telnet-type" class="col-sm-2 control-label"><strong>客户端:</strong></label>
<div class="col-sm-4">
<select id="telnet-type" class="form-control"></select>
</div>
</div>
<div class="form-group form-group-sm">
<label for="telnet-app" class="col-sm-2 control-label"><strong>程序路径:</strong></label>
<div class="col-sm-9">
<div class="input-group">
<input id="telnet-app" type="text" class="form-control input-args" placeholder="客户端可执行程序文件路径" readonly="readonly">
<span class="input-group-btn"><button class="btn btn-sm btn-primary" type="button" id="telnet-select-app">选择...</button></span>
</div>
</div>
</div>
<div class="form-group form-group-sm">
<label for="telnet-cmdline" class="col-sm-2 control-label"><strong>命令参数:</strong></label>
<div class="col-sm-9">
<input id="telnet-cmdline" type="text" class="form-control input-args" placeholder="客户端启动所需命令行参数"/>
</div>
</div>
</div>
<hr/> <hr/>
<p class="cfg-title">本地RDP配置</p> <p class="cfg-title">本地RDP配置</p>