kallithea Changeset - 7df3855bf6c7

Changeset - 7df3855bf6c7

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 15 years ago 2010-11-18 19:21:24
marcin@python-works.com

Added fork name to journal
added account gravatar to my page

3 files changed with 46 insertions and 20 deletions:

rhodecode/controllers/settings.py

rhodecode/lib/helpers.py

rhodecode/templates/admin/users/user_edit_my_account.html

0 comments (0 inline, 0 general)

rhodecode/controllers/settings.py

➞

Show inline comments

@@ @@ -150,28 +150,29 @@ class SettingsController(BaseController) @@
     def fork_create(self, repo_name):
         repo_model = RepoModel()
         c.repo_info = repo_model.get(repo_name)
         _form = RepoForkForm(old_data={'repo_type':c.repo_info.repo_type})()
         form_result = {}
         try:
             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')
             return htmlfill.render(
                 r,
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8")
         return redirect(url('home'))

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -387,55 +387,69 @@ def bool2icon(value): @@
     return value
 def action_parser(user_log):
     """
     This helper will map the specified string action into translated
     fancy names with icons and links
     @param action:
     """
     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)
 #==============================================================================
 # PERMS
 #==============================================================================
 from rhodecode.lib.auth import HasPermissionAny, HasPermissionAll, \
 HasRepoPermissionAny, HasRepoPermissionAll
 #==============================================================================
 # GRAVATAR URL
 #==============================================================================

rhodecode/templates/admin/users/user_edit_my_account.html

➞

Show inline comments

@@ @@ -15,24 +15,35 @@ @@
 <%def name="main()">
 <div class="box box-left">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     <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">
 	                    <label for="username">${_('Username')}:</label>
 	                </div>
 	                <div class="input">
 	                    ${h.text('username',class_="medium")}
 	                </div>
 	             </div>
 	             <div class="field">
 	                <div class="label">
@@ @@ -77,25 +88,25 @@ @@
 	            </div>
 	    	</div>
 	    </div>
     ${h.end_form()}
     </div>
 </div>
 <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>
     <!-- end box / title -->
     <div class="table">
 	    <table>
 	    <thead>
             <tr>
             <th class="left">${_('Name')}</th>
             <th class="left">${_('revision')}</th>
             <th colspan="2" class="left">${_('action')}</th>
 	    </thead>

0 comments (0 inline, 0 general)