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

[Adnane Belmadiaf]

[Daniel Holbach (dholbach)]

 - This model change requires a separate new migration script. Have a look at ./manage.py startmigration <...>
 - Can we make the api key configurable like the google api key?

Apart from that: nice work!

review: Needs Fixing

[lp:~daker/loco-team-portal/fix.579833]

261. By Daniel Holbach on 2010-08-26

merged lp:~adnane002/loco-directory/fix.624299

262. By Daniel Holbach on 2010-08-26

merged lp:~adnane002/loco-directory/fix.622252

[Adnane Belmadiaf (daker)]

Oki done!!

review: Needs Resubmitting

[Daniel Holbach (dholbach)]

I'm not sure. Do we want to use a 'public' API key? After all it's readable from the source code. Apart from that, total thumbs up!

[lp:~daker/loco-team-portal/fix.579833]

263. By Daniel Holbach on 2010-08-27

merged lp:~yoboy-leguesh/loco-directory/bugfix-lp-624885

[Adnane Belmadiaf (daker)]

We need the API key to get the json dump, it will appear on the source code because the dump is rendered with the jQuery framework.

[lp:~daker/loco-team-portal/fix.579833]

264. By Michael Hall on 2010-08-28

Add User Profiles, merge from Daniel Holbach

265. By Michael Hall on 2010-08-28

Redesign of Global Events to match Team Event redesign, merge from Chris Johnston

266. By Michael Hall on 2010-08-28

More profiles from Daniel Holbach

267. By Michael Hall on 2010-08-28

Team Details cleanup, merge from Martin Owens

[Michael Hall (mhall119)]

Did you manually edit loco_directory/teams/migrations/0001_initial.py ?

[Daniel Holbach (dholbach)]

I know we need the API key, but I'd prefer if people set it 'manually' in local_settings.py (like the Google API key), so we don't share 'our' flickr key publicly (in bazaar and Launchpad). I hope I'm less confusing now. :-)

[Adnane Belmadiaf (daker)]

> Did you manually edit loco_directory/teams/migrations/0001_initial.py ?
The first time yes in rev 261, i have undo the changes then i have created the migration script in rev 262

> I know we need the API key, but I'd prefer if people set it 'manually' in
> local_settings.py (like the Google API key), so we don't share 'our' flickr
> key publicly (in bazaar and Launchpad). I hope I'm less confusing now. :-)

i have done this, you can set it manualy (like the Google API key) rev 262, just one thing that the API key will be shown in the source code (when the user hit "View Source" in the browser) for only one reason that the process is made on the client side.

[Daniel Holbach (dholbach)]

Can you resolve the conflict in loco_directory/templates/teams/team_detail.html and rename loco_directory/teams/migrations/0005_flickr_account.py to loco_directory/teams/migrations/0008_flickr_account.py?

Apart from that everything should be fine.

review: Needs Fixing

[lp:~daker/loco-team-portal/fix.579833]

268. By Adnane Belmadiaf on 2010-09-01

* Resolved conflict in templates/teams/team_detail.html
* Renamed the flickr account migration script

269. By Adnane Belmadiaf on 2010-09-01

* Changed the number of flickr photos from 25 to 27

[Michael Hall (mhall119)]

Looks fantastic!

review: Approve

=== modified file 'loco_directory/common/context_processors.py'
--- loco_directory/common/context_processors.py	2010-07-28 13:13:39 +0000
+++ loco_directory/common/context_processors.py	2010-09-01 16:44:42 +0000
@@ -26,6 +26,17 @@
         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 = ""
+    return {'flickr_api_key': flickr_api_key}
+
 def login_redirect(request):
     return {'login_next': request.get_full_path()}
 

