Merge lp:~daker/loco-team-portal/1178915-1178911 into lp:loco-team-portal

[Adnane Belmadiaf]

Fixed the templatetag priority causing invalid characters when there is a link in a comment
Replaced the static Gmap with the interactive one

Registred TeamEventComment in the admin
Changed team_event_object to team_event
Line 390 is the fix for bug 1178911

=== modified file 'loco_directory/events/admin.py'
--- loco_directory/events/admin.py	2012-12-25 22:00:46 +0000
+++ loco_directory/events/admin.py	2013-05-11 14:16:26 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from django.contrib import admin
-from .models import (Venue, GlobalEvent, TeamEvent, Attendee)
+from .models import (Venue, GlobalEvent, TeamEvent, Attendee, TeamEventComment)
 
 
 class TeamEventAdmin(admin.ModelAdmin):
@@ -11,3 +11,4 @@
 admin.site.register(GlobalEvent)
 admin.site.register(TeamEvent, TeamEventAdmin)
 admin.site.register(Attendee)
+admin.site.register(TeamEventComment)
 
=== modified file 'loco_directory/events/models.py'
--- loco_directory/events/models.py	2013-03-11 21:49:37 +0000
+++ loco_directory/events/models.py	2013-05-11 14:16:26 +0000
@@ -15,7 +15,6 @@
 from .fields import GuestsField
 
 
-
 ATTENDEE_PROMISE_CHOICES = (
     ('sure', _('attending')),
     ('maybe', _('might be attending')),
 
=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py	2013-04-08 20:08:25 +0000
+++ loco_directory/events/views.py	2013-05-11 14:16:26 +0000
@@ -132,9 +132,9 @@
     """
     detailed view for a team event
     """
-    team_event_object = get_object_or_404(TeamEvent, pk=team_event_id)
+    team_event = get_object_or_404(TeamEvent, pk=team_event_id)
     is_member = False
-    for team_object in team_event_object.teams.all():
+    for team_object in team_event.teams.all():
         is_member = is_member or launchpad.is_team_member(request.user, team_object)
 
     if request.user.is_authenticated():
@@ -142,19 +142,19 @@
             form = TeamEventCommentForm(data=request.POST)
             if form.is_valid():
                 team_event_comment = form.save(commit=False)
-                team_event_comment.team_event = team_event_object
+                team_event_comment.team_event = team_event
                 team_event_comment.commenter_profile = request.user.get_profile()
                 team_event_comment.save()
                 request.user.message_set.create(message=_('Your comment has been saved.'))
-                return redirect(team_event_object)
+                return redirect(team_event)
         else:
             form = TeamEventCommentForm()
     else:
         form = None
 
     context = {
-        'team_event_object': team_event_object,
-        'user_is_attending': team_event_object.is_attending(request.user),
+        'team_event': team_event,
+        'user_is_attending': team_event.is_attending(request.user),
         'user_is_team_member': is_member,
         'form': form,
     }
 
=== modified file 'loco_directory/media/css/styles.css'
--- loco_directory/media/css/styles.css	2013-04-13 17:54:34 +0000
+++ loco_directory/media/css/styles.css	2013-05-11 14:16:26 +0000
@@ -346,9 +346,10 @@
 }
 
 .f img {
-    width: 50px;
-    height: 50px;
+    width: 61px;
+    height: 55px;
     margin-bottom: 5px;
+    margin-right: 5px;
 }
 
 .f0 {
 
=== modified file 'loco_directory/templates/events/team_event_comment_new.inc.html'
--- loco_directory/templates/events/team_event_comment_new.inc.html	2013-01-01 14:04:15 +0000
+++ loco_directory/templates/events/team_event_comment_new.inc.html	2013-05-11 14:16:26 +0000
@@ -14,6 +14,6 @@
 </div>
 {% else %}
 <div style="padding:10px;">
-    {% 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 %}
+    {% 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 %}
 </div>
 {% endif %}
 
=== modified file 'loco_directory/templates/events/team_event_detail.html'
--- loco_directory/templates/events/team_event_detail.html	2012-11-28 00:46:29 +0000
+++ loco_directory/templates/events/team_event_detail.html	2013-05-11 14:16:26 +0000
@@ -1,48 +1,64 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block page_name %}{% trans team_event_object.name %}{% endblock %}
+{% block page_name %}{% trans team_event.name %}{% endblock %}
 
 {% block extrahead %}{{ block.super }}
 <meta property="fb:app_id" content="127188230723188"/>
-<meta property="og:title" content="{{ team_event_object.name }}" />
-{% if team_event_object.description %}
-<meta property="og:description" content="{{ team_event_object.description|linebreaks|striptags }}" />
+<meta property="og:title" content="{{ team_event.name }}" />
+{% if team_event.description %}
+<meta property="og:description" content="{{ team_event.description|linebreaks|striptags }}" />
 {% endif %}
