From f0e1b7b6b2a8106424bc3559e5b663fc7e47a0e9 Mon Sep 17 00:00:00 2001
From: Nick Smith <nick.smith@torchbox.com>
Date: Wed, 2 Jul 2014 11:41:47 +0100
Subject: [PATCH] Move/re-namespace existing users forms, templates, urls,
 views

---
 .../templates/wagtailadmin/pages/search_results.html |  2 +-
 .../templates/wagtailusers/{ => users}/create.html   |  2 +-
 .../templates/wagtailusers/{ => users}/edit.html     |  2 +-
 .../templates/wagtailusers/{ => users}/index.html    |  6 +++---
 .../templates/wagtailusers/{ => users}/list.html     | 10 +++++-----
 .../templates/wagtailusers/{ => users}/results.html  |  4 ++--
 wagtail/wagtailusers/urls.py                         |  8 --------
 wagtail/wagtailusers/urls/__init__.py                |  0
 wagtail/wagtailusers/urls/users.py                   |  8 ++++++++
 wagtail/wagtailusers/views/users.py                  | 12 ++++++------
 wagtail/wagtailusers/wagtail_hooks.py                |  6 +++---
 11 files changed, 30 insertions(+), 30 deletions(-)
 rename wagtail/wagtailusers/templates/wagtailusers/{ => users}/create.html (96%)
 rename wagtail/wagtailusers/templates/wagtailusers/{ => users}/edit.html (96%)
 rename wagtail/wagtailusers/templates/wagtailusers/{ => users}/index.html (73%)
 rename wagtail/wagtailusers/templates/wagtailusers/{ => users}/list.html (68%)
 rename wagtail/wagtailusers/templates/wagtailusers/{ => users}/results.html (85%)
 delete mode 100644 wagtail/wagtailusers/urls.py
 create mode 100644 wagtail/wagtailusers/urls/__init__.py
 create mode 100644 wagtail/wagtailusers/urls/users.py

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/search_results.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/search_results.html
index 932f7b082..bbb6f254d 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/search_results.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/search_results.html
@@ -17,7 +17,7 @@
                 <ul class="filter-options">
                     <li><a href="{% url 'wagtailimages_index' %}?q={{ query_string|urlencode }}" class="icon icon-image">{% trans "Images" %}</a></li>
                     <li><a href="{% url 'wagtaildocs_index' %}?q={{ query_string|urlencode }}" class="icon icon-doc-full-inverse">{% trans "Documents" %}</a></li>
-                    <li><a href="{% url 'wagtailusers_index' %}?q={{ query_string|urlencode }}" class="icon icon-user">{% trans "Users" %}</a></li>
+                    <li><a href="{% url 'wagtailusers_users_index' %}?q={{ query_string|urlencode }}" class="icon icon-user">{% trans "Users" %}</a></li>
                 </ul>
             </nav>
         {% endif %}
diff --git a/wagtail/wagtailusers/templates/wagtailusers/create.html b/wagtail/wagtailusers/templates/wagtailusers/users/create.html
similarity index 96%
rename from wagtail/wagtailusers/templates/wagtailusers/create.html
rename to wagtail/wagtailusers/templates/wagtailusers/users/create.html
index 91cba6846..02e7ecec1 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/create.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/users/create.html
@@ -13,7 +13,7 @@
         <li><a href="#roles">{% trans "Roles" %}</a></li>
     </ul>   
 
-    <form action="{% url 'wagtailusers_create' %}" method="POST">
+    <form action="{% url 'wagtailusers_users_create' %}" method="POST">
         <div class="tab-content">
             {% csrf_token %}
             <section id="account" class="active nice-padding">
diff --git a/wagtail/wagtailusers/templates/wagtailusers/edit.html b/wagtail/wagtailusers/templates/wagtailusers/users/edit.html
similarity index 96%
rename from wagtail/wagtailusers/templates/wagtailusers/edit.html
rename to wagtail/wagtailusers/templates/wagtailusers/users/edit.html
index 1f0cc384f..22ae8b3a7 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/edit.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/users/edit.html
@@ -13,7 +13,7 @@
         <li><a href="#roles">{% trans "Roles" %}</a></li>
     </ul>   
 
-    <form action="{% url 'wagtailusers_edit' user.id %}" method="POST">
+    <form action="{% url 'wagtailusers_users_edit' user.id %}" method="POST">
         <div class="tab-content">
             {% csrf_token %}
 
