Merge branch 'master', remote-tracking branch 'origin' into aquarium

[astakos] / astakos / im / admin / urls.py

diff --git a/astakos/im/admin/urls.py b/astakos/im/admin/urls.py
deleted file mode 100644 (file)
index a239837..0000000
--- a/astakos/im/admin/urls.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2011 GRNET S.A. All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or
-# without modification, are permitted provided that the following
-# conditions are met:
-# 
-#   1. Redistributions of source code must retain the above
-#      copyright notice, this list of conditions and the following
-#      disclaimer.
-# 
-#   2. Redistributions in binary form must reproduce the above
-#      copyright notice, this list of conditions and the following
-#      disclaimer in the documentation and/or other materials
-#      provided with the distribution.
-# 
-# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-# 
-# The views and conclusions contained in the software and
-# documentation are those of the authors and should not be
-# interpreted as representing official policies, either expressed
-# or implied, of GRNET S.A.
-
-from django.conf.urls.defaults import patterns, url
-
-urlpatterns = patterns('astakos.im.admin.views',
-    url(r'^$', 'admin'),
-    
-    url(r'^users/?$', 'users_list'),
-    url(r'^users/(\d+)/?$', 'users_info'),
-    url(r'^users/create$', 'users_create'),
-    url(r'^users/(\d+)/modify/?$', 'users_modify'),
-    url(r'^users/(\d+)/delete/?$', 'users_delete'),
-    url(r'^users/export/?$', 'users_export'),
-    url(r'^users/pending/?$', 'pending_users'),
-    url(r'^users/activate/(\d+)/?$', 'users_activate'),
-    
-    url(r'^invitations/?$', 'invitations_list'),
-    url(r'^invitations/export/?$', 'invitations_export'),
-)
\ No newline at end of file