LoCo Team Portal

Merge lp:~cjohnston/loco-team-portal/bugfix-lp-622680 into lp:loco-team-portal

  1. bugfix-lp-622680
  2. Merge into 0.2
Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: 260
Merged at revision: 265
Proposed branch: lp:~cjohnston/loco-team-portal/bugfix-lp-622680
Merge into: lp:loco-team-portal
Diff against target: 389 lines (+140/-157)
4 files modified
loco_directory/locale/loco-directory.pot (+24/-37)
loco_directory/templates/events/global_event_detail.inc.html (+26/-18)
loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html (+40/-44)
loco_directory/templates/events/global_event_detail_basic.inc.html (+50/-58)
To merge this branch: bzr merge lp:~cjohnston/loco-team-portal/bugfix-lp-622680
Reviewer Review Type Date Requested Status
LoCo Team Portal Developers Pending
Review via email: mp+33379@code.launchpad.net

Description of the change

Makes the global event looks like the team event page

To post a comment you must log in.
Revision history for this message
Dave Walker (davewalker) wrote :

Visually looking, nothing is jumping out at me as an issue. However, due to the size of the diff and that HTML changes it introduces; I'd quite like to run it locally before approving myself. Thanks!

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-08-23 08:20:57 +0000
3+++ loco_directory/locale/loco-directory.pot 2010-08-23 13:21:42 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: PACKAGE VERSION\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2010-08-23 08:20+0000\n"
9+"POT-Creation-Date: 2010-08-23 13:16+0000\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13@@ -625,7 +625,7 @@
14 msgid "Team Events as ical"
15 msgstr ""
16
17-#: templates/index.html:76 templates/events/global_event_detail.inc.html:11
18+#: templates/index.html:76 templates/events/global_event_detail.inc.html:30
19 msgid "Microblogging"
20 msgstr ""
21
22@@ -855,46 +855,45 @@
23 msgid "Delete Event"
24 msgstr ""
25
26-#: templates/events/global_event_detail.inc.html:20
27+#: templates/events/global_event_detail.inc.html:14
28+#: templates/events/team_event_detail.inc.html:14
29+msgid "Details"
30+msgstr ""
31+
32+#: templates/events/global_event_detail.inc.html:22
33 #, python-format
34 msgid "Participating Team Events (%(team_count)s)"
35 msgstr ""
36
37-#: templates/events/global_event_detail_attending_teamevents.inc.html:11
38-#: templates/events/global_event_detail_attending_teamevents.inc.html:27
39-#: templates/events/global_event_detail_attending_teamevents.inc.html:41
40+#: templates/events/global_event_detail_attending_teamevents.inc.html:10
41+#: templates/events/global_event_detail_attending_teamevents.inc.html:25
42+#: templates/events/global_event_detail_attending_teamevents.inc.html:38
43 msgid "More Information about Team Event"
44 msgstr ""
45
46-#: templates/events/global_event_detail_attending_teamevents.inc.html:21
47+#: templates/events/global_event_detail_attending_teamevents.inc.html:19
48 msgid "Events in countries without continents"
49 msgstr ""
50
51-#: templates/events/global_event_detail_attending_teamevents.inc.html:37
52+#: templates/events/global_event_detail_attending_teamevents.inc.html:34
53 msgid "Events without venue"
54 msgstr ""
55
56 #: templates/events/global_event_detail_basic.inc.html:6
57-msgid "Date begin:"
58-msgstr ""
59-
60-#: templates/events/global_event_detail_basic.inc.html:12
61-msgid "Date end:"
62-msgstr ""
63-
64-#: templates/events/global_event_detail_basic.inc.html:18
65-msgid "Description:"
66-msgstr ""
67-
68-#: templates/events/global_event_detail_basic.inc.html:24
69-msgid "Announce:"
70-msgstr ""
71-
72-#: templates/events/global_event_detail_basic.inc.html:30
73+#: templates/events/team_event_detail_basic.inc.html:6
74+msgid "When:"
75+msgstr ""
76+
77+#: templates/events/global_event_detail_basic.inc.html:19
78+#: templates/events/team_event_detail_basic.inc.html:33
79+msgid "Announcement:"
80+msgstr ""
81+
82+#: templates/events/global_event_detail_basic.inc.html:26
83 msgid "Microblog Hashtag:"
84 msgstr ""
85
86-#: templates/events/global_event_detail_basic.inc.html:45
87+#: templates/events/global_event_detail_basic.inc.html:40
88 msgid "Pictag:"
89 msgstr ""
90
91@@ -963,10 +962,6 @@
92 msgid "iCal Feed"
93 msgstr ""
94
95-#: templates/events/team_event_detail.inc.html:14
96-msgid "Details"
97-msgstr ""
98-
99 #: templates/events/team_event_detail.inc.html:19
100 #: templates/events/team_event_detail_attendees.inc.html:24
101 msgid "Attendees"
102@@ -997,10 +992,6 @@
103 msgid "Registration Status"
104 msgstr ""
105
106-#: templates/events/team_event_detail_basic.inc.html:6
107-msgid "When:"
108-msgstr ""
109-
110 #: templates/events/team_event_detail_basic.inc.html:19
111 msgid "Where:"
112 msgstr ""
113@@ -1019,10 +1010,6 @@
114 msgid "Get more information about this team"
115 msgstr ""
116
117-#: templates/events/team_event_detail_basic.inc.html:33
118-msgid "Announcement:"
119-msgstr ""
120-
121 #: templates/events/team_event_detail_basic.inc.html:40
122 msgid "Global Event:"
123 msgstr ""
124
125=== modified file 'loco_directory/templates/events/global_event_detail.inc.html'
126--- loco_directory/templates/events/global_event_detail.inc.html 2010-08-20 02:49:29 +0000
127+++ loco_directory/templates/events/global_event_detail.inc.html 2010-08-23 13:21:42 +0000
128@@ -1,25 +1,33 @@
129 {% load i18n %}
130-<article class="minor-content">
131-
132-<h2>{{global_event_object.name}}</h2>
133-{% include "events/global_event_detail_basic.inc.html" %}
134-</article>
135-
136-{% if global_event_object.microbloghashtag %}
137-<article class="minor-content alone">
138-
139-<h2>{% trans "Microblogging" %} #{{global_event_object.microbloghashtag}}</h2>
140-<p><script src="{{MEDIA_URL}}js/twidenash.js?{{global_event_object.microbloghashtag}}"></script></p>
141-</article>
142-{% endif %}
143+<article class="main-content">
144+ <h2>{{global_event_object.name}}</h2>
145+ {% if global_event_object.description %}
146+ <table id="global-event-basic">
147+ <tr>
148+ <td class="form-item-value">{{ global_event_object.description|linebreaksbr }}</td>
149+ </tr>
150+ </table>
151+ {% endif %}
152+</article>
153+
154+<article class="main-content">
155+ <h3>{% trans "Details" %}</h3>
156+ {% include "events/global_event_detail_basic.inc.html" %}
157+</article>
158
159 <hr class="divide" />
160
161 {% if global_event_object.teamevent_set.all %}
162-<article id="global-event-attending" class="main-content alone">
163-<h2>{% blocktrans with global_event_object.teamevent_set.all.count as team_count %}Participating Team Events ({{team_count}}){% endblocktrans %}</h2>
164-<br />
165-{% include "events/global_event_detail_attending_teamevents.inc.html" %}
166-</article>
167+ <article id="global-event-attending" class="minor-content">
168+ <h2>{% blocktrans with global_event_object.teamevent_set.all.count as team_count %}Participating Team Events ({{team_count}}){% endblocktrans %}</h2>
169+ <br />
170+ {% include "events/global_event_detail_attending_teamevents.inc.html" %}
171+ </article>
172 {% endif %}
173
174+{% if global_event_object.microbloghashtag %}
175+ <article class="minor-content alone">
176+ <h2>{% trans "Microblogging" %} #{{global_event_object.microbloghashtag}}</h2>
177+ <p><script src="{{MEDIA_URL}}js/twidenash.js?{{global_event_object.microbloghashtag}}"></script></p>
178+ </article>
179+{% endif %}
180
181=== modified file 'loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html'
182--- loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html 2010-08-18 13:38:25 +0000
183+++ loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html 2010-08-23 13:21:42 +0000
184@@ -1,49 +1,45 @@
185 {% load i18n %}
186 {% if global_event_object.teamevent_set.all %}
187-{% for continent in continents %}
188- <h3>{{ continent.name }}</h3>
189- {% for country in countries %}{% for cont in country.continents.all %}{% ifequal cont continent %}
190- <h4>{{ country.name }}</h4>
191+ {% for continent in continents %}
192+ <h3>{{ continent.name }}</h3>
193+ {% for country in countries %}{% for cont in country.continents.all %}{% ifequal cont continent %}
194+ <h4>{{ country.name }}</h4>
195+ <ul>
196+ {% for team_event in global_event_object.teamevent_set.all %}{% ifequal country team_event.venue.country %}
197+ <li class="{% if team_event.is_past %}approved{% else %}unapproved{% endif %}">
198+ <a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>
199+ </li>
200+ {% endifequal %}{% endfor %}
201+ </ul>
202+ <br class="clear" />
203+ {% endifequal %}{% endfor %}{% endfor %}
204+ {% endfor %}
205+
206+ {% if countries_without_continents %}
207+ <h3>{% trans "Events in countries without continents" %}</h3>
208+ {% for country in countries_without_continents %}
209+ <h4>{{ country.name }}</h4>
210+ <ul>
211+ {% for team_event in global_event_object.teamevent_set.all %}{% ifequal country team_event.venue.country %}
212+ <li class="{% if team_event.is_past %}approved{% else %}unapproved{% endif %}</li>">
213+ <a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>
214+ </li>
215+ {% endifequal %}{% endfor %}
216+ </ul>
217+ <br class="clear" />
218+ {% endfor %}
219+ {% endif %}
220+
221+ {% if events_without_venue %}
222+ <h3>{% trans "Events without venue" %}</h3>
223 <ul>
224- {{colcycle.reset}}
225- {% for team_event in global_event_object.teamevent_set.all %}{% ifequal country team_event.venue.country %}
226- <li class="{% if team_event.is_past %}approved{% else %}unapproved{% endif %} {{colcycle.next}}">
227- <a title="{% trans "More Information about Team Event" %}"
228- href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>
229- </li>
230- {% endifequal %}{% endfor %}
231- </ul>
232- <br class="clear" />
233- {% endifequal %}{% endfor %}{% endfor %}
234-{% endfor %}
235-
236-{% if countries_without_continents %}
237- <h3>{% trans "Events in countries without continents" %}</h3>
238- {% for country in countries_without_continents %}
239- <h4>{{ country.name }}</h4>
240- <ul>{{colcycle.reset}}
241- {% for team_event in global_event_object.teamevent_set.all %}{% ifequal country team_event.venue.country %}
242- <li class="{% if team_event.is_past %}approved{% else %}unapproved{% endif %} {{colcycle.next}}">
243- <a title="{% trans "More Information about Team Event" %}"
244- href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>
245- </li>
246- {% endifequal %}{% endfor %}
247- </ul>
248- <br class="clear" />
249- {% endfor %}
250-{% endif %}
251-
252-{% if events_without_venue %}
253- <h3>{% trans "Events without venue" %}</h3>
254- <ul>{{colcycle.reset}}
255- {% for team_event in events_without_venue %}
256- <li class="{% if team_event.is_past %}approved{% else %}unapproved{% endif %} {{colcycle.next}}">
257- <a title="{% trans "More Information about Team Event" %}"
258- href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>
259- </li>
260- {% endfor %}
261- </ul>
262- <br class="clear" />
263-{% endif %}
264+ {% for team_event in events_without_venue %}
265+ <li class="{% if team_event.is_past %}approved{% else %}unapproved{% endif %}">
266+ <a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>
267+ </li>
268+ {% endfor %}
269+ </ul>
270+ <br class="clear" />
271+ {% endif %}
272
273 {% endif %}
274
275=== modified file 'loco_directory/templates/events/global_event_detail_basic.inc.html'
276--- loco_directory/templates/events/global_event_detail_basic.inc.html 2010-06-18 02:48:47 +0000
277+++ loco_directory/templates/events/global_event_detail_basic.inc.html 2010-08-23 13:21:42 +0000
278@@ -1,62 +1,54 @@
279 {% load i18n %}
280 {% if global_event_object %}
281-<table id="global-event-basic">
282- {% if global_event_object.date_begin %}
283- <tr>
284- <th class="form-item-label" scope="row"><label>{% trans "Date begin:" %}</label></th>
285- <td class="form-item-value">{{global_event_object.date_begin|date:"r" }}</td>
286- </tr>
287- {% endif %}
288- {% if global_event_object.date_end %}
289- <tr>
290- <th class="form-item-label" scope="row"><label>{% trans "Date end:" %}</label></th>
291- <td class="form-item-value">{{ global_event_object.date_end|date:"r" }}</td>
292- </tr>
293- {% endif %}
294- {% if global_event_object.description %}
295- <tr>
296- <th class="form-item-label" scope="row" valign="top"><label>{% trans "Description:" %}</label></th>
297- <td class="form-item-value">{{ global_event_object.description|linebreaksbr }}</td>
298- </tr>
299- {% endif %}
300- {% if global_event_object.announce %}
301- <tr>
302- <th class="form-item-label" scope="row"><label>{% trans "Announce:" %}</label></th>
303- <td class="form-item-value"><a href="{{ global_event_object.announce }}">{{global_event_object.announce }}</a></td>
304- </tr>
305- {% endif %}
306- {% if global_event_object.microbloghashtag %}
307- <tr>
308- <th class="form-item-label" scope="row"><label>{% trans "Microblog Hashtag:" %}</label></th>
309- <td class="form-item-value">{{ global_event_object.microbloghashtag }}&nbsp;
310- <a href="http://identi.ca/tag/{{ global_event_object.microbloghashtag }}">
311- <img src="/media/img/identica.ico"
312- alt="{{ global_event_object.microbloghashtag }} on Identi.ca" />
313- </a>&nbsp;
314- <a href="http://twitter.com/#search?q=%23{{ global_event_object.microbloghashtag }}">
315- <img src="/media/img/twitter.ico"
316- alt="{{ global_event_object.microbloghashtag }} on Twitter" />
317- </a>
318- </td>
319- </tr>
320- {% endif %}
321- {% if global_event_object.pictag %}
322- <tr>
323- <th class="form-item-label" scope="row"><label>{% trans "Pictag:" %}</label></th>
324- <td class="form-item-value">{{ global_event_object.pictag }}&nbsp;
325- <a href="http://www.flickr.com/search/?w=all&q={{ global_event_object.pictag }}&m=tags">
326- <img src="/media/img/flickr.ico"
327- alt="{{ global_event_object.pictag }} on Flickr" />
328- </a>&nbsp;
329- <a href="http://picasaweb.google.com/lh/view?tags=%22{{ global_event_object.pictag }}%22&psc=G#">
330- <img src="/media/img/picasa.ico"
331- alt="{{ global_event_object.pictag }} on Picasa" />
332- </a>
333- </td>
334-
335- </tr>
336- {% endif %}
337-
338-</table>
339+ <table id="global-event-basic">
340+ {% if global_event_object.date_begin %}
341+ <tr>
342+ <th class="form-item-label" scope="row"><label>{% trans "When:" %}</label></th>
343+ <td class="form-item-value">
344+ {% ifequal global_event_object.date_begin|date global_event_object.date_end|date %}
345+ {{ global_event_object.date_begin|date:"D, d N Y H:i" }} - {{ global_event_object.date_end|date:"H:i O" }}
346+ {% else %}
347+ {{ global_event_object.date_begin|date:"D, d N Y H:i" }} - {{ global_event_object.date_end|date:"D, d N Y H:i O" }}
348+ {% endifequal %}
349+ </td>
350+ </tr>
351+ {% endif %}
352+
353+ {% if global_event_object.announce %}
354+ <tr>
355+ <th class="form-item-label" scope="row"><label>{% trans "Announcement:" %}</label></th>
356+ <td class="form-item-value"><a href="{{ global_event_object.announce }}">{{global_event_object.announce }}</a></td>
357+ </tr>
358+ {% endif %}
359+
360+ {% if global_event_object.microbloghashtag %}
361+ <tr>
362+ <th class="form-item-label" scope="row"><label>{% trans "Microblog Hashtag:" %}</label></th>
363+ <td class="form-item-value">{{ global_event_object.microbloghashtag }}&nbsp;
364+ <a href="http://identi.ca/tag/{{ global_event_object.microbloghashtag }}">
365+ <img src="/media/img/identica.ico" alt="{{ global_event_object.microbloghashtag }} on Identi.ca" />
366+ </a>&nbsp;
367+ <a href="http://twitter.com/#search?q=%23{{ global_event_object.microbloghashtag }}">
368+ <img src="/media/img/twitter.ico" alt="{{ global_event_object.microbloghashtag }} on Twitter" />
369+ </a>
370+ </td>
371+ </tr>
372+ {% endif %}
373+
374+ {% if global_event_object.pictag %}
375+ <tr>
376+ <th class="form-item-label" scope="row"><label>{% trans "Pictag:" %}</label></th>
377+ <td class="form-item-value">{{ global_event_object.pictag }}&nbsp;
378+ <a href="http://www.flickr.com/search/?w=all&q={{ global_event_object.pictag }}&m=tags">
379+ <img src="/media/img/flickr.ico" alt="{{ global_event_object.pictag }} on Flickr" />
380+ </a>&nbsp;
381+ <a href="http://picasaweb.google.com/lh/view?tags=%22{{ global_event_object.pictag }}%22&psc=G#">
382+ <img src="/media/img/picasa.ico" alt="{{ global_event_object.pictag }} on Picasa" />
383+ </a>
384+ </td>
385+ </tr>
386+ {% endif %}
387+
388+ </table>
389 {% endif %}
390

Subscribers

People subscribed via source and target branches