Adnane Belmadiaf has proposed merging
lp:~adnane002/loco-directory/fix.634071-633633 into lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
Related bugs:
#633633 combine photo feeds
https://bugs.launchpad.net/bugs/633633
#634071 Change photo feed block titles
https://bugs.launchpad.net/bugs/634071
--
https://code.launchpad.net/~adnane002/loco-directory/fix.634071-633633/+merge/34997
Your team loco-directory-dev is requested to review the proposed merge of
lp:~adnane002/loco-directory/fix.634071-633633 into lp:loco-directory.
=== modified file 'loco_directory/templates/events/global_event_detail.inc.html'
--- loco_directory/templates/events/global_event_detail.inc.html 2010-09-08 21:48:47 +0000
+++ loco_directory/templates/events/global_event_detail.inc.html 2010-09-09 15:42:45 +0000
@@ -21,13 +21,13 @@
var photoStringStart = '<a class="lightbox" rel="lightbox[flickr]" ';
var photoStringEnd = 'title="' + rPhoto.title + '" href="'+
- mediumPhotoURL +'"><img src="' + thumbPhotoURL + '" alt="' +
+ mediumPhotoURL +'"><img width="75" height="75 src="' + thumbPhotoURL + '" alt="' +
rPhoto.title + '"/></a>';
var photoString = photoStringStart + photoStringEnd;
- $(photoString).appendTo("#flickr");
+ $(photoString).appendTo("#photo-feed");
});
- $("#flickr a.lightbox").lightBox();
+ $("#photo-feed a.lightbox").lightBox();
});
@@ -50,9 +50,9 @@
title = title + " by " + item.author[0].name.$t;
$("<a/>").attr("class","lightbox").attr("href", altLink).attr("target","_blank").attr("rel","lightbox[picasa]").append(
$("<img/>").attr("src", item.media$group.media$thumbnail[0].url).attr("title", title)
- ).appendTo("#picasa");
+ ).appendTo("#photo-feed");
});
- $("#picasa a.lightbox").lightBox();
+ $("#photo-feed a.lightbox").lightBox();
});
@@ -61,13 +61,13 @@
$.each(data.items, function(i, Photo){
var photoStringStart = '<a class="lightbox" rel="lightbox[flickr]" ';
var photoStringEnd = 'title="' + Photo.title + '" href="'+
- Photo.sizes[5].url +'"><img src="' + Photo.sizes[1].url + '" alt="' +
+ Photo.sizes[4].url +'"><img width="75" height="75" src="' + Photo.sizes[1].url + '" alt="' +
Photo.title + '"/></a>';
var photoString = photoStringStart + photoStringEnd;
- $(photoString).appendTo("#pixie");
+ $(photoString).appendTo("#photo-feed");
});
- $("#pixie a.lightbox").lightBox();
+ $("#photo-feed a.lightbox").lightBox();
});
});
</script>
@@ -77,17 +77,7 @@
</script>
<style type="text/css">
-div#flickr a.lightbox img {
- border: 5px solid #b3aaa4;
- margin-left: 5px;
- margin-right: 5px;
-}
-div#picasa a.lightbox img {
- border: 5px solid #b3aaa4;
- margin-left: 5px;
- margin-right: 5px;
-}
-div#pixie a.lightbox img {
+div#photo-feed a.lightbox img {
border: 5px solid #b3aaa4;
margin-left: 5px;
margin-right: 5px;
@@ -131,18 +121,9 @@
{% if global_event_object.pictag %}
<article class="minor-content alone" style="width:95%;">
- <h2>Flickr Feed</a></h2>
- <div id="flickr"></div>
-</article>
-
-<article class="minor-content alone" style="width:95%;">
- <h2>Picasa Feed</a></h2>
- <div id="picasa"></div>
-</article>
-
-<article class="minor-content alone" style="width:95%;">
- <h2>Pix.ie Feed</a></h2>
- <div id="pixie"></div>
-</article>
+ <h2>{% trans "Photos of" %} #{{ global_event_object.pictag }}</a></h2>
+ <div id="photo-feed"></div>
+</article>
+
{% endif %}
=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html 2010-09-01 22:06:33 +0000
+++ loco_directory/templates/teams/team_detail.html 2010-09-09 15:42:45 +0000
@@ -166,7 +166,7 @@
{% if team.flickr_id %}
<article class="minor-content alone" style="width:95%;">
-<h2>Flickr Photos</a></h2>
+<h2>{% trans "Photos from" %} {{ team.name }}</a></h2>
<div style="width:100%;" id="flickr"> </div>
</article>
{% endif %}
_______________________________________________
Mailing list: https://launchpad.net/~loco-directory-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~loco-directory-dev
More help : https://help.launchpad.net/ListHelp
