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:31:01 UTC
[07/13] git commit: [#4723] ticket:487 author.url anon check
[#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 %}