Merge lp:~ronnie.vd.c/erato/trunk into lp:erato

[Ronnie]

Added Copyright and GPLv3 comment

[lp:~ronnie.vd.c/erato/trunk]

4. By Ronnie on 2010-10-20

Added Copyright and GPLv3 comment

5. By Ronnie on 2010-10-20

Fixed Copyright and some indentations

[Martin Owens (doctormo)]

Good commit, thanks!

review: Approve

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2010-10-20 19:16:20 +0000
@@ -0,0 +1,5 @@
+.settings
+.project
+.pydevproject
+*.pyc
+local_settings.py

=== modified file 'art_website/assets/models.py'
--- art_website/assets/models.py	2010-10-20 15:33:05 +0000
+++ art_website/assets/models.py	2010-10-20 19:16:20 +0000
@@ -1,3 +1,20 @@
+#
+# Copyright 2010, Martin Owens and Adnane Belmadiaf.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 from django.db import models
 
 # Create your models here.

=== modified file 'art_website/assets/tests.py'
--- art_website/assets/tests.py	2010-10-20 15:33:05 +0000
+++ art_website/assets/tests.py	2010-10-20 19:16:20 +0000
@@ -1,3 +1,20 @@
+#
+# Copyright 2010, Martin Owens and Adnane Belmadiaf.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 """
 This file demonstrates two different styles of tests (one doctest and one
 unittest). These will both pass when you run "manage.py test".

=== modified file 'art_website/assets/views.py'
--- art_website/assets/views.py	2010-10-20 15:33:05 +0000
+++ art_website/assets/views.py	2010-10-20 19:16:20 +0000
@@ -1,1 +1,18 @@
+#
+# Copyright 2010, Martin Owens and Adnane Belmadiaf.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 # Create your views here.

=== modified file 'art_website/common/context_processors.py'
--- art_website/common/context_processors.py	2010-10-19 19:34:42 +0000
+++ art_website/common/context_processors.py	2010-10-20 19:16:20 +0000
@@ -1,3 +1,20 @@
+#
+# Copyright 2010, Martin Owens and Adnane Belmadiaf.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 # context processors for loco-directory
 # see: http://docs.djangoproject.com/en/dev/ref/settings/#setting-TEMPLATE_CONTEXT_PROCESSORS
 # to use this processor, add "common.context_processors.loco_version" to your variable TEMPLATE_CONTEXT_PROCESSORS in your settings file

=== modified file 'art_website/common/launchpad.py'
--- art_website/common/launchpad.py	2010-10-19 19:34:42 +0000
+++ art_website/common/launchpad.py	2010-10-20 19:16:20 +0000
@@ -1,4 +1,20 @@
 # -*- coding: utf-8 -*-
+#
+# Copyright 2010, Martin Owens and Adnane Belmadiaf.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 from launchpadlib.launchpad import Launchpad
 from launchpadlib.errors import HTTPError
@@ -75,11 +91,11 @@
     # or similar, we are in a hard spot.
     # When this bug is fixed, this can be made cleaner.
     try:
-       lp.people[identity].mugshot.open()
-       return "https://edge.launchpad.net/api/beta/~%s/mugshot" % (identity)
+        lp.people[identity].mugshot.open()
+        return "https://edge.launchpad.net/api/beta/~%s/mugshot" % (identity)
     except HTTPError:
-       # 404 or some other issue that means we should default to False
-       return "https://edge.launchpad.net/api/beta/ubuntu/mugshot"
+        # 404 or some other issue that means we should default to False
+        return "https://edge.launchpad.net/api/beta/ubuntu/mugshot"
 
 def get_user_timezone(username, lp=None):
     timezone = 'UTC'

=== modified file 'art_website/common/shortcuts.py'
--- art_website/common/shortcuts.py	2010-10-19 19:34:42 +0000
+++ art_website/common/shortcuts.py	2010-10-20 19:16:20 +0000
@@ -1,3 +1,20 @@
+#
+# Copyright 2010, Martin Owens and Adnane Belmadiaf.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 """
 Lifted from Django 1.1.1 for loco-directory
 

