LoCo Team Portal

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

  1. 601679
  2. Merge into 0.2
Proposed by Daniel Holbach
Status: Merged
Merged at revision: 185
Proposed branch: lp:~dholbach/loco-team-portal/601679
Merge into: lp:loco-team-portal
Diff against target: 81 lines (+16/-10)
2 files modified
loco_directory/locale/loco-directory.pot (+13/-9)
loco_directory/templates/teams/team_detail.html (+3/-1)
To merge this branch: bzr merge lp:~dholbach/loco-team-portal/601679
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+29531@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2010-07-01 06:21+0000\n"11"POT-Creation-Date: 2010-07-09 10:06+0000\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -850,7 +850,7 @@
850msgid "Location:"850msgid "Location:"
851msgstr ""851msgstr ""
852852
853#: templates/teams/team_detail.html:34 templates/teams/team_detail.html:108853#: templates/teams/team_detail.html:34 templates/teams/team_detail.html:110
854msgid "None Specified"854msgid "None Specified"
855msgstr ""855msgstr ""
856856
@@ -886,32 +886,36 @@
886msgid "Team Mailing List"886msgid "Team Mailing List"
887msgstr ""887msgstr ""
888888
889#: templates/teams/team_detail.html:84889#: templates/teams/team_detail.html:83
890msgid "Contact Team via Launchpad"
891msgstr ""
892
893#: templates/teams/team_detail.html:86
890msgid "Team Forums"894msgid "Team Forums"
891msgstr ""895msgstr ""
892896
893#: templates/teams/team_detail.html:87897#: templates/teams/team_detail.html:89
894msgid "Team Website"898msgid "Team Website"
895msgstr ""899msgstr ""
896900
897#: templates/teams/team_detail.html:90901#: templates/teams/team_detail.html:92
898msgid "Provides Support"902msgid "Provides Support"
899msgstr ""903msgstr ""
900904
901#: templates/teams/team_detail.html:96905#: templates/teams/team_detail.html:98
902msgid "Upcoming Events:"906msgid "Upcoming Events:"
903msgstr ""907msgstr ""
904908
905#: templates/teams/team_detail.html:103909#: templates/teams/team_detail.html:105
906#, python-format910#, python-format
907msgid "%(start_date)s in %(city)s"911msgid "%(start_date)s in %(city)s"
908msgstr ""912msgstr ""
909913
910#: templates/teams/team_detail.html:103914#: templates/teams/team_detail.html:105
911msgid "on: "915msgid "on: "
912msgstr ""916msgstr ""
913917
914#: templates/teams/team_detail.html:106918#: templates/teams/team_detail.html:108
915msgid "Show detailed Event List"919msgid "Show detailed Event List"
916msgstr ""920msgstr ""
917921
918922
=== 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 @@
77 {% if team.ml_url %}77 {% if team.ml_url %}
78 <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>78 <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>
79 {% endif %}79 {% endif %}
80 {% if team.email %}80 {% if team.email and user.is_authenticated %}
81 <a href="mailto:{{ team.email }}"><img class="resource" src="/media/img/res/email.png" alt="{% trans "Email Address" %}" title="{% trans "Email Address" %}"/></a>81 <a href="mailto:{{ team.email }}"><img class="resource" src="/media/img/res/email.png" alt="{% trans "Email Address" %}" title="{% trans "Email Address" %}"/></a>
82 {% else %}
83 <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>
82 {% endif %}84 {% endif %}
83 {% if team.forum_url %}85 {% if team.forum_url %}
84 <a href="{{ team.forum_url }}"><img class="resource" src="/media/img/res/forum.png" alt="{% trans "Team Forums" %}" title="{% trans "Team Forums" %}"/></a>86 <a href="{{ team.forum_url }}"><img class="resource" src="/media/img/res/forum.png" alt="{% trans "Team Forums" %}" title="{% trans "Team Forums" %}"/></a>

Subscribers

People subscribed via source and target branches