Changeset 138 for trunk

Timestamp:

Oct 8, 2007, 2:56:01 AM (17 years ago)

Author:

ecprice

Message:

ParaVM on list

Location:

trunk/web/templates

Files:

• list.tmpl (modified) (1 diff)
• main.py (modified) (2 diffs)

trunk/web/templates/list.tmpl

@@ -45 +45 @@
 </td>
         <td>#slurp
-#if $has_vnc.get($machine.name)
+#if $has_vnc.get($machine.name) == True
 <a href="vnc?machine_id=$machine.machine_id">Console</a>#slurp
 #else
-off#slurp
+$has_vnc.get($machine.name)
 #end if
 </td>

trunk/web/templates/main.py

@@ -42 +42 @@
 
 def haveAccess(user, machine):
-    if user.username == 'quentin':
+    if user.username == 'moo':
         return True
     return machine.owner == user.username
@@ -277 +277 @@
     on = uptimes
     for m in machines:
-        if on.get(m.name) and m.type.hvm:
+        if not on.get(m.name):
+            has_vnc[m.name] = 'Off'
+        elif m.type.hvm:
             has_vnc[m.name] = True
         else:
-            has_vnc[m.name] = False
+            help_name = 'paravm_console'
+            has_vnc[m.name] = 'ParaVM <span class="helplink"><a href="help?subject=%s&amp;simple=true" target="_blank" onclick="return helppopup(\'%s\')">(?)</a></span>' % (help_name, help_name)
     #     for m in machines:
     #         status = statusInfo(m)