LoCo Team Portal

Merge lp:~cjohnston/loco-team-portal/bug-637283 into lp:loco-team-portal

  1. bug-637283
  2. Merge into 0.2
Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: 291
Merged at revision: 292
Proposed branch: lp:~cjohnston/loco-team-portal/bug-637283
Merge into: lp:loco-team-portal
Diff against target: 367 lines (+133/-119) (has conflicts)
2 files modified
loco_directory/locale/loco-directory.pot (+31/-23)
loco_directory/templates/teams/team_detail.html (+102/-96)
Text conflict in loco_directory/locale/loco-directory.pot
To merge this branch: bzr merge lp:~cjohnston/loco-team-portal/bug-637283
Reviewer Review Type Date Requested Status
LoCo Team Portal Developers Pending
Review via email: mp+35305@code.launchpad.net
To post a comment you must log in.
lp:~cjohnston/loco-team-portal/bug-637283 updated
292. By Chris Johnston

Adds .all to profile check

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/locale/loco-directory.pot'
2--- loco_directory/locale/loco-directory.pot 2010-09-13 17:08:59 +0000
3+++ loco_directory/locale/loco-directory.pot 2010-09-13 19:09:45 +0000
4@@ -8,7 +8,11 @@
5 msgstr ""
6 "Project-Id-Version: PACKAGE VERSION\n"
7 "Report-Msgid-Bugs-To: \n"
8+<<<<<<< TREE
9 "POT-Creation-Date: 2010-09-13 17:08+0000\n"
10+=======
11+"POT-Creation-Date: 2010-09-13 16:48+0000\n"
12+>>>>>>> MERGE-SOURCE
13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15 "Language-Team: LANGUAGE <LL@li.org>\n"
16@@ -260,7 +264,7 @@
17 msgid "Email Address"
18 msgstr ""
19
20-#: teams/models.py:74 templates/teams/team_detail.html:125
21+#: teams/models.py:74 templates/teams/team_detail.html:132
22 msgid "IRC Channel"
23 msgstr ""
24
25@@ -825,7 +829,7 @@
26 msgid "Add Team Event"
27 msgstr ""
28
29-#: templates/events/event_list.html:14 templates/teams/team_detail.html:143
30+#: templates/events/event_list.html:14 templates/teams/team_detail.html:150
31 #: templates/teams/team_event_list.html:8
32 msgid "Past Events"
33 msgstr ""
34@@ -992,7 +996,7 @@
35 msgstr ""
36
37 #: templates/events/team_event_detail.html:17
38-#: templates/teams/team_detail.html:145
39+#: templates/teams/team_detail.html:152
40 msgid "iCal Feed"
41 msgstr ""
42
43@@ -1146,7 +1150,7 @@
44 msgstr ""
45
46 #: templates/teams/team_detail.html:72 templates/teams/team_detail.html:82
47-#: templates/teams/team_detail.html:156
48+#: templates/teams/team_detail.html:164
49 msgid "None Specified"
50 msgstr ""
51
52@@ -1154,68 +1158,72 @@
53 msgid "Languages:"
54 msgstr ""
55
56-#: templates/teams/team_detail.html:89
57+#: templates/teams/team_detail.html:88
58 msgid "Approval Date:"
59 msgstr ""
60
61-#: templates/teams/team_detail.html:95
62+#: templates/teams/team_detail.html:94
63 msgid "Expires Date:"
64 msgstr ""
65
66-#: templates/teams/team_detail.html:100
67+#: templates/teams/team_detail.html:99
68 msgid "Local Support:"
69 msgstr ""
70
71-#: templates/teams/team_detail.html:104
72+#: templates/teams/team_detail.html:103
73 msgid "Team Admin(s):"
74 msgstr ""
75
76-#: templates/teams/team_detail.html:112
77-msgid "Loco Contacts(s):"
78-msgstr ""
79-
80-#: templates/teams/team_detail.html:119
81+#: templates/teams/team_detail.html:114
82+msgid "Team Contact(s):"
83+msgstr ""
84+
85+#: templates/teams/team_detail.html:121
86+msgid "No LoCo Team contacts are set."
87+msgstr ""
88+
89+#: templates/teams/team_detail.html:126
90 msgid "Resources:"
91 msgstr ""
92
93-#: templates/teams/team_detail.html:122
94+#: templates/teams/team_detail.html:129
95 msgid "Team Wiki"
96 msgstr ""
97
98-#: templates/teams/team_detail.html:128
99+#: templates/teams/team_detail.html:135
100 msgid "Team Mailing List"
101 msgstr ""
102
103-#: templates/teams/team_detail.html:131
104+#: templates/teams/team_detail.html:138
105 msgid "Team Forums"
106 msgstr ""
107
108-#: templates/teams/team_detail.html:134
109+#: templates/teams/team_detail.html:141
110 msgid "Team Website"
111 msgstr ""
112
113-#: templates/teams/team_detail.html:139
114+#: templates/teams/team_detail.html:146
115 msgid "Upcoming Events:"
116 msgstr ""
117
118-#: templates/teams/team_detail.html:142
119+#: templates/teams/team_detail.html:149
120 msgid "All Events"
121 msgstr ""
122
123-#: templates/teams/team_detail.html:144
124+#: templates/teams/team_detail.html:151
125 msgid "RSS Feed"
126 msgstr ""
127
128-#: templates/teams/team_detail.html:152
129+#: templates/teams/team_detail.html:159
130 #, python-format
131 msgid "%(start_date)s in %(city)s"
132 msgstr ""
133
134-#: templates/teams/team_detail.html:152
135+#: templates/teams/team_detail.html:159
136 msgid "on: "
137 msgstr ""
138
139-#: templates/teams/team_detail.html:169
140+#: templates/teams/team_detail.html:177
141 msgid "Photos from"
142 msgstr ""
143
144
145=== modified file 'loco_directory/templates/teams/team_detail.html'
146--- loco_directory/templates/teams/team_detail.html 2010-09-09 21:07:01 +0000
147+++ loco_directory/templates/teams/team_detail.html 2010-09-13 19:09:45 +0000
148@@ -60,117 +60,123 @@
149
150 {% block content %}
151 <article class="minor-content alone">
152-<h2><a href="https://launchpad.net/~{{ team.lp_name }}">{{ team.name }}</a></h2>
153+ <h2><a href="https://launchpad.net/~{{ team.lp_name }}">{{ team.name }}</a></h2>
154
155- <table>
156- <tr>
157- <th class="form-item-label" scope="row"><label>{% trans "Location:" %}</label></th>
158- <td class="form-item-value">
159- {% if team.countries.all %}
160- {% for country in team.countries.all %}{% if not forloop.first %}, {% endif %}{{ country.name }}{% endfor %}{% if team.spr %}, {% trans team.spr %}{% endif %}{% if team.city %}, {% trans team.city %}{% endif %}
161- {% else %}
162- {% trans "None Specified" %}
163- {% endif %}
164- </td>
165- </tr>
166- <tr>
167- <th class="form-item-label" scope="row"><label>{% trans "Languages:" %}</label></th>
168- <td class="form-item-value">
169- {% if team.languages.all %}
170- {% for language in team.languages.all %}{% if not forloop.first %}, {% endif %}{{ language.name }}{% endfor %}
171- {% else %}
172- {% trans "None Specified" %}
173- {% endif %}
174- </td>
175- </tr>
176-
177+ <table>
178+ <tr>
179+ <th class="form-item-label" scope="row"><label>{% trans "Location:" %}</label></th>
180+ <td class="form-item-value">
181+ {% if team.countries.all %}
182+ {% for country in team.countries.all %}{% if not forloop.first %}, {% endif %}{{ country.name }}{% endfor %}{% if team.spr %}, {% trans team.spr %}{% endif %}{% if team.city %}, {% trans team.city %}{% endif %}
183+ {% else %}
184+ {% trans "None Specified" %}
185+ {% endif %}
186+ </td>
187+ </tr>
188+ <tr>
189+ <th class="form-item-label" scope="row"><label>{% trans "Languages:" %}</label></th>
190+ <td class="form-item-value">
191+ {% if team.languages.all %}
192+ {% for language in team.languages.all %}{% if not forloop.first %}, {% endif %}{{ language.name }}{% endfor %}
193+ {% else %}
194+ {% trans "None Specified" %}
195+ {% endif %}
196+ </td>
197+ </tr>
198 {% if team.approved_date %}
199- <tr>
200- <th class="form-item-label" scope="row"><label>{% trans "Approval Date:" %}</label></th>
201- <td class="form-item-value">{{ team.approved_date }}</td>
202- </tr>
203+ <tr>
204+ <th class="form-item-label" scope="row"><label>{% trans "Approval Date:" %}</label></th>
205+ <td class="form-item-value">{{ team.approved_date }}</td>
206+ </tr>
207 {% endif %}
208 {% if team.approved %}
209- <tr>
210- <th class="form-item-label" scope="row"><label>{% trans "Expires Date:" %}</label></th>
211- <td class="form-item-value">{{ team.expires_date }}</td>
212- </tr>
213+ <tr>
214+ <th class="form-item-label" scope="row"><label>{% trans "Expires Date:" %}</label></th>
215+ <td class="form-item-value">{{ team.expires_date }}</td>
216+ </tr>
217 {% endif %}
218 <tr>
219- <th class="form-item-label" scope="row"><label>{% trans "Local Support:" %}</label></th>
220- <td class="form-item-value">{% if team.provides_support %}Yes{% else %}No{% endif %}</td>
221- </tr>
222- <tr>
223- <th class="form-item-label" scope="row"><label>{% trans "Team Admin(s):" %}</label></th>
224- <td class="form-item-value">{% for admin in team.admin_profiles.all %}
225- {% ifequal team.owner admin.user.username %}
226- <strong><a href="https://launchpad.net/~{{ admin.user.username }}">{{ admin.realname }}</a></strong>{% else %}
227- <a href="https://launchpad.net/~{{ admin.user.username }}">{{ admin.realname }}</a>{% endifequal %}{% if not forloop.last %},{% endif %}
228- {% endfor %}</td>
229- </tr>
230- <tr>
231- <th class="form-item-label" scope="row"><label>{% trans "Loco Contacts(s):" %}</label></th>
232- <td class="form-item-value">{% for contact in team.contact_profiles.all %}
233- <a href="https://launchpad.net/~{{ contact.user.username }}">{{ contact.realname }}</a>{% if not forloop.last %},{% endif %}
234- {% endfor %}</td>
235- </tr>
236-
237- <tr>
238- <th class="form-item-label" scope="row"><label>{% trans "Resources:" %}</label></th>
239- <td class="form-item-value">
240- {% if team.wiki_url %}
241- <a href="{{ team.wiki_url }}"><img class="resource" src="/media/images/team/wiki.png" alt="{% trans "Team Wiki" %}" title="{% trans "Team Wiki" %}"/></a>
242- {% endif %}
243- {% if team.irc_chan %}
244- <a href="http://webchat.freenode.net/?channels={{ team.irc_chan }}"><img class="resource" src="/media/images/team/irc.png" alt="{% trans "IRC Channel" %} ({{ team.irc_chan }})" title="{% trans "IRC Channel" %} ({{ team.irc_chan }})"/></a>
245- {% endif %}
246- {% if team.ml_url %}
247- <a href="{{ team.ml_url }}"><img class="resource" src="/media/images/team/list.png" alt="{% trans "Team Mailing List" %}" title="{% trans "Team Mailing List" %}"/></a>
248- {% endif %}
249- {% if team.forum_url %}
250- <a href="{{ team.forum_url }}"><img class="resource" src="/media/images/team/forum.png" alt="{% trans "Team Forums" %}" title="{% trans "Team Forums" %}"/></a>
251- {% endif %}
252- {% if team.web_url %}
253- <a href="{{ team.web_url }}"><img class="resource" src="/media/images/team/website.png" alt="{% trans "Team Website" %}" title="{% trans "Team Website" %}"/></a>
254- {% endif %}
255- </td>
256- </tr>
257- <tr>
258- <th class="form-item-label" scope="row"><label>{% trans "Upcoming Events:" %}</label></th>
259- <td class="form-item-value">
260- <ul class="team-event-nav">
261- <li style="font-size:0.98em"><a href="{% url team-event-list team.lp_name %}">{% trans "All Events" %}</a></li>
262- <li style="font-size:0.98em"><a href="{% url team-event-history team.lp_name %}">{% trans "Past Events" %}</a></li>
263- <li style="font-size:0.98em"><a href="{% url team-events-rss team.lp_name %}">{% trans "RSS Feed" %}</a></li>
264- <li style="font-size:0.98em"><a href="{% url team-event-list-ical team.lp_name %}">{% trans "iCal Feed" %}</a></li>
265- </ul>
266- {% if team.teamevent_set.next_5_events %}
267- <ul>
268- {% for team_event in team.teamevent_set.next_5_events %}
269- {% comment %}TRANSLATORS: If event has a venue, show: date "in" city{% endcomment %}
270- <li>
271- <a title="{% if team_event.venue %}{% blocktrans with team_event.date_begin|date:"M d" as start_date and team_event.venue.city as city %}{{start_date}} in {{city}}{% endblocktrans %}{% else %}{{team_event.date_begin|date:"M d"}}{% endif %}" href="{% url team-event-detail team_event.id %}">{{ team_event.name }}</a> {% trans "on: " %}{{ team_event.date_begin|date}}
272- </li>
273+ <th class="form-item-label" scope="row"><label>{% trans "Local Support:" %}</label></th>
274+ <td class="form-item-value">{% if team.provides_support %}Yes{% else %}No{% endif %}</td>
275+ </tr>
276+ <tr>
277+ <th class="form-item-label" scope="row"><label>{% trans "Team Admin(s):" %}</label></th>
278+ <td class="form-item-value">
279+ {% for admin in team.admin_profiles.all %}
280+ {% ifequal team.owner admin.user.username %}
281+ <strong><a href="https://launchpad.net/~{{ admin.user.username }}">{{ admin.realname }}</a></strong>
282+ {% else %}
283+ <a href="https://launchpad.net/~{{ admin.user.username }}">{{ admin.realname }}</a>{% endifequal %}{% if not forloop.last %},{% endif %}
284+ {% endfor %}
285+ </td>
286+ </tr>
287+ <tr>
288+ <th class="form-item-label" scope="row"><label>{% trans "Team Contact(s):" %}</label></th>
289+ <td class="form-item-value">
290+ {% if team.contact_profiles.all %}
291+ {% for contact in team.contact_profiles.all %}
292+ <a href="https://launchpad.net/~{{ contact.user.username }}">{{ contact.realname }}</a>{% if not forloop.last %},{% endif %}
293 {% endfor %}
294- </ul>
295- {% else %}{% trans "None Specified" %}{% endif %}
296- </td>
297- </tr>
298-
299- </table>
300+ {% else %}
301+ <p>{% trans "No LoCo Team contacts are set." %}</p>
302+ {% endif %}
303+ </td>
304+ </tr>
305+ <tr>
306+ <th class="form-item-label" scope="row"><label>{% trans "Resources:" %}</label></th>
307+ <td class="form-item-value">
308+ {% if team.wiki_url %}
309+ <a href="{{ team.wiki_url }}"><img class="resource" src="/media/images/team/wiki.png" alt="{% trans "Team Wiki" %}" title="{% trans "Team Wiki" %}" /></a>
310+ {% endif %}
311+ {% if team.irc_chan %}
312+ <a href="http://webchat.freenode.net/?channels={{ team.irc_chan }}"><img class="resource" src="/media/images/team/irc.png" alt="{% trans "IRC Channel" %} ({{ team.irc_chan }})" title="{% trans "IRC Channel" %} ({{ team.irc_chan }})" /></a>
313+ {% endif %}
314+ {% if team.ml_url %}
315+ <a href="{{ team.ml_url }}"><img class="resource" src="/media/images/team/list.png" alt="{% trans "Team Mailing List" %}" title="{% trans "Team Mailing List" %}" /></a>
316+ {% endif %}
317+ {% if team.forum_url %}
318+ <a href="{{ team.forum_url }}"><img class="resource" src="/media/images/team/forum.png" alt="{% trans "Team Forums" %}" title="{% trans "Team Forums" %}" /></a>
319+ {% endif %}
320+ {% if team.web_url %}
321+ <a href="{{ team.web_url }}"><img class="resource" src="/media/images/team/website.png" alt="{% trans "Team Website" %}" title="{% trans "Team Website" %}" /></a>
322+ {% endif %}
323+ </td>
324+ </tr>
325+ <tr>
326+ <th class="form-item-label" scope="row"><label>{% trans "Upcoming Events:" %}</label></th>
327+ <td class="form-item-value">
328+ <ul class="team-event-nav">
329+ <li style="font-size:0.98em"><a href="{% url team-event-list team.lp_name %}">{% trans "All Events" %}</a></li>
330+ <li style="font-size:0.98em"><a href="{% url team-event-history team.lp_name %}">{% trans "Past Events" %}</a></li>
331+ <li style="font-size:0.98em"><a href="{% url team-events-rss team.lp_name %}">{% trans "RSS Feed" %}</a></li>
332+ <li style="font-size:0.98em"><a href="{% url team-event-list-ical team.lp_name %}">{% trans "iCal Feed" %}</a></li>
333+ </ul>
334+ {% if team.teamevent_set.next_5_events %}
335+ <ul>
336+ {% for team_event in team.teamevent_set.next_5_events %}
337+ {% comment %}TRANSLATORS: If event has a venue, show: date "in" city{% endcomment %}
338+ <li>
339+ <a title="{% if team_event.venue %}{% blocktrans with team_event.date_begin|date:"M d" as start_date and team_event.venue.city as city %}{{start_date}} in {{city}}{% endblocktrans %}{% else %}{{team_event.date_begin|date:"M d"}}{% endif %}" href="{% url team-event-detail team_event.id %}">{{ team_event.name }}</a> {% trans "on: " %}{{ team_event.date_begin|date}}
340+ </li>
341+ {% endfor %}
342+ </ul>
343+ {% else %}
344+ {% trans "None Specified" %}
345+ {% endif %}
346+ </td>
347+ </tr>
348+ </table>
349 </article>
350
351 <article class="minor-content">
352-<img id="locobranding" src="{{ team.mugshot_url }}" alt="" title="{{ team.name }}"/>
353+ <img id="locobranding" src="{{ team.mugshot_url }}" alt="" title="{{ team.name }}" />
354 </article>
355
356 {% if team.flickr_id %}
357 <article class="minor-content alone" style="width:95%;">
358-<h2>{% trans "Photos from" %} {{ team.name }}</a></h2>
359-<div style="width:100%;" id="flickr"> </div>
360+ <h2>{% trans "Photos from" %} {{ team.name }}</a></h2>
361+ <div style="width:100%;" id="flickr"> </div>
362 </article>
363 {% endif %}
364
365-
366-
367 {% endblock %}

Subscribers

People subscribed via source and target branches