Update URLs for uniformity

Signed-off-by: Roberto Rosario <roberto.rosario@mayan-edms.com>
2019-07-30 04:46:21 -04:00
parent 4ecf075fd4
commit e20102333e
20 changed files with 536 additions and 485 deletions
--- a/mayan/apps/cabinets/urls.py
+++ b/mayan/apps/cabinets/urls.py
@@ -12,55 +12,62 @@ from .views import (
    CabinetDeleteView, CabinetDetailView, CabinetEditView, CabinetListView,
 )

-urlpatterns = [
+urlpatterns_cabinets = [
    url(
-        regex=r'^list/$', view=CabinetListView.as_view(), name='cabinet_list'
+        regex=r'^cabinets/$', view=CabinetListView.as_view(), name='cabinet_list'
    ),
    url(
-        regex=r'^(?P<pk>\d+)/child/add/$', view=CabinetChildAddView.as_view(),
-        name='cabinet_child_add'
-    ),
-    url(
-        regex=r'^create/$', view=CabinetCreateView.as_view(),
+        regex=r'^cabinets/create/$', view=CabinetCreateView.as_view(),
        name='cabinet_create'
    ),
    url(
-        regex=r'^(?P<pk>\d+)/edit/$', view=CabinetEditView.as_view(),
-        name='cabinet_edit'
+        regex=r'^cabinets/(?P<pk>\d+)/children/add/$', view=CabinetChildAddView.as_view(),
+        name='cabinet_child_add'
    ),
    url(
-        regex=r'^(?P<pk>\d+)/delete/$', view=CabinetDeleteView.as_view(),
+        regex=r'^cabinets/(?P<pk>\d+)/delete/$', view=CabinetDeleteView.as_view(),
        name='cabinet_delete'
    ),
    url(
-        regex=r'^(?P<pk>\d+)/$', view=CabinetDetailView.as_view(),
-        name='cabinet_view'
+        regex=r'^cabinets/(?P<pk>\d+)/edit/$', view=CabinetEditView.as_view(),
+        name='cabinet_edit'
    ),
    url(
-        regex=r'^document/(?P<pk>\d+)/cabinet/add/$',
+        regex=r'^cabinets/(?P<pk>\d+)/$', view=CabinetDetailView.as_view(),
+        name='cabinet_view'
+    ),
+]
+
+urlpatterns_documents_cabinets = [
+    url(
+        regex=r'^documents/(?P<pk>\d+)/cabinets/add/$',
        view=DocumentAddToCabinetView.as_view(), name='document_cabinet_add'
    ),
    url(
-        regex=r'^document/multiple/cabinet/add/$',
+        regex=r'^documents/multiple/cabinets/add/$',
        view=DocumentAddToCabinetView.as_view(),
        name='document_multiple_cabinet_add'
    ),
    url(
-        regex=r'^document/(?P<pk>\d+)/cabinet/remove/$',
+        regex=r'^documents/(?P<pk>\d+)/cabinets/remove/$',
        view=DocumentRemoveFromCabinetView.as_view(),
        name='document_cabinet_remove'
    ),
    url(
-        regex=r'^document/multiple/cabinet/remove/$',
+        regex=r'^documents/multiple/cabinets/remove/$',
        view=DocumentRemoveFromCabinetView.as_view(),
        name='multiple_document_cabinet_remove'
    ),
    url(
-        regex=r'^document/(?P<pk>\d+)/cabinet/list/$',
+        regex=r'^documents/(?P<pk>\d+)/cabinets/$',
        view=DocumentCabinetListView.as_view(), name='document_cabinet_list'
    ),
 ]

+urlpatterns = []
+urlpatterns.extend(urlpatterns_cabinets)
+urlpatterns.extend(urlpatterns_documents_cabinets)
+
 api_urls = [
    url(
        regex=r'^cabinets/(?P<pk>[0-9]+)/documents/(?P<document_pk>[0-9]+)/$',
--- a/mayan/apps/common/urls.py
+++ b/mayan/apps/common/urls.py
@@ -1,7 +1,7 @@
 from __future__ import unicode_literals

 from django.conf.urls import url
-from django.views.i18n import JavaScriptCatalog, set_language
+from django.views.i18n import JavaScriptCatalog

 from .api_views import (
    APIContentTypeList, APITemplateDetailView, APITemplateListView
@@ -13,23 +13,7 @@ from .views import (
    RootView, SetupListView, ToolsListView
 )

-urlpatterns = [
-    url(regex=r'^$', view=RootView.as_view(), name='root'),
-    url(regex=r'^home/$', view=HomeView.as_view(), name='home'),
-    url(regex=r'^about/$', view=AboutView.as_view(), name='about_view'),
-    url(regex=r'^license/$', view=LicenseView.as_view(), name='license_view'),
-    url(regex=r'^setup/$', view=SetupListView.as_view(), name='setup_list'),
-    url(regex=r'^tools/$', view=ToolsListView.as_view(), name='tools_list'),
-    url(
-        regex=r'^user/locale/$',
-        view=CurrentUserLocaleProfileDetailsView.as_view(),
-        name='current_user_locale_profile_details'
-    ),
-    url(
-        regex=r'^user/locale/edit/$',
-        view=CurrentUserLocaleProfileEditView.as_view(),
-        name='current_user_locale_profile_edit'
-    ),
+urlpatterns_error_logs = [
    url(
        regex=r'^object/(?P<app_label>[-\w]+)/(?P<model>[-\w]+)/(?P<object_id>\d+)/errors/$',
        view=ObjectErrorLogEntryListView.as_view(), name='object_error_list'
@@ -41,7 +25,20 @@ urlpatterns = [
    ),
 ]

-urlpatterns += [
+urlpatterns_user_locale = [
+    url(
+        regex=r'^user/locale/$',
+        view=CurrentUserLocaleProfileDetailsView.as_view(),
+        name='current_user_locale_profile_details'
+    ),
+    url(
+        regex=r'^user/locale/edit/$',
+        view=CurrentUserLocaleProfileEditView.as_view(),
+        name='current_user_locale_profile_edit'
+    ),
+]
+
+urlpatterns_misc = [
    url(
        regex=r'^favicon\.ico$', view=FaviconRedirectView.as_view()
    ),
@@ -49,11 +46,21 @@ urlpatterns += [
        regex=r'^jsi18n/(?P<packages>\S+?)/$', view=JavaScriptCatalog.as_view(),
        name='javascript_catalog'
    ),
-    url(
-        regex=r'^set_language/$', view=set_language, name='set_language'
-    ),
 ]

+urlpatterns = [
+    url(regex=r'^$', view=RootView.as_view(), name='root'),
+    url(regex=r'^home/$', view=HomeView.as_view(), name='home'),
+    url(regex=r'^about/$', view=AboutView.as_view(), name='about_view'),
+    url(regex=r'^license/$', view=LicenseView.as_view(), name='license_view'),
+    url(regex=r'^setup/$', view=SetupListView.as_view(), name='setup_list'),
+    url(regex=r'^tools/$', view=ToolsListView.as_view(), name='tools_list'),
+]
+
+urlpatterns.extend(urlpatterns_error_logs)
+urlpatterns.extend(urlpatterns_misc)
+urlpatterns.extend(urlpatterns_user_locale)
+
 api_urls = [
    url(
        regex=r'^content_types/$', view=APIContentTypeList.as_view(),
--- a/mayan/apps/converter/urls.py
+++ b/mayan/apps/converter/urls.py
@@ -9,19 +9,19 @@ from .views import (

 urlpatterns = [
    url(
-        regex=r'^create_for/(?P<app_label>[-\w]+)/(?P<model>[-\w]+)/(?P<object_id>\d+)/$',
-        view=TransformationCreateView.as_view(), name='transformation_create'
-    ),
-    url(
-        regex=r'^list_for/(?P<app_label>[-\w]+)/(?P<model>[-\w]+)/(?P<object_id>\d+)/$',
+        regex=r'^object/(?P<app_label>[-\w]+)/(?P<model>[-\w]+)/(?P<object_id>\d+)/transformations/$',
        view=TransformationListView.as_view(), name='transformation_list'
    ),
    url(
-        regex=r'^delete/(?P<pk>\d+)/$', view=TransformationDeleteView.as_view(),
+        regex=r'^object/(?P<app_label>[-\w]+)/(?P<model>[-\w]+)/(?P<object_id>\d+)/transformations/create/$',
+        view=TransformationCreateView.as_view(), name='transformation_create'
+    ),
+    url(
+        regex=r'^transformations/(?P<pk>\d+)/delete/$', view=TransformationDeleteView.as_view(),
        name='transformation_delete'
    ),
    url(
-        regex=r'^edit/(?P<pk>\d+)/$', view=TransformationEditView.as_view(),
+        regex=r'^transformations/(?P<pk>\d+)/edit/$', view=TransformationEditView.as_view(),
        name='transformation_edit'
    ),
 ]
--- a/mayan/apps/django_gpg/urls.py
+++ b/mayan/apps/django_gpg/urls.py
@@ -11,35 +11,35 @@ from .views import (

 urlpatterns = [
    url(
-        regex=r'^(?P<pk>\d+)/$', view=KeyDetailView.as_view(),
+        regex=r'^keys/(?P<pk>\d+)/$', view=KeyDetailView.as_view(),
        name='key_detail'
    ),
    url(
-        regex=r'^(?P<pk>\d+)/delete/$', view=KeyDeleteView.as_view(),
+        regex=r'^keys/(?P<pk>\d+)/delete/$', view=KeyDeleteView.as_view(),
        name='key_delete'
    ),
    url(
-        regex=r'^(?P<pk>\d+)/download/$', view=KeyDownloadView.as_view(),
+        regex=r'^keys/(?P<pk>\d+)/download/$', view=KeyDownloadView.as_view(),
        name='key_download'
    ),
    url(
-        regex=r'^list/private/$', view=PrivateKeyListView.as_view(),
+        regex=r'^keys/private/$', view=PrivateKeyListView.as_view(),
        name='key_private_list'
    ),
    url(
-        regex=r'^list/public/$', view=PublicKeyListView.as_view(),
+        regex=r'^keys/public/$', view=PublicKeyListView.as_view(),
        name='key_public_list'
    ),
    url(
-        regex=r'^upload/$', view=KeyUploadView.as_view(), name='key_upload'
+        regex=r'^keys/upload/$', view=KeyUploadView.as_view(), name='key_upload'
    ),
-    url(regex=r'^query/$', view=KeyQueryView.as_view(), name='key_query'),
+    url(regex=r'^keys/query/$', view=KeyQueryView.as_view(), name='key_query'),
    url(
-        regex=r'^query/results/$', view=KeyQueryResultView.as_view(),
+        regex=r'^keys/query/results/$', view=KeyQueryResultView.as_view(),
        name='key_query_results'
    ),
    url(
-        regex=r'^receive/(?P<key_id>.+)/$', view=KeyReceive.as_view(),
+        regex=r'^keys/receive/(?P<key_id>.+)/$', view=KeyReceive.as_view(),
        name='key_receive'
    ),
 ]
--- a/mayan/apps/document_comments/urls.py
+++ b/mayan/apps/document_comments/urls.py
@@ -11,25 +11,25 @@ from .views import (

 urlpatterns = [
    url(
-        regex=r'^(?P<pk>\d+)/comment/add/$',
+        regex=r'^documents/(?P<pk>\d+)/comments/$',
+        view=DocumentCommentListView.as_view(), name='comments_for_document'
+    ),
+    url(
+        regex=r'^documents/(?P<pk>\d+)/comments/add/$',
        view=DocumentCommentCreateView.as_view(), name='comment_add'
    ),
    url(
-        regex=r'^comment/(?P<pk>\d+)/delete/$',
+        regex=r'^comments/(?P<pk>\d+)/delete/$',
        view=DocumentCommentDeleteView.as_view(), name='comment_delete'
    ),
    url(
-        regex=r'^comment/(?P<pk>\d+)/$',
+        regex=r'^comments/(?P<pk>\d+)/$',
        view=DocumentCommentDetailView.as_view(), name='comment_details'
    ),
    url(
-        regex=r'^comment/(?P<pk>\d+)/edit/$',
+        regex=r'^comments/(?P<pk>\d+)/edit/$',
        view=DocumentCommentEditView.as_view(), name='comment_edit'
    ),
-    url(
-        regex=r'^(?P<pk>\d+)/comment/list/$',
-        view=DocumentCommentListView.as_view(), name='comments_for_document'
-    ),
 ]

 api_urls = [
--- a/mayan/apps/document_indexing/urls.py
+++ b/mayan/apps/document_indexing/urls.py
@@ -15,72 +15,81 @@ from .views import (
    TemplateNodeCreateView, TemplateNodeDeleteView, TemplateNodeEditView
 )

-urlpatterns = [
+urlpatterns_indexes = [
    url(
-        regex=r'^setup/document_types/(?P<pk>\d+)/index_templates/$',
+        regex=r'^document_types/(?P<pk>\d+)/index_templates/$',
        view=DocumentTypeIndexesView.as_view(),
        name='document_type_index_templates'
    ),
    url(
-        regex=r'^setup/index/list/$', view=SetupIndexListView.as_view(),
+        regex=r'^indexes/$', view=SetupIndexListView.as_view(),
        name='index_setup_list'
    ),
    url(
-        regex=r'^setup/index/create/$', view=SetupIndexCreateView.as_view(),
+        regex=r'^indexes/create/$', view=SetupIndexCreateView.as_view(),
        name='index_setup_create'
    ),
    url(
-        regex=r'^setup/index/(?P<pk>\d+)/edit/$',
-        view=SetupIndexEditView.as_view(), name='index_setup_edit'
-    ),
-    url(
-        regex=r'^setup/index/(?P<pk>\d+)/delete/$',
+        regex=r'^indexes/(?P<pk>\d+)/delete/$',
        view=SetupIndexDeleteView.as_view(), name='index_setup_delete'
    ),
    url(
-        regex=r'^setup/index/(?P<pk>\d+)/template/$',
-        view=SetupIndexTreeTemplateListView.as_view(), name='index_setup_view'
+        regex=r'^indexes/(?P<pk>\d+)/edit/$',
+        view=SetupIndexEditView.as_view(), name='index_setup_edit'
    ),
    url(
-        regex=r'^setup/index/(?P<pk>\d+)/document_types/$',
+        regex=r'^indexes/(?P<pk>\d+)/document_types/$',
        view=SetupIndexDocumentTypesView.as_view(),
        name='index_setup_document_types'
    ),
    url(
-        regex=r'^setup/index/(?P<pk>\d+)/rebuild/$',
+        regex=r'^indexes/(?P<pk>\d+)/rebuild/$',
        view=SetupIndexRebuildView.as_view(), name='index_setup_rebuild'
    ),
    url(
-        regex=r'^setup/template/node/(?P<pk>\d+)/create/child/$',
+        regex=r'^indexes/(?P<pk>\d+)/nodes/$',
+        view=SetupIndexTreeTemplateListView.as_view(), name='index_setup_view'
+    ),
+    url(
+        regex=r'^indexes/nodes/(?P<pk>\d+)/children/create/$',
        view=TemplateNodeCreateView.as_view(), name='template_node_create'
    ),
    url(
-        regex=r'^setup/template/node/(?P<pk>\d+)/edit/$',
-        view=TemplateNodeEditView.as_view(), name='template_node_edit'
-    ),
-    url(
-        regex=r'^setup/template/node/(?P<pk>\d+)/delete/$',
+        regex=r'^indexes/nodes/(?P<pk>\d+)/delete/$',
        view=TemplateNodeDeleteView.as_view(), name='template_node_delete'
    ),
-
    url(
-        regex=r'^index/list/$', view=IndexListView.as_view(), name='index_list'
+        regex=r'^indexes/nodes/(?P<pk>\d+)/edit/$',
+        view=TemplateNodeEditView.as_view(), name='template_node_edit'
+    ),
+]
+
+urlpatterns_index_instances = [
+    url(
+        regex=r'^index_instances/$', view=IndexListView.as_view(), name='index_list'
    ),
    url(
-        regex=r'^instance/node/(?P<pk>\d+)/$',
+        regex=r'^index_instances/nodes/(?P<pk>\d+)/$',
        view=IndexInstanceNodeView.as_view(), name='index_instance_node_view'
    ),
+    url(
+        regex=r'^documents/(?P<pk>\d+)/index_instances/$',
+        view=DocumentIndexNodeListView.as_view(), name='document_index_list'
+    ),
+]

+urlpatterns_tools = [
    url(
        regex=r'^indexes/rebuild/$', view=IndexesRebuildView.as_view(),
        name='rebuild_index_instances'
    ),
-    url(
-        regex=r'^list/for/document/(?P<pk>\d+)/$',
-        view=DocumentIndexNodeListView.as_view(), name='document_index_list'
-    ),
 ]

+urlpatterns = []
+urlpatterns.extend(urlpatterns_indexes)
+urlpatterns.extend(urlpatterns_index_instances)
+urlpatterns.extend(urlpatterns_tools)
+
 api_urls = [
    url(
        regex=r'^indexes/node/(?P<pk>[0-9]+)/documents/$',
--- a/mayan/apps/document_signatures/urls.py
+++ b/mayan/apps/document_signatures/urls.py
@@ -12,37 +12,37 @@ from .views import (

 urlpatterns = [
    url(
-        regex=r'^(?P<pk>\d+)/details/$',
+        regex=r'^signatures/(?P<pk>\d+)/details/$',
        view=DocumentVersionSignatureDetailView.as_view(),
        name='document_version_signature_details'
    ),
    url(
-        regex=r'^signature/(?P<pk>\d+)/download/$',
+        regex=r'^signatures/(?P<pk>\d+)/download/$',
        view=DocumentVersionSignatureDownloadView.as_view(),
        name='document_version_signature_download'
    ),
    url(
-        regex=r'^document/version/(?P<pk>\d+)/signatures/list/$',
+        regex=r'^documents/versions/(?P<pk>\d+)/signatures/$',
        view=DocumentVersionSignatureListView.as_view(),
        name='document_version_signature_list'
    ),
    url(
-        regex=r'^documents/version/(?P<pk>\d+)/signature/detached/upload/$',
+        regex=r'^documents/versions/(?P<pk>\d+)/signatures/detached/upload/$',
        view=DocumentVersionSignatureUploadView.as_view(),
        name='document_version_signature_upload'
    ),
    url(
-        regex=r'^documents/version/(?P<pk>\d+)/signature/detached/create/$',
+        regex=r'^documents/versions/(?P<pk>\d+)/signatures/detached/create/$',
        view=DocumentVersionDetachedSignatureCreateView.as_view(),
        name='document_version_signature_detached_create'
    ),
    url(
-        regex=r'^documents/version/(?P<pk>\d+)/signature/embedded/create/$',
+        regex=r'^documents/versions/(?P<pk>\d+)/signatures/embedded/create/$',
        view=DocumentVersionEmbeddedSignatureCreateView.as_view(),
        name='document_version_signature_embedded_create'
    ),
    url(
-        regex=r'^signature/(?P<pk>\d+)/delete/$',
+        regex=r'^signatures/(?P<pk>\d+)/delete/$',
        view=DocumentVersionSignatureDeleteView.as_view(),
        name='document_version_signature_delete'
    ),
--- a/mayan/apps/document_states/urls.py
+++ b/mayan/apps/document_states/urls.py
@@ -225,7 +225,7 @@ urlpatterns_workflow_transition_fields = [
    ),
 ]

-urlpatterns = [
+urlpatterns_tools = [
    url(
        regex=r'^tools/workflows/launch/$',
        view=ToolLaunchWorkflows.as_view(),
@@ -233,6 +233,8 @@ urlpatterns = [
    ),
 ]

+urlpatterns = []
+urlpatterns.extend(urlpatterns_tools)
 urlpatterns.extend(urlpatterns_workflow_instances)
 urlpatterns.extend(urlpatterns_workflow_runtime_proxies)
 urlpatterns.extend(urlpatterns_workflow_states)
--- a/mayan/apps/documents/urls.py
+++ b/mayan/apps/documents/urls.py
--- a/mayan/apps/events/urls.py
+++ b/mayan/apps/events/urls.py
@@ -14,44 +14,55 @@ from .views import (
    VerbEventListView
 )

-urlpatterns = [
-    url(regex=r'^all/$', view=EventListView.as_view(), name='events_list'),
+urlpatterns_events = [
+    url(regex=r'^events/$', view=EventListView.as_view(), name='events_list'),
    url(
-        regex=r'^for/(?P<app_label>[-\w]+)/(?P<model>[-\w]+)/(?P<object_id>\d+)/$',
+        regex=r'^object/(?P<app_label>[-\w]+)/(?P<model>[-\w]+)/(?P<object_id>\d+)/events/$',
        view=ObjectEventListView.as_view(), name='events_for_object'
    ),
    url(
-        regex=r'^by_verb/(?P<verb>[\w\-\.]+)/$',
+        regex=r'^verbs/(?P<verb>[\w\-\.]+)/$',
        view=VerbEventListView.as_view(), name='events_by_verb'
    ),
-    url(
-        regex=r'^notifications/(?P<pk>\d+)/mark_read/$',
-        view=NotificationMarkRead.as_view(), name='notification_mark_read'
-    ),
-    url(
-        regex=r'^notifications/all/mark_read/$',
-        view=NotificationMarkReadAll.as_view(), name='notification_mark_read_all'
-    ),
    url(
        regex=r'^user/events/$', name='current_user_events',
        view=CurrentUserEventListView.as_view()
    ),
+]
+
+urlpatterns_notification = [
    url(
-        regex=r'^user/(?P<app_label>[-\w]+)/(?P<model>[-\w]+)/(?P<object_id>\d+)/subscriptions/$',
-        view=ObjectEventTypeSubscriptionListView.as_view(),
-        name='object_event_types_user_subcriptions_list'
+        regex=r'^user/notifications/$', view=NotificationListView.as_view(),
+        name='user_notifications_list'
    ),
+    url(
+        regex=r'^user/notifications/(?P<pk>\d+)/mark_read/$',
+        view=NotificationMarkRead.as_view(), name='notification_mark_read'
+    ),
+    url(
+        regex=r'^user/notifications/all/mark_read/$',
+        view=NotificationMarkReadAll.as_view(), name='notification_mark_read_all'
+    ),
+]
+
+urlpatterns_subscriptions = [
    url(
        regex=r'^user/event_types/subscriptions/$',
        view=EventTypeSubscriptionListView.as_view(),
        name='event_types_user_subcriptions_list'
    ),
    url(
-        regex=r'^user/notifications/$', view=NotificationListView.as_view(),
-        name='user_notifications_list'
+        regex=r'^user/object/(?P<app_label>[-\w]+)/(?P<model>[-\w]+)/(?P<object_id>\d+)/subscriptions/$',
+        view=ObjectEventTypeSubscriptionListView.as_view(),
+        name='object_event_types_user_subcriptions_list'
    ),
 ]

+urlpatterns = []
+urlpatterns.extend(urlpatterns_events)
+urlpatterns.extend(urlpatterns_notification)
+urlpatterns.extend(urlpatterns_subscriptions)
+
 api_urls = [
    url(
        regex=r'^event_type_namespaces/(?P<name>[-\w]+)/$',
--- a/mayan/apps/linking/urls.py
+++ b/mayan/apps/linking/urls.py
@@ -18,12 +18,12 @@ from .views import (

 urlpatterns = [
    url(
-        regex=r'^document/(?P<pk>\d+)/list/$',
+        regex=r'^documents/(?P<pk>\d+)/smart_links/$',
        view=DocumentSmartLinkListView.as_view(),
        name='smart_link_instances_for_document'
    ),
    url(
-        regex=r'^document/(?P<document_pk>\d+)/(?P<smart_link_pk>\d+)/$',
+        regex=r'^documents/(?P<document_pk>\d+)/smart_links/(?P<smart_link_pk>\d+)/$',
        view=ResolvedSmartLinkView.as_view(), name='smart_link_instance_view'
    ),
    url(
@@ -32,46 +32,46 @@ urlpatterns = [
        name='document_type_smart_links'
    ),
    url(
-        regex=r'^setup/list/$', view=SmartLinkListView.as_view(),
+        regex=r'^smart_links/$', view=SmartLinkListView.as_view(),
        name='smart_link_list'
    ),
    url(
-        regex=r'^setup/create/$', view=SmartLinkCreateView.as_view(),
+        regex=r'^smart_links/create/$', view=SmartLinkCreateView.as_view(),
        name='smart_link_create'
    ),
    url(
-        regex=r'^setup/(?P<pk>\d+)/delete/$',
+        regex=r'^smart_links/(?P<pk>\d+)/delete/$',
        view=SmartLinkDeleteView.as_view(), name='smart_link_delete'
    ),
    url(
-        regex=r'^setup/(?P<pk>\d+)/edit/$', view=SmartLinkEditView.as_view(),
+        regex=r'^smart_links/(?P<pk>\d+)/edit/$', view=SmartLinkEditView.as_view(),
        name='smart_link_edit'
    ),
    url(
-        regex=r'^setup/(?P<pk>\d+)/document_types/$',
+        regex=r'^smart_links/(?P<pk>\d+)/document_types/$',
        view=SetupSmartLinkDocumentTypesView.as_view(),
        name='smart_link_document_types'
    ),
    url(
-        regex=r'^setup/(?P<pk>\d+)/condition/list/$',
+        regex=r'^smart_links/(?P<pk>\d+)/conditions/$',
        view=SmartLinkConditionListView.as_view(),
        name='smart_link_condition_list'
    ),
    url(
-        regex=r'^setup/(?P<pk>\d+)/condition/create/$',
+        regex=r'^smart_links/(?P<pk>\d+)/conditions/create/$',
        view=SmartLinkConditionCreateView.as_view(),
        name='smart_link_condition_create'
    ),
    url(
-        regex=r'^setup/smart_link/condition/(?P<pk>\d+)/edit/$',
-        view=SmartLinkConditionEditView.as_view(),
-        name='smart_link_condition_edit'
-    ),
-    url(
-        regex=r'^setup/smart_link/condition/(?P<pk>\d+)/delete/$',
+        regex=r'^smart_links/conditions/(?P<pk>\d+)/delete/$',
        view=SmartLinkConditionDeleteView.as_view(),
        name='smart_link_condition_delete'
    ),
+    url(
+        regex=r'^smart_links/conditions/(?P<pk>\d+)/edit/$',
+        view=SmartLinkConditionEditView.as_view(),
+        name='smart_link_condition_edit'
+    ),
 ]

 api_urls = [
--- a/mayan/apps/mailer/urls.py
+++ b/mayan/apps/mailer/urls.py
@@ -11,19 +11,19 @@ from .views import (

 urlpatterns = [
    url(
-        regex=r'^(?P<pk>\d+)/send/link/$', view=MailDocumentLinkView.as_view(),
+        regex=r'^documents/(?P<pk>\d+)/send/link/$', view=MailDocumentLinkView.as_view(),
        name='send_document_link'
    ),
    url(
-        regex=r'^multiple/send/link/$', view=MailDocumentLinkView.as_view(),
+        regex=r'^documents/multiple/send/link/$', view=MailDocumentLinkView.as_view(),
        name='send_multiple_document_link'
    ),
    url(
-        regex=r'^(?P<pk>\d+)/send/document/$', view=MailDocumentView.as_view(),
+        regex=r'^documents/(?P<pk>\d+)/send/document/$', view=MailDocumentView.as_view(),
        name='send_document'
    ),
    url(
-        regex=r'^multiple/send/document/$', view=MailDocumentView.as_view(),
+        regex=r'^documents/multiple/send/document/$', view=MailDocumentView.as_view(),
        name='send_multiple_document'
    ),
    url(
--- a/mayan/apps/mayan_statistics/urls.py
+++ b/mayan/apps/mayan_statistics/urls.py
@@ -8,17 +8,17 @@ from .views import (
 )

 urlpatterns = [
-    url(regex=r'^$', view=NamespaceListView.as_view(), name='namespace_list'),
+    url(regex=r'^namespace/$', view=NamespaceListView.as_view(), name='namespace_list'),
    url(
-        regex=r'^namespace/(?P<slug>[\w-]+)/details/$',
+        regex=r'^namespaces/(?P<slug>[\w-]+)/$',
        view=NamespaceDetailView.as_view(), name='namespace_details'
    ),
    url(
-        regex=r'^(?P<slug>[\w-]+)/view/$', view=StatisticDetailView.as_view(),
+        regex=r'^statistics/(?P<slug>[\w-]+)/view/$', view=StatisticDetailView.as_view(),
        name='statistic_detail'
    ),
    url(
-        regex=r'^(?P<slug>[\w-]+)/queue/$', view=StatisticQueueView.as_view(),
+        regex=r'^statistics/(?P<slug>[\w-]+)/queue/$', view=StatisticQueueView.as_view(),
        name='statistic_queue'
    ),
 ]
--- a/mayan/apps/metadata/urls.py
+++ b/mayan/apps/metadata/urls.py
@@ -17,56 +17,56 @@ from .views import (

 urlpatterns = [
    url(
-        regex=r'^(?P<pk>\d+)/edit/$', view=DocumentMetadataEditView.as_view(),
+        regex=r'^documents/metadata/(?P<pk>\d+)/edit/$', view=DocumentMetadataEditView.as_view(),
        name='metadata_edit'
    ),
    url(
-        regex=r'^multiple/edit/$', view=DocumentMetadataEditView.as_view(),
+        regex=r'^documents/multiple/metadata/edit/$', view=DocumentMetadataEditView.as_view(),
        name='metadata_multiple_edit'
    ),
    url(
-        regex=r'^(?P<pk>\d+)/view/$', view=DocumentMetadataListView.as_view(),
+        regex=r'^documents/(?P<pk>\d+)/view/$', view=DocumentMetadataListView.as_view(),
        name='metadata_view'
    ),
    url(
-        regex=r'^(?P<pk>\d+)/add/$', view=DocumentMetadataAddView.as_view(),
+        regex=r'^documents/(?P<pk>\d+)/add/$', view=DocumentMetadataAddView.as_view(),
        name='metadata_add'
    ),
    url(
-        regex=r'^multiple/add/$', view=DocumentMetadataAddView.as_view(),
+        regex=r'^documents/multiple/add/$', view=DocumentMetadataAddView.as_view(),
        name='metadata_multiple_add'
    ),
    url(
-        regex=r'^(?P<pk>\d+)/remove/$',
+        regex=r'^documents/(?P<pk>\d+)/remove/$',
        view=DocumentMetadataRemoveView.as_view(), name='metadata_remove'
    ),
    url(
-        regex=r'^multiple/remove/$', view=DocumentMetadataRemoveView.as_view(),
+        regex=r'^documents/multiple/remove/$', view=DocumentMetadataRemoveView.as_view(),
        name='metadata_multiple_remove'
    ),
    url(
-        regex=r'^setup/type/list/$', view=MetadataTypeListView.as_view(),
+        regex=r'^metadata_types/$', view=MetadataTypeListView.as_view(),
        name='setup_metadata_type_list'
    ),
    url(
-        regex=r'^setup/type/create/$', view=MetadataTypeCreateView.as_view(),
+        regex=r'^metadata_types/create/$', view=MetadataTypeCreateView.as_view(),
        name='setup_metadata_type_create'
    ),
    url(
-        regex=r'^setup/type/(?P<pk>\d+)/edit/$',
+        regex=r'^metadata_types/(?P<pk>\d+)/edit/$',
        view=MetadataTypeEditView.as_view(), name='setup_metadata_type_edit'
    ),
    url(
-        regex=r'^setup/type/(?P<pk>\d+)/delete/$',
+        regex=r'^metadata_types/(?P<pk>\d+)/delete/$',
        view=MetadataTypeDeleteView.as_view(), name='setup_metadata_type_delete'
    ),
    url(
-        regex=r'^setup/document_types/(?P<pk>\d+)/metadata_types/$',
+        regex=r'^document_types/(?P<pk>\d+)/metadata_types/$',
        view=SetupDocumentTypeMetadataTypes.as_view(),
        name='setup_document_type_metadata_types'
    ),
    url(
-        regex=r'^setup/metadata_types/(?P<pk>\d+)/document_types/$',
+        regex=r'^metadata_types/(?P<pk>\d+)/document_types/$',
        view=SetupMetadataTypesDocumentTypes.as_view(),
        name='setup_metadata_type_document_types'
    ),
--- a/mayan/apps/motd/urls.py
+++ b/mayan/apps/motd/urls.py
@@ -8,18 +8,18 @@ from .views import (
 )

 urlpatterns = [
-    url(regex=r'^list/$', view=MessageListView.as_view(), name='message_list'),
+    url(regex=r'^messages/$', view=MessageListView.as_view(), name='message_list'),
    url(
-        regex=r'^create/$', view=MessageCreateView.as_view(),
+        regex=r'^messages/create/$', view=MessageCreateView.as_view(),
        name='message_create'
    ),
    url(
-        regex=r'^(?P<pk>\d+)/edit/$', view=MessageEditView.as_view(),
-        name='message_edit'
+        regex=r'^messages/(?P<pk>\d+)/delete/$', view=MessageDeleteView.as_view(),
+        name='message_delete'
    ),
    url(
-        regex=r'^(?P<pk>\d+)/delete/$', view=MessageDeleteView.as_view(),
-        name='message_delete'
+        regex=r'^messages/(?P<pk>\d+)/edit/$', view=MessageEditView.as_view(),
+        name='message_edit'
    ),
 ]

--- a/mayan/apps/ocr/urls.py
+++ b/mayan/apps/ocr/urls.py
@@ -13,19 +13,6 @@ from .views import (
 )

 urlpatterns = [
-    url(
-        regex=r'^documents/pages/(?P<pk>\d+)/content/$',
-        view=DocumentPageOCRContentView.as_view(),
-        name='document_page_ocr_content'
-    ),
-    url(
-        regex=r'^documents/(?P<pk>\d+)/content/$',
-        view=DocumentOCRContentView.as_view(), name='document_ocr_content'
-    ),
-    url(
-        regex=r'^documents/(?P<pk>\d+)/submit/$',
-        view=DocumentSubmitView.as_view(), name='document_submit'
-    ),
    url(
        regex=r'^document_types/submit/$',
        view=DocumentTypeSubmitView.as_view(), name='document_type_submit'
@@ -39,6 +26,19 @@ urlpatterns = [
        view=DocumentTypeSettingsEditView.as_view(),
        name='document_type_ocr_settings'
    ),
+    url(
+        regex=r'^documents/pages/(?P<pk>\d+)/content/$',
+        view=DocumentPageOCRContentView.as_view(),
+        name='document_page_ocr_content'
+    ),
+    url(
+        regex=r'^documents/(?P<pk>\d+)/content/$',
+        view=DocumentOCRContentView.as_view(), name='document_ocr_content'
+    ),
+    url(
+        regex=r'^documents/(?P<pk>\d+)/submit/$',
+        view=DocumentSubmitView.as_view(), name='document_submit'
+    ),
    url(
        regex=r'^documents/(?P<pk>\d+)/ocr/errors/$',
        view=DocumentOCRErrorsListView.as_view(),
@@ -48,7 +48,7 @@ urlpatterns = [
        regex=r'^documents/(?P<pk>\d+)/ocr/download/$',
        view=DocumentOCRDownloadView.as_view(), name='document_ocr_download'
    ),
-    url(regex=r'^all/$', view=EntryListView.as_view(), name='entry_list'),
+    url(regex=r'^logs/$', view=EntryListView.as_view(), name='entry_list'),
 ]

 api_urls = [
--- a/mayan/apps/permissions/urls.py
+++ b/mayan/apps/permissions/urls.py
@@ -10,30 +10,30 @@ from .views import (

 urlpatterns = [
    url(
-        regex=r'^group/(?P<pk>\d+)/roles/$',
+        regex=r'^groups/(?P<pk>\d+)/roles/$',
        view=GroupRolesView.as_view(), name='group_roles'
    ),
-    url(regex=r'^role/list/$', view=RoleListView.as_view(), name='role_list'),
+    url(regex=r'^roles/$', view=RoleListView.as_view(), name='role_list'),
    url(
-        regex=r'^role/create/$', view=RoleCreateView.as_view(),
+        regex=r'^roles/create/$', view=RoleCreateView.as_view(),
        name='role_create'
    ),
    url(
-        regex=r'^role/(?P<pk>\d+)/permissions/$',
-        view=SetupRolePermissionsView.as_view(), name='role_permissions'
-    ),
-    url(
-        regex=r'^role/(?P<pk>\d+)/edit/$', view=RoleEditView.as_view(),
-        name='role_edit'
-    ),
-    url(
-        regex=r'^role/(?P<pk>\d+)/delete/$', view=RoleDeleteView.as_view(),
+        regex=r'^roles/(?P<pk>\d+)/delete/$', view=RoleDeleteView.as_view(),
        name='role_delete'
    ),
    url(
-        regex=r'^role/(?P<pk>\d+)/groups/$',
+        regex=r'^roles/(?P<pk>\d+)/edit/$', view=RoleEditView.as_view(),
+        name='role_edit'
+    ),
+    url(
+        regex=r'^roles/(?P<pk>\d+)/groups/$',
        view=SetupRoleMembersView.as_view(), name='role_groups'
    ),
+    url(
+        regex=r'^roles/(?P<pk>\d+)/permissions/$',
+        view=SetupRolePermissionsView.as_view(), name='role_permissions'
+    ),
 ]

 api_urls = [
--- a/mayan/apps/sources/urls.py
+++ b/mayan/apps/sources/urls.py
@@ -15,59 +15,59 @@ from .wizards import DocumentCreateWizard

 urlpatterns = [
    url(
-        regex=r'^staging_file/(?P<pk>\d+)/(?P<encoded_filename>.+)/delete/$',
+        regex=r'^staging_files/(?P<pk>\d+)/(?P<encoded_filename>.+)/delete/$',
        view=StagingFileDeleteView.as_view(), name='staging_file_delete'
    ),
+
+    # Document create views
+
    url(
-        regex=r'^upload/document/new/interactive/(?P<source_id>\d+)/$',
+        regex=r'^documents/create/from/local/multiple/$',
+        view=DocumentCreateWizard.as_view(), name='document_create_multiple'
+    ),
+    url(
+        regex=r'^documents/upload/new/interactive/(?P<source_id>\d+)/$',
        view=UploadInteractiveView.as_view(), name='upload_interactive'
    ),
    url(
-        regex=r'^upload/document/new/interactive/$',
+        regex=r'^documents/upload/new/interactive/$',
        view=UploadInteractiveView.as_view(), name='upload_interactive'
    ),
    url(
-        regex=r'^upload/document/(?P<document_pk>\d+)/version/interactive/(?P<source_id>\d+)/$',
+        regex=r'^documents/(?P<document_pk>\d+)/versions/upload/interactive/(?P<source_id>\d+)/$',
        view=UploadInteractiveVersionView.as_view(), name='upload_version'
    ),
    url(
-        regex=r'^upload/document/(?P<document_pk>\d+)/version/interactive/$',
+        regex=r'^documents/(?P<document_pk>\d+)/versions/upload/interactive/$',
        view=UploadInteractiveVersionView.as_view(), name='upload_version'
    ),

    # Setup views

    url(
-        regex=r'^setup/list/$', view=SetupSourceListView.as_view(),
+        regex=r'^sources/$', view=SetupSourceListView.as_view(),
        name='setup_source_list'
    ),
    url(
-        regex=r'^setup/(?P<pk>\d+)/edit/$', view=SetupSourceEditView.as_view(),
+        regex=r'^sources/(?P<pk>\d+)/edit/$', view=SetupSourceEditView.as_view(),
        name='setup_source_edit'
    ),
    url(
-        regex=r'^setup/(?P<pk>\d+)/logs/$', view=SourceLogListView.as_view(),
+        regex=r'^sources/(?P<pk>\d+)/logs/$', view=SourceLogListView.as_view(),
        name='setup_source_logs'
    ),
    url(
-        regex=r'^setup/(?P<pk>\d+)/delete/$',
+        regex=r'^sources/(?P<pk>\d+)/delete/$',
        view=SetupSourceDeleteView.as_view(), name='setup_source_delete'
    ),
    url(
-        regex=r'^setup/(?P<source_type>\w+)/create/$',
+        regex=r'^sources/(?P<source_type>\w+)/create/$',
        view=SetupSourceCreateView.as_view(), name='setup_source_create'
    ),
    url(
-        regex=r'^setup/(?P<pk>\d+)/check/$',
+        regex=r'^sources/(?P<pk>\d+)/check/$',
        view=SetupSourceCheckView.as_view(), name='setup_source_check'
    ),
-
-    # Document create views
-
-    url(
-        regex=r'^create/from/local/multiple/$',
-        view=DocumentCreateWizard.as_view(), name='document_create_multiple'
-    ),
 ]

 api_urls = [
--- a/mayan/apps/tags/urls.py
+++ b/mayan/apps/tags/urls.py
@@ -13,44 +13,44 @@ from .views import (
 )

 urlpatterns = [
-    url(regex=r'^list/$', view=TagListView.as_view(), name='tag_list'),
-    url(regex=r'^create/$', view=TagCreateView.as_view(), name='tag_create'),
+    url(regex=r'^tags/$', view=TagListView.as_view(), name='tag_list'),
+    url(regex=r'^tags/create/$', view=TagCreateView.as_view(), name='tag_create'),
    url(
-        regex=r'^(?P<pk>\d+)/delete/$', view=TagDeleteActionView.as_view(),
+        regex=r'^tags/(?P<pk>\d+)/delete/$', view=TagDeleteActionView.as_view(),
        name='tag_delete'
    ),
    url(
-        regex=r'^(?P<pk>\d+)/edit/$', view=TagEditView.as_view(),
+        regex=r'^tags/(?P<pk>\d+)/edit/$', view=TagEditView.as_view(),
        name='tag_edit'
    ),
    url(
-        regex=r'^(?P<pk>\d+)/documents/$', view=TagDocumentListView.as_view(),
+        regex=r'^tags/(?P<pk>\d+)/documents/$', view=TagDocumentListView.as_view(),
        name='tag_document_list'
    ),
    url(
-        regex=r'^multiple/delete/$', view=TagDeleteActionView.as_view(),
+        regex=r'^tags/multiple/delete/$', view=TagDeleteActionView.as_view(),
        name='tag_multiple_delete'
    ),
    url(
-        regex=r'^multiple/remove/document/(?P<pk>\d+)/$',
+        regex=r'^documents/(?P<pk>\d+)/tags/remove/$',
        view=TagRemoveActionView.as_view(),
        name='single_document_multiple_tag_remove'
    ),
    url(
-        regex=r'^multiple/remove/document/multiple/$',
+        regex=r'^documents/multiple/tags/remove/$',
        view=TagRemoveActionView.as_view(),
        name='multiple_documents_selection_tag_remove'
    ),
    url(
-        regex=r'^selection/attach/document/(?P<pk>\d+)/$',
+        regex=r'^documents/(?P<pk>\d+)/tags/attach/$',
        view=TagAttachActionView.as_view(), name='tag_attach'
    ),
    url(
-        regex=r'^selection/attach/document/multiple/$',
+        regex=r'^documents/multiple/tags/attach/$',
        view=TagAttachActionView.as_view(), name='multiple_documents_tag_attach'
    ),
    url(
-        regex=r'^document/(?P<pk>\d+)/tags/$',
+        regex=r'^documents/(?P<pk>\d+)/tags/$',
        view=DocumentTagListView.as_view(), name='document_tag_list'
    ),
 ]
--- a/mayan/apps/user_management/urls.py
+++ b/mayan/apps/user_management/urls.py
@@ -26,22 +26,22 @@ urlpatterns_current_user = [

 urlpatterns_groups = [
    url(
-        regex=r'^group/list/$', view=GroupListView.as_view(), name='group_list'
+        regex=r'^groups/$', view=GroupListView.as_view(), name='group_list'
    ),
    url(
-        regex=r'^group/create/$', view=GroupCreateView.as_view(),
+        regex=r'^groups/create/$', view=GroupCreateView.as_view(),
        name='group_create'
    ),
    url(
-        regex=r'^group/(?P<pk>\d+)/edit/$', view=GroupEditView.as_view(),
-        name='group_edit'
-    ),
-    url(
-        regex=r'^group/(?P<pk>\d+)/delete/$', view=GroupDeleteView.as_view(),
+        regex=r'^groups/(?P<pk>\d+)/delete/$', view=GroupDeleteView.as_view(),
        name='group_delete'
    ),
    url(
-        regex=r'^group/(?P<pk>\d+)/users/$', view=GroupUsersView.as_view(),
+        regex=r'^groups/(?P<pk>\d+)/edit/$', view=GroupEditView.as_view(),
+        name='group_edit'
+    ),
+    url(
+        regex=r'^groups/(?P<pk>\d+)/users/$', view=GroupUsersView.as_view(),
        name='group_members'
    )
 ]