Merge lp:~ronnie.vd.c/loco-team-portal/713727_flickr into lp:loco-team-portal

[Ronnie]

[lp:~ronnie.vd.c/loco-team-portal/713727_flickr]

387. By Ronnie on 2011-02-05

some other cleanups

[Michael Hall (mhall119)]

Looks good.

review: Approve

=== added file 'loco_directory/media/js/jquery-flickr.js'
--- loco_directory/media/js/jquery-flickr.js	1970-01-01 00:00:00 +0000
+++ loco_directory/media/js/jquery-flickr.js	2011-02-05 21:44:12 +0000
@@ -0,0 +1,92 @@
+/*
+ * jQuery Flickr plugin 0.1.0
+ * Requires jQuery 1.4.2
+ *
+ * Copyright 2011, Ronnie van den Crommenacker
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ */
+
+(function ($) {
+    $.fn.extend({   
+        //This is where you write your plugin's name  
+        flickr: function (options) {
+            var defaults = {
+                key: null,
+                id: null,
+                tag: null,
+                amount: 16,
+                lightbox_class: 'lightbox' 
+            },
+                group = false,
+                html_elements = this,
+                data = { 
+                    format: 'json',
+                    method: 'flickr.photos.search',
+                    api_key: options.key,
+                    per_page: options.amount,
+                    jsoncallback: '' 
+                };
+            options =  $.extend(defaults, options);
+            
+            function parseResponse(data) {
+                var images = [];
+                if (data.stat === 'ok') {
+                    $.each(data.photos.photo, function (i, rPhoto) {
+                        var basePhotoURL = 'http://farm' + rPhoto.farm + '.static.flickr.com/'
+                            + rPhoto.server + '/' + rPhoto.id + '_' + rPhoto.secret,
+                            image = $('<img>').attr({
+                                src: basePhotoURL + '_s.jpg',
+                                alt: rPhoto.title
+                            }),
+                            link = $('<a>').addClass(options.lightbox_class).attr({
+                                title: rPhoto.title,
+                                href: basePhotoURL + '.jpg'
+                            }).append(image);
+                        images.push(link);
+                    });
+                    $(html_elements).each(function (i, html_element) {
+                        var index;
+                        for (index in images) {
+                            if (images.hasOwnProperty(index)) {
+                                $(html_element).append(images[index]);
+                            }
+                        }
+                    });
+                    // Reinitiale the lightbox with the new photo's
+                    $('a.' + options.lightbox_class).lightBox();
+                } else {
+                    // Error: Unknown user
+                    if (data.code === 2 && !group) {
+                        // If the user does not exists, maybe its a group id, try that one.
+                        group = true;
+                        data = { 
+                            format: 'json',
+                            method: 'flickr.photos.search',
+                            api_key: options.key,
+                            group_id: options.id,
+                            per_page: options.amount,
+                        };
+                        $.getJSON('http://api.flickr.com/services/rest/?' + $.param(data) + '&jsoncallback=?', parseResponse);
+                    } else {
+                        // Show the error message
+                        $(html_elements).each(function (i, html_element) {
+                            $(html_element).append($('<p>').text(data.message));
+                        });
+                    }
+                }
+            }
+            
+            if (options.id) {
+                data.user_id = options.id;
+            } else if (options.tag) {
+                data.tags = options.tag;
+            }
+            
+            $.getJSON('http://api.flickr.com/services/rest/?' + $.param(data) + '&jsoncallback=?', parseResponse);
+            
+            // Return the html objects untouched (the photo's are added when loaded)
+            return this;
+        } // End of flickr command
+    });
+}(jQuery));

=== modified file 'loco_directory/templates/events/global_event_detail.inc.html'
--- loco_directory/templates/events/global_event_detail.inc.html	2010-12-19 21:25:01 +0000
+++ loco_directory/templates/events/global_event_detail.inc.html	2011-02-05 21:44:12 +0000
@@ -3,33 +3,15 @@
 {% if global_event_object.pictag %}
 <link rel="stylesheet" href="{{MEDIA_URL}}css/jquery.lightbox-0.5.css" type="text/css" media="screen" /> 
 <script type="text/javascript" src="{{MEDIA_URL}}js/jquery.lightbox-0.5.min.js"></script>
