Refactoring: moved templates

talks/contributors/tests.py

@@ -245,7 +245,7 @@ def test_edit_event_group_200(self):
         self.assertEquals(response.status_code, 200)
         self.assertContains(response, group.title)
         self.assertContains(response, group.description)
-        self.assertTemplateUsed(response, "events/event_group_form.html")
+        self.assertTemplateUsed(response, "contributors/event_group_form.html")
 
     def test_edit_event_group_post_happy(self):
         group = factories.EventGroupFactory.create()
@@ -280,12 +280,12 @@ def test_edit_event_group_post_invalid(self):
         self.assertFormError(response, 'group_form', 'title', ['This field is required.'])
         self.assertEquals(saved_group.title, old_title)
         self.assertEquals(saved_group.description, old_description)
-        self.assertTemplateUsed(response, "events/event_group_form.html")
+        self.assertTemplateUsed(response, "contributors/event_group_form.html")
 
     def test_create_event_group_200(self):
         response = self.client.get("/talks/series/new")
         self.assertEquals(response.status_code, 200)
-        self.assertTemplateUsed(response, "events/event_group_form.html")
+        self.assertTemplateUsed(response, "contributors/event_group_form.html")
 
     def test_create_event_group_post_happy(self):
         data = {
@@ -311,7 +311,7 @@ def test_create_event_group_post_invalid(self):
         response = self.client.post("/talks/series/new", data)
         self.assertFormError(response, 'group_form', 'title', ['This field is required.'])
         self.assertQuerysetEqual(models.EventGroup.objects.all(), [])
-        self.assertTemplateUsed(response, "events/event_group_form.html")
+        self.assertTemplateUsed(response, "contributors/event_group_form.html")
 
 
 class TestCreateEventView(AuthTestCase):
@@ -320,7 +320,7 @@ def test_get_happy_no_group_id(self):
         response = self.client.get('/talks/new')
         logging.info("Form errors: %s", response.context['event_form'].errors)
         self.assertEquals(response.status_code, 200)
-        self.assertTemplateUsed(response, 'events/event_form.html')
+        self.assertTemplateUsed(response, 'contributors/event_form.html')
         self.assertContains(response, "Oxford Talks")
         self.assertContains(response, "New Talk")
         self.assertIn('event_form', response.context)
@@ -587,7 +587,7 @@ def test_edit_event_200(self):
         self.assertContains(response, event.description)
         self.assertContains(response, event.start)
         self.assertContains(response, event.end)
-        self.assertTemplateUsed(response, "events/event_form.html")
+        self.assertTemplateUsed(response, "contributors/event_form.html")
 
     @mock.patch('requests.get', autospec=True)
     def test_edit_event_post_happy(self, requests_get):
@@ -639,4 +639,4 @@ def test_edit_event_post_invalid(self):
         self.assertFormError(response, 'event_form', 'audience', ['This field is required.'])
         self.assertEquals(saved_event.title, old_title)
         self.assertEquals(saved_event.description, old_description)
-        self.assertTemplateUsed(response, "events/event_form.html")
+        self.assertTemplateUsed(response, "contributors/event_form.html")

talks/contributors/views.py

@@ -46,7 +46,7 @@ def edit_event(request, event_slug):
             return redirect(event.get_absolute_url())
         else:
             messages.warning(request, "Please correct errors below")
-    return render(request, "events/event_form.html", context)
+    return render(request, "contributors/event_form.html", context)
 
 @login_required
 @permission_required("events.add_event", raise_exception=PermissionDenied)
@@ -99,7 +99,7 @@ def create_event(request, group_slug=None):
             'host_form': PersonQuickAdd,
             'is_editing': False
         }
-    return render(request, 'events/event_form.html', context)
+    return render(request, 'contributors/event_form.html', context)
 
 
 @login_required
@@ -124,7 +124,7 @@ def delete_event(request, event_slug):
         event.delete()
         messages.success(request, "Talk has been successfully deleted")
         return redirect('contributors-events')
-    return render(request, "events/delete_event.html", context)
+    return render(request, "contributors/delete_event.html", context)
 
 @login_required
 @permission_required('events.change_eventgroup', raise_exception=PermissionDenied)
@@ -146,7 +146,7 @@ def edit_event_group(request, event_group_slug):
         'event_group': group,
         'is_editing': True
     }
-    return render(request, 'events/event_group_form.html', context)
+    return render(request, 'contributors/event_group_form.html', context)
 
 
 @login_required
@@ -176,9 +176,9 @@ def create_event_group(request):
     }
 
     if is_modal:
-        return render(request, 'events/event_group_modal_form.html', context, status=status_code)
+        return render(request, 'contributors/event_group_modal_form.html', context, status=status_code)
     else:
