Merge lp:~daker/loco-team-portal/pixie-plugin into lp:loco-team-portal

[Adnane Belmadiaf]

Made a jquery plugin for pixie.

[Ronnie (ronnie.vd.c)]

Works perfect here

[Ronnie (ronnie.vd.c)]

review: Approve

[Ronnie (ronnie.vd.c)]

pix.ie key should be in settings.py

review: Disapprove

[Ronnie (ronnie.vd.c)]

Well done Adnane. Well tested and good to go. Approve!

review: Approve

[Nigel Babu (nigelbabu)]

Attempt to merge into lp:loco-directory failed due to conflicts:

text conflict in loco_directory/templates/teams/team_detail.html

[Adnane Belmadiaf (daker)]

ok i have fixed the text conflict.

=== modified file 'loco_directory/common/context_processors.py'
--- loco_directory/common/context_processors.py	2010-11-20 17:25:50 +0000
+++ loco_directory/common/context_processors.py	2011-04-15 15:09:49 +0000
@@ -8,11 +8,8 @@
     """
     add the loco version to template context processor. 
     """
-    try:
-        version = settings.VERSION_STRING
-    except AttributeError:
-        version = "unknown"
-
+    
+    version = getattr(settings, 'VERSION_STRING', 'unknown')
     return {'loco_version': version}
 
 def google_api_key(request):
@@ -20,22 +17,24 @@
     Return the Google API Key or "" if none is defined.
     """
 
-    try:
-        google_api_key = settings.GOOGLE_API_KEY
-    except AttributeError:
-        google_api_key = ""
+    google_api_key = getattr(settings, 'GOOGLE_API_KEY', '')
     return {'google_api_key': google_api_key}
 
 def flickr_api_key(request):
     """
     Return the Flickr API Key or "" if none is defined.
     """
-
-    try:
-        flickr_api_key = settings.FLICKR_API_KEY
-    except AttributeError:
-        flickr_api_key = ""
+    
+    flickr_api_key = getattr(settings, 'FLICKR_API_KEY', '')
     return {'flickr_api_key': flickr_api_key}
+    
+def pixie_api_key(request):
+    """
+    Return the Pix.ie API Key or "" if none is defined.
+    """
+    
+    pixie_api_key = getattr(settings, 'PIXIE_API_KEY', '')
+    return {'pixie_api_key': pixie_api_key}
 
 def login_redirect(request):
     return {'login_next': request.get_full_path()}

=== added file 'loco_directory/media/js/jquery-pixie.js'
--- loco_directory/media/js/jquery-pixie.js	1970-01-01 00:00:00 +0000
+++ loco_directory/media/js/jquery-pixie.js	2011-04-15 15:09:49 +0000
@@ -0,0 +1,63 @@
+/*
+ * jQuery Pixie plugin 0.1.0 (Based on jQuery Flickr plugin)
+ * Requires jQuery 1.4.2
+ *
+ * Copyright 2011, Adnane Belmadiaf
+ * 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  
+        pixie: function (options) {
+            var defaults = {
+                key: null,
+                id: null,
+                amount: 16,
+                lightbox_class: 'lightbox'
+            },
+                html_elements = this,
+                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: '' 
+                };
+            options =  $.extend(defaults, options);
+            
+            function parseResponse(data) {
+                var images = [], image, link;
+                $.each(data.items, function (i, rPhoto) {
+                    image = $('<img>').attr({
+                        src: rPhoto.sizes[1].url,
+                        alt: rPhoto.title
+                    });
+                    link = $('<a>').addClass(options.lightbox_class).attr({
+                        title: rPhoto.title,
+                        href: rPhoto.sizes[4].url
+                    }).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();
+            }
+
+            $.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
+    });
+}(jQuery));

=== modified file 'loco_directory/settings.py'
--- loco_directory/settings.py	2010-12-07 21:42:01 +0000
+++ loco_directory/settings.py	2011-04-15 15:09:49 +0000
@@ -90,6 +90,7 @@
     "common.context_processors.loco_version",
     "common.context_processors.google_api_key",
     "common.context_processors.flickr_api_key",
+    "common.context_processors.pixie_api_key",
     "common.context_processors.login_redirect",
     "common.context_processors.url_base",
     "common.context_processors.site_search",
@@ -158,6 +159,7 @@
 
 
 FLICKR_API_KEY = '8c969a1e8a49629bb89b411930ab1cc8'
+PIXIE_API_KEY = '1dcc8233-a6da-46b0-acb0-4e29aa612b30'
 
 import logging
 try:

=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2011-03-02 22:34:34 +0000
+++ loco_directory/templates/teams/team_detail.html	2011-04-15 15:09:49 +0000
@@ -20,6 +20,7 @@
 <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" src="{{MEDIA_URL}}js/jquery-pixie.js"></script>
 <script type="text/javascript"> 
 $(function() {
     var perPage = '16';
@@ -49,25 +50,10 @@
     });
 {% 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){
-        $.each(data.items, function(i, Photo){
-            var photoStringStart = '<a class="lightbox" ';
-            var photoStringEnd = 'title="' + Photo.title + '" href="'+ 
-                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");
-        });
-        $("a.lightbox").lightBox();
-    });
+    $('#pixie').pixie({ key: "{{ pixie_api_key }}", id: "{{ team.pixie_id }}", amount: perPage });
 {% endif %}
 {% if team.flickr_id or team.picasa_id or team.pixie_id %}
 });
-
 </script>
 <style type="text/css"> 
 div#flickr a.lightbox img {