diff --git a/wagtail/wagtailusers/templates/wagtailusers/index.html b/wagtail/wagtailusers/templates/wagtailusers/users/index.html
similarity index 73%
rename from wagtail/wagtailusers/templates/wagtailusers/index.html
rename to wagtail/wagtailusers/templates/wagtailusers/users/index.html
index d2f3e9972..67589aaaf 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/index.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/users/index.html
@@ -6,7 +6,7 @@
 {% block extra_js %}
     <script>
         window.headerSearch = {
-            url: "{% url 'wagtailusers_index' %}",
+            url: "{% url 'wagtailusers_users_index' %}",
             termInput: "#id_q",
             targetOutput: "#user-results"
         }
@@ -16,11 +16,11 @@
 {% block content %}
     {% trans "Users" as users_str %}
     {% trans "Add a user" as add_a_user_str %}
-    {% include "wagtailadmin/shared/header.html" with title=users_str add_link="wagtailusers_create" add_text=add_a_user_str icon="user" search_url="wagtailusers_index" %}
+    {% include "wagtailadmin/shared/header.html" with title=users_str add_link="wagtailusers_users_create" add_text=add_a_user_str icon="user" search_url="wagtailusers_users_index" %}
 
     <div class="nice-padding">
         <div id="user-results" class="users">
-            {% include "wagtailusers/results.html" %}
+            {% include "wagtailusers/users/results.html" %}
         </div>
     </div>
 {% endblock %}
diff --git a/wagtail/wagtailusers/templates/wagtailusers/list.html b/wagtail/wagtailusers/templates/wagtailusers/users/list.html
similarity index 68%
rename from wagtail/wagtailusers/templates/wagtailusers/list.html
rename to wagtail/wagtailusers/templates/wagtailusers/users/list.html
index 798ab7fb4..372b80345 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/list.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/users/list.html
@@ -6,17 +6,17 @@
             <th class="name">
                 {% trans "Name" %}
                 {% if ordering == "name" %}
-                    <a href="{% url 'wagtailusers_index' %}" class="icon icon-arrow-down-after teal"></a>
+                    <a href="{% url 'wagtailusers_users_index' %}" class="icon icon-arrow-down-after teal"></a>
                 {% else %}
-                    <a href="{% url 'wagtailusers_index' %}?ordering=name" class="icon icon-arrow-down-after"></a>
+                    <a href="{% url 'wagtailusers_users_index' %}?ordering=name" class="icon icon-arrow-down-after"></a>
                 {% endif %}
             </th>
             <th class="username">
                 {% trans "Username" %}
                 {% if ordering == "username" %}
-                    <a href="{% url 'wagtailusers_index' %}" class="icon icon-arrow-down-after teal"></a>
+                    <a href="{% url 'wagtailusers_users_index' %}" class="icon icon-arrow-down-after teal"></a>
                 {% else %}
-                    <a href="{% url 'wagtailusers_index' %}?ordering=username" class="icon icon-arrow-down-after"></a>
+                    <a href="{% url 'wagtailusers_users_index' %}?ordering=username" class="icon icon-arrow-down-after"></a>
                 {% endif %}
             </th>
             <th class="level">{% trans "Level" %}</th>
@@ -29,7 +29,7 @@
                 <td class="title">
                     <h2>
                         <span class="avatar small icon icon-user"><img src="{% gravatar_url user.email 25 %}" /></span>
-                        <a href="{% url 'wagtailusers_edit' user.id %}">{{ user.get_full_name|default:user.username }}</a>
+                        <a href="{% url 'wagtailusers_users_edit' user.id %}">{{ user.get_full_name|default:user.username }}</a>
                     </h2>
                 </td>
                 <td class="username">{{ user.username }}</td>
diff --git a/wagtail/wagtailusers/templates/wagtailusers/results.html b/wagtail/wagtailusers/templates/wagtailusers/users/results.html
similarity index 85%
rename from wagtail/wagtailusers/templates/wagtailusers/results.html
rename to wagtail/wagtailusers/templates/wagtailusers/users/results.html
index 1f3a03586..1c168b95b 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/results.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/users/results.html
@@ -10,9 +10,9 @@
         </h2>
     {% endif %}
 
-    {% include "wagtailusers/list.html" %}
+    {% include "wagtailusers/users/list.html" %}
 
-    {% include "wagtailadmin/shared/pagination_nav.html" with items=users is_searching=is_searching linkurl="wagtailusers_index" %}
+    {% include "wagtailadmin/shared/pagination_nav.html" with items=users is_searching=is_searching linkurl="wagtailusers_users_index" %}
 {% else %}
     {% if is_searching %}
          <p>{% blocktrans %}Sorry, no users match "<em>{{ query_string }}</em>"{% endblocktrans %}</p>