=== added file 'loco_directory/media/css/jquery.lightbox-0.5.css'
--- loco_directory/media/css/jquery.lightbox-0.5.css	1970-01-01 00:00:00 +0000
+++ loco_directory/media/css/jquery.lightbox-0.5.css	2010-09-01 16:44:42 +0000
@@ -0,0 +1,101 @@
+/**
+ * jQuery lightBox plugin
+ * This jQuery plugin was inspired and based on Lightbox 2 by Lokesh Dhakar (http://www.huddletogether.com/projects/lightbox2/)
+ * and adapted to me for use like a plugin from jQuery.
+ * @name jquery-lightbox-0.5.css
+ * @author Leandro Vieira Pinho - http://leandrovieira.com
+ * @version 0.5
+ * @date April 11, 2008
+ * @category jQuery plugin
+ * @copyright (c) 2008 Leandro Vieira Pinho (leandrovieira.com)
+ * @license CC Attribution-No Derivative Works 2.5 Brazil - http://creativecommons.org/licenses/by-nd/2.5/br/deed.en_US
+ * @example Visit http://leandrovieira.com/projects/jquery/lightbox/ for more informations about this jQuery plugin
+ */
+#jquery-overlay {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 90;
+	width: 100%;
+        opacity:.5;
+}
+#jquery-lightbox {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	z-index: 100;
+	text-align: center;
+	line-height: 0;
+}
+#jquery-lightbox a img { border: none; }
+#lightbox-container-image-box {
+	position: relative;
+	background-color: #fff;
+	width: 250px;
+	height: 250px;
+	margin: 0 auto;
+}
+#lightbox-container-image { padding: 10px; }
+#lightbox-loading {
+	position: absolute;
+	top: 40%;
+	left: 0%;
+	height: 25%;
+	width: 100%;
+	text-align: center;
+	line-height: 0;
+}
+#lightbox-nav {
+	position: absolute;
+	top: 0;
+	left: 0;
+	height: 100%;
+	width: 100%;
+	z-index: 10;
+}
+#lightbox-container-image-box > #lightbox-nav { left: 0; }
+#lightbox-nav a { outline: none;}
+#lightbox-nav-btnPrev, #lightbox-nav-btnNext {
+	width: 49%;
+	height: 100%;
+	zoom: 1;
+	display: block;
+}
+#lightbox-nav-btnPrev { 
+	left: 0; 
+	float: left;
+}
+#lightbox-nav-btnNext { 
+	right: 0; 
+	float: right;
+}
+#lightbox-container-image-data-box {
+	font: 10px Verdana, Helvetica, sans-serif;
+	background-color: #fff;
+	margin: 0 auto;
+	line-height: 1.4em;
+	overflow: auto;
+	width: 100%;
+	padding: 0 10px 0;
+}
+#lightbox-container-image-data {
+	padding: 0 10px; 
+	color: #666; 
+}
+#lightbox-container-image-data #lightbox-image-details { 
+	width: 70%; 
+	float: left; 
+	text-align: left; 
+}	
+#lightbox-image-details-caption { font-weight: bold; }
+#lightbox-image-details-currentNumber {
+	display: block; 
+	clear: left; 
+	padding-bottom: 1.0em;	
+}			
+#lightbox-secNav-btnClose {
+	width: 66px; 
+	float: right;
+	padding-bottom: 0.7em;	
+}

