Merge lp:~daker/loco-team-portal/fix.profil-links into lp:loco-team-portal

[Adnane Belmadiaf]

Fixed profile links

=== modified file 'loco_directory/media/css/jquery.lightbox-0.5.css'
--- loco_directory/media/css/jquery.lightbox-0.5.css	2010-08-25 21:50:17 +0000
+++ loco_directory/media/css/jquery.lightbox-0.5.css	2012-12-09 15:21:20 +0000
@@ -35,6 +35,9 @@
 	width: 250px;
 	height: 250px;
 	margin: 0 auto;
+	-webkit-border-radius: 5px 5px 0 0;
+	-moz-border-radius: 5px 5px 0 0;
+	border-radius: 5px 5px 0 0;
 }
 #lightbox-container-image { padding: 10px; }
 #lightbox-loading {
@@ -62,12 +65,12 @@
 	zoom: 1;
 	display: block;
 }
-#lightbox-nav-btnPrev { 
-	left: 0; 
+#lightbox-nav-btnPrev {
+	left: 0;
 	float: left;
 }
-#lightbox-nav-btnNext { 
-	right: 0; 
+#lightbox-nav-btnNext {
+	right: 0;
 	float: right;
 }
 #lightbox-container-image-data-box {
@@ -78,24 +81,27 @@
 	overflow: auto;
 	width: 100%;
 	padding: 0 10px 0;
+	-webkit-border-radius: 0 0 5px 5px;
+	-moz-border-radius: 0 0 5px 5px;
+	border-radius: 0 0 5px 5px;
 }
 #lightbox-container-image-data {
-	padding: 0 10px; 
-	color: #666; 
-}
-#lightbox-container-image-data #lightbox-image-details { 
-	width: 70%; 
-	float: left; 
-	text-align: left; 
-}	
+	padding: 0 10px;
+	color: #666;
+}
+#lightbox-container-image-data #lightbox-image-details {
+	width: 70%;
+	float: left;
+	text-align: left;
+}
 #lightbox-image-details-caption { font-weight: bold; }
 #lightbox-image-details-currentNumber {
-	display: block; 
-	clear: left; 
-	padding-bottom: 1.0em;	
-}			
+	display: block;
+	clear: left;
+	padding-bottom: 1.0em;
+}
 #lightbox-secNav-btnClose {
-	width: 66px; 
+	width: 66px;
 	float: right;
-	padding-bottom: 0.7em;	
+	padding-bottom: 0.7em;
 }

=== modified file 'loco_directory/media/css/styles.css'
--- loco_directory/media/css/styles.css	2012-11-18 22:02:56 +0000
+++ loco_directory/media/css/styles.css	2012-12-09 15:21:20 +0000
@@ -1000,7 +1000,6 @@
     position: relative;
     display: inline-block;
     text-transform: uppercase;
