Updated help text with formatting changes.

diff --git a/code/main.py b/code/main.py
index 57cfbe2..e5722fa 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -196,7 +196,7 @@ console will suffer artifacts.
             'Windows': """
 <strong>Windows 7:</strong> The Windows 7 image is licensed for all MIT students and will automatically activate off the network; see <a href="/static/msca-7.txt">the licensing agreement</a> for details. The installer requires 512 MiB RAM and at least 15 GiB disk space (20 GiB or more recommended).<br>
 <strong>Windows Vista:</strong> The Vista image is licensed for all MIT students and will automatically activate off the network; see <a href="/static/msca-email.txt">the licensing confirmation e-mail</a> for details. The installer requires 512 MiB RAM and at least 7.5 GiB disk space (15 GiB or more recommended).<br>
             'Windows': """
 <strong>Windows 7:</strong> The Windows 7 image is licensed for all MIT students and will automatically activate off the network; see <a href="/static/msca-7.txt">the licensing agreement</a> for details. The installer requires 512 MiB RAM and at least 15 GiB disk space (20 GiB or more recommended).<br>
 <strong>Windows Vista:</strong> The Vista image is licensed for all MIT students and will automatically activate off the network; see <a href="/static/msca-email.txt">the licensing confirmation e-mail</a> for details. The installer requires 512 MiB RAM and at least 7.5 GiB disk space (15 GiB or more recommended).<br>

-<strong>Windows XP:</strong> This is the volume license CD image. You will need your own volume license key to complete the install. We do not have these available for the general MIT community; ask your department if they have one, or visit <a href="http://msca.mit.edu/">http://msca.mit.edu/</a> if you are staff/faculty to request one. 
+<strong>Windows XP:</strong> This is the volume license CD image. You will need your own volume license key to complete the install. We do not have these available for the general MIT community; ask your department if they have one, or visit <a href="http://msca.mit.edu/">http://msca.mit.edu/</a> if you are staff/faculty to request one.

 """
             }
 
 """
             }
 

diff --git a/code/static/msca-7.txt b/code/static/msca-7.txt
index f1495e2..39a2028 100644 (file)
--- a/code/static/msca-7.txt
+++ b/code/static/msca-7.txt
@@ -11,10 +11,10 @@ software upgrade on a personally owned machine to be used for MIT purposes.
 
 Upon ceasing employment with MIT, faculty and staff members do not have the
 continued right to use this software upgrade and should delete it from their
 
 Upon ceasing employment with MIT, faculty and staff members do not have the
 continued right to use this software upgrade and should delete it from their

-personally owned machines. 
+personally owned machines.

 
 Upon graduation, students will retain a perpetual, non-upgradeable right to
 
 Upon graduation, students will retain a perpetual, non-upgradeable right to

-continued use of the last received version of Windows. 
+continued use of the last received version of Windows.

 
 Your right to use the software shall be governed by the most current license
 rights, which you may view at <http://www.microsoft.com/Education/Terms.mspx>
 
 Your right to use the software shall be governed by the most current license
 rights, which you may view at <http://www.microsoft.com/Education/Terms.mspx>

diff --git a/code/templates/info.mako b/code/templates/info.mako
index 5423f3d..e83fef1 100644 (file)
--- a/code/templates/info.mako
+++ b/code/templates/info.mako
@@ -50,7 +50,7 @@ Info on ${machine.name}
        % endif
   </div>
   <div>
        % endif
   </div>
   <div>

-       ${command_button("Delete VM", "delete", extra="onclick=\"return confirm('Are you sure that you want to delete this VM (\\\'" + machine.name + "\\\')?');\"")}
+  ${command_button("Delete VM", "delete", extra='''onclick="return confirm('Are you sure that you want to delete this VM (\\\'%s\\\')?');"''' % (machine.name))}

   </div>
 </%def>
 
   </div>
 </%def>
 

diff --git a/debian/changelog b/debian/changelog
index 5c299a6..f0e2736 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-web (0.1.30) unstable; urgency=low
+
+  * Fixed formatting for the changes to help.
+
+ -- Steven Valdez <dvorak42@mit.edu>  Fri, 12 Apr 2013 16:11:02 -0400
+

 invirt-web (0.1.29) precise; urgency=low
 
   * Deleting VM shows the name of the VM that is being deleted.
 invirt-web (0.1.29) precise; urgency=low
 
   * Deleting VM shows the name of the VM that is being deleted.