Changeset 536

Timestamp:

May 16, 2008, 1:23:46 AM (16 years ago)

Author:

ecprice

Message:

Prettier help titles

Location:

trunk/packages/sipb-xen-www/code

Files:

• main.py (modified) (6 diffs)
• templates/help.tmpl (modified) (1 diff)
• templates/list.tmpl (modified) (3 diffs)

trunk/packages/sipb-xen-www/code/main.py

@@ -215 +215 @@
                 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)
@@ -457 +457 @@
     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,
@@ -490 +490 @@
 console will suffer artifacts.
 """
-                   )
+                    }
 
     if not subjects:
@@ -537 +537 @@
                       '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'),
@@ -596 +596 @@
              max_mem=max_mem,
              max_disk=max_disk,
-             owner_help=helppopup("owner"),
+             owner_help=helppopup("Owner"),
              fields = fields)
     return d
@@ -672 +672 @@
         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()

trunk/packages/sipb-xen-www/code/templates/help.tmpl

@@ -23 +23 @@
 #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>

trunk/packages/sipb-xen-www/code/templates/list.tmpl

@@ -48 +48 @@
           <td>HVM/ParaVM#slurp
 #filter None
-$helppopup('hvm_paravm')#slurp
+$helppopup('HVM/ParaVM')#slurp
 #end filter
 </td>
@@ -72 +72 @@
           <td>Autoinstall#slurp
 #filter None
-$helppopup('autoinstall')#slurp
+$helppopup('Autoinstall')#slurp
 #end filter
 </td>
@@ -152 +152 @@
         <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>