allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jetm...@apache.org
Subject [04/50] [abbrv] allura git commit: [#6107] ticket:748 Remove mail link if email osting is not enabled
Date Wed, 27 May 2015 11:57:36 GMT
[#6107] ticket:748 Remove mail link if email osting is not enabled


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/bb390250
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/bb390250
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/bb390250

Branch: refs/heads/ib/7868
Commit: bb390250c19553a8a28da27a5a1781a6cf4aaef4
Parents: 51cf013
Author: Aleksey 'LXj' Alekseyev <gotletter@gmail.com>
Authored: Mon Apr 27 20:00:10 2015 +0300
Committer: Igor Bondarenko <jetmind2@gmail.com>
Committed: Wed Apr 29 09:40:23 2015 +0000

----------------------------------------------------------------------
 Allura/allura/templates/discussion/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/bb390250/Allura/allura/templates/discussion/index.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/discussion/index.html b/Allura/allura/templates/discussion/index.html
index cedcc16..11c987a 100644
--- a/Allura/allura/templates/discussion/index.html
+++ b/Allura/allura/templates/discussion/index.html
@@ -23,10 +23,10 @@
 {% block header %}{{h.really_unicode(discussion.name)}}{% endblock %}
 
 {% block actions %}
-  {% if discussion.email_address %}
+  {% if discussion.email_address and c.app.config.options.get('AllowEmailPosting', True)
%}
     <a href="{{h.really_unicode(discussion.email_link(subject=None))}}" class="email"
title="Send Email to Create a New Topic" ><b data-icon="{{g.icons['pencil'].char}}"
class="ico {{g.icons['pencil'].css}}"></b></a>
-    <a href="feed" title="Feed" ><b data-icon="{{g.icons['feed'].char}}" class="ico
{{g.icons['feed'].css}}"></b></a>
   {% endif %}
+  <a href="feed" title="Feed" ><b data-icon="{{g.icons['feed'].char}}" class="ico
{{g.icons['feed'].css}}"></b></a>
 {% endblock %}
 
 {% block edit_box %}


Mime
View raw message