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

[Adnane Belmadiaf]

[Daniel Holbach (dholbach)]

Good work!

review: Approve

=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2010-10-07 12:18:15 +0000
+++ loco_directory/templates/teams/team_detail.html	2010-10-09 14:23:44 +0000
@@ -14,22 +14,17 @@
 {% block search %}{% endblock %}
 
 {% block extrahead %}{{ block.super }}
-{% if team.flickr_id %}
+{% if team.flickr_id or team.picasa_id or team.pixie_id %}
 <script type="text/javascript" src="{{MEDIA_URL}}jquery/jquery.js"></script>
 <script type="text/javascript" src="{{MEDIA_URL}}js/jquery.lightbox-0.5.min.js"></script>
-<link rel="stylesheet" href="{{MEDIA_URL}}css/jquery.lightbox-0.5.css" type="text/css" media="screen" /> 
+<link rel="stylesheet" href="{{MEDIA_URL}}css/jquery.lightbox-0.5.css" type="text/css" media="screen" />
 <script type="text/javascript"> 
-
-
-
 $(function() {
     var apiKey = '{{ flickr_api_key }}';
     var perPage = '27';
+{% endif %}
+{% if team.flickr_id %}   
     var flickr_userId = '{{ team.flickr_id }}';
-    var picasa_userId = '{{ team.picasa_id }}';
-    var pixie_userId = '{{ team.pixie_id }}';
-
-
     $.getJSON('http://api.flickr.com/services/rest/?format=json&method='+
         'flickr.photos.search&api_key=' + apiKey + '&user_id=' + flickr_userId + 
         '&per_page=' + perPage + '&jsoncallback=?', 
@@ -51,6 +46,9 @@
         });
         $("a.lightbox").lightBox();
     });
+{% endif %}
+{% if team.picasa_id %}
+    var picasa_userId = '{{ team.picasa_id }}';
     $.getJSON('http://picasaweb.google.com/data/feed/base/user/'+ picasa_userId +'?alt=json&kind=photo'+
      '&access=public&thumbsize=72&max-results=' + perPage + '&hl=en_US&callback=?',
     function(data) {
@@ -69,7 +67,9 @@
 	  });
          $("a.lightbox").lightBox();
     });
-
+{% endif %}
+{% if team.pixie_id %}
+    var pixie_userId = '{{ team.pixie_id }}';
     $.getJSON('http://api.pix.ie/v0.81/account/'+ pixie_userId +'/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=?', 
     function(data){
@@ -84,10 +84,10 @@
         });
         $("a.lightbox").lightBox();
     });
+{% endif %}
+{% if team.flickr_id or team.picasa_id or team.pixie_id %}
 });
 
-
-
 </script>
 <style type="text/css"> 
 div#flickr a.lightbox img {
@@ -226,7 +226,7 @@
     <img id="locobranding" src="{{ team.mugshot_url }}" alt="" title="{{ team.name }}" />
 </article>
 
-{% if team.flickr_id %} 
+{% if team.flickr_id or team.picasa_id or team.pixie_id %} 
 <article class="minor-content alone" style="width:95%;">
     <h2>{% trans "Photos from" %} {{ team.name }}</h2>
     <div style="width:100%;" id="flickr"> </div>