kallithea Changeset - 5c87d5ad1b5e

Changeset - 5c87d5ad1b5e

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 15 years ago 2010-11-26 02:45:39
marcin@python-works.com

some stylings to journal

2 files changed with 13 insertions and 12 deletions:

rhodecode/lib/helpers.py

rhodecode/templates/journal.html

0 comments (0 inline, 0 general)

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -441,39 +441,40 @@ def action_parser(user_log): @@
     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 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'),
     map = {'user_deleted_repo':_('User [deleted] repository'),
            'user_created_repo':_('User [created] 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') + get_cs_links(),
            'pull':_('Pulled'),
            'started_following_repo':_('User started following repository'),
            'stopped_following_repo':_('User stopped following repository'),
            'started_following_repo':_('User [started following] repository'),
            'stopped_following_repo':_('User [stopped following] repository'),
+            }
     return map.get(action, action)
     action_str = map.get(action, action)
     return literal(action_str.replace('[', '<b>').replace(']', '</b>'))
 #==============================================================================
 # PERMS
 #==============================================================================
 from rhodecode.lib.auth import HasPermissionAny, HasPermissionAll, \
 HasRepoPermissionAny, HasRepoPermissionAll
 #==============================================================================
 # GRAVATAR URL
 #==============================================================================
 import hashlib

rhodecode/templates/journal.html

➞

Show inline comments

@@ @@ -15,25 +15,25 @@ @@
 	    <!-- box / title -->
 	    <div class="title">
 	        <h5>${_('Journal')}</h5>
 	    </div>
 	    <div>
 	    %if c.journal:
             %for entry in c.journal:
             <div style="padding:10px">
                 <div class="gravatar">
                     <img alt="gravatar" src="${h.gravatar_url(entry.user.email)}"/>
                 </div>
                 <div>${entry.user.name} ${entry.user.lastname}</div>
                 <div style="padding-left: 45px;">${h.action_parser(entry)} <br/>
+                <div style="padding-left: 45px;padding-top:5px">${h.action_parser(entry)} <br/>
                 <b>
 		        %if entry.repository:
 		          ${h.link_to(entry.repository.repo_name,
 		                      h.url('summary_home',repo_name=entry.repository.repo_name))}
 		        %else:
 		          ${entry.repository_name}
 		        %endif
                 </b> - <span title="${entry.action_date}">${h.age(entry.action_date)}</span>
                 </div>
             </div>
             <div style="clear:both;border-bottom:1px dashed #DDD;padding:3px 3px;margin:0px 10px 0px 10px"></div>
             %endfor

0 comments (0 inline, 0 general)