Ryan Wilcox  committed b1cba8a Merge

hg flow, merge release `02-20-2011-1` to publish branch `default`

  • Participants
  • Parent commits b0e2f8d, 179a276
  • Branches default
  • Tags 02-20-2011-1

Comments (0)

Files changed (4)

File scrumstatus/

 def scrum_email_txt(status):
     return( dict(status=status) )
+def contact_us():
+    return dict()
+def contact_thanks():
+    return dict()
 def main():

File scrumstatus/views/base.html

     <div id="footer">
       <p>&copy; 2010, Wilcox Development Solutions</p>
-      <p><a href="">Fork ScrumStatus on</a>
+      <p><a href="/contact_us">Contact Us</a></p>
+      <p><a href="">Report a bug</a></p>
+      <p><a href="">Fork ScrumStatus on</a></p>
   </div> <!--! end of #container -->

File scrumstatus/views/contact_thankyou.html

+<p>Thank you for contacting us. We'll look at your email and get back to you really soon!</p>
+%rebase base title="ScrumStatus: Contact Us"

File scrumstatus/views/contact_us.html

+<h1>Contact Us</h1>
+<form action="" method="post" accept-charset="utf-8">
+  <input type="hidden" name="key" value="4a943fa031fb47e0e7fc1104e6f9ec0d" id="key">
+  <label for="from">Your Email Address (so we can reply to you!)</label><input type="text" name="from" value="" id="from"><br/>
+  <label for="subject">Subject</label><input type="text" name="subject" value="About Scrum Status" id="subject"><br/>
+  <textarea name="body" rows="8" cols="60"></textarea><br/>
+  <p><input type="submit" value="Continue &rarr;"></p>
+%rebase base title="ScrumStatus: Contact Us"