=== added file 'loco_directory/media/img/lightbox-blank.gif'
Binary files loco_directory/media/img/lightbox-blank.gif	1970-01-01 00:00:00 +0000 and loco_directory/media/img/lightbox-blank.gif	2010-09-01 16:44:42 +0000 differ
=== added file 'loco_directory/media/img/lightbox-btn-close.gif'
Binary files loco_directory/media/img/lightbox-btn-close.gif	1970-01-01 00:00:00 +0000 and loco_directory/media/img/lightbox-btn-close.gif	2010-09-01 16:44:42 +0000 differ
=== added file 'loco_directory/media/img/lightbox-btn-next.gif'
Binary files loco_directory/media/img/lightbox-btn-next.gif	1970-01-01 00:00:00 +0000 and loco_directory/media/img/lightbox-btn-next.gif	2010-09-01 16:44:42 +0000 differ
=== added file 'loco_directory/media/img/lightbox-btn-prev.gif'
Binary files loco_directory/media/img/lightbox-btn-prev.gif	1970-01-01 00:00:00 +0000 and loco_directory/media/img/lightbox-btn-prev.gif	2010-09-01 16:44:42 +0000 differ
=== added file 'loco_directory/media/img/lightbox-ico-loading.gif'
Binary files loco_directory/media/img/lightbox-ico-loading.gif	1970-01-01 00:00:00 +0000 and loco_directory/media/img/lightbox-ico-loading.gif	2010-09-01 16:44:42 +0000 differ
=== added file 'loco_directory/media/js/jquery.lightbox-0.5.min.js'
--- loco_directory/media/js/jquery.lightbox-0.5.min.js	1970-01-01 00:00:00 +0000
+++ loco_directory/media/js/jquery.lightbox-0.5.min.js	2010-09-01 16:44:42 +0000
@@ -0,0 +1,42 @@
+/**
+ * jQuery lightBox plugin
+ * This jQuery plugin was inspired and based on Lightbox 2 by Lokesh Dhakar (http://www.huddletogether.com/projects/lightbox2/)
+ * and adapted to me for use like a plugin from jQuery.
+ * @name jquery-lightbox-0.5.js
+ * @author Leandro Vieira Pinho - http://leandrovieira.com
+ * @version 0.5
+ * @date April 11, 2008
+ * @category jQuery plugin
+ * @copyright (c) 2008 Leandro Vieira Pinho (leandrovieira.com)
+ * @license CC Attribution-No Derivative Works 2.5 Brazil - http://creativecommons.org/licenses/by-nd/2.5/br/deed.en_US
+ * @example Visit http://leandrovieira.com/projects/jquery/lightbox/ for more informations about this jQuery plugin
+ */
+(function($){$.fn.lightBox=function(settings){settings=jQuery.extend({overlayBgColor:'#000',overlayOpacity:0.8,fixedNavigation:false,imageLoading:'/media/img/lightbox-ico-loading.gif',imageBtnPrev:'/media/img/lightbox-btn-prev.gif',imageBtnNext:'/media/img/lightbox-btn-next.gif',imageBtnClose:'/media/img/lightbox-btn-close.gif',imageBlank:'/media/img/lightbox-blank.gif',containerBorderSize:10,containerResizeSpeed:400,txtImage:'Image',txtOf:'of',keyToClose:'c',keyToPrev:'p',keyToNext:'n',imageArray:[],activeImage:0},settings);var jQueryMatchedObj=this;function _initialize(){_start(this,jQueryMatchedObj);return false;}
+function _start(objClicked,jQueryMatchedObj){$('embed, object, select').css({'visibility':'hidden'});_set_interface();settings.imageArray.length=0;settings.activeImage=0;if(jQueryMatchedObj.length==1){settings.imageArray.push(new Array(objClicked.getAttribute('href'),objClicked.getAttribute('title')));}else{for(var i=0;i<jQueryMatchedObj.length;i++){settings.imageArray.push(new Array(jQueryMatchedObj[i].getAttribute('href'),jQueryMatchedObj[i].getAttribute('title')));}}
+while(settings.imageArray[settings.activeImage][0]!=objClicked.getAttribute('href')){settings.activeImage++;}
+_set_image_to_view();}
+function _set_interface(){$('body').append('<div id="jquery-overlay"></div><div id="jquery-lightbox"><div id="lightbox-container-image-box"><div id="lightbox-container-image"><img id="lightbox-image"><div style="" id="lightbox-nav"><a href="#" id="lightbox-nav-btnPrev"></a><a href="#" id="lightbox-nav-btnNext"></a></div><div id="lightbox-loading"><a href="#" id="lightbox-loading-link"><img src="'+settings.imageLoading+'"></a></div></div></div><div id="lightbox-container-image-data-box"><div id="lightbox-container-image-data"><div id="lightbox-image-details"><span id="lightbox-image-details-caption"></span><span id="lightbox-image-details-currentNumber"></span></div><div id="lightbox-secNav"><a href="#" id="lightbox-secNav-btnClose"><img src="'+settings.imageBtnClose+'"></a></div></div></div></div>');var arrPageSizes=___getPageSize();$('#jquery-overlay').css({backgroundColor:settings.overlayBgColor,opacity:settings.overlayOpacity,width:arrPageSizes[0],height:arrPageSizes[1]}).fadeIn();var arrPageScroll=___getPageScroll();$('#jquery-lightbox').css({top:arrPageScroll[1]+(arrPageSizes[3]/10),left:arrPageScroll[0]}).show();$('#jquery-overlay,#jquery-lightbox').click(function(){_finish();});$('#lightbox-loading-link,#lightbox-secNav-btnClose').click(function(){_finish();return false;});$(window).resize(function(){var arrPageSizes=___getPageSize();$('#jquery-overlay').css({width:arrPageSizes[0],height:arrPageSizes[1]});var arrPageScroll=___getPageScroll();$('#jquery-lightbox').css({top:arrPageScroll[1]+(arrPageSizes[3]/10),left:arrPageScroll[0]});});}
+function _set_image_to_view(){$('#lightbox-loading').show();if(settings.fixedNavigation){$('#lightbox-image,#lightbox-container-image-data-box,#lightbox-image-details-currentNumber').hide();}else{$('#lightbox-image,#lightbox-nav,#lightbox-nav-btnPrev,#lightbox-nav-btnNext,#lightbox-container-image-data-box,#lightbox-image-details-currentNumber').hide();}
+var objImagePreloader=new Image();objImagePreloader.onload=function(){$('#lightbox-image').attr('src',settings.imageArray[settings.activeImage][0]);_resize_container_image_box(objImagePreloader.width,objImagePreloader.height);objImagePreloader.onload=function(){};};objImagePreloader.src=settings.imageArray[settings.activeImage][0];};function _resize_container_image_box(intImageWidth,intImageHeight){var intCurrentWidth=$('#lightbox-container-image-box').width();var intCurrentHeight=$('#lightbox-container-image-box').height();var intWidth=(intImageWidth+(settings.containerBorderSize*2));var intHeight=(intImageHeight+(settings.containerBorderSize*2));var intDiffW=intCurrentWidth-intWidth;var intDiffH=intCurrentHeight-intHeight;$('#lightbox-container-image-box').animate({width:intWidth,height:intHeight},settings.containerResizeSpeed,function(){_show_image();});if((intDiffW==0)&&(intDiffH==0)){if($.browser.msie){___pause(250);}else{___pause(100);}}
+$('#lightbox-container-image-data-box').css({width:intImageWidth});$('#lightbox-nav-btnPrev,#lightbox-nav-btnNext').css({height:intImageHeight+(settings.containerBorderSize*2)});};function _show_image(){$('#lightbox-loading').hide();$('#lightbox-image').fadeIn(function(){_show_image_data();_set_navigation();});_preload_neighbor_images();};function _show_image_data(){$('#lightbox-container-image-data-box').slideDown('fast');$('#lightbox-image-details-caption').hide();if(settings.imageArray[settings.activeImage][1]){$('#lightbox-image-details-caption').html(settings.imageArray[settings.activeImage][1]).show();}
+if(settings.imageArray.length>1){$('#lightbox-image-details-currentNumber').html(settings.txtImage+' '+(settings.activeImage+1)+' '+settings.txtOf+' '+settings.imageArray.length).show();}}
+function _set_navigation(){$('#lightbox-nav').show();$('#lightbox-nav-btnPrev,#lightbox-nav-btnNext').css({'background':'transparent url('+settings.imageBlank+') no-repeat'});if(settings.activeImage!=0){if(settings.fixedNavigation){$('#lightbox-nav-btnPrev').css({'background':'url('+settings.imageBtnPrev+') left 15% no-repeat'}).unbind().bind('click',function(){settings.activeImage=settings.activeImage-1;_set_image_to_view();return false;});}else{$('#lightbox-nav-btnPrev').unbind().hover(function(){$(this).css({'background':'url('+settings.imageBtnPrev+') left 15% no-repeat'});},function(){$(this).css({'background':'transparent url('+settings.imageBlank+') no-repeat'});}).show().bind('click',function(){settings.activeImage=settings.activeImage-1;_set_image_to_view();return false;});}}
+if(settings.activeImage!=(settings.imageArray.length-1)){if(settings.fixedNavigation){$('#lightbox-nav-btnNext').css({'background':'url('+settings.imageBtnNext+') right 15% no-repeat'}).unbind().bind('click',function(){settings.activeImage=settings.activeImage+1;_set_image_to_view();return false;});}else{$('#lightbox-nav-btnNext').unbind().hover(function(){$(this).css({'background':'url('+settings.imageBtnNext+') right 15% no-repeat'});},function(){$(this).css({'background':'transparent url('+settings.imageBlank+') no-repeat'});}).show().bind('click',function(){settings.activeImage=settings.activeImage+1;_set_image_to_view();return false;});}}
+_enable_keyboard_navigation();}
+function _enable_keyboard_navigation(){$(document).keydown(function(objEvent){_keyboard_action(objEvent);});}
+function _disable_keyboard_navigation(){$(document).unbind();}
+function _keyboard_action(objEvent){if(objEvent==null){keycode=event.keyCode;escapeKey=27;}else{keycode=objEvent.keyCode;escapeKey=objEvent.DOM_VK_ESCAPE;}
+key=String.fromCharCode(keycode).toLowerCase();if((key==settings.keyToClose)||(key=='x')||(keycode==escapeKey)){_finish();}
+if((key==settings.keyToPrev)||(keycode==37)){if(settings.activeImage!=0){settings.activeImage=settings.activeImage-1;_set_image_to_view();_disable_keyboard_navigation();}}
+if((key==settings.keyToNext)||(keycode==39)){if(settings.activeImage!=(settings.imageArray.length-1)){settings.activeImage=settings.activeImage+1;_set_image_to_view();_disable_keyboard_navigation();}}}
+function _preload_neighbor_images(){if((settings.imageArray.length-1)>settings.activeImage){objNext=new Image();objNext.src=settings.imageArray[settings.activeImage+1][0];}
+if(settings.activeImage>0){objPrev=new Image();objPrev.src=settings.imageArray[settings.activeImage-1][0];}}
+function _finish(){$('#jquery-lightbox').remove();$('#jquery-overlay').fadeOut(function(){$('#jquery-overlay').remove();});$('embed, object, select').css({'visibility':'visible'});}
+function ___getPageSize(){var xScroll,yScroll;if(window.innerHeight&&window.scrollMaxY){xScroll=window.innerWidth+window.scrollMaxX;yScroll=window.innerHeight+window.scrollMaxY;}else if(document.body.scrollHeight>document.body.offsetHeight){xScroll=document.body.scrollWidth;yScroll=document.body.scrollHeight;}else{xScroll=document.body.offsetWidth;yScroll=document.body.offsetHeight;}
+var windowWidth,windowHeight;if(self.innerHeight){if(document.documentElement.clientWidth){windowWidth=document.documentElement.clientWidth;}else{windowWidth=self.innerWidth;}
+windowHeight=self.innerHeight;}else if(document.documentElement&&document.documentElement.clientHeight){windowWidth=document.documentElement.clientWidth;windowHeight=document.documentElement.clientHeight;}else if(document.body){windowWidth=document.body.clientWidth;windowHeight=document.body.clientHeight;}
+if(yScroll<windowHeight){pageHeight=windowHeight;}else{pageHeight=yScroll;}
+if(xScroll<windowWidth){pageWidth=xScroll;}else{pageWidth=windowWidth;}
+arrayPageSize=new Array(pageWidth,pageHeight,windowWidth,windowHeight);return arrayPageSize;};function ___getPageScroll(){var xScroll,yScroll;if(self.pageYOffset){yScroll=self.pageYOffset;xScroll=self.pageXOffset;}else if(document.documentElement&&document.documentElement.scrollTop){yScroll=document.documentElement.scrollTop;xScroll=document.documentElement.scrollLeft;}else if(document.body){yScroll=document.body.scrollTop;xScroll=document.body.scrollLeft;}
+arrayPageScroll=new Array(xScroll,yScroll);return arrayPageScroll;};function ___pause(ms){var date=new Date();curDate=null;do{var curDate=new Date();}
+while(curDate-date<ms);};return this.unbind('click').click(_initialize);};})(jQuery);