=== modified file 'art_website/common/utils.py'
--- art_website/common/utils.py	2010-10-19 19:34:42 +0000
+++ art_website/common/utils.py	2010-10-20 19:16:20 +0000
@@ -1,3 +1,20 @@
+#
+# Copyright 2010, Martin Owens and Adnane Belmadiaf
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 import email
 import os
 from copy import deepcopy

=== modified file 'art_website/common/views.py'
--- art_website/common/views.py	2010-10-19 19:34:42 +0000
+++ art_website/common/views.py	2010-10-20 19:16:20 +0000
@@ -1,4 +1,21 @@
 # -*- coding: utf-8 -*-
+#
+# Copyright 2010, Martin Owens and Adnane Belmadiaf.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response
 from django.template import RequestContext

=== modified file 'art_website/common/widgets.py'
--- art_website/common/widgets.py	2010-10-19 19:34:42 +0000
+++ art_website/common/widgets.py	2010-10-20 19:16:20 +0000
@@ -1,3 +1,20 @@
+#
+# Copyright 2010, Martin Owens and Adnane Belmadiaf.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 # Modified copy of django.contrib.admin.widgets.RelatedFieldWidgetWrapper
 # Removed reverences to admin_site, and instead accept a popup_url
 

=== modified file 'art_website/settings.py'
--- art_website/settings.py	2010-10-20 15:33:05 +0000
+++ art_website/settings.py	2010-10-20 19:16:20 +0000
@@ -1,3 +1,20 @@
+#
+# Copyright 2010, Martin Owens and Adnane Belmadiaf.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 # Django settings for art_website project.
 
 import os, platform
@@ -7,9 +24,9 @@
 # Far too clever trick to know if we're running on the deployment server.
 DEVELOPMENT_MODE = (platform.node() != "art.ubuntu")		
 if DEVELOPMENT_MODE:
-   DEBUG = True
+	DEBUG = True
 else:
-   DEBUG = False
+	DEBUG = False
 
 TEMPLATE_DEBUG = DEBUG
 STATIC_SERVE = True
@@ -118,6 +135,6 @@
 
 import logging
 try:
-  from local_settings import *
+	from local_settings import *
 except ImportError:
-  logging.warning("No local_settings.py were found. See INSTALL for instructions.")
+	logging.warning("No local_settings.py were found. See INSTALL for instructions.")

=== modified file 'art_website/urls.py'
--- art_website/urls.py	2010-10-20 15:33:05 +0000
+++ art_website/urls.py	2010-10-20 19:16:20 +0000
@@ -1,3 +1,20 @@
+#
+# Copyright 2010, Martin Owens and Adnane Belmadiaf.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 import os
 from django.conf.urls.defaults import *
 from django.conf import settings

=== modified file 'art_website/users/admin.py'
--- art_website/users/admin.py	2010-10-20 15:33:05 +0000
+++ art_website/users/admin.py	2010-10-20 19:16:20 +0000
@@ -1,3 +1,20 @@
+#
+# Copyright 2010, Martin Owens and Adnane Belmadiaf.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 from django.contrib import admin
 from users.models import UserProfile
 

=== modified file 'art_website/users/management/commands/update-profiles.py'
--- art_website/users/management/commands/update-profiles.py	2010-10-20 15:33:05 +0000
+++ art_website/users/management/commands/update-profiles.py	2010-10-20 19:16:20 +0000
@@ -1,4 +1,20 @@
 #!/usr/bin/python
+#
+# Copyright 2010, Martin Owens and Adnane Belmadiaf.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 from django.core.management.base import NoArgsCommand
 

=== modified file 'art_website/users/models.py'
--- art_website/users/models.py	2010-10-20 15:33:05 +0000
+++ art_website/users/models.py	2010-10-20 19:16:20 +0000
@@ -1,3 +1,20 @@
+#
+# Copyright 2010, Martin Owens and Adnane Belmadiaf.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 from django.db import models
 from django.contrib.auth import models as auth_models
 # Create your models here.

=== modified file 'media/css/styles.css'
--- media/css/styles.css	2010-10-20 15:33:05 +0000
+++ media/css/styles.css	2010-10-20 19:16:20 +0000
@@ -1,3 +1,20 @@
+/*
+	Copyright 2008, Martin Owens.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 body { 
 	font-family: 'Ubuntubeta','Ubuntu','Bitstream Vera Sans','DejaVu Sans', Tahoma, sans-serif; 
 	font-size:12px;