[open-ils-commits] r400 - in servres/trunk/conifer: syrup/views templates (gfawcett)

Sun Apr 26 21:58:06 EDT 2009

Author: gfawcett
Date: 2009-04-26 21:58:05 -0400 (Sun, 26 Apr 2009)
New Revision: 400

Modified:
   servres/trunk/conifer/syrup/views/courses.py
   servres/trunk/conifer/templates/course_invitation.xhtml
Log:
cleaned up invitation page; fixed bug in bad-invitation handler.


Modified: servres/trunk/conifer/syrup/views/courses.py
===================================================================

--- servres/trunk/conifer/syrup/views/courses.py	2009-04-27 01:58:00 UTC (rev 399)
+++ servres/trunk/conifer/syrup/views/courses.py	2009-04-27 01:58:05 UTC (rev 400)
@@ -217,7 +217,7 @@
             # think. Should we temporarily disable accounts after
             # multiple failures?
             log('WARN', 'Invitation failure, user %r gave code %r' % \
-                (datetime.now(), request.user.username, code))
+                (request.user.username, code))
             error = _('The code you provided is not valid.')
             return g.render('course_invitation.xhtml', **locals())
 

Modified: servres/trunk/conifer/templates/course_invitation.xhtml
===================================================================
--- servres/trunk/conifer/templates/course_invitation.xhtml	2009-04-27 01:58:00 UTC (rev 399)
+++ servres/trunk/conifer/templates/course_invitation.xhtml	2009-04-27 01:58:05 UTC (rev 400)
@@ -7,6 +7,11 @@
 <xi:include href="master.xhtml"/>
 <head>
   <title>${title}</title>
+  <script>
+    $(function() {
+    $('#code').focus();
+    });
+  </script>
 </head>
 <body>
   <h1>${title}</h1>
@@ -17,10 +22,10 @@
   more information.</p>
   <div class="errors" py:if="error">${error}</div>
   <form action="." method="POST">
-  <table>
-    <tr><th>Invitation Code:</th><td><input type="text" name="code" size="30" value="${code}"/></td></tr>
-    <tr><th/><td><input type="submit" value="Continue"/> <a style="margin-left: 12;" href="../">Go back</a></td></tr>
+  <table class="metadata_table">
+    <tr><th>Invitation Code:</th><td><input type="text" id="code" name="code" size="30" value="${code}"/></td></tr>
   </table>
+<p><input type="submit" value="Continue"/> <a style="margin-left: 12px;" href="../">or go back</a></p>
   </form>
   <div class="gap"/>
 </body>

