Merge lp:~dholbach/loco-team-portal/601679 into lp:loco-team-portal

[Daniel Holbach]

[Michael Hall (mhall119)]

Very nice, now even if a team doesn't have a listed email address, they will at least have the contact form option!

review: Approve

=== modified file 'loco_directory/locale/loco-directory.pot'
--- loco_directory/locale/loco-directory.pot	2010-07-01 06:26:23 +0000
+++ loco_directory/locale/loco-directory.pot	2010-07-09 10:11:03 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-01 06:21+0000\n"
+"POT-Creation-Date: 2010-07-09 10:06+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -850,7 +850,7 @@
 msgid "Location:"
 msgstr ""
 
-#: templates/teams/team_detail.html:34 templates/teams/team_detail.html:108
+#: templates/teams/team_detail.html:34 templates/teams/team_detail.html:110
 msgid "None Specified"
 msgstr ""
 
@@ -886,32 +886,36 @@
 msgid "Team Mailing List"
 msgstr ""
 
-#: templates/teams/team_detail.html:84
+#: templates/teams/team_detail.html:83
+msgid "Contact Team via Launchpad"
+msgstr ""
+
+#: templates/teams/team_detail.html:86
 msgid "Team Forums"
 msgstr ""
 
-#: templates/teams/team_detail.html:87
+#: templates/teams/team_detail.html:89
 msgid "Team Website"
 msgstr ""
 
-#: templates/teams/team_detail.html:90
+#: templates/teams/team_detail.html:92
 msgid "Provides Support"
 msgstr ""
 
-#: templates/teams/team_detail.html:96
+#: templates/teams/team_detail.html:98
 msgid "Upcoming Events:"
 msgstr ""
 
-#: templates/teams/team_detail.html:103
+#: templates/teams/team_detail.html:105
 #, python-format
 msgid "%(start_date)s in %(city)s"
 msgstr ""
 
-#: templates/teams/team_detail.html:103
+#: templates/teams/team_detail.html:105
 msgid "on: "
 msgstr ""
 
-#: templates/teams/team_detail.html:106
+#: templates/teams/team_detail.html:108
 msgid "Show detailed Event List"
 msgstr ""
 

=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2010-06-24 19:18:57 +0000
+++ loco_directory/templates/teams/team_detail.html	2010-07-09 10:11:03 +0000
@@ -77,8 +77,10 @@
             {% if team.ml_url %}
               <a href="{{ team.ml_url }}"><img class="resource" src="/media/img/res/list.png" alt="{% trans "Team Mailing List" %}" title="{% trans "Team Mailing List" %}"/></a>
             {% endif %}
-            {% if team.email %}
+            {% if team.email and user.is_authenticated %}
               <a href="mailto:{{ team.email }}"><img class="resource" src="/media/img/res/email.png" alt="{% trans "Email Address" %}" title="{% trans "Email Address" %}"/></a>
+            {% else %}
+              <a href="https://launchpad.net/~{{ team.lp_name }}/+contactuser"><img class="resource" src="/media/img/res/email.png" alt="{% trans "Contact Team via Launchpad" %}" title="{% trans "Contact Team via Launchpad" %}"/></a>
             {% endif %}
             {% if team.forum_url %}
               <a href="{{ team.forum_url }}"><img class="resource" src="/media/img/res/forum.png" alt="{% trans "Team Forums" %}" title="{% trans "Team Forums" %}"/></a>