# HG changeset patch # User Marcin Kuzminski # Date 2010-08-08 00:09:32 # Node ID 7eba3d1e4227133098e695dcdd1994231813c0e2 # Parent f5c1eec9f3762590d98aba2e4fd5794cd3cde217 webhelpers import bugfix for gravatar +some css fixes, and added gravatar for summary. diff --git a/pylons_app/lib/helpers.py b/pylons_app/lib/helpers.py --- a/pylons_app/lib/helpers.py +++ b/pylons_app/lib/helpers.py @@ -305,14 +305,13 @@ HasRepoPermissionAny, HasRepoPermissionA #=============================================================================== import hashlib import urllib +from pylons import request -def gravatar_url(email): +def gravatar_url(email, size=30): ssl_enabled = 'https' == request.environ.get('HTTP_X_URL_SCHEME') default = 'identicon' - size = 32 baseurl_nossl = "http://www.gravatar.com/avatar/" baseurl_ssl = "https://secure.gravatar.com/avatar/" - baseurl = baseurl_ssl if ssl_enabled else baseurl_nossl diff --git a/pylons_app/public/css/style.css b/pylons_app/public/css/style.css --- a/pylons_app/public/css/style.css +++ b/pylons_app/public/css/style.css @@ -3446,12 +3446,13 @@ table#permissions_manage tr#add_perm_inp /* ----------------------------------------------------------- GRAVATARS ----------------------------------------------------------- */ -.gravatar_box img{ - float:left; - padding-right: 5px; - padding-top:3px; -} - +div.gravatar{ + background-color:white; + border:1px solid #D0D0D0; + float:left; + margin-right:0.7em; + padding: 2px 2px 0px; +} /* ----------------------------------------------------------- jquery ui diff --git a/pylons_app/templates/admin/users/user_edit.html b/pylons_app/templates/admin/users/user_edit.html --- a/pylons_app/templates/admin/users/user_edit.html +++ b/pylons_app/templates/admin/users/user_edit.html @@ -30,7 +30,7 @@
- gravatar +
gravatar

Change your avatar at gravatar.com
${_('Using')} ${c.user.email} diff --git a/pylons_app/templates/admin/users/users.html b/pylons_app/templates/admin/users/users.html --- a/pylons_app/templates/admin/users/users.html +++ b/pylons_app/templates/admin/users/users.html @@ -40,7 +40,7 @@ %for cnt,user in enumerate(c.users_list): %if user.name !='default': - gravatar +

gravatar
${h.link_to(user.username,h.url('edit_user', id=user.user_id))} ${user.name} ${user.lastname} diff --git a/pylons_app/templates/summary/summary.html b/pylons_app/templates/summary/summary.html --- a/pylons_app/templates/summary/summary.html +++ b/pylons_app/templates/summary/summary.html @@ -4,8 +4,6 @@ ${_('Mercurial Repository Overview')} - - <%def name="breadcrumbs_links()"> ${h.link_to(u'Home',h.url('/'))} » @@ -64,7 +62,12 @@ E.onDOMReady(function(e){
- ${c.repo_info.contact} +
+ gravatar +
+ ${_('Username')}: ${c.repo_info.dbrepo.user.username}
+ ${_('Name')}: ${c.repo_info.dbrepo.user.name} ${c.repo_info.dbrepo.user.lastname}
+ ${_('Email')}: ${c.repo_info.dbrepo.user.email}