Merge lp:~daker/loco-team-portal/1178915-1178911 into lp:loco-team-portal
- 1178915-1178911
- Merge into 0.2
Proposed by
Adnane Belmadiaf
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Adnane Belmadiaf | ||||||||
Approved revision: | 642 | ||||||||
Merged at revision: | 642 | ||||||||
Proposed branch: | lp:~daker/loco-team-portal/1178915-1178911 | ||||||||
Merge into: | lp:loco-team-portal | ||||||||
Diff against target: |
421 lines (+103/-76) 9 files modified
loco_directory/events/admin.py (+2/-1) loco_directory/events/models.py (+0/-1) loco_directory/events/views.py (+6/-6) loco_directory/media/css/styles.css (+3/-2) loco_directory/templates/events/team_event_comment_new.inc.html (+1/-1) loco_directory/templates/events/team_event_detail.html (+35/-19) loco_directory/templates/events/team_event_detail.inc.html (+50/-39) loco_directory/templates/events/team_event_detail_comments.inc.html (+5/-5) loco_directory/templates/venues/venue_detail.html (+1/-2) |
||||||||
To merge this branch: | bzr merge lp:~daker/loco-team-portal/1178915-1178911 | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
LoCo Team Portal Developers | Pending | ||
Review via email: mp+163400@code.launchpad.net |
Commit message
Fixed the templatetag priority causing invalid characters when there is a link in a comment
Replaced the static Gmap with the interactive one
Description of the change
Registred TeamEventComment in the admin
Changed team_event_object to team_event
Line 390 is the fix for bug 1178911
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-25 22:00:46 +0000 |
3 | +++ loco_directory/events/admin.py 2013-05-11 14:16:26 +0000 |
4 | @@ -1,6 +1,6 @@ |
5 | # -*- coding: utf-8 -*- |
6 | from django.contrib import admin |
7 | -from .models import (Venue, GlobalEvent, TeamEvent, Attendee) |
8 | +from .models import (Venue, GlobalEvent, TeamEvent, Attendee, TeamEventComment) |
9 | |
10 | |
11 | class TeamEventAdmin(admin.ModelAdmin): |
12 | @@ -11,3 +11,4 @@ |
13 | admin.site.register(GlobalEvent) |
14 | admin.site.register(TeamEvent, TeamEventAdmin) |
15 | admin.site.register(Attendee) |
16 | +admin.site.register(TeamEventComment) |
17 | |
18 | === modified file 'loco_directory/events/models.py' |
19 | --- loco_directory/events/models.py 2013-03-11 21:49:37 +0000 |
20 | +++ loco_directory/events/models.py 2013-05-11 14:16:26 +0000 |
21 | @@ -15,7 +15,6 @@ |
22 | from .fields import GuestsField |
23 | |
24 | |
25 | - |
26 | ATTENDEE_PROMISE_CHOICES = ( |
27 | ('sure', _('attending')), |
28 | ('maybe', _('might be attending')), |
29 | |
30 | === modified file 'loco_directory/events/views.py' |
31 | --- loco_directory/events/views.py 2013-04-08 20:08:25 +0000 |
32 | +++ loco_directory/events/views.py 2013-05-11 14:16:26 +0000 |
33 | @@ -132,9 +132,9 @@ |
34 | """ |
35 | detailed view for a team event |
36 | """ |
37 | - team_event_object = get_object_or_404(TeamEvent, pk=team_event_id) |
38 | + team_event = get_object_or_404(TeamEvent, pk=team_event_id) |
39 | is_member = False |
40 | - for team_object in team_event_object.teams.all(): |
41 | + for team_object in team_event.teams.all(): |
42 | is_member = is_member or launchpad.is_team_member(request.user, team_object) |
43 | |
44 | if request.user.is_authenticated(): |
45 | @@ -142,19 +142,19 @@ |
46 | form = TeamEventCommentForm(data=request.POST) |
47 | if form.is_valid(): |
48 | team_event_comment = form.save(commit=False) |
49 | - team_event_comment.team_event = team_event_object |
50 | + team_event_comment.team_event = team_event |
51 | team_event_comment.commenter_profile = request.user.get_profile() |
52 | team_event_comment.save() |
53 | request.user.message_set.create(message=_('Your comment has been saved.')) |
54 | - return redirect(team_event_object) |
55 | + return redirect(team_event) |
56 | else: |
57 | form = TeamEventCommentForm() |
58 | else: |
59 | form = None |
60 | |
61 | context = { |
62 | - 'team_event_object': team_event_object, |
63 | - 'user_is_attending': team_event_object.is_attending(request.user), |
64 | + 'team_event': team_event, |
65 | + 'user_is_attending': team_event.is_attending(request.user), |
66 | 'user_is_team_member': is_member, |
67 | 'form': form, |
68 | } |
69 | |
70 | === modified file 'loco_directory/media/css/styles.css' |
71 | --- loco_directory/media/css/styles.css 2013-04-13 17:54:34 +0000 |
72 | +++ loco_directory/media/css/styles.css 2013-05-11 14:16:26 +0000 |
73 | @@ -346,9 +346,10 @@ |
74 | } |
75 | |
76 | .f img { |
77 | - width: 50px; |
78 | - height: 50px; |
79 | + width: 61px; |
80 | + height: 55px; |
81 | margin-bottom: 5px; |
82 | + margin-right: 5px; |
83 | } |
84 | |
85 | .f0 { |
86 | |
87 | === modified file 'loco_directory/templates/events/team_event_comment_new.inc.html' |
88 | --- loco_directory/templates/events/team_event_comment_new.inc.html 2013-01-01 14:04:15 +0000 |
89 | +++ loco_directory/templates/events/team_event_comment_new.inc.html 2013-05-11 14:16:26 +0000 |
90 | @@ -14,6 +14,6 @@ |
91 | </div> |
92 | {% else %} |
93 | <div style="padding:10px;"> |
94 | - {% blocktrans with team_event_object.get_absolute_url as login_next %}To post your comment you need to <a href="/openid/login?next={{login_next}}">login</a> or <a href="/openid/login/?next={{ login_next }}">create</a> a new account{% endblocktrans %} |
95 | + {% blocktrans with team_event.get_absolute_url as login_next %}To post your comment you need to <a href="/openid/login/?next={{ login_next }}">login</a> or <a href="/openid/login/?next={{ login_next }}">create</a> a new account{% endblocktrans %} |
96 | </div> |
97 | {% endif %} |
98 | |
99 | === modified file 'loco_directory/templates/events/team_event_detail.html' |
100 | --- loco_directory/templates/events/team_event_detail.html 2012-11-28 00:46:29 +0000 |
101 | +++ loco_directory/templates/events/team_event_detail.html 2013-05-11 14:16:26 +0000 |
102 | @@ -1,48 +1,64 @@ |
103 | {% extends "base.html" %} |
104 | {% load i18n %} |
105 | |
106 | -{% block page_name %}{% trans team_event_object.name %}{% endblock %} |
107 | +{% block page_name %}{% trans team_event.name %}{% endblock %} |
108 | |
109 | {% block extrahead %}{{ block.super }} |
110 | <meta property="fb:app_id" content="127188230723188"/> |
111 | -<meta property="og:title" content="{{ team_event_object.name }}" /> |
112 | -{% if team_event_object.description %} |
113 | -<meta property="og:description" content="{{ team_event_object.description|linebreaks|striptags }}" /> |
114 | +<meta property="og:title" content="{{ team_event.name }}" /> |
115 | +{% if team_event.description %} |
116 | +<meta property="og:description" content="{{ team_event.description|linebreaks|striptags }}" /> |
117 | {% endif %} |
118 | -<meta property="og:url" content="http://loco.ubuntu.com{{ team_event_object.get_absolute_url }}"/> |
119 | +<meta property="og:url" content="http://loco.ubuntu.com{{ team_event.get_absolute_url }}"/> |
120 | <meta property="og:image" content="http://loco.ubuntu.com/media/images/cof_orange_hex1.png"/> |
121 | <meta property="og:site_name" content="Loco Team Portal"/> |
122 | <meta property="og:type" content="loco-team-portal:event"/> |
123 | -{% if team_event_object.venue %} |
124 | -<meta property="og:latitude" content="{{ team_event_object.venue.latitude }}"/> |
125 | -<meta property="og:longitude" content="{{ team_event_object.venue.longitude }}"/> |
126 | -<meta property="og:street-address" content="{{ team_event_object.venue.name }} "/> |
127 | -<meta property="og:locality" content="{% if team_event_object.venue.city %}{{ team_event_object.venue.city }}{% endif %}"/> |
128 | +{% if team_event.venue %} |
129 | +<meta property="og:latitude" content="{{ team_event.venue.latitude }}"/> |
130 | +<meta property="og:longitude" content="{{ team_event.venue.longitude }}"/> |
131 | +<meta property="og:street-address" content="{{ team_event.venue.name }} "/> |
132 | +<meta property="og:locality" content="{% if team_event.venue.city %}{{ team_event.venue.city }}{% endif %}"/> |
133 | {% endif %} |
134 | -<script type="text/javascript" src="{{ MEDIA_URL }}js/comments.js"></script> |
135 | -{{form.media}} |
136 | +<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&language={% trans 'en' %}®ion={% trans 'US' %}"></script> |
137 | +<script type="text/javascript" src="http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0/src/markerclusterer_packed.js"></script> |
138 | +<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-ubuntu-maps.js"></script> |
139 | <script type="text/javascript"> |
140 | - $(document).ready(function(){ |
141 | - $('span[rel*=help]').colorTip({color:'orange'}); |
142 | +$(document).ready(function(){ |
143 | + var x = {{ team_event.venue.longitude }}, |
144 | + y = {{ team_event.venue.latitude }}, |
145 | + km = 0.0089930, // 1km |
146 | + radius = 5, |
147 | + minx = x-radius/2*km, |
148 | + miny = y-radius/2*km, |
149 | + maxx = x+radius/2*km, |
150 | + maxy = y+radius/2*km; |
151 | + |
152 | + $.getJSON("http://www.panoramio.com/map/get_panoramas.php?order=popularity&set=public&from=0&to=7&minx=" + minx + "&miny=" + miny + "&maxx=" + maxx + "&maxy=" + maxy +"&size=medium&format=json&callback=?", function(data){ |
153 | + $.each(data.photos, function(i,item){ |
154 | + $("#pamdiv").append('<span class="f f'+ i +'"><a href="http://www.panoramio.com/photo/' + $(this)[0].photo_id + '"><img src="' + $(this)[0].photo_file_url + '" title="' + $(this)[0].photo_title + '" alt="' + $(this)[0].photo_title + '"></a></span>'); |
155 | + }); |
156 | }); |
157 | +}); |
158 | </script> |
159 | +<script type="text/javascript" src="{{ MEDIA_URL }}js/comments.js"></script> |
160 | +{{ form.media }} |
161 | {% endblock %} |
162 | |
163 | |
164 | {% block sub_nav_links %} |
165 | |
166 | -{% for team in team_event_object.teams.all %} |
167 | +{% for team in team_event.teams.all %} |
168 | <li><a class="sub-nav-item" href="{{ team.get_absolute_url }}">{{ team.name }}</a></li> |
169 | {% endfor %} |
170 | |
171 | {% if user.is_authenticated %} |
172 | {% if user_is_team_member %} |
173 | - <li><a class="sub-nav-item" href="{% url team-event-update team_event_object.first_team.lp_name team_event_object.id %}">{% trans "Edit Details" %}</a></li> |
174 | - <li><a class="sub-nav-item" href="{% url team-event-delete team_event_object.first_team.lp_name team_event_object.id %}">{% trans "Delete Event" %}</a></li> |
175 | - <li><a class="sub-nav-item" href="{% url team-event-copy team_event_object.first_team.lp_name team_event_object.id %}">{% trans "Copy Event" %}</a></li> |
176 | + <li><a class="sub-nav-item" href="{% url team-event-update team_event.first_team.lp_name team_event.id %}">{% trans "Edit Details" %}</a></li> |
177 | + <li><a class="sub-nav-item" href="{% url team-event-delete team_event.first_team.lp_name team_event.id %}">{% trans "Delete Event" %}</a></li> |
178 | + <li><a class="sub-nav-item" href="{% url team-event-copy team_event.first_team.lp_name team_event.id %}">{% trans "Copy Event" %}</a></li> |
179 | {% endif %} |
180 | {% endif %} |
181 | -<li><a class="sub-nav-item" href="{% url event-ical team_event_object.first_team.lp_name team_event_object.id %}">{% trans "iCal Feed" %}</a></li> |
182 | +<li><a class="sub-nav-item" href="{% url event-ical team_event.first_team.lp_name team_event.id %}">{% trans "iCal Feed" %}</a></li> |
183 | {% endblock %} |
184 | |
185 | {% block content %} |
186 | |
187 | === modified file 'loco_directory/templates/events/team_event_detail.inc.html' |
188 | --- loco_directory/templates/events/team_event_detail.inc.html 2013-02-16 00:29:22 +0000 |
189 | +++ loco_directory/templates/events/team_event_detail.inc.html 2013-05-11 14:16:26 +0000 |
190 | @@ -3,11 +3,11 @@ |
191 | <section class="span-9"> |
192 | <div class="box_content"> |
193 | <div class="pagelet"> |
194 | - <h2>{{ team_event_object.name }}</h2> |
195 | - {% if team_event_object.global_event %} |
196 | + <h2>{{ team_event.name }}</h2> |
197 | + {% if team_event.global_event %} |
198 | <div class="event-partofglobal-event"> |
199 | {% trans "This event is part of" %} |
200 | - <a href="{{ team_event_object.global_event.get_absolute_url }}">{{team_event_object.global_event.name }}</a> |
201 | + <a href="{{ team_event.global_event.get_absolute_url }}">{{team_event.global_event.name }}</a> |
202 | </div> |
203 | {% endif %} |
204 | <div class="share"> |
205 | @@ -23,111 +23,122 @@ |
206 | <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script> |
207 | <g:plusone size="medium"></g:plusone> |
208 | <a href="http://twitter.com/share" class="twitter-share-button" data-lang="en">Tweet</a> |
209 | - <div class="fb-like" data-href="http://loco.ubuntu.com{{ team_event_object.get_absolute_url }}" data-send="false" data-layout="button_count" data-width="40" data-show-faces="false" data-font="arial"></div> |
210 | + <div class="fb-like" data-href="http://loco.ubuntu.com{{ team_event.get_absolute_url }}" data-send="false" data-layout="button_count" data-width="40" data-show-faces="false" data-font="arial"></div> |
211 | </div> |
212 | |
213 | <div> |
214 | <span class="pictogram calendar"></span> |
215 | <span class="pictogram-l"> |
216 | - {% ifequal team_event_object.local_date_begin|date team_event_object.local_date_end|date %} |
217 | - {{ team_event_object.local_date_begin|date:"D, d N Y H:i" }} - {{ team_event_object.local_date_end|date:"H:i T" }} |
218 | + {% ifequal team_event.local_date_begin|date team_event.local_date_end|date %} |
219 | + {{ team_event.local_date_begin|date:"D, d N Y H:i" }} - {{ team_event.local_date_end|date:"H:i T" }} |
220 | {% else %} |
221 | - {{ team_event_object.local_date_begin|date:"D, d N Y H:i" }} - {{ team_event_object.local_date_end|date:"D, d N Y H:i T" }} |
222 | + {{ team_event.local_date_begin|date:"D, d N Y H:i" }} - {{ team_event.local_date_end|date:"D, d N Y H:i T" }} |
223 | {% endifequal %} |
224 | </span> |
225 | </div> |
226 | |
227 | - {% if team_event_object.description %} |
228 | - <p>{{ team_event_object.description|markdown:'safe'|linebreaks }}</p> |
229 | + {% if team_event.description %} |
230 | + <p>{{ team_event.description|markdown:'safe'|linebreaks }}</p> |
231 | {% endif %} |
232 | |
233 | - {% if team_event_object.announce %} |
234 | + {% if team_event.announce %} |
235 | <div> |
236 | <span class="pictogram announcement"></span> |
237 | - <a class="pictogram-l" href="{{ team_event_object.announce }}">{{team_event_object.announce }}</a> |
238 | + <a class="pictogram-l" href="{{ team_event.announce }}">{{team_event.announce }}</a> |
239 | </div> |
240 | {% endif %} |
241 | </div> |
242 | |
243 | - <div class="map"> |
244 | - <img class="map_img" src="http://maps.googleapis.com/maps/api/staticmap?center={% if team_event_object.venue.address %}{{ team_event_object.venue.address }}{% else %}{{ team_event_object.venue.latitude }},{{ team_event_object.venue.longitude }}{% endif %}&zoom=13&size=640x100&scale=1&maptype=roadmap&markers=color:orange%7Clabel:S%7C{{ team_event_object.venue.latitude }},{{ team_event_object.venue.longitude }}&sensor=false"> |
245 | - </div> |
246 | + {% if team_event.venue.longitude and team_event.venue.latitude %} |
247 | + <div id="venue-map"></div> |
248 | + <script> |
249 | + $(function(){ |
250 | + $('#venue-map').showLocations({ |
251 | + markers_list: [{ lat: {{ team_event.venue.latitude }}, lng: {{ team_event.venue.longitude }} }], |
252 | + marker_icon: '{{ MEDIA_URL }}img/marker.png' |
253 | + }); |
254 | + }); |
255 | + </script> |
256 | + {% endif %} |
257 | |
258 | - {% if team_event_object.venue %} |
259 | + {% if team_event.venue %} |
260 | <div class="event-venue"> |
261 | - <a title="{% trans "show venue details" %}" href="{{ team_event_object.venue.get_absolute_url }}"> |
262 | + <a title="{% trans "show venue details" %}" href="{{ team_event.venue.get_absolute_url }}"> |
263 | <div class="event-venue-name"> |
264 | - {{ team_event_object.venue.name }} |
265 | + {{ team_event.venue.name }} |
266 | </div> |
267 | </a> |
268 | |
269 | <div class="event-venue-city"> |
270 | - {% if team_event_object.venue.city %}{{ team_event_object.venue.city }}{% endif %} |
271 | + {% if team_event.venue.city %}{{ team_event.venue.city }}{% endif %} |
272 | </div> |
273 | |
274 | <div class="event-venue-adress"> |
275 | - {% if team_event_object.venue.address %}{{ team_event_object.venue.address }}{% endif %} |
276 | - {% if team_event_object.venue.address and team_event_object.venue.spr%} ,{% endif %} |
277 | - {% if team_event_object.venue.spr %}{{ team_event_object.venue.spr }}{% endif %} |
278 | + {% if team_event.venue.address %}{{ team_event.venue.address }}{% endif %} |
279 | + {% if team_event.venue.address and team_event.venue.spr%} ,{% endif %} |
280 | + {% if team_event.venue.spr %}{{ team_event.venue.spr }}{% endif %} |
281 | </div> |
282 | </div> |
283 | {% endif %} |
284 | <div> |
285 | - {% if team_event_object.teameventcomment_set.all %} |
286 | - {% include "events/team_event_detail_comments.inc.html" %} |
287 | - {% endif %} |
288 | + {% include "events/team_event_detail_comments.inc.html" %} |
289 | {% include "events/team_event_comment_new.inc.html" %} |
290 | </div> |
291 | </div> |
292 | </section> |
293 | <section class="span-3 box_content last"> |
294 | <div class="sidebar-inner"> |
295 | + <h3 class="title">{% trans "Photos" %}</h3> |
296 | + <div id="pamdiv" style="overflow: hidden;"></div> |
297 | + {% if team_event.venue.address %} |
298 | + <h3 class="attendees-title"><a href="https://maps.google.com/maps?saddr=&daddr={{ team_event.venue.address }}">{% trans "Get directions to this venue" %}</a></h3> |
299 | + {% endif %} |
300 | <div class="event-info"> |
301 | - {% if team_event_object %} |
302 | - {% if team_event_object.channel %} |
303 | + {% if team_event %} |
304 | + {% if team_event.channel %} |
305 | <div> |
306 | <span class="pictogram comments"></span> |
307 | - {{ team_event_object.channel }} |
308 | + {{ team_event.channel }} |
309 | </div> |
310 | {% endif %} |
311 | |
312 | - {% if team_event_object.contact %} |
313 | + {% if team_event.contact %} |
314 | <div> |
315 | <span class="pictogram personne"></span> |
316 | - <a class="pictogram-l" title="{{ team_event_object.contact.realname }}" href="{% url profile-detail team_event_object.contact.user %}">{{ team_event_object.contact.realname }}</a> |
317 | + <a class="pictogram-l" title="{{ team_event.contact.realname }}" href="{% url profile-detail team_event.contact.user %}">{{ team_event.contact.realname }}</a> |
318 | </div> |
319 | {% endif %} |
320 | |
321 | - {% if team_event_object.teams.all %} |
322 | + {% if team_event.teams.all %} |
323 | <div> |
324 | <span class="pictogram team"></span> |
325 | - {% for team in team_event_object.teams.all %}<a class="pictogram-l" title="{% trans "Get more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% if not forloop.last %},{% endif %}{% endfor %} |
326 | + {% for team in team_event.teams.all %}<a class="pictogram-l" title="{% trans "Get more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% if not forloop.last %},{% endif %}{% endfor %} |
327 | </div> |
328 | {% endif %} |
329 | {% endif %} |
330 | </div> |
331 | |
332 | - {% if team_event_object.registration %} |
333 | - <a class="submit-button rsvp-link" href="{{team_event_object.registration}}" target="external_registration">{% trans 'Register' %}</a> |
334 | + {% if team_event.registration %} |
335 | + <a class="submit-button rsvp-link" href="{{team_event.registration}}" target="external_registration">{% trans 'Register' %}</a> |
336 | {% else %} |
337 | {% if user.is_authenticated and user_is_attending %} |
338 | - <a class="submit-button rsvp-link" href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Update Registration' %}</a> |
339 | + <a class="submit-button rsvp-link" href="{% url team-event-register team_event.first_team.lp_name team_event.id %}">{% trans 'Update Registration' %}</a> |
340 | {% else %} |
341 | - <a class="submit-button rsvp-link" href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Register' %}</a> |
342 | + <a class="submit-button rsvp-link" href="{% url team-event-register team_event.first_team.lp_name team_event.id %}">{% trans 'Register' %}</a> |
343 | {% endif %} |
344 | {% endif %} |
345 | |
346 | - {% if team_event_object.created_by %} |
347 | + {% if team_event.created_by %} |
348 | <h3 class="attendees-title">{% trans 'Created by' %}</h3> |
349 | <ul class="attendees"> |
350 | <li class="attendee-cell"> |
351 | <div class="attendee-mugshot"> |
352 | - <a href="{% url profile-detail team_event_object.created_by.username %}"> |
353 | - <img src="{% if team_event_object.created_by.get_profile.mugshot %}{{ team_event_object.created_by.get_profile.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" width="32px" height="32px" alt="{{ team_event_object.created_by.get_profile.realname }}"> |
354 | + <a href="{% url profile-detail team_event.created_by.username %}"> |
355 | + <img src="{% if team_event.created_by.get_profile.mugshot %}{{ team_event.created_by.get_profile.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" width="32px" height="32px" alt="{{ team_event.created_by.get_profile.realname }}"> |
356 | </a> |
357 | </div> |
358 | <div class="attendee-infos"> |
359 | - <a href="{% url profile-detail team_event_object.created_by.username %}">{{ team_event_object.created_by.get_profile.realname }}</a> |
360 | + <a href="{% url profile-detail team_event.created_by.username %}">{{ team_event.created_by.get_profile.realname }}</a> |
361 | </div> |
362 | </li> |
363 | </ul> |
364 | |
365 | === modified file 'loco_directory/templates/events/team_event_detail_comments.inc.html' |
366 | --- loco_directory/templates/events/team_event_detail_comments.inc.html 2013-03-30 22:34:11 +0000 |
367 | +++ loco_directory/templates/events/team_event_detail_comments.inc.html 2013-05-11 14:16:26 +0000 |
368 | @@ -1,13 +1,13 @@ |
369 | {% load i18n %} |
370 | -{% if team_event_object.teameventcomment_set.all %} |
371 | +{% if team_event.teameventcomment_set.all %} |
372 | |
373 | <h3 class="comments-nbr"> |
374 | -{% blocktrans count team_event_object.teameventcomment_set.all.count as comment_count %} |
375 | +{% blocktrans count team_event.teameventcomment_set.all.count as comment_count %} |
376 | {{ comment_count }} Comment{% plural %}{{ comment_count }} Comments{% endblocktrans %} |
377 | </h3> |
378 | |
379 | <ol id="comments" class="comments"> |
380 | - {% for comment in team_event_object.teameventcomment_set.all %} |
381 | + {% for comment in team_event.teameventcomment_set.all %} |
382 | <li id="comment-{{ comment.pk }}" class="response"> |
383 | <div class="mugshot"> |
384 | <a href="{% url profile-detail comment.commenter_profile.user.username %}" class="url" title="{{ comment.commenter_profile.user.get_full_name }}"> |
385 | @@ -24,13 +24,13 @@ |
386 | </a> |
387 | <div class="comment-error" style="display:none;"></div> |
388 | <div class="comment-comment"> |
389 | - {{ comment.comment|linebreaks|urlize }} |
390 | + {{ comment.comment|urlize|linebreaks }} |
391 | </div> |
392 | <p class="comment-meta"> |
393 | <a href="#comment-{{ comment.pk }}" class="posted" title="{{ comment.local_date_created }}"> |
394 | {{ comment.local_date_created|date:"d F Y" }}</a> |
395 | {% if comment.commenter_profile.user.username == user.username %} |
396 | - · <a class="edit" href="#">{% trans "Edit" %}</a> - <a href="{% url team-event-comment-delete comment.id %}?next={{ team_event_object.get_absolute_url }}">{% trans "Delete" %}</a> |
397 | + · <a class="edit" href="#">{% trans "Edit" %}</a> - <a href="{% url team-event-comment-delete comment.id %}?next={{ team_event.get_absolute_url }}">{% trans "Delete" %}</a> |
398 | {% endif %} |
399 | </p> |
400 | </div> |
401 | |
402 | === modified file 'loco_directory/templates/venues/venue_detail.html' |
403 | --- loco_directory/templates/venues/venue_detail.html 2013-02-21 20:31:16 +0000 |
404 | +++ loco_directory/templates/venues/venue_detail.html 2013-05-11 14:16:26 +0000 |
405 | @@ -7,7 +7,6 @@ |
406 | <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&language={% trans 'en' %}®ion={% trans 'US' %}"></script> |
407 | <script type="text/javascript" src="http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0/src/markerclusterer_packed.js"></script> |
408 | <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-ubuntu-maps.js"></script> |
409 | - |
410 | <script type="text/javascript"> |
411 | $(document).ready(function(){ |
412 | var x = {{ venue.longitude }}, |
413 | @@ -116,7 +115,7 @@ |
414 | <section class="span-3 box_content last"> |
415 | <div class="sidebar-inner"> |
416 | <h3 class="title">{% trans "Photos" %}</h3> |
417 | - <div id="pamdiv"></div> |
418 | + <div id="pamdiv" style="overflow: hidden;"></div> |
419 | {% if venue.address %} |
420 | <h3 class="attendees-title"><a href="https://maps.google.com/maps?saddr=&daddr={{ venue.address }}">{% trans "Get directions to this venue" %}</a></h3> |
421 | {% endif %} |