# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 1290104484 -3600
# Node ID 7df3855bf6c715beadc40e6661fcc44091084ada
# Parent  9985eca2e4d0114ef6b1a5c92958d5f66c5b4d99
Added fork name to journal
added account gravatar to my page

diff -r 9985eca2e4d0 -r 7df3855bf6c7 rhodecode/controllers/settings.py
--- a/rhodecode/controllers/settings.py	Thu Nov 18 18:05:52 2010 +0100
+++ b/rhodecode/controllers/settings.py	Thu Nov 18 19:21:24 2010 +0100
@@ -159,11 +159,12 @@
             form_result = _form.to_python(dict(request.POST))
             form_result.update({'repo_name':repo_name})
             repo_model.create_fork(form_result, c.rhodecode_user)
-            h.flash(_('fork %s repository as %s task added') \
+            h.flash(_('forked %s repository as %s') \
                       % (repo_name, form_result['fork_name']),
                     category='success')
-            action_logger(self.rhodecode_user, 'user_forked_repo',
-                            repo_name, '', self.sa)
+            action_logger(self.rhodecode_user,
+                          'user_forked_repo:%s' % form_result['fork_name'],
+                           repo_name, '', self.sa)
         except formencode.Invalid, errors:
             c.new_repo = errors.value['fork_name']
             r = render('settings/repo_fork.html')
diff -r 9985eca2e4d0 -r 7df3855bf6c7 rhodecode/lib/helpers.py
--- a/rhodecode/lib/helpers.py	Thu Nov 18 18:05:52 2010 +0100
+++ b/rhodecode/lib/helpers.py	Thu Nov 18 19:21:24 2010 +0100
@@ -396,37 +396,51 @@
     """
     action = user_log.action
     action_params = None
-    cs_links = ''
 
     x = action.split(':')
 
     if len(x) > 1:
         action, action_params = x
 
-    if action == 'push':
-        revs_limit = 5
-        revs = action_params.split(',')
-        cs_links = " " + ', '.join ([link(rev,
-                url('changeset_home',
-                repo_name=user_log.repository.repo_name,
-                revision=rev)) for rev in revs[:revs_limit] ])
-        if len(revs) > revs_limit:
-            html_tmpl = '<span title="%s"> %s </span>'
-            cs_links += html_tmpl % (', '.join(r for r in revs[revs_limit:]),
-                                     _('and %s more revisions') % (len(revs) - revs_limit))
-
+    def get_cs_links():
+        if action == 'push':
+            revs_limit = 5
+            revs = action_params.split(',')
+            cs_links = " " + ', '.join ([link(rev,
+                    url('changeset_home',
+                    repo_name=user_log.repository.repo_name,
+                    revision=rev)) for rev in revs[:revs_limit] ])
+            if len(revs) > revs_limit:
+                html_tmpl = '<span title="%s"> %s </span>'
+                cs_links += html_tmpl % (', '.join(r for r in revs[revs_limit:]),
+                                         _('and %s more revisions') \
+                                            % (len(revs) - revs_limit))
+                
+            return literal(cs_links)
+        return ''
+    
+    def get_fork_name():
+        if action == 'user_forked_repo':
+            from rhodecode.model.scm import ScmModel
+            repo_name = action_params
+            repo = ScmModel().get(repo_name)
+            if repo is None:
+                return repo_name
+            return link_to(action_params, url('summary_home',
+                                              repo_name=repo.name,),
+                                              title=repo.dbrepo.description)
+        return ''
     map = {'user_deleted_repo':_('User deleted repository'),
            'user_created_repo':_('User created repository'),
-           'user_forked_repo':_('User forked repository'),
+           'user_forked_repo':_('User forked repository as: ') + get_fork_name(),
            'user_updated_repo':_('User updated repository'),
            'admin_deleted_repo':_('Admin delete repository'),
            'admin_created_repo':_('Admin created repository'),
            'admin_forked_repo':_('Admin forked repository'),
            'admin_updated_repo':_('Admin updated repository'),
-           'push':_('Pushed') + literal(cs_links),
+           'push':_('Pushed') + get_cs_links(),
            'pull':_('Pulled'), }
 
-    print action, action_params
     return map.get(action, action)
 
 
diff -r 9985eca2e4d0 -r 7df3855bf6c7 rhodecode/templates/admin/users/user_edit_my_account.html
--- a/rhodecode/templates/admin/users/user_edit_my_account.html	Thu Nov 18 18:05:52 2010 +0100
+++ b/rhodecode/templates/admin/users/user_edit_my_account.html	Thu Nov 18 19:21:24 2010 +0100
@@ -24,6 +24,17 @@
     <div class="ui-tabs-panel ui-widget-content ui-corner-bottom">
     ${h.form(url('admin_settings_my_account_update'),method='put')}
 	    <div class="form">
+	    
+             <div class="field">
+                <div class="gravatar_box">
+                    <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/></div>
+                    <p>
+                    <strong>Change your avatar at <a href="http://gravatar.com">gravatar.com</a></strong><br/> 
+                    ${_('Using')} ${c.user.email}
+                    </p>
+                </div>
+             </div>   	    
+	    
 	        <div class="fields">
 	             <div class="field">
 	                <div class="label">
@@ -86,7 +97,7 @@
 <div class="box box-right">
     <!-- box / title -->
     <div class="title">
-        <h5>${_('My repositories')}
+        <h5>${_('My repositories')} 
         <input class="top-right-rounded-corner top-left-rounded-corner bottom-left-rounded-corner bottom-right-rounded-corner" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/>
         </h5>   
     </div>