added license headers + cleanup

diff --git a/telemeta/models.py b/telemeta/models.py
index 7c6d8995d17643b5b75c77a293451a5329ae9216..13bc4e37d0330aeafab63d3c065451340e8af29f 100644 (file)
--- a/telemeta/models.py
+++ b/telemeta/models.py
@@ -1,3 +1,12 @@
+# Copyright (C) 2007 Samalyse SARL
+# All rights reserved.
+#
+# This software is licensed as described in the file COPYING, which
+# you should have received as part of this distribution. The terms
+# are also available at http://svn.parisson.org/telemeta/TelemetaLicense.
+#
+# Author: Olivier Guilyardi <olivier@samalyse.com>
+
 import telemeta
 from django.db import models
 from django.db.models import Q

diff --git a/telemeta/urls.py b/telemeta/urls.py
index f08699cb642e7dc49d1646d8ac9d25199f433c2a..e7e7784644a1286a37734ccdc732fe3bdc20fd7e 100644 (file)
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -1,36 +1,49 @@
+# Copyright (C) 2007 Samalyse SARL
+# All rights reserved.
+#
+# This software is licensed as described in the file COPYING, which
+# you should have received as part of this distribution. The terms
+# are also available at http://svn.parisson.org/telemeta/TelemetaLicense.
+#
+# Author: Olivier Guilyardi <olivier@samalyse.com>
+
 from django.conf.urls.defaults import *
 from telemeta.models import MediaItem, MediaCollection
 from telemeta.core import ComponentManager
 from telemeta.views.web import WebView
 
+# initialization
 comp_mgr = ComponentManager()
 web_view = WebView(comp_mgr)
 
-all_items = {
-    'queryset': MediaItem.objects.all(),
-}
-
-all_collections = {
-    'queryset': MediaCollection.objects.all(),
-}
+# query sets for Django generic views
+all_items = { 'queryset': MediaItem.objects.all(), }
+all_collections = { 'queryset': MediaCollection.objects.all(), }
 
 urlpatterns = patterns('',
     (r'^$', web_view.index),
+
+    # items
     (r'^items/$', 'django.views.generic.list_detail.object_list', 
         dict(all_items, paginate_by=10, template_name="mediaitem_list.html")),
     (r'^items/(?P<item_id>[0-9]+)/$', web_view.item_detail),
     (r'^items/(?P<item_id>[0-9]+)/download/(?P<format>[0-9A-Z]+)/$', 
         web_view.item_export),
-    #(r'^media_item/(?P<media_item_id>[0-9]+)/$', 'telemeta.views.web.media_item_edit'),
-    (r'^media_item/(?P<media_item_id>[0-9]+)/update/$', 'telemeta.views.web.media_item_update'),
 
+    # collections
     (r'^collections/$', 'django.views.generic.list_detail.object_list',
         dict(all_collections, paginate_by=10, template_name="collection_list.html")),
     (r'^collections/(?P<object_id>[0-9]+)/$', 
         'django.views.generic.list_detail.object_detail',
         dict(all_collections, template_name="collection_detail.html")),
-    #(r'^dictionaries/$', web_view.dictionary_list),        
+
+    # search
+    (r'^search/$', web_view.quick_search),
+
+    # administration        
     (r'^admin/$', web_view.admin_index),        
+
+    # dictionaries administrations
     (r'^admin/dictionaries/(?P<dictionary_id>[0-9a-z]+)/$', web_view.edit_dictionary),        
     (r'^admin/dictionaries/(?P<dictionary_id>[0-9a-z]+)/add/$', web_view.add_to_dictionary),        
     (r'^admin/dictionaries/(?P<dictionary_id>[0-9a-z]+)/update/$', web_view.update_dictionary),        
@@ -40,12 +53,12 @@ urlpatterns = patterns('',
     (r'^admin/dictionaries/(?P<dictionary_id>[0-9a-z]+)/(?P<value_id>[0-9]+)/update/$',
         web_view.update_dictionary_value),   
 
-    (r'^search/$', web_view.quick_search),
-
 
     # CSS+Images (FIXME: for developement only)
-    (r'^css/(?P<path>.*)$', 'django.views.static.serve', {'document_root': './telemeta/htdocs/css'}),
-    (r'^images/(?P<path>.*)$', 'django.views.static.serve', {'document_root': './telemeta/htdocs/images'}),
+    (r'^css/(?P<path>.*)$', 'django.views.static.serve', 
+        {'document_root': './telemeta/htdocs/css'}),
+    (r'^images/(?P<path>.*)$', 'django.views.static.serve', 
+        {'document_root': './telemeta/htdocs/images'}),
 )
 
 

diff --git a/telemeta/views/web.py b/telemeta/views/web.py
index a23cedc72fdbd06251503e0744a0e4bf7d77ce4f..3d92670386a70b4b771d416c386e2b795283f654 100644 (file)
--- a/telemeta/views/web.py
+++ b/telemeta/views/web.py
@@ -1,3 +1,11 @@
+# Copyright (C) 2007 Samalyse SARL
+# All rights reserved.
+#
+# This software is licensed as described in the file COPYING, which
+# you should have received as part of this distribution. The terms
+# are also available at http://svn.parisson.org/telemeta/TelemetaLicense.
+#
+# Author: Olivier Guilyardi <olivier@samalyse.com>
 
 import telemeta
 from django.template import Context, loader