Merge lp:~ronnie.vd.c/erato/art-design-website into lp:erato

[Ronnie]

Fixed static file serve dir because dit has moved

[lp:~ronnie.vd.c/erato/art-design-website]

8. By Ronnie on 2010-10-20

Changed my email, removed some unnecessary functions in launchpad.py and changed the static_media url

[Martin Owens (doctormo)]

Great updates, merged.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2010-10-20 20:37:09 +0000
+++ .bzrignore	2010-10-20 21:41:30 +0000
@@ -4,4 +4,4 @@
 *.pyc
 *.mo
 art_website/art_website.db
-local_settings.py
+art_website/local_settings.py
 
=== modified file 'AUTHORS'
--- AUTHORS	2010-10-20 20:37:09 +0000
+++ AUTHORS	2010-10-20 21:41:30 +0000
@@ -1,3 +1,3 @@
 Martin Owens <[e-mail]>
 Adnane Belmadiaf <[e-mail]>
-Ronnie <[e-mail]>
+Ronnie <[e-mail]>
 
=== modified file 'art_website/common/launchpad.py'
--- art_website/common/launchpad.py	2010-10-20 20:33:00 +0000
+++ art_website/common/launchpad.py	2010-10-20 21:41:30 +0000
@@ -48,22 +48,6 @@
             return None
     return launchpad
 
-def is_user_on_loco_council(user):
-    if not user.is_authenticated():
-        return False
-    if is_debug_user(user.username):
-        return True
-    lc_in_groups = user.groups.filter(name__exact='ubuntu-lococouncil')
-    return (lc_in_groups.count() == 1)
-
-def is_team_member(user, team):
-    if not user.is_authenticated():
-        return False
-    if is_debug_user(user.username):
-        return True
-    user_in_groups = user.groups.filter(name__exact=team.lp_name)
-    return (user_in_groups.count() >= 1)
-
 def get_mugshot_url(lp, identity):
     # Not ideal, but until LP #336943
     # or similar, we are in a hard spot.
 
=== modified file 'art_website/urls.py'
--- art_website/urls.py	2010-10-20 19:14:30 +0000
+++ art_website/urls.py	2010-10-20 21:41:30 +0000
@@ -33,6 +33,6 @@
 
 if settings.STATIC_SERVE:
     urlpatterns += patterns('',
-        (r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': os.path.join(settings.PROJECT_PATH,'media')}),
+        (r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': os.path.join(settings.WEBSITE_PATH,'media')}),
         (r'^robots\.txt$', robots),
     )