Prettier help titles

svn path=/trunk/packages/sipb-xen-www/; revision=536

diff --git a/code/main.py b/code/main.py
index e208a13..ce523cb 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -214,7 +214,7 @@ def getListDict(user):
             elif m.type.hvm:
                 has_vnc[m] = "WTF?"
             else:
-                has_vnc[m] = "ParaVM"+helppopup("paravm_console")
+                has_vnc[m] = "ParaVM"+helppopup("ParaVM Console")
     max_memory = validation.maxMemory(user)
     max_disk = validation.maxDisk(user)
     checkpoint.checkpoint('Got max mem/disk')
@@ -456,40 +456,40 @@ def helpHandler(user, fields):
     simple = fields.getfirst('simple')
     subjects = fields.getlist('subject')
 
-    help_mapping = dict(paravm_console="""
+    help_mapping = {'ParaVM Console': """
 ParaVM machines do not support local console access over VNC.  To
 access the serial console of these machines, you can SSH with Kerberos
-to sipb-xen-console.mit.edu, using the name of the machine as your
+to console.xvm.mit.edu, using the name of the machine as your
 username.""",
-                        hvm_paravm="""
+                    'HVM/ParaVM': """
 HVM machines use the virtualization features of the processor, while
 ParaVM machines use Xen's emulation of virtualization features.  You
 want an HVM virtualized machine.""",
-                        cpu_weight="""
+                    'CPU Weight': """
 Don't ask us!  We're as mystified as you are.""",
-                        owner="""
+                    'Owner': """
 The owner field is used to determine <a
-href="help?subject=quotas">quotas</a>.  It must be the name of a
+href="help?subject=Quotas">quotas</a>.  It must be the name of a
 locker that you are an AFS administrator of.  In particular, you or an
 AFS group you are a member of must have AFS rlidwka bits on the
 locker.  You can check who administers the LOCKER locker using the
 commands 'attach LOCKER; fs la /mit/LOCKER' on Athena.)  See also <a
-href="help?subject=administrator">administrator</a>.""",
-                        administrator="""
+href="help?subject=Administrator">administrator</a>.""",
+                    'Administrator': """
 The administrator field determines who can access the console and
 power on and off the machine.  This can be either a user or a moira
 group.""",
-                        quotas="""
+                    'Quotas': """
 Quotas are determined on a per-locker basis.  Each locker may have a
 maximum of 512 megabytes of active ram, 50 gigabytes of disk, and 4
 active machines.""",
-                        console="""
+                    '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:
         subjects = sorted(help_mapping.keys())
@@ -536,7 +536,7 @@ def infoDict(user, machine):
                       ('memory', 'RAM'),
                       'DISK_INFO',
                       ('state', 'state (xen format)'),
-                      ('cpu_weight', 'CPU weight'+helppopup('cpu_weight')),
+                      ('cpu_weight', 'CPU weight'+helppopup('CPU Weight')),
                       ('on_reboot', 'Action on VM reboot'),
                       ('on_poweroff', 'Action on VM poweroff'),
                       ('on_crash', 'Action on VM crash'),
@@ -595,7 +595,7 @@ def infoDict(user, machine):
              ram=machine.memory,
              max_mem=max_mem,
              max_disk=max_disk,
-             owner_help=helppopup("owner"),
+             owner_help=helppopup("Owner"),
              fields = fields)
     return d
 
@@ -671,7 +671,7 @@ def main(operation, user, fields):
                 sys.exit(1)
         print 'Content-Type: text/plain\n'
         print 'Uh-oh!  We experienced an error.'
-        print 'Please email sipb-xen@mit.edu with the contents of this page.'
+        print 'Please email xvm-dev@mit.edu with the contents of this page.'
         print '----'
         e = revertStandardError()
         print e

diff --git a/code/templates/help.tmpl b/code/templates/help.tmpl
index d6f0768..b4271d1 100644 (file)
--- a/code/templates/help.tmpl
+++ b/code/templates/help.tmpl
@@ -22,10 +22,10 @@ Help
 #end if
 #for $subject in $subjects
 #if $subject in $mapping 
-#if not $simple
 <h2>$subject</h2>
-#end if
+#filter None
 <p>$mapping[$subject]</p>
+#end filter
 #else
 <p>Unknown subject '$subject'.</p>
 #end if

diff --git a/code/templates/list.tmpl b/code/templates/list.tmpl
index f6c9a09..c55261c 100644 (file)
--- a/code/templates/list.tmpl
+++ b/code/templates/list.tmpl
@@ -47,7 +47,7 @@ $errorRow('disk', $err)
         <tr>
           <td>HVM/ParaVM#slurp
 #filter None
-$helppopup('hvm_paravm')#slurp
+$helppopup('HVM/ParaVM')#slurp
 #end filter
 </td>
           <td>
@@ -71,7 +71,7 @@ $errorRow('autoinstall', $err)
        <!--<tr>
          <td>Autoinstall#slurp
 #filter None
-$helppopup('autoinstall')#slurp
+$helppopup('Autoinstall')#slurp
 #end filter
 </td>
          <td><input type="radio" name="cd_or_auto" id="cd_or_auto_auto">
@@ -151,12 +151,12 @@ $has_vnc[$machine]
        <th>Memory</th>
        <th>Owner#slurp
 #filter None
-$helppopup('owner')#slurp
+$helppopup('Owner')#slurp
 #end filter
 </th>
         <th>Administrator#slurp
 #filter None
-$helppopup('administrator')#slurp
+$helppopup('Administrator')#slurp
 #end filter
 </th>
        <th>IP</th>