Index: /package_branches/invirt-web/ajaxterm-rebased/code/main.py =================================================================== --- /package_branches/invirt-web/ajaxterm-rebased/code/main.py (revision 2750) +++ /package_branches/invirt-web/ajaxterm-rebased/code/main.py (revision 2751) @@ -38,4 +38,5 @@ from view import View, revertStandardError +import ajaxterm @@ -388,4 +389,21 @@ else: raise InvalidInput('back', back, 'Not a known back page.') + + atmulti = ajaxterm.Multiplex() + atsessions = {} + + @cherrypy.expose + @cherrypy.tools.mako(filename="/terminal.mako") + def terminal(self, machine_id): + machine = validation.Validate(cherrypy.request.login, cherrypy.request.state, machine_id=machine_id).machine + + status = controls.statusInfo(machine) + has_vnc = hasVnc(status) + + d = dict(on=status, + has_vnc=has_vnc, + machine=machine, + hostname=cherrypy.request.local.name) + return d machine = MachineView() Index: /package_branches/invirt-web/ajaxterm-rebased/code/static/ajaxterm/ajaxterm.css =================================================================== --- /package_branches/invirt-web/ajaxterm-rebased/code/static/ajaxterm/ajaxterm.css (revision 2750) +++ /package_branches/invirt-web/ajaxterm-rebased/code/static/ajaxterm/ajaxterm.css (revision 2751) @@ -59,5 +59,4 @@ pre.term span.b7 { background-color: #bbb; } -body { background-color: #888; } #term { float: left; Index: /package_branches/invirt-web/ajaxterm-rebased/code/templates/info.mako =================================================================== --- /package_branches/invirt-web/ajaxterm-rebased/code/templates/info.mako (revision 2750) +++ /package_branches/invirt-web/ajaxterm-rebased/code/templates/info.mako (revision 2751) @@ -18,9 +18,9 @@ % if on: % if not machine.type.hvm: - Console access: type + Console access: Web Terminal or type ssh ${machine.name}@${config.console.hostname} on Athena. (more info) % elif has_vnc: - Get Console + Get Console or Web Terminal % else: VNC console not enabled; still booting? Index: /package_branches/invirt-web/ajaxterm-rebased/code/templates/skeleton.mako =================================================================== --- /package_branches/invirt-web/ajaxterm-rebased/code/templates/skeleton.mako (revision 2750) +++ /package_branches/invirt-web/ajaxterm-rebased/code/templates/skeleton.mako (revision 2751) @@ -62,4 +62,5 @@
Your machine appears to be off.
+% elif has_vnc: +Your machine appears to be an HVM; you will need to specially configure a serial console before you can use this terminal.
+% endif + +<%def name="header_extra()"> +${parent.header_extra()} + + + + + +%def> + +