LoCo Team Portal

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

  1. fix.657310
  2. Merge into 0.2
Proposed by Adnane Belmadiaf
Status: Merged
Merged at revision: 309
Proposed branch: lp:~daker/loco-team-portal/fix.657310
Merge into: lp:loco-team-portal
Diff against target: 73 lines (+13/-13)
1 file modified
loco_directory/templates/teams/team_detail.html (+13/-13)
To merge this branch: bzr merge lp:~daker/loco-team-portal/fix.657310
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+38047@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Good work!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
14{% block search %}{% endblock %}14{% block search %}{% endblock %}
1515
16{% block extrahead %}{{ block.super }}16{% block extrahead %}{{ block.super }}
17{% if team.flickr_id %}17{% if team.flickr_id or team.picasa_id or team.pixie_id %}
18<script type="text/javascript" src="{{MEDIA_URL}}jquery/jquery.js"></script>18<script type="text/javascript" src="{{MEDIA_URL}}jquery/jquery.js"></script>
19<script type="text/javascript" src="{{MEDIA_URL}}js/jquery.lightbox-0.5.min.js"></script>19<script type="text/javascript" src="{{MEDIA_URL}}js/jquery.lightbox-0.5.min.js"></script>
20<link rel="stylesheet" href="{{MEDIA_URL}}css/jquery.lightbox-0.5.css" type="text/css" media="screen" /> 20<link rel="stylesheet" href="{{MEDIA_URL}}css/jquery.lightbox-0.5.css" type="text/css" media="screen" />
21<script type="text/javascript"> 21<script type="text/javascript">
22
23
24
25$(function() {22$(function() {
26 var apiKey = '{{ flickr_api_key }}';23 var apiKey = '{{ flickr_api_key }}';
27 var perPage = '27';24 var perPage = '27';
25{% endif %}
26{% if team.flickr_id %}
28 var flickr_userId = '{{ team.flickr_id }}';27 var flickr_userId = '{{ team.flickr_id }}';
29 var picasa_userId = '{{ team.picasa_id }}';
30 var pixie_userId = '{{ team.pixie_id }}';
31
32
33 $.getJSON('http://api.flickr.com/services/rest/?format=json&method='+28 $.getJSON('http://api.flickr.com/services/rest/?format=json&method='+
34 'flickr.photos.search&api_key=' + apiKey + '&user_id=' + flickr_userId + 29 'flickr.photos.search&api_key=' + apiKey + '&user_id=' + flickr_userId +
35 '&per_page=' + perPage + '&jsoncallback=?', 30 '&per_page=' + perPage + '&jsoncallback=?',
@@ -51,6 +46,9 @@
51 });46 });
52 $("a.lightbox").lightBox();47 $("a.lightbox").lightBox();
53 });48 });
49{% endif %}
50{% if team.picasa_id %}
51 var picasa_userId = '{{ team.picasa_id }}';
54 $.getJSON('http://picasaweb.google.com/data/feed/base/user/'+ picasa_userId +'?alt=json&kind=photo'+52 $.getJSON('http://picasaweb.google.com/data/feed/base/user/'+ picasa_userId +'?alt=json&kind=photo'+
55 '&access=public&thumbsize=72&max-results=' + perPage + '&hl=en_US&callback=?',53 '&access=public&thumbsize=72&max-results=' + perPage + '&hl=en_US&callback=?',
56 function(data) {54 function(data) {
@@ -69,7 +67,9 @@
69 });67 });
70 $("a.lightbox").lightBox();68 $("a.lightbox").lightBox();
71 });69 });
7270{% endif %}
71{% if team.pixie_id %}
72 var pixie_userId = '{{ team.pixie_id }}';
73 $.getJSON('http://api.pix.ie/v0.81/account/'+ pixie_userId +'/photos.json?oauth_consumer_key=1dcc8233-a6da-46b0-acb0-4e29aa612b30&page=1&perpage=' + perPage73 $.getJSON('http://api.pix.ie/v0.81/account/'+ pixie_userId +'/photos.json?oauth_consumer_key=1dcc8233-a6da-46b0-acb0-4e29aa612b30&page=1&perpage=' + perPage
74 + '&sortby=recent&extras=items_item_owner,items_item_Description,items_item_sizes_all&jsonp=?', 74 + '&sortby=recent&extras=items_item_owner,items_item_Description,items_item_sizes_all&jsonp=?',
75 function(data){75 function(data){
@@ -84,10 +84,10 @@
84 });84 });
85 $("a.lightbox").lightBox();85 $("a.lightbox").lightBox();
86 });86 });
87{% endif %}
88{% if team.flickr_id or team.picasa_id or team.pixie_id %}
87});89});
8890
89
90
91</script>91</script>
92<style type="text/css"> 92<style type="text/css">
93div#flickr a.lightbox img {93div#flickr a.lightbox img {
@@ -226,7 +226,7 @@
226 <img id="locobranding" src="{{ team.mugshot_url }}" alt="" title="{{ team.name }}" />226 <img id="locobranding" src="{{ team.mugshot_url }}" alt="" title="{{ team.name }}" />
227</article>227</article>
228228
229{% if team.flickr_id %} 229{% if team.flickr_id or team.picasa_id or team.pixie_id %}
230<article class="minor-content alone" style="width:95%;">230<article class="minor-content alone" style="width:95%;">
231 <h2>{% trans "Photos from" %} {{ team.name }}</h2>231 <h2>{% trans "Photos from" %} {{ team.name }}</h2>
232 <div style="width:100%;" id="flickr"> </div>232 <div style="width:100%;" id="flickr"> </div>

Subscribers

People subscribed via source and target branches