From: Steven Valdez <dvorak42@mit.edu>
Date: Wed, 24 Jul 2013 03:32:16 +0000 (-0400)
Subject: Added motd to pages
X-Git-Tag: 0.1.36~2
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/commitdiff_plain/215d45efd45e47073a2f4238e4e3cef2dd342dc9?ds=inline

Added motd to pages
---

diff --git a/code/templates/error.mako b/code/templates/error.mako
index 1edb1b4..77c357b 100644
--- a/code/templates/error.mako
+++ b/code/templates/error.mako
@@ -5,6 +5,12 @@
 ERROR!
 </%def>
 
+%if os.path.exists("/etc/invirt/motd.html"):
+<div class="result">
+<p class="error">${open('/etc/invirt/motd.html').read()|n}</p>
+</div>
+%endif
+
 <p>Uh-oh!  We experienced an error.  Sorry about that.  We've gotten
 mail about it.</p>
 
diff --git a/code/templates/info.mako b/code/templates/info.mako
index e83fef1..1fb4284 100644
--- a/code/templates/info.mako
+++ b/code/templates/info.mako
@@ -5,6 +5,12 @@
 Info on ${machine.name}
 </%def>
 
+%if os.path.exists("/etc/invirt/motd.html"):
+<div class="result">
+<p class="error">${open('/etc/invirt/motd.html').read()|n}</p>
+</div>
+%endif
+
 <%def name="infoTable()">
 <h2>Info</h2>
 <table>
diff --git a/debian/changelog b/debian/changelog
index 3e54467..3638daa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-web (0.1.34) unstable; urgency=low
+
+  * Added motd to error page and VM info page.
+
+ -- Steven Valdez <dvorak42@mit.edu>  Tue, 23 Jul 2013 23:31:50 -0400
+
 invirt-web (0.1.33) precise; urgency=low
 
   * Updating version for precise migration.