=== modified file 'loco_directory/settings.py'
--- loco_directory/settings.py	2010-08-23 08:35:14 +0000
+++ loco_directory/settings.py	2010-09-01 16:44:42 +0000
@@ -84,6 +84,7 @@
     "django.core.context_processors.media",
     "common.context_processors.loco_version",
     "common.context_processors.google_api_key",
+    "common.context_processors.flickr_api_key",
     "common.context_processors.login_redirect",
     "common.context_processors.url_base",
 )
@@ -148,6 +149,9 @@
 LOGIN_URL = '/openid/login'
 LOGIN_REDIRECT_URL = '/'
 
+
+FLICKR_API_KEY = '8c969a1e8a49629bb89b411930ab1cc8'
+
 import logging
 try:
   from local_settings import *

=== added file 'loco_directory/teams/migrations/0008_flickr_account.py'
--- loco_directory/teams/migrations/0008_flickr_account.py	1970-01-01 00:00:00 +0000
+++ loco_directory/teams/migrations/0008_flickr_account.py	2010-09-01 16:44:42 +0000
@@ -0,0 +1,67 @@
+
+from south.db import db
+from django.db import models
+from teams.models import *
+
+class Migration:
+    
+    def forwards(self, orm):
+        
+        # Adding field 'Team.flickr_id'
+        db.add_column('teams', 'flickr_id', orm['teams.team:flickr_id'])
+        
+    
+    
+    def backwards(self, orm):
+        
+        # Deleting field 'Team.flickr_id'
+        db.delete_column('teams', 'flickr_id')
+        
+    
+    
+    models = {
+        'teams.continent': {
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
+        },
+        'teams.country': {
+            'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
+        },
+        'teams.language': {
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
+        },
+        'teams.team': {
+            'Meta': {'db_table': "'teams'"},
+            'admins': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.TeamAdministrator']"}),
+            'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']"}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+            'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
+            'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']"}),
+            'lp_name': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'null': 'True', 'db_index': 'True'}),
+            'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}),
+            'owner': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'null': 'True', 'db_index': 'True'}),
+            'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
+            'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+        },
+        'teams.teamadministrator': {
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lpid': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'db_index': 'True'})
+        }
+    }
+    
+    complete_apps = ['teams']

