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:57 UTC
[03/13] git commit: [#4723] ticket:487 replaced first matches
[#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">