Commit 5fd09213 authored by Leigh B Stoller's avatar Leigh B Stoller

Shellinabox fixes.

parent e371173b
#!/usr/bin/perl -w #!/usr/bin/perl -w
# #
# Copyright (c) 2008-2013 University of Utah and the Flux Group. # Copyright (c) 2008-2014 University of Utah and the Flux Group.
# #
# {{{GENIPUBLIC-LICENSE # {{{GENIPUBLIC-LICENSE
# #
...@@ -241,7 +241,7 @@ else { ...@@ -241,7 +241,7 @@ else {
fatal("$uid is not in the passwd file or $APTDIR"); fatal("$uid is not in the passwd file or $APTDIR");
} }
} }
$command = "/usr/bin/ssh" . ($port ? "-p $port" : "") . " " . $command = "/usr/bin/ssh " . ($port ? "-p $port" : "") . " " .
"$sshopts ${uid}\@${nodeid}"; "$sshopts ${uid}\@${nodeid}";
} }
......
...@@ -131,7 +131,7 @@ function ShowTopo(uuid) ...@@ -131,7 +131,7 @@ function ShowTopo(uuid)
$("#showtopo_container").removeClass("invisible"); $("#showtopo_container").removeClass("invisible");
// Subtract -2 cause of the border. // Subtract -2 cause of the border.
maketopmap("#showtopo_container", maketopmap("#showtopo_statuspage",
$("#showtopo_statuspage").outerWidth() - 2, $("#showtopo_statuspage").outerWidth() - 2,
300, topo); 300, topo);
...@@ -383,8 +383,8 @@ function NewSSHTab(hostport, client_id) ...@@ -383,8 +383,8 @@ function NewSSHTab(hostport, client_id)
"</ul>\n" + "</ul>\n" +
"<div id='quicktabs_content' class='tab-content'>\n" + "<div id='quicktabs_content' class='tab-content'>\n" +
" <div class='tab-pane' id='profile'>" + " <div class='tab-pane' id='profile'>" +
" <div id='showtopo_div'>\n" + " <div id='showtopo_statuspage'>\n" +
$('#showtopo_div').html() + $('#showtopo_statuspage').html() +
" </div>\n" + " </div>\n" +
" </div>\n" + " </div>\n" +
"</div>\n"; "</div>\n";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment