# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 1282322588 -7200
# Node ID 25ab66a269756161eb60d83871db2647f7bfa138
# Parent  04e8b31fb2454ae6decca4e8770578f006ac5258
fix for new bcrypt password.
Some templating updates, added "time ago" to file browser
changed whoosh dep.

diff -r 04e8b31fb245 -r 25ab66a26975 pylons_app/model/forms.py
--- a/pylons_app/model/forms.py	Fri Aug 20 10:59:18 2010 +0200
+++ b/pylons_app/model/forms.py	Fri Aug 20 18:43:08 2010 +0200
@@ -24,7 +24,7 @@
     Email, Bool, StringBoolean
 from pylons import session
 from pylons.i18n.translation import _
-from pylons_app.lib.auth import check_password
+from pylons_app.lib.auth import check_password, get_crypt_password
 from pylons_app.model import meta
 from pylons_app.model.db import User, Repository
 from sqlalchemy.exc import OperationalError
diff -r 04e8b31fb245 -r 25ab66a26975 pylons_app/public/css/style.css
--- a/pylons_app/public/css/style.css	Fri Aug 20 10:59:18 2010 +0200
+++ b/pylons_app/public/css/style.css	Fri Aug 20 18:43:08 2010 +0200
@@ -2856,6 +2856,12 @@
     color: #515151;
 }
 
+#register div.form div.activation_msg {
+	padding-top:4px;
+	padding-bottom:4px;
+	
+}
+
 /* -----------------------------------------------------------
 	SUMMARY
 ----------------------------------------------------------- */
diff -r 04e8b31fb245 -r 25ab66a26975 pylons_app/templates/admin/users/users.html
--- a/pylons_app/templates/admin/users/users.html	Fri Aug 20 10:59:18 2010 +0200
+++ b/pylons_app/templates/admin/users/users.html	Fri Aug 20 18:43:08 2010 +0200
@@ -40,7 +40,7 @@
             %for cnt,user in enumerate(c.users_list):
              %if user.name !='default':
                 <tr class="parity${cnt%2}">
-                	<td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(user.email)}"> </div></td>
+                	<td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(user.email,24)}"> </div></td>
                     <td>${h.link_to(user.username,h.url('edit_user', id=user.user_id))}</td>
                     <td>${user.name}</td>
                     <td>${user.lastname}</td>
diff -r 04e8b31fb245 -r 25ab66a26975 pylons_app/templates/files/files_browser.html
--- a/pylons_app/templates/files/files_browser.html	Fri Aug 20 10:59:18 2010 +0200
+++ b/pylons_app/templates/files/files_browser.html	Fri Aug 20 18:43:08 2010 +0200
@@ -56,7 +56,7 @@
 		             </td>
 		             <td>
 		             	%if node.is_file():
-		             		${node.last_changeset.date}
+		             		${h.age(node.last_changeset._ctx.date())} - ${node.last_changeset.date}
 		             	%endif
 		             </td>
 		             <td>
diff -r 04e8b31fb245 -r 25ab66a26975 setup.py
--- a/setup.py	Fri Aug 20 10:59:18 2010 +0200
+++ b/setup.py	Fri Aug 20 18:43:08 2010 +0200
@@ -23,7 +23,7 @@
         "pygments>=1.3.0",
         "mercurial>=1.6",
         "pysqlite",
-        "whoosh>=1.0.0b5",
+        "whoosh==1.0.0b9",
         "py-bcrypt",
     ],
     setup_requires=["PasteScript>=1.6.3"],