Merge lp:~daker/loco-team-portal/fix.global-event into lp:loco-team-portal
- fix.global-event
- Merge into 0.2
Proposed by
Adnane Belmadiaf
Status: | Merged |
---|---|
Approved by: | Adnane Belmadiaf |
Approved revision: | 584 |
Merged at revision: | 585 |
Proposed branch: | lp:~daker/loco-team-portal/fix.global-event |
Merge into: | lp:loco-team-portal |
Diff against target: |
489 lines (+131/-240) 8 files modified
loco_directory/events/admin.py (+6/-1) loco_directory/events/urls.py (+3/-2) loco_directory/events/views.py (+8/-5) loco_directory/media/css/styles.css (+2/-3) loco_directory/templates/events/global_event_detail.html (+47/-23) loco_directory/templates/events/global_event_detail.inc.html (+62/-135) loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html (+3/-4) loco_directory/templates/events/global_event_detail_basic.inc.html (+0/-67) |
To merge this branch: | bzr merge lp:~daker/loco-team-portal/fix.global-event |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
LoCo Team Portal Developers | Pending | ||
Review via email: mp+141170@code.launchpad.net |
Commit message
Fixed the global event layout
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'loco_directory/events/admin.py' |
2 | --- loco_directory/events/admin.py 2012-12-04 22:17:11 +0000 |
3 | +++ loco_directory/events/admin.py 2012-12-22 23:25:26 +0000 |
4 | @@ -2,7 +2,12 @@ |
5 | from django.contrib import admin |
6 | from .models import * |
7 | |
8 | + |
9 | +class TeamEventAdmin(admin.ModelAdmin): |
10 | + list_filter = ('global_event',) |
11 | + raw_id_fields = ('venue', 'contact', 'teams', 'global_event') |
12 | + |
13 | admin.site.register(Venue) |
14 | admin.site.register(GlobalEvent) |
15 | -admin.site.register(TeamEvent) |
16 | +admin.site.register(TeamEvent, TeamEventAdmin) |
17 | admin.site.register(Attendee) |
18 | |
19 | === modified file 'loco_directory/events/urls.py' |
20 | --- loco_directory/events/urls.py 2012-12-04 22:17:11 +0000 |
21 | +++ loco_directory/events/urls.py 2012-12-22 23:25:26 +0000 |
22 | @@ -12,7 +12,8 @@ |
23 | |
24 | #global events |
25 | url(r'^global/ical/$', 'events.views.global_event_list_ical', name='global-event-list-ical'), |
26 | - url(r'^global/(?P<global_event_id>\d+)/detail/$', 'events.views.global_event_detail', name='global-event-detail'), |
27 | + url(r'^global/(?P<global_event_id>\d+)/$', 'events.views.global_event_detail', name='global-event-detail'), |
28 | + url(r'^global/(?P<global_event_id>\d+)/detail/$', 'events.views.global_event_detail', name='global-event-detail-old'), |
29 | url(r'^global/(?P<global_event_id>\d+)/delete/$', 'events.views.global_event_delete', name='global-event-delete'), |
30 | url(r'^global/(?P<global_event_id>\d+)/update/$', 'events.views.global_event_update', name='global-event-update'), |
31 | url(r'^global/(?P<global_event_id>\d+)/locations/$', 'events.views.global_event_locations', name='global-event-locations'), |
32 | @@ -21,7 +22,7 @@ |
33 | #team events |
34 | url(r'^locations/$', 'events.views.team_event_locations', name='team-event-locations'), |
35 | url(r'^ical/$', 'events.views.teams_event_list_ical', name='teams-event-list-ical'), |
36 | - url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)-(?P<event_slug>[a-zA-Z0-9\-\.\+?]+)/$', 'events.views.team_event_detail', name='team-event-detail'), |
37 | + url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)-(?P<event_slug>[a-zA-Z0-9\-\_\.\+?]+)/$', 'events.views.team_event_detail', name='team-event-detail'), |
38 | url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/detail/ical/$', 'events.views.event_ical', name='event-ical'), |
39 | url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/register/$', 'events.views.team_event_register', name='team-event-register'), |
40 | url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/detail/$', 'events.views.team_event_detail', name='team-event-detail-old'), |
41 | |
42 | === modified file 'loco_directory/events/views.py' |
43 | --- loco_directory/events/views.py 2012-12-16 23:28:14 +0000 |
44 | +++ loco_directory/events/views.py 2012-12-22 23:25:26 +0000 |
45 | @@ -384,16 +384,18 @@ |
46 | """ |
47 | detailed view for a global event |
48 | """ |
49 | - global_event_object = get_object_or_404(GlobalEvent, pk=global_event_id) |
50 | + global_event = get_object_or_404(GlobalEvent, pk=global_event_id) |
51 | + team_events = global_event.teamevent_set.all() |
52 | + |
53 | add_team_event = (request.user and request.user.is_authenticated() and \ |
54 | request.user.groups.exclude(name__exact='ubuntu-lococouncil')) |
55 | is_on_lc = launchpad.is_user_on_loco_council(request.user) |
56 | |
57 | - events_without_venue = global_event_object.teamevent_set.filter(venue__isnull=True) |
58 | - country_ids = [a.venue.country.id for a in global_event_object.teamevent_set.filter(venue__isnull=False, |
59 | + events_without_venue = team_events.filter(venue__isnull=True) |
60 | + country_ids = [a.venue.country.id for a in team_events.filter(venue__isnull=False, |
61 | venue__country__continents__isnull=False)] |
62 | country_without_continents_ids = [a.venue.country.id \ |
63 | - for a in global_event_object.teamevent_set.filter(venue__isnull=False, |
64 | + for a in team_events.filter(venue__isnull=False, |
65 | venue__country__isnull=False, |
66 | venue__country__continents__isnull=True)] |
67 | |
68 | @@ -405,7 +407,8 @@ |
69 | continents = Continent.objects.filter(id__in=continent_ids).order_by('name') |
70 | |
71 | context = { |
72 | - 'global_event_object': global_event_object, |
73 | + 'global_event': global_event, |
74 | + 'team_events': team_events, |
75 | 'add_team_event': add_team_event, |
76 | 'events_without_venue': events_without_venue, |
77 | 'user_is_on_lc': is_on_lc, |
78 | |
79 | === modified file 'loco_directory/media/css/styles.css' |
80 | --- loco_directory/media/css/styles.css 2012-12-18 22:25:30 +0000 |
81 | +++ loco_directory/media/css/styles.css 2012-12-22 23:25:26 +0000 |
82 | @@ -45,14 +45,13 @@ |
83 | } |
84 | */ |
85 | |
86 | -.minor-content.venue-map { |
87 | +.minor-content .venue-map { |
88 | min-height: 350px; |
89 | margin-top: 60px; |
90 | } |
91 | |
92 | -.side-content.venue-map { |
93 | +.venue-map { |
94 | min-height: 250px; |
95 | - margin-top: 60px; |
96 | } |
97 | |
98 | #main-content { |
99 | |
100 | === modified file 'loco_directory/templates/events/global_event_detail.html' |
101 | --- loco_directory/templates/events/global_event_detail.html 2012-09-25 21:01:12 +0000 |
102 | +++ loco_directory/templates/events/global_event_detail.html 2012-12-22 23:25:26 +0000 |
103 | @@ -1,35 +1,59 @@ |
104 | {% extends "base.html" %} |
105 | {% load i18n %} |
106 | |
107 | +{% block title %}{{ global_event.name }} | {% trans "Ubuntu LoCo Team Portal" %} {% endblock %} |
108 | + |
109 | {% block extrahead %}{{ block.super }} |
110 | - <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/twidenash.css" /> |
111 | - <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&language={% trans 'en' %}®ion={% trans 'US' %}"></script> |
112 | - <script type="text/javascript" src="http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0/src/markerclusterer_packed.js"></script> |
113 | - <script type="text/javascript" src="{{MEDIA_URL}}js/jquery-ubuntu-maps.js"></script> |
114 | - <script type="text/javascript" src="{{MEDIA_URL}}js/twidenash/jquery-twidenash.js"></script> |
115 | - <script type="text/javascript"> |
116 | - //<![CDATA[ |
117 | - $(function(){ |
118 | - $('.twidenash').twidenash({ |
119 | - sources: [ |
120 | - 'http://search.twitter.com/', |
121 | - ] |
122 | - }); |
123 | - $('#venue-map').showLocations({markers_url:'{% url global-event-locations global_event_id=global_event_object.id %}', |
124 | - marker_icon: '{{ MEDIA_URL }}/img/marker.png'}); |
125 | - }); |
126 | - //]]> |
127 | - </script> |
128 | +<meta property="fb:app_id" content="127188230723188"/> |
129 | +<meta property="og:title" content="{{ global_event.name }}" /> |
130 | +{% if global_event.description %} |
131 | +<meta property="og:description" content="{{ global_event.description|linebreaks|striptags }}" /> |
132 | +{% endif %} |
133 | +<meta property="og:url" content="http://loco.ubuntu.com{{ global_event.get_absolute_url }}"/> |
134 | +<meta property="og:image" content="http://loco.ubuntu.com/media/images/cof_orange_hex1.png"/> |
135 | +<meta property="og:site_name" content="Loco Team Portal"/> |
136 | +<meta property="og:type" content="loco-team-portal:event"/> |
137 | +<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/twidenash.css" /> |
138 | +<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&language={% trans 'en' %}®ion={% trans 'US' %}"></script> |
139 | +<script type="text/javascript" src="http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0/src/markerclusterer_packed.js"></script> |
140 | +<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-ubuntu-maps.js"></script> |
141 | +<script type="text/javascript" src="{{ MEDIA_URL }}js/twidenash/jquery-twidenash.js"></script> |
142 | +<script type="text/javascript"> |
143 | +//<![CDATA[ |
144 | +$(function(){ |
145 | + $('.twidenash').twidenash({ |
146 | + sources: [ |
147 | + 'http://search.twitter.com/', |
148 | + ] |
149 | + }); |
150 | + $('#venue-map').showLocations({ |
151 | + markers_url:'{% url global-event-locations global_event_id=global_event.id %}', |
152 | + marker_icon: '{{ MEDIA_URL }}img/marker.png'}); |
153 | + }); |
154 | +//]]> |
155 | +</script> |
156 | +{% if global_event.pictag %} |
157 | +<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.lightbox-0.5.min.js"></script> |
158 | +<link rel="stylesheet" href="{{ MEDIA_URL }}css/jquery.lightbox-0.5.css" type="text/css" media="screen" /> |
159 | +<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-flickr.js"></script> |
160 | +<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-picasa.js"></script> |
161 | +<script type="text/javascript"> |
162 | +$(function() { |
163 | + var tag = '{{ global_event.pictag }}'; |
164 | + var perPage = '27'; |
165 | + $('#photo-feed').flickr({ key: "{{ flickr_api_key }}", id: tag, amount: perPage }); |
166 | + $('#photo-feed').picasa({ id: tag, amount: perPage }); |
167 | +}); |
168 | +</script> |
169 | +{% endif %} |
170 | {% endblock %} |
171 | |
172 | -{% block title %}{% trans global_event_object.name %} | {% trans "Ubuntu LoCo Team Portal" %} {% endblock %} |
173 | - |
174 | {% block sub_nav_links %} |
175 | <li><a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a></li> |
176 | -<li><a class="sub-nav-item" href="{% url team-event-select %}?global_event_id={{global_event_object.id}}">{% trans "Add Team Event" %}</a></li> |
177 | +<li><a class="sub-nav-item" href="{% url team-event-select %}?global_event_id={{ global_event.id }}">{% trans "Add Team Event" %}</a></li> |
178 | {% if user_is_on_lc %} |
179 | -<li><a class="sub-nav-item" href="{% url global-event-update global_event_object.id %}">{% trans "Edit Details" %}</a></li> |
180 | -<li><a class="sub-nav-item" href="{% url global-event-delete global_event_object.id %}">{% trans "Delete Event" %}</a></li> |
181 | +<li><a class="sub-nav-item" href="{% url global-event-update global_event.id %}">{% trans "Edit Details" %}</a></li> |
182 | +<li><a class="sub-nav-item" href="{% url global-event-delete global_event.id %}">{% trans "Delete Event" %}</a></li> |
183 | {% endif %} |
184 | {% endblock %} |
185 | |
186 | |
187 | === modified file 'loco_directory/templates/events/global_event_detail.inc.html' |
188 | --- loco_directory/templates/events/global_event_detail.inc.html 2012-06-04 22:19:53 +0000 |
189 | +++ loco_directory/templates/events/global_event_detail.inc.html 2012-12-22 23:25:26 +0000 |
190 | @@ -1,138 +1,65 @@ |
191 | {% load i18n teams_tags markup %} |
192 | -{% block extrahead %}{{ block.super }} |
193 | - |
194 | -{% if global_event_object.pictag %} |
195 | -<link rel="stylesheet" href="{{MEDIA_URL}}css/jquery.lightbox-0.5.css" type="text/css" media="screen" /> |
196 | -<script type="text/javascript" src="{{MEDIA_URL}}js/jquery.lightbox-0.5.min.js"></script> |
197 | -<script type="text/javascript" src="{{MEDIA_URL}}js/jquery-flickr.js"></script> |
198 | -<script type="text/javascript"> |
199 | -$(function() { |
200 | - var tag = '{{ global_event_object.pictag }}'; |
201 | - var perPage = '27'; |
202 | - |
203 | -{% if flickr_api_key %} |
204 | - $('#photo-feed').flickr({ key: '{{ flickr_api_key }}', tag: tag, amount: 27 }); |
205 | -{% endif %} |
206 | - |
207 | - var PicasaFeedUrl = 'http://picasaweb.google.com/data/feed/api/all?v=2'+ |
208 | - '&tag=' + tag + '&alt=json-in-script&kind=photo&max-results=' + perPage + '&thumbsize=75c&callback=?'; |
209 | - $.getJSON(PicasaFeedUrl, |
210 | - function(data) { |
211 | - if(!(data.feed && data.feed.entry && data.feed.entry[0])) { |
212 | - return; |
213 | - } |
214 | - $.each(data.feed.entry, function(i, item){ |
215 | - var altLink = "#"; |
216 | - if(item.media$group.media$content[0].url) { |
217 | - altLink = item.media$group.media$content[0].url; |
218 | - } |
219 | - var title = "Untitled"; |
220 | - if(item.media$group.media$description.$t) { |
221 | - title = item.media$group.media$description.$t; |
222 | - } |
223 | - title = title + " by " + item.author[0].name.$t; |
224 | - $("<a/>").attr("class","lightbox").attr("href", altLink).attr("target","_blank").attr("rel","lightbox[picasa]").append( |
225 | - $("<img/>").attr("src", item.media$group.media$thumbnail[0].url).attr("title", title) |
226 | - ).appendTo("#photo-feed"); |
227 | - }); |
228 | - $("#photo-feed a.lightbox").lightBox(); |
229 | - }); |
230 | - |
231 | - |
232 | - $.getJSON('http://api.pix.ie/v0.81/tag/{{ global_event_object.pictag }}/photos.json?oauth_consumer_key=1dcc8233-a6da-46b0-acb0-4e29aa612b30&page=1&perpage='+perPage+'&sortby=recent&extras=items_item_owner,items_item_Description,items_item_sizes_all&jsonp=?', |
233 | - function(data){ |
234 | - $.each(data.items, function(i, Photo){ |
235 | - var photoStringStart = '<a class="lightbox" rel="lightbox[flickr]" '; |
236 | - var photoStringEnd = 'title="' + Photo.title + '" href="'+ |
237 | - Photo.sizes[4].url +'"><img width="75" height="75" src="' + Photo.sizes[1].url + '" alt="' + |
238 | - Photo.title + '"/></a>'; |
239 | - var photoString = photoStringStart + photoStringEnd; |
240 | - |
241 | - $(photoString).appendTo("#photo-feed"); |
242 | - }); |
243 | - $("#photo-feed a.lightbox").lightBox(); |
244 | - }); |
245 | -}); |
246 | -</script> |
247 | - |
248 | -<script type="text/javascript"> |
249 | - |
250 | - |
251 | -</script> |
252 | -<style type="text/css"> |
253 | -div#photo-feed a.lightbox img { |
254 | - border: 5px solid #b3aaa4; |
255 | - margin-left: 5px; |
256 | - margin-right: 5px; |
257 | -} |
258 | -</style> |
259 | -{% endif %} |
260 | -{% endblock %} |
261 | |
262 | <div class="row"> |
263 | -<section class="span-6"> |
264 | - <h2>{{global_event_object.name}}</h2> |
265 | - {% if global_event_object.description %} |
266 | - <table id="global-event-basic"> |
267 | - <tr> |
268 | - <td class="form-item-value">{{ global_event_object.description|markdown }}</td> |
269 | - </tr> |
270 | - </table> |
271 | - {% endif %} |
272 | - |
273 | - <h3>{% trans "Details" %}</h3> |
274 | - {% include "events/global_event_detail_basic.inc.html" %} |
275 | - |
276 | -{% if global_event_object.pictag %} |
277 | - <div id="photo-feed"></div> |
278 | -{% endif %} |
279 | - |
280 | -</section> |
281 | - |
282 | -<section class="span-6 last"> |
283 | - <section id="venue-map" class="side-content alone venue-map"></section> |
284 | - |
285 | - <div class="share"> |
286 | - <a href="http://www.reddit.com/submit" onclick="window.location = 'http://www.reddit.com/submit?url=' + encodeURIComponent(window.location); return false"> <img style="padding-bottom: 4px;"src="http://www.reddit.com/static/spreddit7.gif" alt="submit to reddit" border="0" /></a><br /> |
287 | - <div id="fb-root"></div> |
288 | - <script>(function(d, s, id) { |
289 | - var js, fjs = d.getElementsByTagName(s)[0]; |
290 | - if (d.getElementById(id)) {return;} |
291 | - js = d.createElement(s); js.id = id; |
292 | - js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=127188230723188"; |
293 | - fjs.parentNode.insertBefore(js, fjs); |
294 | - }(document, 'script', 'facebook-jssdk'));</script> |
295 | - <div class="fb-like" data-href="http://loco.ubuntu.com{% url global-event-detail global_event_object.id %}" data-send="false" data-layout="box_count" data-width="40" data-show-faces="false" data-font="arial"></div> |
296 | - <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script> |
297 | - <g:plusone size="tall"></g:plusone> |
298 | - <a href="http://twitter.com/share" class="twitter-share-button" data-count="vertical" data-lang="en">Tweet</a> |
299 | - <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script> |
300 | - <script src="http://www.stumbleupon.com/hostedbadge.php?s=5"></script> |
301 | - </div> |
302 | - |
303 | -{% if global_event_object.teamevent_set.all %} |
304 | - {% include "events/global_event_detail_attending_teamevents.inc.html" %} |
305 | -{% endif %} |
306 | - |
307 | -{% if global_event_object.microbloghashtag %} |
308 | - <article class="alone"> |
309 | - <h2>{% trans "Microblogging" %} #{{global_event_object.microbloghashtag}}</h2> |
310 | - <div class="twidenash" id="{{ global_event_object.microbloghashtag }}"></div> |
311 | - </article> |
312 | -{% endif %} |
313 | - |
314 | - |
315 | -</section> |
316 | -</div> |
317 | - |
318 | -{% if global_event_object.channel %} |
319 | -<div class="row " id="webchat"> |
320 | -<section class="span-12"> |
321 | - {% if user.is_authenticated %} |
322 | - <iframe src="http://webchat.freenode.net/?channels={{ global_event_object.channel }}&prompt=1&uio=OT10cnVlJjEwPXRydWUmMTE9MjM218&nick={{ user.username|irc }}" width="900" height="400"></iframe> |
323 | - {% else %} |
324 | - <iframe src="http://webchat.freenode.net/?channels={{ global_event_object.channel }}&prompt=1&uio=OT10cnVlJjEwPXRydWUmMTE9MjM218&nick=locodir-user" width="900" height="400"></iframe> |
325 | - {% endif %} |
326 | - </section> |
327 | -</div> |
328 | -{% endif %} |
329 | + <section class="span-9"> |
330 | + <div class="box_content"> |
331 | + <div class="pagelet"> |
332 | + <h2>{{ global_event.name }}</h2> |
333 | + <div class="share"> |
334 | + <div id="fb-root"></div> |
335 | + <script>(function(d, s, id) { |
336 | + var js, fjs = d.getElementsByTagName(s)[0]; |
337 | + if (d.getElementById(id)) {return;} |
338 | + js = d.createElement(s); js.id = id; |
339 | + js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=127188230723188"; |
340 | + fjs.parentNode.insertBefore(js, fjs); |
341 | + }(document, 'script', 'facebook-jssdk'));</script> |
342 | + <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script> |
343 | + <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script> |
344 | + <g:plusone size="medium"></g:plusone> |
345 | + <a href="http://twitter.com/share" class="twitter-share-button" data-lang="en">Tweet</a> |
346 | + <div class="fb-like" data-href="http://loco.ubuntu.com{% url global-event-detail global_event.id %}" data-send="false" data-layout="button_count" data-width="40" data-show-faces="false" data-font="arial"></div> |
347 | + </div> |
348 | + |
349 | + <div> |
350 | + <span class="pictogram calendar"></span> |
351 | + <span class="pictogram-l"> |
352 | + {% ifequal global_event.date_begin|date global_event.date_end|date %} |
353 | + {{ global_event.date_begin|date:"D, d N Y H:i" }} - {{ global_event.date_end|date:"H:i T"}} |
354 | + {% else %} |
355 | + {{ global_event.date_begin|date:"D, d N Y H:i" }} - {{ global_event.date_end|date:"D, d N Y H:i T"}} |
356 | + {% endifequal %} |
357 | + </span> |
358 | + </div> |
359 | + |
360 | + {% if global_event.announce %} |
361 | + <div> |
362 | + <span class="pictogram announcement"></span> |
363 | + <a class="pictogram-l" href="{{ global_event.announce }}">{{ global_event.announce }}</a> |
364 | + </div> |
365 | + {% endif %} |
366 | + |
367 | + {% if global_event.description %} |
368 | + <p>{{ global_event.description|markdown }}</p> |
369 | + {% endif %} |
370 | + |
371 | + <p>{{ global_event.get_participating }}</p> |
372 | + </div> |
373 | + <div> |
374 | + <div id="venue-map" class="venue-map"></div> |
375 | + |
376 | + {% if team_events %} |
377 | + {% include "events/global_event_detail_attending_teamevents.inc.html" %} |
378 | + {% endif %} |
379 | + |
380 | + {% if global_event.pictag %} |
381 | + <div id="photo-feed"></div> |
382 | + {% endif %} |
383 | + </div> |
384 | + </div> |
385 | + </section> |
386 | + <section class="span-3 box_content last"> |
387 | + <div class="sidebar-inner"> |
388 | + </div> |
389 | + </section> |
390 | +</div> |
391 | |
392 | === modified file 'loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html' |
393 | --- loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html 2012-02-07 20:10:49 +0000 |
394 | +++ loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html 2012-12-22 23:25:26 +0000 |
395 | @@ -1,11 +1,10 @@ |
396 | {% load i18n %} |
397 | -{% if global_event_object.teamevent_set.all %} |
398 | -<p>{{ global_event_object.get_participating }}</p> |
399 | +{% if team_events %} |
400 | <table class="basic wide"> |
401 | {% for continent in continents %} |
402 | <thead><tr><th colspan="3">{{ continent.name }}</th></tr></thead> |
403 | {% for country in countries %}{% for cont in country.continents.all %}{% ifequal cont continent %} |
404 | - {% for team_event in global_event_object.teamevent_set.all %}{% ifequal country team_event.venue.country %} |
405 | + {% for team_event in team_events %}{% ifequal country team_event.venue.country %} |
406 | <tr> |
407 | <td> |
408 | <a title="{% trans 'More Information about Team Event' %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a> |
409 | @@ -29,7 +28,7 @@ |
410 | {% for country in countries_without_continents %} |
411 | <tr> |
412 | <td> |
413 | - <a title="{% trans 'More Information about Team Event' %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a> |
414 | + <a title="{{ team_event.name }}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a> |
415 | </td> |
416 | <td> |
417 | {{ country.name }} |
418 | |
419 | === removed file 'loco_directory/templates/events/global_event_detail_basic.inc.html' |
420 | --- loco_directory/templates/events/global_event_detail_basic.inc.html 2012-02-07 20:10:49 +0000 |
421 | +++ loco_directory/templates/events/global_event_detail_basic.inc.html 1970-01-01 00:00:00 +0000 |
422 | @@ -1,67 +0,0 @@ |
423 | -{% load i18n %} |
424 | -{% if global_event_object %} |
425 | - <table id="global-event-basic"> |
426 | - {% if global_event_object.date_begin %} |
427 | - <tr> |
428 | - <th class="form-item-label" scope="row">{% trans "When:" %}</th> |
429 | - <td class="form-item-value"> |
430 | - {% ifequal global_event_object.date_begin|date global_event_object.date_end|date %} |
431 | - {{ global_event_object.date_begin|date:"D, d N Y H:i" }} - {{ global_event_object.date_end|date:"H:i T"}} |
432 | - {% else %} |
433 | - {{ global_event_object.date_begin|date:"D, d N Y H:i" }} - {{ global_event_object.date_end|date:"D, d N Y H:i T"}} |
434 | - {% endifequal %} |
435 | - </td> |
436 | - </tr> |
437 | - {% endif %} |
438 | - |
439 | - {% if global_event_object.announce %} |
440 | - <tr> |
441 | - <th class="form-item-label" scope="row">{% trans "Announcement:" %}</th> |
442 | - <td class="form-item-value"><a href="{{ global_event_object.announce }}">{{global_event_object.announce }}</a></td> |
443 | - </tr> |
444 | - {% endif %} |
445 | - |
446 | - {% if global_event_object.microbloghashtag %} |
447 | - <tr> |
448 | - <th class="form-item-label" scope="row">{% trans "Microblog Hashtag:" %}</th> |
449 | - <td class="form-item-value">{{ global_event_object.microbloghashtag }} |
450 | - <a href="http://identi.ca/tag/{{ global_event_object.microbloghashtag }}"> |
451 | - <img src="{{MEDIA_URL}}img/identica.ico" alt="{{ global_event_object.microbloghashtag }} on Identi.ca" /> |
452 | - </a> |
453 | - <a href="http://twitter.com/#search?q=%23{{ global_event_object.microbloghashtag }}"> |
454 | - <img src="{{MEDIA_URL}}img/twitter.ico" alt="{{ global_event_object.microbloghashtag }} on Twitter" /> |
455 | - </a> |
456 | - </td> |
457 | - </tr> |
458 | - {% endif %} |
459 | - |
460 | - {% if global_event_object.pictag %} |
461 | - <tr> |
462 | - <th class="form-item-label" scope="row">{% trans "Pictag:" %}</th> |
463 | - <td class="form-item-value">{{ global_event_object.pictag }} |
464 | - <a href="http://www.flickr.com/search/?w=all&q={{ global_event_object.pictag }}&m=tags"> |
465 | - <img src="{{MEDIA_URL}}img/flickr.ico" alt="{{ global_event_object.pictag }} on Flickr" /> |
466 | - </a> |
467 | - <a href="http://picasaweb.google.com/lh/view?tags=%22{{ global_event_object.pictag }}%22&psc=G#"> |
468 | - <img src="{{MEDIA_URL}}img/picasa.ico" alt="{{ global_event_object.pictag }} on Picasa" /> |
469 | - </a> |
470 | - <a href="http://pix.ie/explore/tag/{{ global_event_object.pictag }}"> |
471 | - <img src="{{MEDIA_URL}}img/pixie.ico" alt="{{ global_event_object.pictag }} on Pix.ie" /> |
472 | - </a> |
473 | - </td> |
474 | - </tr> |
475 | - {% endif %} |
476 | - |
477 | - {% if global_event_object.channel %} |
478 | - <tr> |
479 | - <th class="form-item-label" scope="row">{% trans "Chat Channel:" %}</th> |
480 | - <td class="form-item-value"> |
481 | - <a href="#" onclick="$('#webchat').show('fast', function() {$(window).scrollTop($('#webchat').position().top);} );" >{{ global_event_object.channel }}</a> |
482 | - </td> |
483 | - </tr> |
484 | - {% endif %} |
485 | - |
486 | - </table> |
487 | - |
488 | -{% endif %} |
489 | - |