-        return render(request, 'events/event_group_form.html', context, status=status_code)
+        return render(request, 'contributors/event_group_form.html', context, status=status_code)
 
 
 @login_required
@@ -195,7 +195,7 @@ def delete_event_group(request, event_group_slug):
         event_group.delete()
         messages.success(request, "Series has been successfully deleted")
         return redirect('contributors-events')
-    return render(request, "events/delete_event_group.html", context)
+    return render(request, "contributors/delete_event_group.html", context)
 
 
 def contributors_home(request):
@@ -219,7 +219,7 @@ def create_person(request):
         'person_form': form,
     }
 
-    return render(request, 'events/person_form.html', context, status=status_code)
+    return render(request, 'contributors/person_form.html', context, status=status_code)
 
 @login_required
 @permission_required('events.change_event', raise_exception=PermissionDenied)
@@ -278,7 +278,7 @@ def contributors_events(request):
         'fragment': fragment
     }
 
-    return render(request, 'events/contributors_events.html', context)
+    return render(request, 'contributors/contributors_events.html', context)
 
 
 @login_required()
@@ -299,7 +299,7 @@ def contributors_eventgroups(request):
         'groups': eventgroups
     }
 
-    return render(request, 'events/contributors_groups.html', context)
+    return render(request, 'contributors/contributors_groups.html', context)
 
 
 @login_required()
@@ -322,7 +322,7 @@ def contributors_persons(request):
         'persons': persons
     }
 
-    return render(request, 'events/contributors_persons.html', context)
+    return render(request, 'contributors/contributors_persons.html', context)
 
 
 @login_required
@@ -341,4 +341,4 @@ def edit_person(request, person_slug):
         'person_form': form,
         'person': person,
     }
-    return render(request, 'events/person_form.html', context)
+    return render(request, 'contributors/person_form.html', context)

talks/templates/events/_event_group_form_fields.html → talks/templates/contributors/_event_group_form_fields.html

@@ -7,7 +7,7 @@
 {{ group_form.group_type|bootstrap_horizontal }}
 {{ group_form.organisers|bootstrap_horizontal }}
 {% with person_form=organiser_form role='organiser' prefix='' %}
-{% include 'events/person_quick_add.html' %}
+{% include 'contributors/person_quick_add.html' %}
 {% endwith %}
 {{ group_form.occurence|bootstrap_horizontal }}
 {{ group_form.web_address|bootstrap_horizontal }}

talks/templates/events/event_form.html → talks/templates/contributors/event_form.html

@@ -72,7 +72,7 @@ <h3>New Talk</h3>
     {{ event_form.speakers|bootstrap_horizontal }}
 
     {% with person_form=speaker_form role='speakers' prefix='event-' %}
-    {% include 'events/person_quick_add.html' %}
+    {% include 'contributors/person_quick_add.html' %}
     {% endwith %}
 
     {{ event_form.location|bootstrap_horizontal }}
@@ -83,12 +83,12 @@ <h3>New Talk</h3>
     {{ event_form.department_organiser|bootstrap_horizontal }}
     {{ event_form.organisers|bootstrap_horizontal }}
     {% with person_form=organiser_form role='organisers' prefix='event-' %}
-    {% include 'events/person_quick_add.html' %}
+    {% include 'contributors/person_quick_add.html' %}
     {{ event_form.organiser_email|bootstrap_horizontal }}
     {% endwith %}
     {{ event_form.hosts|bootstrap_horizontal }}
     {% with person_form=host_form role='hosts' prefix='event-' %}
-    {% include 'events/person_quick_add.html' %}
+    {% include 'contributors/person_quick_add.html' %}
     {% endwith %}
 
     {{ event_form.audience|bootstrap_horizontal }}

talks/templates/events/event_group_form.html → talks/templates/contributors/event_group_form.html

@@ -33,7 +33,7 @@ <h3>New series</h3>
 {% endif %}
 
 <form class="form-horizontal" method="post">
-    {% include 'events/_event_group_form_fields.html' %}
+    {% include 'contributors/_event_group_form_fields.html' %}
 
     <div class="form-group">
         <div class="col-sm-offset-2 col-lg-offset-2 col-sm-10 col-lg-10">

talks/templates/events/event_group_modal_form.html → talks/templates/contributors/event_group_modal_form.html

@@ -13,7 +13,7 @@ <h4 class="modal-title" id="form-modal-label">{{ modal_title }}</h4>
         <div class="alert{% if message.tags %} alert-{{ message.tags }}{% endif %}" role="alert">{{ message }}</div>
     {% endfor %}
 {% endif %}
-    {% include 'events/_event_group_form_fields.html' %}
+    {% include 'contributors/_event_group_form_fields.html' %}
 
       </div>
       <div class="modal-footer">