Changeset 147 for trunk


Ignore:
Timestamp:
Oct 9, 2007, 2:31:30 AM (17 years ago)
Author:
ecprice
Message:

For new naming scheme.

Location:
trunk/web/templates
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/web/templates/info.tmpl

    r144 r147  
    7070#if not $on
    7171    <tr><td>Ram:</td><td><input type="text" size=3 value="$machine.memory"/>MB (max $max_mem)</td></tr>
    72     <tr><td>Disk:</td><td><input type="text" size=3 value="${machine.disks[0].size/1024.}"/>GB (max $max_disk)</td></tr>
     72    <tr><td>Disk:</td><td><input type="text" size=3 value="${machine.disks[0].size/1024.}"/>GB (max $max_disk)</td><td>WARNING: Modifying disk size may corrupt your data.</td></tr>
    7373#end if
    7474    <tr><td><input type="submit" class="button" name="action" value="Change"/></td></tr>
  • trunk/web/templates/main.py

    r145 r147  
    213213    lines = value_string.splitlines()
    214214    d = {}
    215     for line in lines[1:]:
     215    for line in lines:
    216216        lst = line.split()
    217217        name, id = lst[:2]
     
    593593    fields = []
    594594    machine_info = {}
     595    machine_info['name'] = machine.name
    595596    machine_info['type'] = machine.type.hvm and 'HVM' or 'ParaVM'
    596597    machine_info['owner'] = machine.owner
     
    609610        if field in ('uptime', 'cputime'):
    610611            fields.append((disp, locals()[field]))
     612        elif field in machine_info:
     613            fields.append((disp, machine_info[field]))
    611614        elif field in main_status:
    612615            fields.append((disp, main_status[field]))
    613         elif field in machine_info:
    614             fields.append((disp, machine_info[field]))
    615616        else:
    616617            pass
Note: See TracChangeset for help on using the changeset viewer.