allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tvansteenbu...@apache.org
Subject [04/13] git commit: [#4723] ticket:500 rename user_link macro to email_link
Date Wed, 27 Nov 2013 17:30:58 GMT
[#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 <yaroslav.sokolovsky@gmail.com>
Authored: Mon Nov 25 13:24:33 2013 +0200
Committer: Tim Van Steenburgh <tvansteenburgh@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 %}


Mime
View raw message