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/11/27 18:30:55 UTC
[01/13] git commit: [#4723] ticket:487 removed anon check in
members.html
Updated Branches:
refs/heads/master ed7b5efac -> 2a4914bba
[#4723] ticket:487 removed anon check in members.html
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/2d67b4a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/2d67b4a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/2d67b4a8
Branch: refs/heads/master
Commit: 2d67b4a83be32d68c1cbd0ecd36da9448cf8b155
Parents: dd57df9
Author: Yaroslav Sokolovsky <ya...@gmail.com>
Authored: Tue Nov 12 16:34:53 2013 +0200
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Nov 27 17:30:25 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/members.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2d67b4a8/Allura/allura/templates/members.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/members.html b/Allura/allura/templates/members.html
index 4b4240f..d455a93 100644
--- a/Allura/allura/templates/members.html
+++ b/Allura/allura/templates/members.html
@@ -34,7 +34,7 @@
{%for user in users%}
<tr>
<td>{{ user.display_name }}</td>
- <td><a href="{% if not user.is_anonymous() %}{{ user.url }}{% endif %}">{{ user.username }}</a></td>
+ <td><a href="{{ user.url }}">{{ user.username }}</a></td>
<td>{{user.roles}}</td>
</tr>
{%endfor%}
[07/13] git commit: [#4723] ticket:487 author.url anon check
Posted by tv...@apache.org.
[#4723] ticket:487 author.url anon check
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/d622d1f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/d622d1f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/d622d1f2
Branch: refs/heads/master
Commit: d622d1f2b86decd5256e92fbe2352fc8bf619003
Parents: 2d67b4a
Author: Yaroslav Sokolovsky <ya...@gmail.com>
Authored: Fri Nov 15 15:08:18 2013 +0200
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Nov 27 17:30:26 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/jinja_master/lib.html | 14 ++++++++++----
Allura/allura/templates/widgets/post_widget.html | 10 ++++++++--
Allura/allura/templates/widgets/thread_widget.html | 8 +++++++-
Allura/allura/templates/widgets/threads_table.html | 5 ++---
.../templates/blog_widgets/preview_post.html | 2 +-
.../forgeblog/templates/blog_widgets/view_post.html | 2 +-
.../templates/discussion_widgets/thread_header.html | 2 +-
.../templates/discussionforums/index.html | 2 +-
.../templates/tracker_widgets/ticket_form.html | 8 +++++++-
ForgeWiki/forgewiki/templates/wiki/page_view.html | 6 ++++--
10 files changed, 42 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d622d1f2/Allura/allura/templates/jinja_master/lib.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/lib.html b/Allura/allura/templates/jinja_master/lib.html
index 5e9902c..31dd4c8 100644
--- a/Allura/allura/templates/jinja_master/lib.html
+++ b/Allura/allura/templates/jinja_master/lib.html
@@ -60,9 +60,15 @@
{% macro user_link(email, name, size=16) -%}
{% set user = h.find_user(email) -%}
- {% if user %}<a href="{% if not user.is_anonymous() %}{{user.url()}}{% endif %}">{% endif -%}
- {{ email_gravatar(email, name, size) }} {{ name }}
- {%- if user %}</a>{% endif -%}
+ {% if user %}
+ {% if not user.is_anonymous() %}
+ <a href="{{user.url()}}">
+ {{ email_gravatar(email, name, size) }} {{ name }}
+ </a>
+ {% else %}
+ {{ email_gravatar(email, name, size) }} {{ name }}
+ {% endif %}
+ {% endif %}
{%- endmacro %}
{% macro file_field(name, label) %}
@@ -115,7 +121,7 @@
{% macro post_summary(post) %}
{% if post %}
<span>
- by <a href="{{post.author().url()}}">{{post.author().display_name}}</a>
+ by {% if not post.author().is_anonymous() %}<a href="{{post.author().url()}}">{{post.author().display_name}}</a>{% else %}{{post.author().display_name}}{% endif %}
{{abbr_date(post.timestamp)}}
</span>
{% endif %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d622d1f2/Allura/allura/templates/widgets/post_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/post_widget.html b/Allura/allura/templates/widgets/post_widget.html
index f37b676..48b769d 100644
--- a/Allura/allura/templates/widgets/post_widget.html
+++ b/Allura/allura/templates/widgets/post_widget.html
@@ -34,7 +34,7 @@
<p class="gravatar">
{% set size = value.parent and 32 or 48 %}
{{lib.gravatar(value.author(), size=size)}}<br>
- <small><a href="{{value.author().url()}}">{{value.author().display_name}}</a></small>
+ <small>{% if not value.author().is_anonymous() %}<a href="{{value.author().url()}}">{{value.author().display_name}}</a>{% else %}{{value.author().display_name}}{% endif %}</small>
<br>
<small>{{lib.abbr_date(value.timestamp)}}</small>
</p>
@@ -125,7 +125,13 @@
<div class="grid-2 tcenter">
<p class="gravatar">
{{lib.gravatar(c.user, size=32)}}<br>
- <small><a href="{% if not c.user.is_anonymous() %}{{c.user.url()}}{% endif %}">{{c.user.display_name}}</a></small>
+ <small>
+ {% if c.user.is_anonymous() %}
+ {% c.user.display_name %}
+ {% else %}
+ <a href="{{c.user.url()}}">{{c.user.display_name}}</a>
+ {% endif %}
+ </small>
</p>
</div>
<div class="grid-14" style="width: {{indent <= 40 and 625-indent*10 or 225}}px">
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d622d1f2/Allura/allura/templates/widgets/thread_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/thread_widget.html b/Allura/allura/templates/widgets/thread_widget.html
index 8590d54..d9d50e0 100644
--- a/Allura/allura/templates/widgets/thread_widget.html
+++ b/Allura/allura/templates/widgets/thread_widget.html
@@ -56,7 +56,13 @@
<div class="grid-2 tcenter">
<p class="gravatar">
{{lib.gravatar(c.user, size=48)}}<br>
- <small><a href="{% if not c.user.is_anonymous() %}{{c.user.url()}}{% endif %}">{{c.user.display_name}}</a></small>
+ <small>
+ {% if c.user.is_anonymous() %}
+ {% c.user.display_name %}
+ {% else %}
+ <a href="{{c.user.url()}}">{{c.user.display_name}}</a>
+ {% endif %}
+ </small>
</p>
</div>
<div class="grid-17">
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d622d1f2/Allura/allura/templates/widgets/threads_table.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/threads_table.html b/Allura/allura/templates/widgets/threads_table.html
index bfc0088..16e25f0 100644
--- a/Allura/allura/templates/widgets/threads_table.html
+++ b/Allura/allura/templates/widgets/threads_table.html
@@ -51,8 +51,7 @@
<a href="{{thread.url()}}" class="btn ico"><b data-icon="{{g.icons['pin'].char}}" class="ico {{g.icons['pin'].css}}"></b> <span>Sticky</span></a>
{% endif %}
<h3><a href="{{thread.url()}}">{{thread.subject and h.text.truncate(thread.subject, 72) or '(no subject)'}}</a></h3>
-
- <span>By <a href="{{author.url()}}">{{author.display_name}}</a></span> on {{thread.first_post.timestamp.strftime('%a %b %d, %Y %I:%M %p')}}
+ <span>By {% if not author.is_anonymous() %}<a href="{{author.url()}}">{{author.display_name}}</a>{% else %}{{author.display_name}}{% endif %}</span> on {{thread.first_post.timestamp.strftime('%a %b %d, %Y %I:%M %p')}}
</td>
{% endif %}
<td>{{thread.num_replies}}</td>
@@ -63,7 +62,7 @@
{% set author = thread.last_post.author() %}
<td>
<p class="gravatar sm">
- By {{lib.gravatar(author, size=16)}}<a href="{{author.url()}}">{{author.display_name}}</a><br />on {{thread.last_post.timestamp.strftime('%a %b %d, %Y %I:%M %p')}}
+ By {{lib.gravatar(author, size=16)}}{% if not author.is_anonymous() %}<a href="{{author.url()}}">{{author.display_name}}</a>{% else %}{{author.display_name}}{% endif %}<br />on {{thread.last_post.timestamp.strftime('%a %b %d, %Y %I:%M %p')}}
</p>
</td>
{% endif %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d622d1f2/ForgeBlog/forgeblog/templates/blog_widgets/preview_post.html
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/templates/blog_widgets/preview_post.html b/ForgeBlog/forgeblog/templates/blog_widgets/preview_post.html
index c3de748..d310189 100644
--- a/ForgeBlog/forgeblog/templates/blog_widgets/preview_post.html
+++ b/ForgeBlog/forgeblog/templates/blog_widgets/preview_post.html
@@ -23,7 +23,7 @@
</h3>
{{value.html_text_preview|safe}}
<em class="grid-19">
- Posted by <a href="{{value.author().url()}}">{{lib.gravatar_or_name(value.author(), size=16)}}</a> {{lib.abbr_date(value.timestamp)}}
+ Posted by {% if not value.author().is_anonymous() %}<a href="{{value.author().url()}}">{{lib.gravatar_or_name(value.author(), size=16)}}</a>{% else %}{{lib.gravatar_or_name(value.author(), size=16)}}{% endif%} {{lib.abbr_date(value.timestamp)}}
{% if value.state != 'published' %}
<span>| {{value.state.capitalize()}}</span>
{% endif %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d622d1f2/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html b/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html
index 27d2ac6..ee4a878 100644
--- a/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html
+++ b/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html
@@ -21,7 +21,7 @@
{{value.html_text|safe}}
{{lib.related_artifacts(value)}}
<em class="grid-19">
- Posted by <a href="{{base_post.author().url()}}">{{lib.gravatar_or_name(base_post.author(), size=16)}}</a> {{lib.abbr_date(value.timestamp)}}
+ Posted by {% if not base_post.author().is_anonymous() %}<a href="{{base_post.author().url()}}">{{lib.gravatar_or_name(base_post.author(), size=16)}}</a> {% else %}{{lib.gravatar_or_name(base_post.author(), size=16)}}{% endif%} {{lib.abbr_date(value.timestamp)}}
{% if value.state != 'published' %}
<span>| {{value.state.capitalize()}}</span>
{% endif %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d622d1f2/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html b/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html
index c500794..be18f82 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html
@@ -20,7 +20,7 @@
<div class="grid-5"><label>Forum:</label> <a href="{{value.discussion.url()}}">{{value.discussion.name}}</a></div>
{% if value.first_post %}
- <div class="grid-5"><label>Creator:</label> <a href="{{value.first_post.author().url()}}">{{value.first_post.author().display_name}}</a></div>
+ <div class="grid-5"><label>Creator:</label> {% if not value.first_post.author().is_anonymous() %}<a href="{{value.first_post.author().url()}}">{{value.first_post.author().display_name}}</a>{% else %}{{value.first_post.author().display_name}}{% endif %}</div>
<div class="grid-4"><label>Created:</label> {{lib.abbr_date(value.first_post.timestamp)}}</div>
{% endif %}
<div class="grid-5"><label>Updated:</label> {{lib.abbr_date(value.mod_date)}}</div>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d622d1f2/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html b/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
index 9103386..ba9a6d7 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
@@ -61,7 +61,7 @@
<td>
{% if forum.last_post %}
<a href="{{forum.last_post.url_paginated()}}">{{h.text.truncate(h.really_unicode(forum.last_post.subject or '(no subject)'),75)}}</a><br>
- by <a href="{{forum.last_post.author().url()}}">{{forum.last_post.author().display_name}}</a><br>
+ by {% if not %}<a href="{{forum.last_post.author().url()}}">{{forum.last_post.author().display_name}}</a>{% else %}{{forum.last_post.author().display_name}}{% endif %}<br>
{{h.ago(forum.last_post.mod_date)}}
{% else %}
No posts yet
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d622d1f2/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
index 24efcb6..e94073d 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
@@ -114,7 +114,13 @@
<div class="grid-2 tcenter">
<p class="gravatar">
{{lib.gravatar(c.user, size=48)}}<br>
- <small><a href="{% if not c.user.is_anonymous() %}{{c.user.url()}}{% endif %}">{{c.user.display_name}}</a></small>
+ <small>
+ {% if c.user.is_anonymous() %}
+ {% c.user.display_name %}
+ {% else %}
+ <a href="{{c.user.url()}}">{{c.user.display_name}}</a>
+ {% endif %}
+ </small>
</p>
</div>
<div class="grid-16">
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d622d1f2/ForgeWiki/forgewiki/templates/wiki/page_view.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_view.html b/ForgeWiki/forgewiki/templates/wiki/page_view.html
index 9c2de74..408fdf6 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_view.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_view.html
@@ -73,9 +73,11 @@
<div class="grid-9 gravatar sm">
<label class="simple">Authors: </label>
{% for author in page.authors() %}
- <a href="{{author.url()}}">
+ {% if not author.is_anonymous() %}
+ <a href="{{author.url()}}">{{lib.gravatar(author, size=16)}}</a>
+ {% else %}
{{lib.gravatar(author, size=16)}}
- </a>
+ {% endif %}
{% endfor %}
</div>
{% if page.attachments %}
[10/13] git commit: [#4723] ticket:500 fixed templates errors
Posted by tv...@apache.org.
[#4723] ticket:500 fixed templates errors
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/121c2c60
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/121c2c60
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/121c2c60
Branch: refs/heads/master
Commit: 121c2c606b078c7633f57f029f084316bf7ad43f
Parents: 90be4d3
Author: Yaroslav Sokolovsky <ya...@gmail.com>
Authored: Mon Nov 25 15:53:29 2013 +0200
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Nov 27 17:30:26 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/jinja_master/lib.html | 2 +-
ForgeBlog/forgeblog/templates/blog_widgets/view_post.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/121c2c60/Allura/allura/templates/jinja_master/lib.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/lib.html b/Allura/allura/templates/jinja_master/lib.html
index bbeddf0..ea6129b 100644
--- a/Allura/allura/templates/jinja_master/lib.html
+++ b/Allura/allura/templates/jinja_master/lib.html
@@ -139,7 +139,7 @@
{% macro post_summary(post) %}
{% if post %}
<span>
- by {{lib.user_link(post.author(), avatar=False)}}
+ by {{user_link(post.author(), avatar=False)}}
{{abbr_date(post.timestamp)}}
</span>
{% endif %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/121c2c60/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html b/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html
index 601c562..bcc49c4 100644
--- a/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html
+++ b/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html
@@ -21,7 +21,7 @@
{{value.html_text|safe}}
{{lib.related_artifacts(value)}}
<em class="grid-19">
- Posted by {{lib.user_link(value.author(), avatar=True)}} {{lib.abbr_date(value.timestamp)}}
+ Posted by {{lib.user_link(base_post.author(), avatar=True)}} {{lib.abbr_date(value.timestamp)}}
{% if value.state != 'published' %}
<span>| {{value.state.capitalize()}}</span>
{% endif %}
[02/13] git commit: [#4723] ticket:487 added check to reply form
Posted by tv...@apache.org.
[#4723] ticket:487 added check to reply form
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/dd57df9d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/dd57df9d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/dd57df9d
Branch: refs/heads/master
Commit: dd57df9d0100da1c67de69bd9565a9ecdc357a6f
Parents: 7cddb02
Author: Yaroslav Sokolovsky <ya...@gmail.com>
Authored: Tue Nov 12 16:02:48 2013 +0200
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Nov 27 17:30:25 2013 +0000
----------------------------------------------------------------------
.../forgetracker/templates/tracker_widgets/ticket_form.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/dd57df9d/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
index fc7057e..24efcb6 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
@@ -114,7 +114,7 @@
<div class="grid-2 tcenter">
<p class="gravatar">
{{lib.gravatar(c.user, size=48)}}<br>
- <small><a href="{% if not c.user.is_anonymous() %}{{c.user.url()}}{% enif %}">{{c.user.display_name}}</a></small>
+ <small><a href="{% if not c.user.is_anonymous() %}{{c.user.url()}}{% endif %}">{{c.user.display_name}}</a></small>
</p>
</div>
<div class="grid-16">
[09/13] git commit: [#4723] ticket:500 fixed test_blank_user
Posted by tv...@apache.org.
[#4723] ticket:500 fixed test_blank_user
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/008346fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/008346fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/008346fe
Branch: refs/heads/master
Commit: 008346fe09ab96738ad90b30ddb15e0cd6e6814f
Parents: 121c2c6
Author: Yaroslav Sokolovsky <ya...@gmail.com>
Authored: Mon Nov 25 16:51:05 2013 +0200
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Nov 27 17:30:26 2013 +0000
----------------------------------------------------------------------
ForgeTracker/forgetracker/tests/functional/test_root.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/008346fe/ForgeTracker/forgetracker/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/functional/test_root.py b/ForgeTracker/forgetracker/tests/functional/test_root.py
index 5a8fc15..757eb71 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -2384,7 +2384,7 @@ class TestCustomUserField(TrackerTestController):
ticket_view = self.new_ticket(summary='test custom fields', **kw).follow()
# summary header shows 'nobody'
assert ticket_view.html.findAll('label', 'simple',
- text='Code Review:')[1].parent.parent.text == 'Code Review:nobody'
+ text='Code Review:')[1].parent.parent.text == 'Code Review:'
# form input is blank
select = ticket_view.html.find('select',
dict(name='ticket_form.custom_fields._code_review'))
[06/13] git commit: [#4723] ticket:500 add fix errors to pass tests
Posted by tv...@apache.org.
[#4723] ticket:500 add fix errors to pass tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/90be4d3f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/90be4d3f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/90be4d3f
Branch: refs/heads/master
Commit: 90be4d3f9e41e6adc8366e4341e78d7ab9dbb3c5
Parents: fce1905
Author: Yaroslav Sokolovsky <ya...@gmail.com>
Authored: Mon Nov 25 15:10:35 2013 +0200
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Nov 27 17:30:26 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/jinja_master/lib.html | 2 +-
.../forgediscussion/templates/discussionforums/index.html | 1 +
ForgeWiki/forgewiki/templates/wiki/page_view.html | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/90be4d3f/Allura/allura/templates/jinja_master/lib.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/lib.html b/Allura/allura/templates/jinja_master/lib.html
index de4e724..bbeddf0 100644
--- a/Allura/allura/templates/jinja_master/lib.html
+++ b/Allura/allura/templates/jinja_master/lib.html
@@ -76,7 +76,7 @@
{% if not user.is_anonymous() %}
{% if avatar %}
<a href="{{user.url()}}">
- {{ lib.gravatar_or_name(user, size) }}
+ {{ gravatar_or_name(user, size) }}
</a>
{% else %}
<a href="{{user.url()}}">
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/90be4d3f/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html b/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
index f13ab8b..2f207ed 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
@@ -17,6 +17,7 @@
under the License.
-#}
{% extends g.theme.master %}
+{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
{% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / Forums{% endblock %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/90be4d3f/ForgeWiki/forgewiki/templates/wiki/page_view.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_view.html b/ForgeWiki/forgewiki/templates/wiki/page_view.html
index da51012..8369b9c 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_view.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_view.html
@@ -18,6 +18,7 @@
-#}
{% extends 'forgewiki:templates/wiki/master.html' %}
{% do g.register_forge_css('css/forge/hilite.css', compress=False) %}
+{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
{% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / {{page.title}}{% endblock %}
[12/13] git commit: [#4723] Restore nobody in ticket header
Posted by tv...@apache.org.
[#4723] Restore nobody in ticket header
Also remove unnecessary kwargs in macro calls.
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/2a4914bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/2a4914bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/2a4914bb
Branch: refs/heads/master
Commit: 2a4914bba5077eb08a39addc55a2d0ff065bbf5f
Parents: 4b015dd
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Wed Nov 27 17:29:42 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Nov 27 17:30:27 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/jinja_master/lib.html | 2 +-
.../allura/templates/widgets/post_widget.html | 4 +--
.../allura/templates/widgets/thread_widget.html | 2 +-
.../allura/templates/widgets/threads_table.html | 34 ++++++++++----------
.../discussion_widgets/thread_header.html | 2 +-
.../templates/discussionforums/index.html | 2 +-
.../forgetracker/templates/tracker/ticket.html | 6 +++-
.../templates/tracker_widgets/ticket_form.html | 6 ++--
.../forgetracker/tests/functional/test_root.py | 2 +-
9 files changed, 32 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2a4914bb/Allura/allura/templates/jinja_master/lib.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/lib.html b/Allura/allura/templates/jinja_master/lib.html
index 94fa653..8f6ddf2 100644
--- a/Allura/allura/templates/jinja_master/lib.html
+++ b/Allura/allura/templates/jinja_master/lib.html
@@ -137,7 +137,7 @@
{% macro post_summary(post) %}
{% if post %}
<span>
- by {{user_link(post.author(), avatar=False)}}
+ by {{user_link(post.author())}}
{{abbr_date(post.timestamp)}}
</span>
{% endif %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2a4914bb/Allura/allura/templates/widgets/post_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/post_widget.html b/Allura/allura/templates/widgets/post_widget.html
index 819796f..2aebd44 100644
--- a/Allura/allura/templates/widgets/post_widget.html
+++ b/Allura/allura/templates/widgets/post_widget.html
@@ -35,7 +35,7 @@
{% set size = value.parent and 32 or 48 %}
{{lib.gravatar(value.author(), size=size)}}<br>
<small>
- {{lib.user_link(value.author(), avatar=False)}}
+ {{lib.user_link(value.author())}}
</small>
<br>
<small>{{lib.abbr_date(value.timestamp)}}</small>
@@ -128,7 +128,7 @@
<p class="gravatar">
{{lib.gravatar(c.user, size=32)}}<br>
<small>
- {{lib.user_link(c.user, avatar=False)}}
+ {{lib.user_link(c.user)}}
</small>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2a4914bb/Allura/allura/templates/widgets/thread_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/thread_widget.html b/Allura/allura/templates/widgets/thread_widget.html
index c60845f..863fd8f 100644
--- a/Allura/allura/templates/widgets/thread_widget.html
+++ b/Allura/allura/templates/widgets/thread_widget.html
@@ -57,7 +57,7 @@
<p class="gravatar">
{{lib.gravatar(c.user, size=48)}}<br>
<small>
- {{lib.user_link(c.user, avatar=False)}}
+ {{lib.user_link(c.user)}}
</small>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2a4914bb/Allura/allura/templates/widgets/threads_table.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/threads_table.html b/Allura/allura/templates/widgets/threads_table.html
index 7375d9b..301b93b 100644
--- a/Allura/allura/templates/widgets/threads_table.html
+++ b/Allura/allura/templates/widgets/threads_table.html
@@ -20,16 +20,16 @@
<div{{ {'id': div_id}|xmlattr }}>
<table class="forum-list clear">
- <thead>
- <tr>
- <th><span class="ico ico-mail" title="Subscriptions" data-icon="M"></span></th>
- <th class="topic">Topic</th>
- <th>Posts</th>
- <th>Views</th>
- <th>Last Post</th>
- </tr>
- </thead>
- <tbody class="forum-list">
+ <thead>
+ <tr>
+ <th><span class="ico ico-mail" title="Subscriptions" data-icon="M"></span></th>
+ <th class="topic">Topic</th>
+ <th>Posts</th>
+ <th>Views</th>
+ <th>Last Post</th>
+ </tr>
+ </thead>
+ <tbody class="forum-list">
{% for thread in value %}
<tr>
<td>
@@ -51,10 +51,10 @@
<a href="{{thread.url()}}" class="btn ico"><b data-icon="{{g.icons['pin'].char}}" class="ico {{g.icons['pin'].css}}"></b> <span>Sticky</span></a>
{% endif %}
<h3><a href="{{thread.url()}}">{{thread.subject and h.text.truncate(thread.subject, 72) or '(no subject)'}}</a></h3>
- <span>By {{lib.user_link(author, avatar=False)}}</span> on {{thread.first_post.timestamp.strftime('%a %b %d, %Y %I:%M %p')}}
- </td>
+ <span>By {{lib.user_link(author)}}</span> on {{thread.first_post.timestamp.strftime('%a %b %d, %Y %I:%M %p')}}
+ </td>
{% endif %}
- <td>{{thread.num_replies}}</td>
+ <td>{{thread.num_replies}}</td>
<td>{{thread.num_views}}</td>
{% if not thread.last_post %}
<td> </td>
@@ -62,13 +62,13 @@
{% set author = thread.last_post.author() %}
<td>
<p class="gravatar sm">
- By {{lib.gravatar(author, size=16)}} {{lib.user_link(author, avatar=False)}}<br />on {{thread.last_post.timestamp.strftime('%a %b %d, %Y %I:%M %p')}}
+ By {{lib.gravatar(author, size=16)}} {{lib.user_link(author)}}<br />on {{thread.last_post.timestamp.strftime('%a %b %d, %Y %I:%M %p')}}
</p>
- </td>
+ </td>
{% endif %}
- </tr>
+ </tr>
{% endfor %}
- </tbody>
+ </tbody>
</table>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2a4914bb/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html b/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html
index ee7a161..9a988df 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html
@@ -20,7 +20,7 @@
<div class="grid-5"><label>Forum:</label> <a href="{{value.discussion.url()}}">{{value.discussion.name}}</a></div>
{% if value.first_post %}
- <div class="grid-5"><label>Creator:</label> {{lib.user_link(value.first_post.author(), avatar=False)}}</div>
+ <div class="grid-5"><label>Creator:</label> {{lib.user_link(value.first_post.author())}}</div>
<div class="grid-4"><label>Created:</label> {{lib.abbr_date(value.first_post.timestamp)}}</div>
{% endif %}
<div class="grid-5"><label>Updated:</label> {{lib.abbr_date(value.mod_date)}}</div>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2a4914bb/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html b/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
index 2f207ed..941975a 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
@@ -62,7 +62,7 @@
<td>
{% if forum.last_post %}
<a href="{{forum.last_post.url_paginated()}}">{{h.text.truncate(h.really_unicode(forum.last_post.subject or '(no subject)'),75)}}</a><br>
- by {{lib.user_link(forum.last_post.author(), avatar=False)}}<br>
+ by {{lib.user_link(forum.last_post.author())}}<br>
{{h.ago(forum.last_post.mod_date)}}
{% else %}
No posts yet
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2a4914bb/ForgeTracker/forgetracker/templates/tracker/ticket.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/ticket.html b/ForgeTracker/forgetracker/templates/tracker/ticket.html
index 1659e82..508c2c6 100644
--- a/ForgeTracker/forgetracker/templates/tracker/ticket.html
+++ b/ForgeTracker/forgetracker/templates/tracker/ticket.html
@@ -105,7 +105,11 @@
<label class="simple">{{field.label}}:</label>
{% if field.type == 'user' %}
{% set user = ticket.get_custom_user(field.name) %}
- {{lib.user_link(user, avatar=False)}}
+ {% if user and not user.is_anonymous() %}
+ {{lib.user_link(user, avatar=False)}}
+ {% else %}
+ nobody
+ {% endif %}
{% elif field.type == 'milestone' %}
<a href="{{c.app.url}}{{field.name[1:]}}/{{ticket.custom_fields[field.name]}}">{{ticket.custom_fields[field.name]}}</a>
{% else %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2a4914bb/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
index b60cc35..8676159 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
@@ -51,7 +51,7 @@
</div>
<div class="grid-6">
{{widget.display_field_by_name('private')}}
- </div>
+ </div>
<div style="clear:both"> </div>
<div class="grid-6">
<label class="simple">Updated:</label>
@@ -74,7 +74,7 @@
{% if ticket %}
<a href="{{ticket.reported_by.url()}}">{{ticket.reported_by.display_name}}</a>
{% else %}
- {{lib.user_link(c.user, avatar=False)}}
+ {{lib.user_link(c.user)}}
{% endif %}
</div>
<div style="clear:both"> </div>
@@ -113,7 +113,7 @@
<p class="gravatar">
{{lib.gravatar(c.user, size=48)}}<br>
<small>
- {{lib.user_link(c.user, avatar=False)}}
+ {{lib.user_link(c.user)}}
</small>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2a4914bb/ForgeTracker/forgetracker/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/functional/test_root.py b/ForgeTracker/forgetracker/tests/functional/test_root.py
index 757eb71..5a8fc15 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -2384,7 +2384,7 @@ class TestCustomUserField(TrackerTestController):
ticket_view = self.new_ticket(summary='test custom fields', **kw).follow()
# summary header shows 'nobody'
assert ticket_view.html.findAll('label', 'simple',
- text='Code Review:')[1].parent.parent.text == 'Code Review:'
+ text='Code Review:')[1].parent.parent.text == 'Code Review:nobody'
# form input is blank
select = ticket_view.html.find('select',
dict(name='ticket_form.custom_fields._code_review'))
[03/13] git commit: [#4723] ticket:487 replaced first matches
Posted by tv...@apache.org.
[#4723] ticket:487 replaced first matches
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/7cddb021
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/7cddb021
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/7cddb021
Branch: refs/heads/master
Commit: 7cddb021a422066ab9e79024bab6b088ff7cbad3
Parents: ed7b5ef
Author: coldmind <so...@yandex.ru>
Authored: Tue Nov 12 14:30:44 2013 +0200
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Nov 27 17:30:25 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/jinja_master/lib.html | 2 +-
Allura/allura/templates/members.html | 2 +-
Allura/allura/templates/widgets/post_widget.html | 2 +-
Allura/allura/templates/widgets/thread_widget.html | 2 +-
ForgeTracker/forgetracker/templates/tracker/ticket.html | 2 +-
.../forgetracker/templates/tracker_widgets/ticket_form.html | 8 +++++---
6 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7cddb021/Allura/allura/templates/jinja_master/lib.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/lib.html b/Allura/allura/templates/jinja_master/lib.html
index ffe3dfd..5e9902c 100644
--- a/Allura/allura/templates/jinja_master/lib.html
+++ b/Allura/allura/templates/jinja_master/lib.html
@@ -60,7 +60,7 @@
{% macro user_link(email, name, size=16) -%}
{% set user = h.find_user(email) -%}
- {% if user %}<a href="{{user.url()}}">{% endif -%}
+ {% if user %}<a href="{% if not user.is_anonymous() %}{{user.url()}}{% endif %}">{% endif -%}
{{ email_gravatar(email, name, size) }} {{ name }}
{%- if user %}</a>{% endif -%}
{%- endmacro %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7cddb021/Allura/allura/templates/members.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/members.html b/Allura/allura/templates/members.html
index d455a93..4b4240f 100644
--- a/Allura/allura/templates/members.html
+++ b/Allura/allura/templates/members.html
@@ -34,7 +34,7 @@
{%for user in users%}
<tr>
<td>{{ user.display_name }}</td>
- <td><a href="{{ user.url }}">{{ user.username }}</a></td>
+ <td><a href="{% if not user.is_anonymous() %}{{ user.url }}{% endif %}">{{ user.username }}</a></td>
<td>{{user.roles}}</td>
</tr>
{%endfor%}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7cddb021/Allura/allura/templates/widgets/post_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/post_widget.html b/Allura/allura/templates/widgets/post_widget.html
index 5cc876b..f37b676 100644
--- a/Allura/allura/templates/widgets/post_widget.html
+++ b/Allura/allura/templates/widgets/post_widget.html
@@ -125,7 +125,7 @@
<div class="grid-2 tcenter">
<p class="gravatar">
{{lib.gravatar(c.user, size=32)}}<br>
- <small><a href="{{c.user.url()}}">{{c.user.display_name}}</a></small>
+ <small><a href="{% if not c.user.is_anonymous() %}{{c.user.url()}}{% endif %}">{{c.user.display_name}}</a></small>
</p>
</div>
<div class="grid-14" style="width: {{indent <= 40 and 625-indent*10 or 225}}px">
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7cddb021/Allura/allura/templates/widgets/thread_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/thread_widget.html b/Allura/allura/templates/widgets/thread_widget.html
index 90b47ce..8590d54 100644
--- a/Allura/allura/templates/widgets/thread_widget.html
+++ b/Allura/allura/templates/widgets/thread_widget.html
@@ -56,7 +56,7 @@
<div class="grid-2 tcenter">
<p class="gravatar">
{{lib.gravatar(c.user, size=48)}}<br>
- <small><a href="{{c.user.url()}}">{{c.user.display_name}}</a></small>
+ <small><a href="{% if not c.user.is_anonymous() %}{{c.user.url()}}{% endif %}">{{c.user.display_name}}</a></small>
</p>
</div>
<div class="grid-17">
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7cddb021/ForgeTracker/forgetracker/templates/tracker/ticket.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/ticket.html b/ForgeTracker/forgetracker/templates/tracker/ticket.html
index 34814f2..1fd159e 100644
--- a/ForgeTracker/forgetracker/templates/tracker/ticket.html
+++ b/ForgeTracker/forgetracker/templates/tracker/ticket.html
@@ -105,7 +105,7 @@
<label class="simple">{{field.label}}:</label>
{% if field.type == 'user' %}
{% set user = ticket.get_custom_user(field.name) %}
- {% if user %}
+ {% if user and not user.is_anonymous() %}
<a href="{{user.url()}}">{{user.get_pref('display_name')}}</a>
{% else %}
nobody
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7cddb021/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
index 5741603..fc7057e 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
@@ -74,7 +74,9 @@
{% if ticket %}
<a href="{{ticket.reported_by.url()}}">{{ticket.reported_by.display_name}}</a>
{% else %}
- <a href="{{c.user.url()}}">{{c.user.display_name}}</a>
+ {% if not c.user.is_anonymous() %}
+ <a href="{{c.user.url()}}">{{c.user.display_name}}</a>
+ {% endif %}
{% endif %}
</div>
<div style="clear:both"> </div>
@@ -111,8 +113,8 @@
<div class="reply discussion-post" style="position:relative;{% if not show_comment %} display:none{% endif %}">
<div class="grid-2 tcenter">
<p class="gravatar">
- {{lib.gravatar(c.user, size=48)}}<br>
- <small><a href="{{c.user.url()}}">{{c.user.display_name}}</a></small>
+ {{lib.gravatar(c.user, size=48)}}<br>
+ <small><a href="{% if not c.user.is_anonymous() %}{{c.user.url()}}{% enif %}">{{c.user.display_name}}</a></small>
</p>
</div>
<div class="grid-16">
[04/13] git commit: [#4723] ticket:500 rename user_link macro to
email_link
Posted by tv...@apache.org.
[#4723] ticket:500 rename user_link macro to email_link
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/2c693195
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/2c693195
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/2c693195
Branch: refs/heads/master
Commit: 2c693195aaa0e7fa45e3c0db6e513ef2f90b0458
Parents: a632bb3
Author: Yaroslav Sokolovsky <ya...@gmail.com>
Authored: Mon Nov 25 13:24:33 2013 +0200
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Nov 27 17:30:26 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/jinja_master/lib.html | 2 +-
Allura/allura/templates/widgets/repo/log.html | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2c693195/Allura/allura/templates/jinja_master/lib.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/lib.html b/Allura/allura/templates/jinja_master/lib.html
index 31dd4c8..657d1ff 100644
--- a/Allura/allura/templates/jinja_master/lib.html
+++ b/Allura/allura/templates/jinja_master/lib.html
@@ -58,7 +58,7 @@
{% endif %}
{%- endmacro %}
-{% macro user_link(email, name, size=16) -%}
+{% macro email_link(email, name, size=16) -%}
{% set user = h.find_user(email) -%}
{% if user %}
{% if not user.is_anonymous() %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2c693195/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 0359a8f..39e4dc0 100644
--- a/Allura/allura/templates/widgets/repo/log.html
+++ b/Allura/allura/templates/widgets/repo/log.html
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-#}
-{% from 'allura:templates/jinja_master/lib.html' import user_link, abbr_date with context %}
+{% from 'allura:templates/jinja_master/lib.html' import email_link, abbr_date with context %}
{% set app = app or c.app %}
{% set path = request.params.get('path', '')%}
<div>
@@ -50,9 +50,9 @@
{%if is_file %}
({{ commit.size|filesizeformat if commit.size else 'None' }})
{% endif %}
- by {{ user_link(commit.authored.email, commit.authored.name) }}
+ by {{ email_link(commit.authored.email, commit.authored.name) }}
{%- if commit.committed.email != commit.authored.email %},
- pushed by {{ user_link(commit.committed.email, commit.committed.name) }}
+ pushed by {{ email_link(commit.committed.email, commit.committed.name) }}
{% endif %}
{{g.markdown_commit.convert(commit.message)}}
{% if commit.rename_details %}
[11/13] git commit: [#4723] ticket:487 fixed one more error in
template syntax
Posted by tv...@apache.org.
[#4723] ticket:487 fixed one more error in template syntax
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/a632bb31
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/a632bb31
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/a632bb31
Branch: refs/heads/master
Commit: a632bb318b9ef0003c12025c25177fcbafa6f620
Parents: 8f20b00
Author: Yaroslav Sokolovsky <ya...@gmail.com>
Authored: Fri Nov 15 16:15:25 2013 +0200
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Nov 27 17:30:26 2013 +0000
----------------------------------------------------------------------
.../forgediscussion/templates/discussionforums/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/a632bb31/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html b/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
index ba9a6d7..17d2e14 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
@@ -61,7 +61,7 @@
<td>
{% if forum.last_post %}
<a href="{{forum.last_post.url_paginated()}}">{{h.text.truncate(h.really_unicode(forum.last_post.subject or '(no subject)'),75)}}</a><br>
- by {% if not %}<a href="{{forum.last_post.author().url()}}">{{forum.last_post.author().display_name}}</a>{% else %}{{forum.last_post.author().display_name}}{% endif %}<br>
+ by {% if not forum.last_post.author().is_anonymous() %}<a href="{{forum.last_post.author().url()}}">{{forum.last_post.author().display_name}}</a>{% else %}{{forum.last_post.author().display_name}}{% endif %}<br>
{{h.ago(forum.last_post.mod_date)}}
{% else %}
No posts yet
[13/13] git commit: [#4723] ticket:500 Minor code style fix
Posted by tv...@apache.org.
[#4723] ticket:500 Minor code style fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/4b015dd3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/4b015dd3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/4b015dd3
Branch: refs/heads/master
Commit: 4b015dd3268862921dc8dcbf1e60aa27bc18df02
Parents: 008346f
Author: Igor Bondarenko <je...@gmail.com>
Authored: Wed Nov 27 10:49:06 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Nov 27 17:30:27 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/jinja_master/lib.html | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4b015dd3/Allura/allura/templates/jinja_master/lib.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/lib.html b/Allura/allura/templates/jinja_master/lib.html
index ea6129b..94fa653 100644
--- a/Allura/allura/templates/jinja_master/lib.html
+++ b/Allura/allura/templates/jinja_master/lib.html
@@ -74,15 +74,13 @@
{% macro user_link(user, avatar=False, size=16) -%}
{% if user %}
{% if not user.is_anonymous() %}
- {% if avatar %}
- <a href="{{user.url()}}">
+ <a href="{{user.url()}}">
+ {% if avatar %}
{{ gravatar_or_name(user, size) }}
- </a>
- {% else %}
- <a href="{{user.url()}}">
+ {% else %}
{{ h.really_unicode(user.display_name) }}
- </a>
- {% endif %}
+ {% endif %}
+ </a>
{% else %}
{{ h.really_unicode(user.display_name) }}
{% endif %}
[05/13] git commit: [#4723] ticket:500 add user_link macro and use it
instead of direct check in templates
Posted by tv...@apache.org.
[#4723] ticket:500 add user_link macro and use it instead of direct check in templates
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/fce1905d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/fce1905d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/fce1905d
Branch: refs/heads/master
Commit: fce1905ded26267cccee207690872cb4abf734e0
Parents: 2c69319
Author: Yaroslav Sokolovsky <ya...@gmail.com>
Authored: Mon Nov 25 14:32:14 2013 +0200
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Nov 27 17:30:26 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/jinja_master/lib.html | 20 +++++++++++++++++++-
.../allura/templates/widgets/post_widget.html | 10 ++++------
.../allura/templates/widgets/thread_widget.html | 6 +-----
.../allura/templates/widgets/threads_table.html | 4 ++--
.../templates/blog_widgets/preview_post.html | 2 +-
.../templates/blog_widgets/view_post.html | 2 +-
.../discussion_widgets/thread_header.html | 2 +-
.../templates/discussionforums/index.html | 2 +-
.../forgetracker/templates/tracker/ticket.html | 6 +-----
.../templates/tracker_widgets/ticket_form.html | 12 ++----------
.../forgewiki/templates/wiki/page_view.html | 6 +-----
11 files changed, 34 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/fce1905d/Allura/allura/templates/jinja_master/lib.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/lib.html b/Allura/allura/templates/jinja_master/lib.html
index 657d1ff..de4e724 100644
--- a/Allura/allura/templates/jinja_master/lib.html
+++ b/Allura/allura/templates/jinja_master/lib.html
@@ -71,6 +71,24 @@
{% endif %}
{%- endmacro %}
+{% macro user_link(user, avatar=False, size=16) -%}
+ {% if user %}
+ {% if not user.is_anonymous() %}
+ {% if avatar %}
+ <a href="{{user.url()}}">
+ {{ lib.gravatar_or_name(user, size) }}
+ </a>
+ {% else %}
+ <a href="{{user.url()}}">
+ {{ h.really_unicode(user.display_name) }}
+ </a>
+ {% endif %}
+ {% else %}
+ {{ h.really_unicode(user.display_name) }}
+ {% endif %}
+ {% endif %}
+{%- endmacro %}
+
{% macro file_field(name, label) %}
{% if label %}
<label for="{{name}}">{{label}}</label>
@@ -121,7 +139,7 @@
{% macro post_summary(post) %}
{% if post %}
<span>
- by {% if not post.author().is_anonymous() %}<a href="{{post.author().url()}}">{{post.author().display_name}}</a>{% else %}{{post.author().display_name}}{% endif %}
+ by {{lib.user_link(post.author(), avatar=False)}}
{{abbr_date(post.timestamp)}}
</span>
{% endif %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/fce1905d/Allura/allura/templates/widgets/post_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/post_widget.html b/Allura/allura/templates/widgets/post_widget.html
index b73341d..819796f 100644
--- a/Allura/allura/templates/widgets/post_widget.html
+++ b/Allura/allura/templates/widgets/post_widget.html
@@ -34,7 +34,9 @@
<p class="gravatar">
{% set size = value.parent and 32 or 48 %}
{{lib.gravatar(value.author(), size=size)}}<br>
- <small>{% if not value.author().is_anonymous() %}<a href="{{value.author().url()}}">{{value.author().display_name}}</a>{% else %}{{value.author().display_name}}{% endif %}</small>
+ <small>
+ {{lib.user_link(value.author(), avatar=False)}}
+ </small>
<br>
<small>{{lib.abbr_date(value.timestamp)}}</small>
</p>
@@ -126,11 +128,7 @@
<p class="gravatar">
{{lib.gravatar(c.user, size=32)}}<br>
<small>
- {% if c.user.is_anonymous() %}
- {{ c.user.display_name }}
- {% else %}
- <a href="{{c.user.url()}}">{{c.user.display_name}}</a>
- {% endif %}
+ {{lib.user_link(c.user, avatar=False)}}
</small>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/fce1905d/Allura/allura/templates/widgets/thread_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/thread_widget.html b/Allura/allura/templates/widgets/thread_widget.html
index ea3a5d4..c60845f 100644
--- a/Allura/allura/templates/widgets/thread_widget.html
+++ b/Allura/allura/templates/widgets/thread_widget.html
@@ -57,11 +57,7 @@
<p class="gravatar">
{{lib.gravatar(c.user, size=48)}}<br>
<small>
- {% if c.user.is_anonymous() %}
- {{ c.user.display_name }}
- {% else %}
- <a href="{{c.user.url()}}">{{c.user.display_name}}</a>
- {% endif %}
+ {{lib.user_link(c.user, avatar=False)}}
</small>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/fce1905d/Allura/allura/templates/widgets/threads_table.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/threads_table.html b/Allura/allura/templates/widgets/threads_table.html
index 16e25f0..7375d9b 100644
--- a/Allura/allura/templates/widgets/threads_table.html
+++ b/Allura/allura/templates/widgets/threads_table.html
@@ -51,7 +51,7 @@
<a href="{{thread.url()}}" class="btn ico"><b data-icon="{{g.icons['pin'].char}}" class="ico {{g.icons['pin'].css}}"></b> <span>Sticky</span></a>
{% endif %}
<h3><a href="{{thread.url()}}">{{thread.subject and h.text.truncate(thread.subject, 72) or '(no subject)'}}</a></h3>
- <span>By {% if not author.is_anonymous() %}<a href="{{author.url()}}">{{author.display_name}}</a>{% else %}{{author.display_name}}{% endif %}</span> on {{thread.first_post.timestamp.strftime('%a %b %d, %Y %I:%M %p')}}
+ <span>By {{lib.user_link(author, avatar=False)}}</span> on {{thread.first_post.timestamp.strftime('%a %b %d, %Y %I:%M %p')}}
</td>
{% endif %}
<td>{{thread.num_replies}}</td>
@@ -62,7 +62,7 @@
{% set author = thread.last_post.author() %}
<td>
<p class="gravatar sm">
- By {{lib.gravatar(author, size=16)}}{% if not author.is_anonymous() %}<a href="{{author.url()}}">{{author.display_name}}</a>{% else %}{{author.display_name}}{% endif %}<br />on {{thread.last_post.timestamp.strftime('%a %b %d, %Y %I:%M %p')}}
+ By {{lib.gravatar(author, size=16)}} {{lib.user_link(author, avatar=False)}}<br />on {{thread.last_post.timestamp.strftime('%a %b %d, %Y %I:%M %p')}}
</p>
</td>
{% endif %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/fce1905d/ForgeBlog/forgeblog/templates/blog_widgets/preview_post.html
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/templates/blog_widgets/preview_post.html b/ForgeBlog/forgeblog/templates/blog_widgets/preview_post.html
index d310189..c70b8be 100644
--- a/ForgeBlog/forgeblog/templates/blog_widgets/preview_post.html
+++ b/ForgeBlog/forgeblog/templates/blog_widgets/preview_post.html
@@ -23,7 +23,7 @@
</h3>
{{value.html_text_preview|safe}}
<em class="grid-19">
- Posted by {% if not value.author().is_anonymous() %}<a href="{{value.author().url()}}">{{lib.gravatar_or_name(value.author(), size=16)}}</a>{% else %}{{lib.gravatar_or_name(value.author(), size=16)}}{% endif%} {{lib.abbr_date(value.timestamp)}}
+ Posted by {{lib.user_link(value.author(), avatar=True)}} {{lib.abbr_date(value.timestamp)}}
{% if value.state != 'published' %}
<span>| {{value.state.capitalize()}}</span>
{% endif %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/fce1905d/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html b/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html
index ee4a878..601c562 100644
--- a/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html
+++ b/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html
@@ -21,7 +21,7 @@
{{value.html_text|safe}}
{{lib.related_artifacts(value)}}
<em class="grid-19">
- Posted by {% if not base_post.author().is_anonymous() %}<a href="{{base_post.author().url()}}">{{lib.gravatar_or_name(base_post.author(), size=16)}}</a> {% else %}{{lib.gravatar_or_name(base_post.author(), size=16)}}{% endif%} {{lib.abbr_date(value.timestamp)}}
+ Posted by {{lib.user_link(value.author(), avatar=True)}} {{lib.abbr_date(value.timestamp)}}
{% if value.state != 'published' %}
<span>| {{value.state.capitalize()}}</span>
{% endif %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/fce1905d/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html b/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html
index be18f82..ee7a161 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html
@@ -20,7 +20,7 @@
<div class="grid-5"><label>Forum:</label> <a href="{{value.discussion.url()}}">{{value.discussion.name}}</a></div>
{% if value.first_post %}
- <div class="grid-5"><label>Creator:</label> {% if not value.first_post.author().is_anonymous() %}<a href="{{value.first_post.author().url()}}">{{value.first_post.author().display_name}}</a>{% else %}{{value.first_post.author().display_name}}{% endif %}</div>
+ <div class="grid-5"><label>Creator:</label> {{lib.user_link(value.first_post.author(), avatar=False)}}</div>
<div class="grid-4"><label>Created:</label> {{lib.abbr_date(value.first_post.timestamp)}}</div>
{% endif %}
<div class="grid-5"><label>Updated:</label> {{lib.abbr_date(value.mod_date)}}</div>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/fce1905d/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html b/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
index 17d2e14..f13ab8b 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
@@ -61,7 +61,7 @@
<td>
{% if forum.last_post %}
<a href="{{forum.last_post.url_paginated()}}">{{h.text.truncate(h.really_unicode(forum.last_post.subject or '(no subject)'),75)}}</a><br>
- by {% if not forum.last_post.author().is_anonymous() %}<a href="{{forum.last_post.author().url()}}">{{forum.last_post.author().display_name}}</a>{% else %}{{forum.last_post.author().display_name}}{% endif %}<br>
+ by {{lib.user_link(forum.last_post.author(), avatar=False)}}<br>
{{h.ago(forum.last_post.mod_date)}}
{% else %}
No posts yet
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/fce1905d/ForgeTracker/forgetracker/templates/tracker/ticket.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/ticket.html b/ForgeTracker/forgetracker/templates/tracker/ticket.html
index 1fd159e..1659e82 100644
--- a/ForgeTracker/forgetracker/templates/tracker/ticket.html
+++ b/ForgeTracker/forgetracker/templates/tracker/ticket.html
@@ -105,11 +105,7 @@
<label class="simple">{{field.label}}:</label>
{% if field.type == 'user' %}
{% set user = ticket.get_custom_user(field.name) %}
- {% if user and not user.is_anonymous() %}
- <a href="{{user.url()}}">{{user.get_pref('display_name')}}</a>
- {% else %}
- nobody
- {% endif %}
+ {{lib.user_link(user, avatar=False)}}
{% elif field.type == 'milestone' %}
<a href="{{c.app.url}}{{field.name[1:]}}/{{ticket.custom_fields[field.name]}}">{{ticket.custom_fields[field.name]}}</a>
{% else %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/fce1905d/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
index 7c44fe3..b60cc35 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
@@ -74,11 +74,7 @@
{% if ticket %}
<a href="{{ticket.reported_by.url()}}">{{ticket.reported_by.display_name}}</a>
{% else %}
- {% if not c.user.is_anonymous() %}
- <a href="{{c.user.url()}}">{{c.user.display_name}}</a>
- {% else %}
- {{c.user.display_name}}
- {% endif %}
+ {{lib.user_link(c.user, avatar=False)}}
{% endif %}
</div>
<div style="clear:both"> </div>
@@ -117,11 +113,7 @@
<p class="gravatar">
{{lib.gravatar(c.user, size=48)}}<br>
<small>
- {% if c.user.is_anonymous() %}
- {{ c.user.display_name }}
- {% else %}
- <a href="{{c.user.url()}}">{{c.user.display_name}}</a>
- {% endif %}
+ {{lib.user_link(c.user, avatar=False)}}
</small>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/fce1905d/ForgeWiki/forgewiki/templates/wiki/page_view.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_view.html b/ForgeWiki/forgewiki/templates/wiki/page_view.html
index 408fdf6..da51012 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_view.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_view.html
@@ -73,11 +73,7 @@
<div class="grid-9 gravatar sm">
<label class="simple">Authors: </label>
{% for author in page.authors() %}
- {% if not author.is_anonymous() %}
- <a href="{{author.url()}}">{{lib.gravatar(author, size=16)}}</a>
- {% else %}
- {{lib.gravatar(author, size=16)}}
- {% endif %}
+ {{lib.user_link(author, avatar=True)}}
{% endfor %}
</div>
{% if page.attachments %}
[08/13] git commit: [#4723] ticket:487 fix error in template syntax
Posted by tv...@apache.org.
[#4723] ticket:487 fix error in template syntax
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/8f20b008
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/8f20b008
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/8f20b008
Branch: refs/heads/master
Commit: 8f20b00852183d024c48c67c71858880bebb6f8a
Parents: d622d1f
Author: Yaroslav Sokolovsky <ya...@gmail.com>
Authored: Fri Nov 15 15:41:16 2013 +0200
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Nov 27 17:30:26 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/widgets/post_widget.html | 2 +-
Allura/allura/templates/widgets/thread_widget.html | 2 +-
.../forgetracker/templates/tracker_widgets/ticket_form.html | 4 +++-
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/8f20b008/Allura/allura/templates/widgets/post_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/post_widget.html b/Allura/allura/templates/widgets/post_widget.html
index 48b769d..b73341d 100644
--- a/Allura/allura/templates/widgets/post_widget.html
+++ b/Allura/allura/templates/widgets/post_widget.html
@@ -127,7 +127,7 @@
{{lib.gravatar(c.user, size=32)}}<br>
<small>
{% if c.user.is_anonymous() %}
- {% c.user.display_name %}
+ {{ c.user.display_name }}
{% else %}
<a href="{{c.user.url()}}">{{c.user.display_name}}</a>
{% endif %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/8f20b008/Allura/allura/templates/widgets/thread_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/thread_widget.html b/Allura/allura/templates/widgets/thread_widget.html
index d9d50e0..ea3a5d4 100644
--- a/Allura/allura/templates/widgets/thread_widget.html
+++ b/Allura/allura/templates/widgets/thread_widget.html
@@ -58,7 +58,7 @@
{{lib.gravatar(c.user, size=48)}}<br>
<small>
{% if c.user.is_anonymous() %}
- {% c.user.display_name %}
+ {{ c.user.display_name }}
{% else %}
<a href="{{c.user.url()}}">{{c.user.display_name}}</a>
{% endif %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/8f20b008/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
index e94073d..7c44fe3 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
@@ -76,6 +76,8 @@
{% else %}
{% if not c.user.is_anonymous() %}
<a href="{{c.user.url()}}">{{c.user.display_name}}</a>
+ {% else %}
+ {{c.user.display_name}}
{% endif %}
{% endif %}
</div>
@@ -116,7 +118,7 @@
{{lib.gravatar(c.user, size=48)}}<br>
<small>
{% if c.user.is_anonymous() %}
- {% c.user.display_name %}
+ {{ c.user.display_name }}
{% else %}
<a href="{{c.user.url()}}">{{c.user.display_name}}</a>
{% endif %}