templates: Rename additional templates

Make ALL the things consistent.

Signed-off-by: Stephen Finucane <stephen@that.guru>

diff --git a/patchwork/templates/patchwork/download_buttons.html b/patchwork/templates/patchwork/download-buttons.html
similarity index 100%
rename from patchwork/templates/patchwork/download_buttons.html
rename to patchwork/templates/patchwork/download-buttons.html

diff --git a/patchwork/templates/patchwork/mail-form.html b/patchwork/templates/patchwork/mail.html
similarity index 100%
rename from patchwork/templates/patchwork/mail-form.html
rename to patchwork/templates/patchwork/mail.html

diff --git a/patchwork/templates/patchwork/registration_form.html b/patchwork/templates/patchwork/registration.html
similarity index 100%
rename from patchwork/templates/patchwork/registration_form.html
rename to patchwork/templates/patchwork/registration.html

diff --git a/patchwork/templates/patchwork/submission.html b/patchwork/templates/patchwork/submission.html
index f03e14084b3634c0ab669aeede0ec71ae4ce3b86..6e189b27359ac67a6feec8d839da28d9a57b98c5 100644 (file)
--- a/patchwork/templates/patchwork/submission.html
+++ b/patchwork/templates/patchwork/submission.html
@@ -28,7 +28,7 @@ function toggle_div(link_id, headers_id)
 </script>
 
 <h1>{{ submission.name }}
-{% include "patchwork/download_buttons.html" %}
+{% include "patchwork/download-buttons.html" %}
 </h1>
 
 <table class="patchmeta">
@@ -285,7 +285,7 @@ function toggle_div(link_id, headers_id)
 {% if submission.diff %}
 <h2>
  Patch
- {% include "patchwork/download_buttons.html" %}
+ {% include "patchwork/download-buttons.html" %}
 </h2>
 
 <div id="patch" class="patch">

diff --git a/patchwork/tests/test_mail_settings.py b/patchwork/tests/test_mail_settings.py
index 2c8266924a1da6f0051be1ffdd776cb5845d5d60..34b3f8685f6edea77501a9bd0d90bc74f770cd69 100644 (file)
--- a/patchwork/tests/test_mail_settings.py
+++ b/patchwork/tests/test_mail_settings.py
@@ -33,14 +33,14 @@ class MailSettingsTest(TestCase):
     def test_post_empty(self):
         response = self.client.post(reverse('mail-settings'), {'email': ''})
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, 'patchwork/mail-form.html')
+        self.assertTemplateUsed(response, 'patchwork/mail.html')
         self.assertFormError(response, 'form', 'email',
                              'This field is required.')
 
     def test_post_invalid(self):
         response = self.client.post(reverse('mail-settings'), {'email': 'foo'})
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, 'patchwork/mail-form.html')
+        self.assertTemplateUsed(response, 'patchwork/mail.html')
         self.assertFormError(response, 'form', 'email', error_strings['email'])
 
     def test_post_optin(self):

diff --git a/patchwork/tests/test_registration.py b/patchwork/tests/test_registration.py
index 5e7a49dbbaf8235a7de69cc85ead85307ab34aa3..6e74d98fc372e9cee7c282768e37f4ad0ba1b36d 100644 (file)
--- a/patchwork/tests/test_registration.py
+++ b/patchwork/tests/test_registration.py
@@ -42,7 +42,7 @@ class RegistrationTest(TestCase):
     def test_registration_form(self):
         response = self.client.get('/register/')
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, 'patchwork/registration_form.html')
+        self.assertTemplateUsed(response, 'patchwork/registration.html')
 
     def test_blank_fields(self):
         for field in ['username', 'email', 'password']:

diff --git a/patchwork/views/mail.py b/patchwork/views/mail.py
index f6bdbb47b5730f69000b32c38e1e5656d8f6dfdd..280f4e8cfb07b4f7675e836e49344602fb4b77b0 100644 (file)
--- a/patchwork/views/mail.py
+++ b/patchwork/views/mail.py
@@ -35,7 +35,7 @@ def settings(request):
         'form': form,
     }
 
-    return render(request, 'patchwork/mail-form.html', context)
+    return render(request, 'patchwork/mail.html', context)
 
 
 def optout_confirm(request, conf):

diff --git a/patchwork/views/user.py b/patchwork/views/user.py
index 838a1abca60bc70a57c95e98510848d04df72dc2..f3d8ae36dc4c7e8e6a02f1aa25518569b95b5578 100644 (file)
--- a/patchwork/views/user.py
+++ b/patchwork/views/user.py
@@ -69,7 +69,7 @@ def register(request):
 
     context['form'] = form
 
-    return render(request, 'patchwork/registration_form.html', context)
+    return render(request, 'patchwork/registration.html', context)
 
 
 def register_confirm(request, conf):