Mercurial > kallithea

changeset 416:25ab66a26975

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix for new bcrypt password. Some templating updates, added "time ago" to file browser changed whoosh dep.
author Marcin Kuzminski <marcin@python-works.com>
date Fri, 20 Aug 2010 18:43:08 +0200
parents 04e8b31fb245
children 3ed2d46a2ca7
files pylons_app/model/forms.py pylons_app/public/css/style.css pylons_app/templates/admin/users/users.html pylons_app/templates/files/files_browser.html setup.py
diffstat 5 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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
 ----------------------------------------------------------- */
--- 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>
--- 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>
--- 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"],