-    top: -4px;
 }
 
 .new:active {

=== modified file 'loco_directory/media/js/jquery-pixie.js'
--- loco_directory/media/js/jquery-pixie.js	2011-07-03 15:11:51 +0000
+++ loco_directory/media/js/jquery-pixie.js	2012-12-09 15:21:20 +0000
@@ -8,8 +8,8 @@
  */
 
 (function ($) {
-    $.fn.extend({   
-        //This is where you write your plugin's name  
+    $.fn.extend({
+        //This is where you write your plugin's name
         pixie: function (options) {
             var defaults = {
                 key: null,
@@ -18,16 +18,16 @@
                 lightbox_class: 'lightbox'
             },
                 html_elements = this,
-                data = { 
+                data = {
                     oauth_consumer_key: options.key,
                     page: '1',
                     perpage: options.amount,
                     sortby: 'recent',
                     extras: 'items_item_owner,items_item_Description,items_item_sizes_all',
-                    callback: '' 
+                    callback: ''
                 };
             options =  $.extend(defaults, options);
-            
+
             function parseResponse(data) {
                 var images = [], image, link;
                 $.each(data.items, function (i, rPhoto) {
@@ -41,7 +41,7 @@
                     }).append(image);
                     images.push(link);
                 });
-                
+
                 $(html_elements).each(function (i, html_element) {
                     var index;
                     for (index in images) {
@@ -55,7 +55,7 @@
             }
 
             $.getJSON('http://api.pix.ie/v0.81/account/' + options.id + '/photos.json?' + $.param(data) + '&jsonp=?', parseResponse);
-            
+
             // Return the html objects untouched (the photo's are added when loaded)
             return this;
         } // End of pixie command

=== modified file 'loco_directory/templates/base.html'
--- loco_directory/templates/base.html	2012-11-27 21:04:48 +0000
+++ loco_directory/templates/base.html	2012-12-09 15:21:20 +0000
@@ -25,7 +25,7 @@
 
 {% block top_nav_login_links %}
     {% if user.is_authenticated %}
-        {% trans "Welcome" %} <a class="top-login-item" href="http://launchpad.net/~{{ user.username }}">{{ user.username }}</a>
+        {% trans "Welcome" %} <a class="top-login-item" href="{% url profile-detail user.username %}">{{ user.username }}</a>
         <span class="top-login-separator">|</span>
         {% if user.is_staff %}
             <a class="top-login-item" href="/admin" title="Admin">{% trans "Admin" %}</a>

=== modified file 'loco_directory/templates/events/team_event_detail.inc.html'
--- loco_directory/templates/events/team_event_detail.inc.html	2012-11-28 00:46:29 +0000
+++ loco_directory/templates/events/team_event_detail.inc.html	2012-12-09 15:21:20 +0000
@@ -94,7 +94,7 @@
                     {% if team_event_object.contact %}
                     <div>
                         <span class="pictogram personne"></span>
-                        <a class="pictogram-l" title="{{ team_event_object.contact.realname }}" href="https://launchpad.net/~{{ team_event_object.contact.user }}">{{ team_event_object.contact.realname }}</a>
+                        <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>
                     </div>
                     {% endif %}
 

=== removed file 'loco_directory/templates/events/team_event_detail_basic.inc.html'
--- loco_directory/templates/events/team_event_detail_basic.inc.html	2011-07-17 19:01:27 +0000
+++ loco_directory/templates/events/team_event_detail_basic.inc.html	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-{% load i18n %}
-{% if team_event_object %}
-<table id="team-event-basic">
-    {% if team_event_object.date_begin %}
-    <tr>
-        <th class="form-item-label" scope="row">{% trans "When:" %}</th>
-        <td class="form-item-value">
-            {% 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" }}
-            {% 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" }}
-            {% endifequal %}
-        </td>
-    </tr>
-{% endif %}
-
-    {% if team_event_object.venue %}
-    <tr>
-        <th class="form-item-label" scope="row">{% trans "Where:" %}</th>
-        <td class="form-item-value"><a title="{% trans "show venue details" %}" href="{{ team_event_object.venue.get_absolute_url }}">{{ team_event_object.venue.name }}{% if team_event_object.venue.city %} in {{ team_event_object.venue.city }}{% endif %}</a></td>
-    </tr>
-    {% endif %}
-
-    {% if team_event_object.channel %}
-    <tr>
-        <th class="form-item-label" scope="row">{% trans "IRC Channel:" %}</th>
-        <td class="form-item-value">{{ team_event_object.channel }}</td>
-    </tr>
-    {% endif %}
-
-    {% if team_event_object.contact %}
-    <tr>
-        <th class="form-item-label" scope="row">{% trans "Event Contact:" %}</th>
-        <td class="form-item-value"><a title="{{ team_event_object.contact.realname }}" href="https://launchpad.net/~{{ team_event_object.contact.user }}">{{ team_event_object.contact.realname }}</a></td>
-    </tr>
-    {% endif %}
-
-    {% if team_event_object.teams.all %}
-    <tr>
-        <th class="form-item-label" scope="row">{% trans "Organizing Team(s):" %}</th>
-        <td class="form-item-value">{% for team in team_event_object.teams.all %}<a title="{% trans "Get more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% if not forloop.last %},{% endif %}{% endfor %}</td>
-    </tr>
-    {% endif %}
-
-    {% if team_event_object.announce %}
-    <tr>
-        <th class="form-item-label" scope="row">{% trans "Announcement:" %}</th>
-        <td class="form-item-value"><a href="{{ team_event_object.announce }}">{{team_event_object.announce }}</a></td>
-    </tr>
-    {% endif %}
-
-    {% if team_event_object.global_event %}
-    <tr>
-        <th class="form-item-label" scope="row">{% trans "Global Event:" %}</th>
-        <td class="form-item-value"><a href="{{ team_event_object.global_event.get_absolute_url }}">{{team_event_object.global_event.name }}</a></td>
-    </tr>
-    {% endif %}
-</table>
-{% endif %}

=== modified file 'loco_directory/templates/events/team_event_detail_comments.inc.html'
--- loco_directory/templates/events/team_event_detail_comments.inc.html	2012-09-08 21:51:39 +0000
+++ loco_directory/templates/events/team_event_detail_comments.inc.html	2012-12-09 15:21:20 +0000
@@ -11,18 +11,18 @@
     {% for comment in team_event_object.teameventcomment_set.all %}
     <li id="comment-{{ comment.pk }}" class="response">
         <div class="mugshot">
-            <a href="https://launchpad.net/~{{ comment.commenter_profile.user.username }}" class="url" title="{{ comment.commenter_profile.user.get_full_name }}">
-                <img alt="" class="photo fn" src="{% if comment.commenter_profile.mugshot %}{{ comment.commenter_profile.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}">                
+            <a href="{% url profile-detail comment.commenter_profile.user.username %}" class="url" title="{{ comment.commenter_profile.user.get_full_name }}">
+                <img alt="" class="photo fn" src="{% if comment.commenter_profile.mugshot %}{{ comment.commenter_profile.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}">
             </a>
         </div>
         <div class="comment-body">
-            <a href="https://launchpad.net/~{{ comment.commenter_profile.user.username }}" class="url" title="{{ comment.commenter_profile.user.get_full_name }}">
+            <a href="{% url profile-detail comment.commenter_profile.user.username %}" class="url" title="{{ comment.commenter_profile.user.get_full_name }}">
             {% if comment.commenter_profile.user.get_full_name %}
                 {{ comment.commenter_profile.user.get_full_name }}
             {% else %}
                 {{ comment.commenter_profile.realname }}
             {% endif %}
-            </a>             
+            </a>
             <div class="comment-error" style="display:none;"></div>
             <div class="comment-comment">
                 {{ comment.comment|linebreaks|urlize }}
@@ -31,9 +31,9 @@
                 <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="#">Edit</a> - <a href="{% url team-event-comment-delete comment.id %}?next={% url team-event-detail team_event_object.first_team.lp_name team_event_object.id %}">Delete</a> 
-            {% endif %} 
-            </p>  
+                · <a class="edit" href="#">Edit</a> - <a href="{% url team-event-comment-delete comment.id %}?next={% url team-event-detail team_event_object.first_team.lp_name team_event_object.id %}">Delete</a>
+            {% endif %}
+            </p>
         </div>
     </li>
     {% endfor %}

=== modified file 'loco_directory/templates/profiles/details.html'
--- loco_directory/templates/profiles/details.html	2012-11-19 23:03:10 +0000
+++ loco_directory/templates/profiles/details.html	2012-12-09 15:21:20 +0000
@@ -18,14 +18,16 @@
                         <a href="{% url team-detail team_slug=team.lp_name %}" title="{{ team.name }}" class="link2">
                             {{ team.name }}
                         </a>
-                        <a href="{% url team-meeting-new team_slug=team.lp_name %}" title="{% trans "Schedule a meeting" %}" class="new">{% trans "Schedule a meeting" %}</a>
-                        <a href="{% url team-event-new team_slug=team.lp_name %}" title="{% trans "Create an event" %}" class="new">{% trans "Create an event" %}</a>
+                        <div style="float: right">
+                            <a href="{% url team-meeting-new team_slug=team.lp_name %}" title="{% trans "Schedule a meeting" %}" class="new">{% trans "Schedule a meeting" %}</a>
+                            <a href="{% url team-event-new team_slug=team.lp_name %}" title="{% trans "Create an event" %}" class="new">{% trans "Create an event" %}</a>
+                        </div>
                         <h4 class="title">{% trans "Meetings" %}</h4>
                         <ul class="indent">
                         {% if team.teammeeting_set.next_3_meetings %}
-                        {% for team_event in team.teammeeting_set.next_3_meetings %}
+                        {% for team_metting in team.teammeeting_set.next_3_meetings %}
                             <li>
-                                <a title="{{team_event.date_begin|date:"M d"}}" href="{% url team-meeting-detail team_event.first_team.lp_name team_event.id %}">{{ team_event.name }} {% trans "on" %} {{ team_event.local_date_begin|date:"l, d N Y" }} {% trans "at " %}{{ team_event.local_date_begin|date:"H:i T" }}</a>
+                                <a title="{{ team_metting.name }}" href="{{ team_metting.get_absolute_url }}">{{ team_metting.name }} {% trans "on" %} {{ team_metting.local_date_begin|date:"l, d N Y" }} {% trans "at " %}{{ team_metting.local_date_begin|date:"H:i T" }}</a>
                             </li>
                         {% endfor %}
                         {% else %}
@@ -38,7 +40,7 @@
                         {% if team.teamevent_set.next_3_events %}
                         {% for team_event in team.teamevent_set.next_3_events %}
                             <li>
-                                <a title="{% if team_event.venue %}{% else %}{{team_event.date_begin|date:"M d"}}{% endif %}" href="{% url team-event-detail team_event.first_team.lp_name team_event.id %}">{{ team_event.name }} {% trans "on" %} {{ team_event.local_date_begin|date:"l, d N Y" }} {% trans "at " %}{{ team_event.local_date_begin|date:"H:i T" }}</a>
+                                <a title="{% if team_event.venue %}{% else %}{{team_event.date_begin|date:"M d"}}{% endif %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }} {% trans "on" %} {{ team_event.local_date_begin|date:"l, d N Y" }} {% trans "at " %}{{ team_event.local_date_begin|date:"H:i T" }}</a>
                             </li>
                         {% endfor %}
                         {% else %}

=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2012-11-28 00:46:29 +0000
+++ loco_directory/templates/teams/team_detail.html	2012-12-09 15:21:20 +0000
@@ -31,17 +31,20 @@
 <script type="text/javascript" src="{{MEDIA_URL}}js/jquery-pixie.js"></script>
 {% endif %}
 
+{% if team.microbloghashtag %}
 <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/twidenash.css" />
 <script type="text/javascript" src="{{MEDIA_URL}}js/twidenash/jquery-twidenash.js"></script>
-
+{% endif %}
 <script type="text/javascript">
 $(function() {
     var perPage = '14';
+    {% if team.microbloghashtag %}
     $('.twidenash').twidenash({
         sources: [
             'http://search.twitter.com/',
         ]
     });
+    {% endif %}
     {% if team.flickr_id %}
         $('#flickr').flickr({ key: "{{ flickr_api_key }}", id: "{{ team.flickr_id }}", amount: perPage });
     {% endif %}
@@ -112,7 +115,7 @@
 
                     <div style="display:block;">
                         <div id="loco-location">
-                            <span title="{% trans "Mailing List" %}" class="pictogram ml"></span>
+                            <span title="{% trans "Resources" %}" class="pictogram ml"></span>
                             <span class="value ellipsis small-ellipsis">
                                 {% if team.web_url %}
                                 <a href="{{ team.web_url }}" title="{% trans "Website" %}" target="_blank">
@@ -130,7 +133,7 @@
 
 
                         <div id="loco-support">
-                            <span class="pictogram forums" title="{% trans "Local Support" %}"></span>
+                            <span class="pictogram forums" title="{% trans "Support" %}"></span>
                             <span class="value ellipsis">
                                 {% if team.ml_url %}
                                 <a href="{{ team.ml_url }}" title="{% trans "Mailing List" %}" target="_blank">
@@ -176,7 +179,7 @@
                             <a href="{% url team-event-history team.lp_name %}" title="{% trans "Past Events" %}">{% trans "Past Events" %}</a>
                         </span>
                         <span>
-                            <a class="pictogram rss action" href="/feeds/teams/{{ team.lp_name }}" title="{% trans "RSS Feed" %}"></a>
+                            <a class="pictogram rss action" href="/feeds/teams/{{ team.lp_name }}/" title="{% trans "RSS Feed" %}"></a>
                         </span>
                         <span>
                             <a class="pictogram ical action" href="{% url team-calendar team.lp_name %}" title="{% trans "iCal Feed" %}"></a>
@@ -227,12 +230,12 @@
             <div class="team-admins">
             {% for admin in team.admin_profiles.all %}
                 {% ifequal team.owner admin.user.username %}
-                    <a href="https://launchpad.net/~{{ admin.user.username }}">
+                    <a href="{% url profile-detail admin.user.username %}">
                         <img alt="" class="photo fn" src="{% if admin.mugshot %}{{ admin.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot">
                         <p>{{ admin.realname }}</p>
                     </a>
                 {% else %}
-                    <a href="https://launchpad.net/~{{ admin.user.username }}">
+                    <a href="{% url profile-detail admin.user.username %}">
                         <img alt="{{ admin.realname }}" src="{% if admin.mugshot %}{{ admin.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot" height="50" width="50">
                         <p>{{ admin.realname }}</p>
                     </a>
@@ -243,7 +246,7 @@
             <div class="team-admins">
                 {% if team.contact_profiles.all %}
                     {% for contact in team.contact_profiles.all %}
-                        <a href="https://launchpad.net/~{{ contact.user.username }}">
+                        <a href="{% url profile-detail contact.user.username %}">
                         <img alt="{{ contact.realname }}" src="{% if contact.mugshot %}{{ contact.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot" height="50" width="50">
                         <p>{{ contact.realname }}</p>
                     </a>

=== modified file 'loco_directory/urls.py'
--- loco_directory/urls.py	2012-11-26 23:07:59 +0000
+++ loco_directory/urls.py	2012-12-09 15:21:20 +0000
@@ -39,7 +39,7 @@
     url(r'^services/', include('services.urls')),
     url(r'^search/', 'common.views.site_search', name='site_search'),
     url(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}, name='feed_view'),
-    url(r'', include('userprofiles.urls')),
+    url(r'^', include('userprofiles.urls')),
 )
 
 urlpatterns += patterns('django_openid_auth.views',

=== modified file 'loco_directory/userprofiles/models.py'
--- loco_directory/userprofiles/models.py	2012-11-28 00:46:29 +0000
+++ loco_directory/userprofiles/models.py	2012-12-09 15:21:20 +0000
@@ -6,7 +6,6 @@
 from common.launchpad import (get_user_timezone, lp_login, get_mugshot_url, set_user_openid)
 
 import pytz
-
 import logging
 import sys
 st_handler = logging.StreamHandler(sys.stderr)
@@ -17,6 +16,7 @@
 log.addHandler(st_handler)
 log.setLevel(logging.DEBUG)
 
+
 class UserProfile(models.Model):
     " Store profile information about a user "
 
@@ -61,6 +61,7 @@
         local = self.timezone.localize(dt)
         return local.astimezone(pytz.utc)
 
+
 def _getUserProfile(self):
     if not self.is_authenticated():
         return UserProfile()
@@ -73,12 +74,14 @@
 
     return profile
 
+
 def _getAnonProfile(self):
     return UserProfile()
 
 auth_models.User.profile = property(_getUserProfile)
 auth_models.AnonymousUser.profile = property(_getAnonProfile)
 
+
 def create_userprofile(sender, instance, lp=None, USER_BLACKLIST=(u"root", u"admin"), need_update=False, **kwargs):
     profile, created = UserProfile.objects.get_or_create(user=instance)
     if instance.username in USER_BLACKLIST:
@@ -93,10 +96,10 @@
                 log.debug("Updating %s" % instance)
                 lp_user = lp.people[instance.username]
                 profile.tz = lp_user.time_zone or "UTC"
-                profile.realname = lp_user.display_name or user.username
+                profile.realname = lp_user.display_name or instance.username
                 profile.mugshot = get_mugshot_url(lp_user.mugshot_link)
                 profile.save()
-            except Exception, e:
+            except Exception:
                 log.error("Error updating %s" % instance)
     return profile
 

=== modified file 'loco_directory/userprofiles/urls.py'
--- loco_directory/userprofiles/urls.py	2012-11-18 22:02:56 +0000
+++ loco_directory/userprofiles/urls.py	2012-12-09 15:21:20 +0000
@@ -2,9 +2,5 @@
 from django.conf.urls.defaults import *
 
 urlpatterns = patterns('userprofiles.views',
-    url(r'^(?P<username>[-.\w]+)/$',
-        view='profile_detail',
-        name='profile_detail',
-    ),
-
-)
\ No newline at end of file
+    url(r'^(?P<username>[-.\w]+)/$', 'profile_detail', name='profile-detail'),
+)

=== modified file 'loco_directory/userprofiles/views.py'
--- loco_directory/userprofiles/views.py	2012-11-19 23:03:10 +0000
+++ loco_directory/userprofiles/views.py	2012-12-09 15:21:20 +0000
@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
 from django.shortcuts import render_to_response,  get_object_or_404
 from django.template import RequestContext
-from django.http import Http404
 from django.contrib.auth.models import User
-
 from django.db.models import Count
 
 from userprofiles.models import UserProfile
 from teams.models import Team
-from events.models import Attendee, TeamEvent
+from events.models import TeamEvent
+
 
 def profile_detail(request, username):
     user = get_object_or_404(User, username__iexact=username)