-<meta property="og:url" content="http://loco.ubuntu.com{{ team_event_object.get_absolute_url }}"/>
+<meta property="og:url" content="http://loco.ubuntu.com{{ team_event.get_absolute_url }}"/>
 <meta property="og:image" content="http://loco.ubuntu.com/media/images/cof_orange_hex1.png"/>
 <meta property="og:site_name" content="Loco Team Portal"/>
 <meta property="og:type" content="loco-team-portal:event"/>
-{% if team_event_object.venue %}
-<meta property="og:latitude" content="{{ team_event_object.venue.latitude }}"/>
-<meta property="og:longitude" content="{{ team_event_object.venue.longitude }}"/>
-<meta property="og:street-address" content="{{ team_event_object.venue.name }} "/>
-<meta property="og:locality" content="{% if team_event_object.venue.city %}{{ team_event_object.venue.city }}{% endif %}"/>
+{% if team_event.venue %}
+<meta property="og:latitude" content="{{ team_event.venue.latitude }}"/>
+<meta property="og:longitude" content="{{ team_event.venue.longitude }}"/>
+<meta property="og:street-address" content="{{ team_event.venue.name }} "/>
+<meta property="og:locality" content="{% if team_event.venue.city %}{{ team_event.venue.city }}{% endif %}"/>
 {% endif %}
-<script type="text/javascript" src="{{ MEDIA_URL }}js/comments.js"></script>
-{{form.media}}
+<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&language={% trans 'en' %}&region={% trans 'US' %}"></script>
+<script type="text/javascript" src="http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0/src/markerclusterer_packed.js"></script>
+<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-ubuntu-maps.js"></script>
 <script type="text/javascript">
