Move templates and fix namespacing

Move base template

    Refactor services urls and templates

    Refactor groupmanagement urls and templates

    Refactor notifications urls and templates

allianceauth/services/modules/discord/auth_hooks.py

@@ -15,7 +15,7 @@ class DiscordService(ServicesHook):
         ServicesHook.__init__(self)
         self.urlpatterns = urlpatterns
         self.name = 'discord'
-        self.service_ctrl_template = 'registered/discord_service_ctrl.html'
+        self.service_ctrl_template = 'services/discord/discord_service_ctrl.html'
         self.access_perm = 'discord.access_discord'
 
     def delete_user(self, user, notify_user=False):

allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html

@@ -7,20 +7,20 @@
     <td class="text-center"><a href="https://discordapp.com/channels/{{ DISCORD_SERVER_ID }}/{{ DISCORD_SERVER_ID}}">https://discordapp.com</a></td>
     <td class="text-center">
         {% if not discord_uid %}
-            <a href="{% url 'auth_activate_discord' %}" title="Activate" class="btn btn-warning">
+            <a href="{% url 'discord:activate' %}" title="Activate" class="btn btn-warning">
                 <span class="glyphicon glyphicon-ok"></span>
             </a>
         {% else %}
-            <a href="{% url 'auth_reset_discord' %}" title="Reset" class="btn btn-primary">
+            <a href="{% url 'discord:reset' %}" title="Reset" class="btn btn-primary">
                 <span class="glyphicon glyphicon-refresh"></span>
             </a>
-            <a href="{% url 'auth_deactivate_discord' %}" title="Deactivate" class="btn btn-danger">
+            <a href="{% url 'discord:deactivate' %}" title="Deactivate" class="btn btn-danger">
                 <span class="glyphicon glyphicon-remove"></span>
             </a>
         {% endif %}
         {% if request.user.is_superuser %}
             <div class="text-center" style="padding-top:5px;">
-                <a type="button" class="btn btn-success" href="{% url 'auth_discord_add_bot' %}">{% trans "Link Discord Server" %}</a>
+                <a type="button" class="btn btn-success" href="{% url 'discord:add_bot' %}">{% trans "Link Discord Server" %}</a>
             </div>
         {% endif %}
     </td>

allianceauth/services/modules/discord/tests.py

@@ -120,7 +120,7 @@ class DiscordHooksTestCase(TestCase):
     def test_render_services_ctrl(self):
         service = self.service()
         member = User.objects.get(username=self.member)
-        request = RequestFactory().get('/en/services/')
+        request = RequestFactory().get('/services/')
         request.user = member
 
         response = service.render_services_ctrl(request)
@@ -166,7 +166,7 @@ class DiscordViewsTestCase(TestCase):
         self.assertTrue(manager.add_user.called)
         self.assertEqual(manager.update_nickname.called, settings.DISCORD_SYNC_NAMES)
         self.assertEqual(self.member.discord.uid, '1234')
-        self.assertRedirects(response, expected_url='/en/services/', target_status_code=200)
+        self.assertRedirects(response, expected_url='/services/', target_status_code=200)
 
     @mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager')
     def test_reset(self, manager):
@@ -187,7 +187,7 @@ class DiscordViewsTestCase(TestCase):
         response = self.client.get('/discord/deactivate/')
 
         self.assertTrue(manager.delete_user.called)
-        self.assertRedirects(response, expected_url='/en/services/', target_status_code=200)
+        self.assertRedirects(response, expected_url='/services/', target_status_code=200)
         with self.assertRaises(ObjectDoesNotExist):
             discord_user = User.objects.get(pk=self.member.pk).discord
 

allianceauth/services/modules/discord/urls.py

@@ -4,13 +4,13 @@ from . import views
 
 module_urls = [
     # Discord Service Control
-    url(r'^activate/$', views.activate_discord, name='auth_activate_discord'),
-    url(r'^deactivate/$', views.deactivate_discord, name='auth_deactivate_discord'),
-    url(r'^reset/$', views.reset_discord, name='auth_reset_discord'),
-    url(r'^callback/$', views.discord_callback, name='auth_discord_callback'),
-    url(r'^add_bot/$', views.discord_add_bot, name='auth_discord_add_bot'),
+    url(r'^activate/$', views.activate_discord, name='activate'),
+    url(r'^deactivate/$', views.deactivate_discord, name='deactivate'),
+    url(r'^reset/$', views.reset_discord, name='reset'),
+    url(r'^callback/$', views.discord_callback, name='callback'),
+    url(r'^add_bot/$', views.discord_add_bot, name='add_bot'),
 ]
 
 urlpatterns = [
-    url(r'^discord/', include(module_urls))
+    url(r'^discord/', include(module_urls, namespace='discord'))
 ]

allianceauth/services/modules/discord/views.py

@@ -25,7 +25,7 @@ def deactivate_discord(request):
     else:
         logger.error("Unsuccessful attempt to deactivate discord for user %s" % request.user)
         messages.error(request, 'An error occurred while processing your Discord account.')
-    return redirect("auth_services")
+    return redirect("services:services")
 
 
 @login_required
@@ -34,10 +34,10 @@ def reset_discord(request):
     logger.debug("reset_discord called by user %s" % request.user)
     if DiscordTasks.delete_user(request.user):
         logger.info("Successfully deleted discord user for user %s - forwarding to discord activation." % request.user)
-        return redirect("auth_activate_discord")
+        return redirect("discord:activate")
     logger.error("Unsuccessful attempt to reset discord for user %s" % request.user)
     messages.error(request, 'An error occurred while processing your Discord account.')
-    return redirect("auth_services")
+    return redirect("services:services")
 
 
 @login_required
@@ -54,14 +54,14 @@ def discord_callback(request):
     code = request.GET.get('code', None)
     if not code:
         logger.warn("Did not receive OAuth code from callback of user %s" % request.user)
-        return redirect("auth_services")
+        return redirect("services:services")
     if DiscordTasks.add_user(request.user, code):
         logger.info("Successfully activated Discord for user %s" % request.user)
         messages.success(request, 'Activated Discord account.')
     else:
         logger.error("Failed to activate Discord for user %s" % request.user)
         messages.error(request, 'An error occurred while processing your Discord account.')
-    return redirect("auth_services")
+    return redirect("services:services")
 
 
 @login_required