+<script type="text/javascript" src="{{MEDIA_URL}}js/jquery-flickr.js"></script>
 <script type="text/javascript"> 
 $(function() {
-    var apiKey = '{{ flickr_api_key }}';
     var tag = '{{ global_event_object.pictag }}';
     var perPage = '27';
     
-$.getJSON('http://api.flickr.com/services/rest/?format=json&method='+
-        'flickr.photos.search&api_key=' + apiKey + '&tags=' + tag + '&per_page=' + perPage + '&jsoncallback=?', 
-    function(data){
-        $.each(data.photos.photo, function(i, rPhoto){
-            var basePhotoURL = 'http://farm' + rPhoto.farm + '.static.flickr.com/'
-                + rPhoto.server + '/' + rPhoto.id + '_' + rPhoto.secret;
-            
-            var thumbPhotoURL = basePhotoURL + '_s.jpg';
-            var mediumPhotoURL = basePhotoURL + '.jpg';
-            
-            var photoStringStart = '<a class="lightbox" rel="lightbox[flickr]" ';
-            var photoStringEnd = 'title="' + rPhoto.title + '" href="'+ 
-                mediumPhotoURL +'"><img width="75" height="75"" src="' + thumbPhotoURL + '" alt="' + 
-                rPhoto.title + '"/></a>';
-            var photoString = photoStringStart +  photoStringEnd;  
-
-            $(photoString).appendTo("#photo-feed");
-        });
-            $("#photo-feed a.lightbox").lightBox();
-    });
-
+{% if flickr_api_key %}
+    $('#photo-feed').flickr({ key: '{{ flickr_api_key }}', tag: tag, amount: 27 });
+{% endif %}
 
 	var PicasaFeedUrl = 'http://picasaweb.google.com/data/feed/api/all?v=2'+
         '&tag=' + tag + '&alt=json-in-script&kind=photo&max-results=' + perPage + '&thumbsize=75c&callback=?';

=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2011-01-26 00:57:42 +0000
+++ loco_directory/templates/teams/team_detail.html	2011-02-05 21:44:12 +0000
@@ -19,34 +19,13 @@
 <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" />
+<script type="text/javascript" src="{{MEDIA_URL}}js/jquery-flickr.js"></script>
 <script type="text/javascript"> 
 $(function() {
-    var apiKey = '{{ flickr_api_key }}';
     var perPage = '16';
 {% endif %}
-{% if team.flickr_id %}   
-    var flickr_userId = '{{ team.flickr_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=?', 
-    function(data){
-        $.each(data.photos.photo, function(i, rPhoto){
-            var basePhotoURL = 'http://farm' + rPhoto.farm + '.static.flickr.com/'
-                + rPhoto.server + '/' + rPhoto.id + '_' + rPhoto.secret;
-            
-            var thumbPhotoURL = basePhotoURL + '_s.jpg';
-            var mediumPhotoURL = basePhotoURL + '.jpg';
-            
-            var photoStringStart = '<a class="lightbox" ';
-            var photoStringEnd = 'title="' + rPhoto.title + '" href="'+ 
-                mediumPhotoURL +'"><img src="' + thumbPhotoURL + '" alt="' + 
-                rPhoto.title + '"/></a>;';
-            var photoString = photoStringStart +  photoStringEnd   
-
-            $(photoString).appendTo("#flickr");
-        });
-        $("a.lightbox").lightBox();
-    });
+{% if team.flickr_id %}
+    $('#flickr').flickr({ key: "{{ flickr_api_key }}", id: "{{ team.flickr_id }}", amount: perPage });
 {% endif %}
 {% if team.picasa_id %}
     var picasa_userId = '{{ team.picasa_id }}';