You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2013/05/08 00:29:02 UTC
[28/50] [abbrv] git commit: [#5773] ticket:328 fixed authored.name
and committed name
[#5773] ticket:328 fixed authored.name and committed name
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/ba100cc3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/ba100cc3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/ba100cc3
Branch: refs/heads/tv/4321
Commit: ba100cc3fa89641552ec2618d97bbe6d1cf25acd
Parents: 5a51840
Author: Yuriy Arhipov <yu...@yandex.ru>
Authored: Thu May 2 09:53:31 2013 +0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Thu May 2 20:37:06 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/widgets/repo/log.html | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ba100cc3/Allura/allura/templates/widgets/repo/log.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/repo/log.html b/Allura/allura/templates/widgets/repo/log.html
index c46b425..1d2c24d 100644
--- a/Allura/allura/templates/widgets/repo/log.html
+++ b/Allura/allura/templates/widgets/repo/log.html
@@ -43,23 +43,19 @@
<a href="{{c.app.repo.url_for_commit(tag)}}">{{tag}}</a>{% if not loop.last %} {% endif %}
{%- endfor %})
{% endif %}
- {% if commit.committed.email != commit.authored.email %}
- {% if commit.committer_url %}
+ {%if is_file%}
+ ({{commit.tree.get_obj_by_path(request.params.get('path')).size|filesizeformat}})
+ {%endif%}
by
+ {{email_gravatar(commit.authored.email, title=commit.authored.name, size=16)}} {{commit.authored.name}}{%if commit.committed.email != commit.authored.email %}, pushed by
+ {% if commit.committer_url %}
<a href="{{commit.committer_url}}">{{email_gravatar(commit.committed.email, title=commit.committed.name, size=16)}}
{{commit.committed.name}}</a>,
pushed
{% else %}
- by
- {{email_gravatar(commit.committed.email, title=commit.committed.name, size=16)}} {{commit.committed.name}},
- pushed
+ {{email_gravatar(commit.committed.email, title=commit.committed.name, size=16)}} {{commit.committed.name}}
{% endif %}
{% endif %}
- by
- {{email_gravatar(commit.authored.email, title=commit.authored.name, size=16)}} {{commit.authored.name}}
- {%if is_file%}
- ({{commit.tree.get_obj_by_path(request.params.get('path')).size|filesizeformat}})
- {%endif%}
{{g.markdown.convert(commit.message)}}
</div>
</td>