The <input /> tag is always empty, so having a separate closing

[invirt/packages/invirt-web.git] / code / templates / list.mako

diff --git a/code/templates/list.mako b/code/templates/list.mako
index b03a04f..99e81cb 100644 (file)
--- a/code/templates/list.mako
+++ b/code/templates/list.mako
@@ -54,18 +54,16 @@ VM List
        <tr>
          <td>Autoinstall${self.fn.helppopup('Autoinstalls')}</td>
          <td><input type="radio" name="cd_or_auto" id="cd_or_auto_auto"
        <tr>
          <td>Autoinstall${self.fn.helppopup('Autoinstalls')}</td>
          <td><input type="radio" name="cd_or_auto" id="cd_or_auto_auto"

-                 onchange="\$('cdromlist').value = ''; \$('vmtype-linux').checked = true">
+                 onchange="$('cdromlist').value = ''; $('vmtype-linux').checked = true" />

 ${self.fn.autoList(defaults.cdrom, "$('cd_or_auto_auto').checked = true;$('cdromlist').value = '';$('vmtype-linux').checked = true")}
              (experimental; 2-3 minutes, and you have a machine with empty root password.)
 ${self.fn.autoList(defaults.cdrom, "$('cd_or_auto_auto').checked = true;$('cdromlist').value = '';$('vmtype-linux').checked = true")}
              (experimental; 2-3 minutes, and you have a machine with empty root password.)

-         </input>

        </tr>
        <tr>
          <td>Boot CD</td>
          <td><input type="radio" name="cd_or_auto" id="cd_or_auto_cd" checked="checked"
        </tr>
        <tr>
          <td>Boot CD</td>
          <td><input type="radio" name="cd_or_auto" id="cd_or_auto_cd" checked="checked"

-                onchange="\$('autoinstalllist').value = ''; \$('vmtype-linux-hvm').checked = true">
+                onchange="$('autoinstalllist').value = ''; $('vmtype-linux-hvm').checked = true" />

 ${self.fn.cdromList(defaults.cdrom, "$('cd_or_auto_cd').checked = true;$('autoinstalllist').value = '';$('vmtype-linux-hvm').checked = true")}
 </td>
 ${self.fn.cdromList(defaults.cdrom, "$('cd_or_auto_cd').checked = true;$('autoinstalllist').value = '';$('vmtype-linux-hvm').checked = true")}
 </td>

-         </input>

        </tr>
        ${self.fn.errorRow('cdrom', err)}
        ${self.fn.errorRow('cdrom', err)}
        </tr>
        ${self.fn.errorRow('cdrom', err)}
        ${self.fn.errorRow('cdrom', err)}

@@ -84,23 +82,27 @@ ${self.fn.cdromList(defaults.cdrom, "$('cd_or_auto_cd').checked = true;$('autoin
 <%def name="machineRow(machine)">
       <tr> 
        <td rowspan="2">
 <%def name="machineRow(machine)">
       <tr> 
        <td rowspan="2">

-         <form action="command" method="post">
+       % if machine.uptime and installing[machine]:
+       <img src="static/power_installing.png" alt="Installing..." />
+       % else:
+         <form action="machine/${machine.machine_id}/command/${'shutdown' if machine.uptime else 'create'}" method="post">

            <input type="hidden" name="back" value="list"/>
            <input type="hidden" name="machine_id"
                   value="${machine.machine_id}"/>
            <input type="hidden" name="back" value="list"/>
            <input type="hidden" name="machine_id"
                   value="${machine.machine_id}"/>

-<input type="submit" class="power ${'on' if machine.uptime else 'off'}" name="action" value="${'Power off' if machine.uptime else 'Power on'}"\
+<input type="submit" class="power ${'on' if machine.uptime else 'off'}" name="action" value="${'Shutdown' if machine.uptime else 'Power on'}"\

 % if machine.uptime:
  onclick="return confirm('Are you sure you want to power off this VM?');"
 % endif
 />
          </form>
 % if machine.uptime:
  onclick="return confirm('Are you sure you want to power off this VM?');"
 % endif
 />
          </form>

+         % endif

        </td>
        </td>

-       <td><a href="info?machine_id=${machine.machine_id}">${machine.name}</a></td>
+       <td><a href="machine/${machine.machine_id}">${machine.name}</a></td>

        <td>${machine.memory}M</td>
        <td>${machine.owner}</td>
        <td>${machine.administrator}</td>
 % if machine.nics:
        <td>${machine.memory}M</td>
        <td>${machine.owner}</td>
        <td>${machine.administrator}</td>
 % if machine.nics:

-       <td>${', '.join(map(lambda x: x.ip, machine.nics))}</td>
+       <td>${', '.join(nic.ip for nic in machine.nics)}</td>

 % else:
        <td></td>
 % endif
 % else:
        <td></td>
 % endif

@@ -111,14 +113,16 @@ ${datetime.timedelta(seconds=int(machine.uptime))}\
 </td>
        <td>\
 % if has_vnc[machine] == True:
 </td>
        <td>\
 % if has_vnc[machine] == True:

-<a href="vnc?machine_id=${machine.machine_id}">Console</a>\
+<a href="machine/${machine.machine_id}/vnc">Console</a>\
+% elif has_vnc[machine] == 'ParaVM':
+ParaVM${self.fn.helppopup("ParaVM Console")}

 % elif has_vnc[machine] != 'Off':
 ${has_vnc[machine]}
 % endif
 </td>
       </tr>
       <tr>
 % elif has_vnc[machine] != 'Off':
 ${has_vnc[machine]}
 % endif
 </td>
       </tr>
       <tr>

-        <td colspan="7" style="padding-left: 1em; color: #666">${machine.description}</td>
+        <td colspan="7" style="padding-left: 1em; color: #666">${machine.description|self.fn.module.nl2br}</td>

       </tr>
 </%def>
 
       </tr>
 </%def>
 

@@ -141,7 +145,7 @@ ${has_vnc[machine]}
     <script type="text/javascript" src="/static/stripe.js"></script>
     <script type="text/javascript">
         document.observe("dom:loaded", function() {
     <script type="text/javascript" src="/static/stripe.js"></script>
     <script type="text/javascript">
         document.observe("dom:loaded", function() {

-            stripe(\$('machinelist').getElementsByTagName('table')[0],
+            stripe($('machinelist').getElementsByTagName('table')[0],

                    'stripedrow');
         });
     </script>
                    'stripedrow');
         });
     </script>