diff --git a/wagtail/wagtailusers/urls.py b/wagtail/wagtailusers/urls.py
deleted file mode 100644
index 87b3d3f5c..000000000
--- a/wagtail/wagtailusers/urls.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from django.conf.urls import url
-from wagtail.wagtailusers.views import users
-
-urlpatterns = [
-    url(r'^$', users.index, name='wagtailusers_index'),
-    url(r'^new/$', users.create, name='wagtailusers_create'),
-    url(r'^(\d+)/$', users.edit, name='wagtailusers_edit'),
-]
diff --git a/wagtail/wagtailusers/urls/__init__.py b/wagtail/wagtailusers/urls/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/wagtail/wagtailusers/urls/users.py b/wagtail/wagtailusers/urls/users.py
new file mode 100644
index 000000000..78487fc5a
--- /dev/null
+++ b/wagtail/wagtailusers/urls/users.py
@@ -0,0 +1,8 @@
+from django.conf.urls import url
+from wagtail.wagtailusers.views import users
+
+urlpatterns = [
+    url(r'^$', users.index, name='wagtailusers_users_index'),
+    url(r'^new/$', users.create, name='wagtailusers_users_create'),
+    url(r'^(\d+)/$', users.edit, name='wagtailusers_users_edit'),
+]
diff --git a/wagtail/wagtailusers/views/users.py b/wagtail/wagtailusers/views/users.py
index 4c17e4489..5c89862e7 100644
--- a/wagtail/wagtailusers/views/users.py
+++ b/wagtail/wagtailusers/views/users.py
@@ -60,14 +60,14 @@ def index(request):
         users = paginator.page(paginator.num_pages)
 
     if request.is_ajax():
-        return render(request, "wagtailusers/results.html", {
+        return render(request, "wagtailusers/users/results.html", {
             'users': users,
             'is_searching': is_searching,
             'query_string': q,
             'ordering': ordering,
         })
     else:
-        return render(request, "wagtailusers/index.html", {
+        return render(request, "wagtailusers/users/index.html", {
             'search_form': form,
             'users': users,
             'is_searching': is_searching,
@@ -82,13 +82,13 @@ def create(request):
         if form.is_valid():
             user = form.save()
             messages.success(request, _("User '{0}' created.").format(user))
-            return redirect('wagtailusers_index')
+            return redirect('wagtailusers_users_index')
         else:
             messages.error(request, _("The user could not be created due to errors.") )
     else:
         form = UserCreationForm()
 
-    return render(request, 'wagtailusers/create.html', {
+    return render(request, 'wagtailusers/users/create.html', {
         'form': form,
     })
 
@@ -101,13 +101,13 @@ def edit(request, user_id):
         if form.is_valid():
             user = form.save()
             messages.success(request, _("User '{0}' updated.").format(user))
-            return redirect('wagtailusers_index')
+            return redirect('wagtailusers_users_index')
         else:
             messages.error(request, _("The user could not be saved due to errors."))
     else:
         form = UserEditForm(instance=user)
 
-    return render(request, 'wagtailusers/edit.html', {
+    return render(request, 'wagtailusers/users/edit.html', {
         'user': user,
         'form': form,
     })
diff --git a/wagtail/wagtailusers/wagtail_hooks.py b/wagtail/wagtailusers/wagtail_hooks.py
index 6637430e1..6c03614b8 100644
--- a/wagtail/wagtailusers/wagtail_hooks.py
+++ b/wagtail/wagtailusers/wagtail_hooks.py
@@ -5,12 +5,12 @@ from django.utils.translation import ugettext_lazy as _
 from wagtail.wagtailcore import hooks
 from wagtail.wagtailadmin.menu import MenuItem
 
-from wagtail.wagtailusers import urls
+from wagtail.wagtailusers.urls import users
 
 
 def register_admin_urls():
     return [
-        url(r'^users/', include(urls)),
+        url(r'^users/', include(users)),
     ]
 hooks.register('register_admin_urls', register_admin_urls)
 
@@ -18,6 +18,6 @@ hooks.register('register_admin_urls', register_admin_urls)
 def construct_main_menu(request, menu_items):
     if request.user.has_module_perms('auth'):
         menu_items.append(
-            MenuItem(_('Users'), urlresolvers.reverse('wagtailusers_index'), classnames='icon icon-user', order=600)
+            MenuItem(_('Users'), urlresolvers.reverse('wagtailusers_users_index'), classnames='icon icon-user', order=600)
         )
 hooks.register('construct_main_menu', construct_main_menu)