=== modified file 'loco_directory/teams/models.py'
--- loco_directory/teams/models.py	2010-08-18 15:29:01 +0000
+++ loco_directory/teams/models.py	2010-09-01 16:44:42 +0000
@@ -85,6 +85,8 @@
     contact_profiles = models.ManyToManyField(UserProfile, related_name='contacts')
     mugshot_url = models.URLField(_("URL of mugshot"), verify_exists=False, null=True, blank=True)
     languages = models.ManyToManyField(Language)
+    flickr_id = models.CharField(_("Flickr User ID"), max_length=20, null=True, blank=True,
+                                help_text=_("To get your Flickr user id go to http://idgettr.com. Ex. 47353004@N03"))
     
     objects = TeamManager()
     

=== modified file 'loco_directory/templates/base.html'
--- loco_directory/templates/base.html	2010-08-26 00:00:52 +0000
+++ loco_directory/templates/base.html	2010-09-01 16:44:42 +0000
@@ -14,7 +14,7 @@
     <a class="main-nav-item {% ifequal url_base 'events' %}current{% endifequal %}" title="{% trans "Show All Events" %}" href="{% url event-list %}">{% trans "Events" %}</a>
     <a class="main-nav-item {% ifequal url_base 'loco-council' %}current{% endifequal %}" title="{% trans "LoCo Council" %}" href="{% url loco_council %}">{% trans "LoCo Council" %}</a>
     <a class="main-nav-item {% ifequal url_base 'about-loco' %}current{% endifequal %}" title="{% trans "About LoCo Teams" %}" href="{% url about_loco %}">{% trans "About LoCos" %}</a></li>
