From 5c8eb4eb70c0bf3a2d055d1473e3e9cdc9d16be6 Mon Sep 17 00:00:00 2001
From: Antony Chazapis <chazapis@gmail.com>
Date: Wed, 19 Oct 2011 13:29:50 +0300
Subject: [PATCH] Fix urls.

---
 pithos/im/templates/users_create.html |    2 +-
 pithos/im/templates/users_info.html   |    6 +++---
 pithos/im/templates/users_list.html   |    6 +++---
 pithos/im/urls.py                     |    6 +++---
 pithos/urls.py                        |    2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pithos/im/templates/users_create.html b/pithos/im/templates/users_create.html
index 7c4a99d..19c628e 100644
--- a/pithos/im/templates/users_create.html
+++ b/pithos/im/templates/users_create.html
@@ -2,7 +2,7 @@
 
 {% block body %}
 
-<form action="{% url im.views.users_create %}" method="post">
+<form action="{% url pithos.im.views.users_create %}" method="post">
   <div class="clearfix">
     <label for="user-uniq">Uniq</label>
     <div class="input">
diff --git a/pithos/im/templates/users_info.html b/pithos/im/templates/users_info.html
index fe04720..ecd47bf 100644
--- a/pithos/im/templates/users_info.html
+++ b/pithos/im/templates/users_info.html
@@ -2,7 +2,7 @@
 
 {% block body %}
 
-<form action="{% url im.views.users_modify user.id %}" method="post">
+<form action="{% url pithos.im.views.users_modify user.id %}" method="post">
   <div class="clearfix">
     <label for="user-id">ID</label>
     <div class="input">
@@ -76,13 +76,13 @@
     <button type="submit" class="btn primary">Save Changes</button>
     <button type="reset" class="btn">Reset</button>
         &nbsp;&nbsp;
-    <a class="btn danger needs-confirm" href="{% url im.views.users_delete user.id %}">Delete User</a>
+    <a class="btn danger needs-confirm" href="{% url pithos.im.views.users_delete user.id %}">Delete User</a>
   </div>
 
   <div class="alert-message block-message error">
     <p><strong>WARNING:</strong> Are you sure you want to delete this user?</p>
     <div class="alert-actions">
-      <a class="btn danger" href="{% url im.views.users_delete user.id %}">Delete</a>
+      <a class="btn danger" href="{% url pithos.im.views.users_delete user.id %}">Delete</a>
       <a class="btn alert-close">Cancel</a>
     </div>
   </div>
diff --git a/pithos/im/templates/users_list.html b/pithos/im/templates/users_list.html
index 7abfd46..eda5816 100644
--- a/pithos/im/templates/users_list.html
+++ b/pithos/im/templates/users_list.html
@@ -27,8 +27,8 @@
   <tbody>
     {% for user in users %}
     <tr>
-      <td><a href="{% url im.views.users_info user.id %}">{{ user.id }}</a></td>
-      <td><a href="{% url im.views.users_info user.id %}">{{ user.uniq }}</a></td>
+      <td><a href="{% url pithos.im.views.users_info user.id %}">{{ user.id }}</a></td>
+      <td><a href="{% url pithos.im.views.users_info user.id %}">{{ user.uniq }}</a></td>
       <td>{{ user.realname }}</td>
       <td>{{ user.is_admin }}</td>
       <td>{{ user.affiliation }}</td>
@@ -61,6 +61,6 @@
 </div>
 {% endif %}
 
-<a class="btn success" href="{% url im.views.users_create %}">Create a user</a>
+<a class="btn success" href="{% url pithos.im.views.users_create %}">Create a user</a>
 <br /><br />
 {% endblock body %}
diff --git a/pithos/im/urls.py b/pithos/im/urls.py
index ea8c178..b5106bf 100644
--- a/pithos/im/urls.py
+++ b/pithos/im/urls.py
@@ -45,7 +45,7 @@ urlpatterns = patterns('pithos.im.views',
     (r'^admin/users/(\d+)/?$', 'users_info'),
     (r'^admin/users/create$', 'users_create'),
     (r'^admin/users/(\d+)/modify/?$', 'users_modify'),
-    (r'^admin/users/(\d+)/delete/?$', 'users_delete'),
+    (r'^admin/users/(\d+)/delete/?$', 'users_delete')
 )
 
 urlpatterns += patterns('',
@@ -53,6 +53,6 @@ urlpatterns += patterns('',
 )
 
 urlpatterns += patterns('',
-    (r'^/static/(?P<path>.*)$', 'django.views.static.serve', {
-                    'document_root': settings.PROJECT_PATH + '/im/static'})
+    (r'^static/(?P<path>.*)$', 'django.views.static.serve',
+                                {'document_root': settings.PROJECT_PATH + '/im/static'})
 )
diff --git a/pithos/urls.py b/pithos/urls.py
index c2f1b41..7065646 100644
--- a/pithos/urls.py
+++ b/pithos/urls.py
@@ -37,5 +37,5 @@ urlpatterns = patterns('',
     (r'^v1(?:$|/)', include('pithos.api.urls')),
     (r'^v1\.0(?:$|/)', include('pithos.api.urls')),
     (r'^public(?:$|/)', include('pithos.public.urls')),
-    (r'^im(?:$|/)', include('pithos.im.urls'))
+    (r'^im/', include('pithos.im.urls'))
 )
-- 
1.7.10.4