From 36097be5e255b54e405def8be29c780ecaa42764 Mon Sep 17 00:00:00 2001
From: Greg Price <price@mit.edu>
Date: Sat, 29 Mar 2008 11:54:58 -0400
Subject: [PATCH] move framebuffer tip to /help page

svn path=/trunk/packages/sipb-xen-www/; revision=309
---
 code/main.py            |    8 +++++++-
 code/templates/vnc.tmpl |    8 ++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/code/main.py b/code/main.py
index a3c84ee..31465f6 100755
--- a/code/main.py
+++ b/code/main.py
@@ -445,7 +445,13 @@ group.""",
                         quotas="""
 Quotas are determined on a per-locker basis.  Each quota may have a
 maximum of 512 megabytes of active ram, 50 gigabytes of disk, and 4
-active machines."""
+active machines.""",
+                        console="""
+<strong>Framebuffer:</strong> At a Linux boot prompt in your VM, try
+setting <tt>fb=false</tt> to disable the framebuffer.  If you don't,
+your machine will run just fine, but the applet's display of the
+console will suffer artifacts.
+"""
                    )
     
     if not subjects:
diff --git a/code/templates/vnc.tmpl b/code/templates/vnc.tmpl
index a0b8b01..7ae0607 100644
--- a/code/templates/vnc.tmpl
+++ b/code/templates/vnc.tmpl
@@ -6,13 +6,13 @@ Console to $machine.name
 #end def
 
 #def body
-<h1>Console</h1>
+<h1>Console to ${machine.name}</h1>
 #if not $on
 <p> Your machine appears to be off.</p>
 #else if not $has_vnc
 <p> Your machine appears to not be accepting VNC connections. Perhaps you have a ParaVM machine?</p>
 #end if
-<p>Here is a console to ${machine.name}.</p>
+<p>See <a href="help?subject=console">tips</a> about framebuffer and other issues.</p>
 <APPLET CODE="VncViewer.class" ARCHIVE="https://$hostname:446/static/VncViewer.jar"
         WIDTH="100%" HEIGHT="1000">
 <PARAM NAME="PASSWORD" VALUE="moocow">
@@ -22,8 +22,4 @@ Console to $machine.name
 <PARAM NAME="AUTHTOKEN" VALUE="$authtoken">
 <PARAM NAME="SocketFactory" VALUE="VNCProxyConnectSocketFactory">
 </APPLET>
-<p><strong>Tip:</strong> At a Linux boot prompt, try setting <tt>fb=false</tt> to disable the framebuffer.  If you don't, your machine will run just fine, but this applet's display of the console will suffer artifacts.</p>
-#*
-java VncViewer HOST black-mesa PORT 10003 VMNAME tabbott_test AUTHTOKEN quentin SocketFactory VNCProxyConnectSocketFactory
-*#
 #end def
-- 
1.7.9.5