balki/pgweb
1
0
Fork 0
Code Pull Requests Activity

Allow setting ssh connection key file, fix connection ui

Browse Source
This commit is contained in:
Dan Sosedoff
2017-09-26 23:29:28 -05:00
parent bf423658af
commit 5e22795828
9 changed files with 67 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
static/css/app.css
View File

@@ -563,6 +563,10 @@
font-size: 12px;
}
.connection-settings form .no-left-padding {
padding-left: 0;
}
.connection-scheme-group {
display: none;
}

27
static/index.html
View File

@@ -147,9 +147,12 @@
<div class="form-group">
<label class="col-sm-3 control-label">Host</label>
<div class="col-sm-9">
<div class="col-sm-7">
<input type="text" id="pg_host" class="form-control" />
</div>
<div class="col-sm-2 no-left-padding">
<input type="text" id="pg_port" class="form-control" placeholder="5432" />
</div>
</div>
<div class="form-group">
@@ -174,14 +177,7 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Port</label>
<div class="col-sm-9">
<input type="text" id="pg_port" class="form-control" placeholder="5432" />
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">SSL</label>
<label class="col-sm-3 control-label">SSL Mode</label>
<div class="col-sm-9">
<select class="form-control" id="connection_ssl">
<option value="disable">disable</option>
@@ -193,13 +189,18 @@
</div>
<div class="connection-ssh-group">
<hr/>
<div class="form-group">
<label class="col-sm-3 control-label">SSH Host</label>
<div class="col-sm-9">
<div class="col-sm-7">
<input type="text" id="ssh_host" class="form-control" />
</div>
<div class="col-sm-2 no-left-padding">
<input type="text" id="ssh_port" class="form-control" placeholder="22" />
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">SSH User</label>
<div class="col-sm-9">
@@ -215,9 +216,9 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">SSH Port</label>
<label class="col-sm-3 control-label">SSH Key</label>
<div class="col-sm-9">
<input type="text" id="ssh_port" class="form-control" placeholder="optional" />
<input type="text" id="ssh_key" class="form-control" placeholder="optional" />
</div>
</div>
</div>

3
static/js/app.js
View File

@@ -1149,6 +1149,7 @@ $(document).ready(function() {
$("#ssh_port").val(item.ssh.port);
$("#ssh_user").val(item.ssh.user);
$("#ssh_password").val(item.ssh.password);
$("#ssh_key").val(item.ssh.key);
$("#connection_ssh").click();
}
else {
@@ -1156,6 +1157,7 @@ $(document).ready(function() {
$("#ssh_port").val("");
$("#ssh_user").val("");
$("#ssh_password").val("");
$("#ssh_key").val("");
$(".connection-ssh-group").hide();
}
});
@@ -1178,6 +1180,7 @@ $(document).ready(function() {
params["ssh_port"] = $("#ssh_port").val();
params["ssh_user"] = $("#ssh_user").val();
params["ssh_password"] = $("#ssh_password").val();
params["ssh_key"] = $("#ssh_key").val();
}
$("#connection_error").hide();