-    <a class="main-nav-item {% ifequal url_base 'irc_chat' %}current{% endifequal %}" title="{% trans "IRC Chat" %}" href="{% url irc_chat %}">{% trans "IRC Chat" %}</a></li>
+    <a class="main-nav-item {% ifequal url_base 'irc' %}current{% endifequal %}" title="{% trans "IRC Chat" %}" href="{% url irc_chat %}">{% trans "IRC Chat" %}</a></li>
     {% if user.is_authenticated %}
         <a class="main-nav-item" href="/logout" title="{% trans "Log Out" %}: {{ user.username }}">{% trans "Log Out" %}</a>
     {% else %}

=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2010-08-28 18:06:01 +0000
+++ loco_directory/templates/teams/team_detail.html	2010-09-01 16:44:42 +0000
@@ -13,6 +13,48 @@
 {% block search %}{% endblock %}
 
 {% block extrahead %}
+{% if team.flickr_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" /> 
+<script type="text/javascript"> 
+$(function() {
+    var apiKey = '{{ flickr_api_key }}';
+    var userId = '{{ team.flickr_id }}';
+    var tag = '';
+    var perPage = '27';
+    
+    $.getJSON('http://api.flickr.com/services/rest/?format=json&method='+
+        'flickr.photos.search&api_key=' + apiKey + '&user_id=' + userId + 
+        '&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" ';
+            var photoStringEnd = 'title="' + rPhoto.title + '" href="'+ 
+                mediumPhotoURL +'"><img src="' + thumbPhotoURL + '" alt="' + 
+                rPhoto.title + '"/></a>;';
+            var photoString = photoStringStart +  photoStringEnd   
+
+            $(photoString).appendTo("#flickr");
+        });
+        $("a.lightbox").lightBox();
+    });
+});
+</script> 
+<style type="text/css"> 
+div#flickr a.lightbox img {
+	border: 5px solid #b3aaa4;
+	margin-left: 5px;
+	margin-right: 5px;
+}
+</style> 
+{% endif %}
 <link type="application/rss+xml" rel="alternate" title="{% trans "Team Events (RSS)" %}" href="{% url team-events-rss team.lp_name %}" />
 {% endblock %}
 
@@ -122,4 +164,13 @@
 <img id="locobranding" src="{{ team.mugshot_url }}" alt="" title="{{ team.name }}"/>
 </article>
 
+{% if team.flickr_id %} 
+<article class="minor-content alone" style="width:95%;">
+<h2>Flickr Photos</a></h2>
+<div style="width:100%;" id="flickr"> </div> 
+</article>
+{% endif %}
+
+
+
 {% endblock %}