Mercurial > kallithea
diff rhodecode/templates/journal/journal_data.html @ 1052:c96651aebd8a beta
fixed journal look & feel
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Tue, 15 Feb 2011 19:45:15 +0100 |
| parents | 3fc9183e05dd |
| children | c6b811f11c94 |
line wrap: on
line diff
--- a/rhodecode/templates/journal/journal_data.html Tue Feb 15 19:09:29 2011 +0100 +++ b/rhodecode/templates/journal/journal_data.html Tue Feb 15 19:45:15 2011 +0100 @@ -4,28 +4,30 @@ %for day,items in c.journal_day_aggreagate: <div class="journal_day">${day}</div> % for user,entries in items: - <div style="padding:10px"> - <div class="gravatar"> - <img alt="gravatar" src="${h.gravatar_url(user.email,24)}"/> - </div> - <div class="journal_user">${user.name} ${user.lastname}</div> - % for entry in entries: - <div class="journal_icon"> ${h.action_parser_icon(entry)}</div> - <div class="journal_action">${h.action_parser(entry)}</div> - <div class="journal_repo"> - <span class="journal_repo_name"> - %if entry.repository is not None: - ${h.link_to(entry.repository.repo_name, - h.url('summary_home',repo_name=entry.repository.repo_name))} - %else: - ${entry.repository_name} - %endif - </span> - </div> - <div class="date"><span class="tooltip" title="${entry.action_date}">${h.age(entry.action_date)}</span></div> - %endfor - </div> - <div style="clear:both;border-bottom:1px dashed #DDD;padding:3px 3px;margin:0px 10px 0px 10px"></div> + <div class="journal_container"> + <div class="gravatar"> + <img alt="gravatar" src="${h.gravatar_url(user.email,24)}"/> + </div> + <div class="journal_user">${user.name} ${user.lastname}</div> + <div class="journal_action_container"> + % for entry in entries: + <div class="journal_icon"> ${h.action_parser_icon(entry)}</div> + <div class="journal_action">${h.action_parser(entry)[0]}</div> + <div class="journal_repo"> + <span class="journal_repo_name"> + %if entry.repository is not None: + ${h.link_to(entry.repository.repo_name, + h.url('summary_home',repo_name=entry.repository.repo_name))} + %else: + ${entry.repository_name} + %endif + </span> + </div> + <div class="journal_action_params">${h.literal(h.action_parser(entry)[1]())}</div> + <div class="date"><span class="tooltip" title="${entry.action_date}">${h.age(entry.action_date)}</span></div> + %endfor + </div> + </div> %endfor %endfor