-    $(document).ready(function(){
-        $('span[rel*=help]').colorTip({color:'orange'});
+$(document).ready(function(){
+    var x = {{ team_event.venue.longitude }},
+        y = {{ team_event.venue.latitude }},
+        km = 0.0089930, // 1km
+        radius =  5,
+        minx = x-radius/2*km,
+        miny = y-radius/2*km,
+        maxx = x+radius/2*km,
+        maxy = y+radius/2*km;
+
+    $.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){
+        $.each(data.photos, function(i,item){
+            $("#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>');
+        });
     });
+});
 </script>
+<script type="text/javascript" src="{{ MEDIA_URL }}js/comments.js"></script>
+{{ form.media }}
 {% endblock %}
 
 
 {% block sub_nav_links %}
 
-{% for team in team_event_object.teams.all %}
+{% for team in team_event.teams.all %}
     <li><a class="sub-nav-item" href="{{ team.get_absolute_url }}">{{ team.name }}</a></li>
 {% endfor %}
 
 {% if user.is_authenticated %}
   {% if user_is_team_member %}
-    <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>
-    <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>
-    <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>
+    <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>
+    <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>
+    <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>
   {% endif %}
 {% endif %}
-<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>
+<li><a class="sub-nav-item" href="{% url event-ical team_event.first_team.lp_name team_event.id %}">{% trans "iCal Feed" %}</a></li>
 {% endblock %}
 
 {% block content %}
 
=== modified file 'loco_directory/templates/events/team_event_detail.inc.html'
--- loco_directory/templates/events/team_event_detail.inc.html	2013-02-16 00:29:22 +0000
+++ loco_directory/templates/events/team_event_detail.inc.html	2013-05-11 14:16:26 +0000
@@ -3,11 +3,11 @@
     <section class="span-9">
         <div class="box_content">
             <div class="pagelet">
-                <h2>{{ team_event_object.name }}</h2>
-                {% if team_event_object.global_event %}
+                <h2>{{ team_event.name }}</h2>
+                {% if team_event.global_event %}
                     <div class="event-partofglobal-event">
                         {% trans "This event is part of" %}
-                        <a href="{{ team_event_object.global_event.get_absolute_url }}">{{team_event_object.global_event.name }}</a>
+                        <a href="{{ team_event.global_event.get_absolute_url }}">{{team_event.global_event.name }}</a>
                     </div>
                 {% endif %}
                 <div class="share">
@@ -23,111 +23,122 @@
                     <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
                     <g:plusone size="medium"></g:plusone>
                     <a href="http://twitter.com/share" class="twitter-share-button" data-lang="en">Tweet</a>
-                    <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>
+                    <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>
                 </div>
 
                 <div>
                     <span class="pictogram calendar"></span>
                     <span class="pictogram-l">
-                    {% ifequal team_event_object.local_date_begin|date team_event_object.local_date_end|date %}
-                        {{ team_event_object.local_date_begin|date:"D, d N Y H:i" }} - {{ team_event_object.local_date_end|date:"H:i T" }}
+                    {% ifequal team_event.local_date_begin|date team_event.local_date_end|date %}
+                        {{ team_event.local_date_begin|date:"D, d N Y H:i" }} - {{ team_event.local_date_end|date:"H:i T" }}
                     {% else %}
-                    {{ 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" }}
+                    {{ 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" }}
                     {% endifequal %}
                     </span>
                 </div>
 
-                {% if team_event_object.description %}
-                    <p>{{ team_event_object.description|markdown:'safe'|linebreaks }}</p>
+                {% if team_event.description %}
+                    <p>{{ team_event.description|markdown:'safe'|linebreaks }}</p>
                 {% endif %}
 
-                {% if team_event_object.announce %}
+                {% if team_event.announce %}
                 <div>
                     <span class="pictogram announcement"></span>
-                    <a class="pictogram-l" href="{{ team_event_object.announce }}">{{team_event_object.announce }}</a>
+                    <a class="pictogram-l" href="{{ team_event.announce }}">{{team_event.announce }}</a>
                 </div>
                 {% endif %}
             </div>
 
-            <div class="map">
-                <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">
-            </div>
+            {% if team_event.venue.longitude and team_event.venue.latitude %}
+                <div id="venue-map"></div>
+                <script>
+                    $(function(){
+                        $('#venue-map').showLocations({
+                            markers_list: [{ lat: {{ team_event.venue.latitude }}, lng: {{ team_event.venue.longitude }} }],
+                            marker_icon: '{{ MEDIA_URL }}img/marker.png'
+                        });
+                    });
+                </script>
+            {% endif %}
 
-            {% if team_event_object.venue %}
+            {% if team_event.venue %}
             <div class="event-venue">
-                <a title="{% trans "show venue details" %}" href="{{ team_event_object.venue.get_absolute_url }}">
+                <a title="{% trans "show venue details" %}" href="{{ team_event.venue.get_absolute_url }}">
                     <div class="event-venue-name">
-                        {{ team_event_object.venue.name }}
+                        {{ team_event.venue.name }}
                     </div>
                 </a>
 
                 <div class="event-venue-city">
-                    {% if team_event_object.venue.city %}{{ team_event_object.venue.city }}{% endif %}
+                    {% if team_event.venue.city %}{{ team_event.venue.city }}{% endif %}
                 </div>
 
                 <div class="event-venue-adress">
-                    {% if team_event_object.venue.address %}{{ team_event_object.venue.address }}{% endif %}
-                    {% if team_event_object.venue.address and team_event_object.venue.spr%} ,{% endif %}
-                    {% if team_event_object.venue.spr %}{{ team_event_object.venue.spr }}{% endif %}
+                    {% if team_event.venue.address %}{{ team_event.venue.address }}{% endif %}
+                    {% if team_event.venue.address and team_event.venue.spr%} ,{% endif %}
+                    {% if team_event.venue.spr %}{{ team_event.venue.spr }}{% endif %}
                 </div>
             </div>
             {% endif %}
             <div>
-            {% if team_event_object.teameventcomment_set.all %}
-                {% include "events/team_event_detail_comments.inc.html" %}
-            {% endif %}
+            {% include "events/team_event_detail_comments.inc.html" %}
             {% include "events/team_event_comment_new.inc.html" %}
             </div>
         </div>
     </section>
     <section class="span-3 box_content last">
         <div class="sidebar-inner">
+            <h3 class="title">{% trans "Photos" %}</h3>
+            <div id="pamdiv" style="overflow: hidden;"></div>
+            {% if team_event.venue.address %}
+                <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>
+            {% endif %}
             <div class="event-info">
-                {% if team_event_object %}
-                    {% if team_event_object.channel %}
+                {% if team_event %}
+                    {% if team_event.channel %}
                     <div>
                         <span class="pictogram comments"></span>
-                        {{ team_event_object.channel }}
+                        {{ team_event.channel }}
                     </div>
                     {% endif %}
 
-                    {% if team_event_object.contact %}
+                    {% if team_event.contact %}
                     <div>
                         <span class="pictogram personne"></span>
-                        <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>
+                        <a class="pictogram-l" title="{{ team_event.contact.realname }}" href="{% url profile-detail team_event.contact.user %}">{{ team_event.contact.realname }}</a>
                     </div>
                     {% endif %}
 
-                    {% if team_event_object.teams.all %}
+                    {% if team_event.teams.all %}
                         <div>
                             <span class="pictogram team"></span>
-                            {% 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 %}
+                            {% 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 %}
                         </div>
                     {% endif %}
                 {% endif %}
             </div>
 
-            {% if team_event_object.registration %}
-                <a class="submit-button rsvp-link" href="{{team_event_object.registration}}" target="external_registration">{% trans 'Register' %}</a>
+            {% if team_event.registration %}
+                <a class="submit-button rsvp-link" href="{{team_event.registration}}" target="external_registration">{% trans 'Register' %}</a>
             {% else %}
                 {% if user.is_authenticated and user_is_attending %}
-                    <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>
+                    <a class="submit-button rsvp-link" href="{% url team-event-register team_event.first_team.lp_name team_event.id %}">{% trans 'Update Registration' %}</a>
                 {% else %}
-                    <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>
+                    <a class="submit-button rsvp-link" href="{% url team-event-register team_event.first_team.lp_name team_event.id %}">{% trans 'Register' %}</a>
                 {% endif %}
             {% endif %}
 
-            {% if team_event_object.created_by %}
+            {% if team_event.created_by %}
                 <h3 class="attendees-title">{% trans 'Created by' %}</h3>
                 <ul class="attendees">
                     <li class="attendee-cell">
                         <div class="attendee-mugshot">
-                            <a href="{% url profile-detail team_event_object.created_by.username %}">
-                              <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 }}">
+                            <a href="{% url profile-detail team_event.created_by.username %}">
+                              <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 }}">
                             </a>
                         </div>
                         <div class="attendee-infos">
-                            <a href="{% url profile-detail team_event_object.created_by.username %}">{{ team_event_object.created_by.get_profile.realname }}</a>
+                            <a href="{% url profile-detail team_event.created_by.username %}">{{ team_event.created_by.get_profile.realname }}</a>
                         </div>
                     </li>
                 </ul>
 
=== modified file 'loco_directory/templates/events/team_event_detail_comments.inc.html'
--- loco_directory/templates/events/team_event_detail_comments.inc.html	2013-03-30 22:34:11 +0000
+++ loco_directory/templates/events/team_event_detail_comments.inc.html	2013-05-11 14:16:26 +0000
@@ -1,13 +1,13 @@
 {% load i18n %}
-{% if team_event_object.teameventcomment_set.all %}
+{% if team_event.teameventcomment_set.all %}
 
 <h3 class="comments-nbr">
-{% blocktrans count team_event_object.teameventcomment_set.all.count as comment_count %}
+{% blocktrans count team_event.teameventcomment_set.all.count as comment_count %}
 {{ comment_count }} Comment{% plural %}{{ comment_count }} Comments{% endblocktrans %}
 </h3>
 
 <ol id="comments" class="comments">
-    {% for comment in team_event_object.teameventcomment_set.all %}
+    {% for comment in team_event.teameventcomment_set.all %}
     <li id="comment-{{ comment.pk }}" class="response">
         <div class="mugshot">
             <a href="{% url profile-detail comment.commenter_profile.user.username %}" class="url" title="{{ comment.commenter_profile.user.get_full_name }}">
@@ -24,13 +24,13 @@
             </a>
             <div class="comment-error" style="display:none;"></div>
             <div class="comment-comment">
-                {{ comment.comment|linebreaks|urlize }}
+                {{ comment.comment|urlize|linebreaks }}
             </div>
             <p class="comment-meta">
                 <a href="#comment-{{ comment.pk }}" class="posted" title="{{ comment.local_date_created }}">
                     {{ comment.local_date_created|date:"d F Y" }}</a>
                 {% if comment.commenter_profile.user.username == user.username %}
-                · <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>
+                · <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>
             {% endif %}
             </p>
         </div>
 
=== modified file 'loco_directory/templates/venues/venue_detail.html'
--- loco_directory/templates/venues/venue_detail.html	2013-02-21 20:31:16 +0000
+++ loco_directory/templates/venues/venue_detail.html	2013-05-11 14:16:26 +0000
@@ -7,7 +7,6 @@
 <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&language={% trans 'en' %}&region={% trans 'US' %}"></script>
 <script type="text/javascript" src="http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0/src/markerclusterer_packed.js"></script>
 <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-ubuntu-maps.js"></script>
-
 <script type="text/javascript">
 $(document).ready(function(){
     var x = {{ venue.longitude }},
@@ -116,7 +115,7 @@
     <section class="span-3 box_content last">
         <div class="sidebar-inner">
             <h3 class="title">{% trans "Photos" %}</h3>
-            <div id="pamdiv"></div>
+            <div id="pamdiv" style="overflow: hidden;"></div>
             {% if venue.address %}
                 <h3 class="attendees-title"><a href="https://maps.google.com/maps?saddr=&daddr={{ venue.address }}">{% trans "Get directions to this venue" %}</a></h3>
             {% endif %}