Removed modals.

src/personalisation/admin_urls.py

@@ -12,13 +12,6 @@ urlpatterns = [
         name='enable'),
     url(r'^segment/(?P<segment_id>[0-9]+)/disable/$', views.disable,
         name='disable'),
-    # TODO: These might no longer be needed when using a modal
-    url(r'^segment/time-rule/$', views.time_rule_embed,
-        name="time_rule_embed"),
-    url(r'^segment/referral-rule/$', views.referral_rule_embed,
-        name="refferal_rule_embed"),
-    url(r'^segment/visit-count-rule/$', views.visit_count_rule_embed,
-        name="visit_count_rule_embed"),
     url(r'^variations/(?P<page_pk>\d+)/add/(?P<segment_pk>[^/]+)/$',
         views.AddVariation.as_view(), name='add')
 ]

src/personalisation/templates/wagtailadmin/embeds/referral_rule.html

@@ -1,23 +0,0 @@
-{% extends "wagtailadmin/base.html" %}
-{% load i18n staticfiles %}
-{% block titletag %}{% trans "Referral Rule" %}{% endblock %}
-
-
-{% block content %}
-    <div class="nice-padding">
-        <h2>Referral</h2>
-        <p>Choose the number of visits the user has to have made.</p>
-    </div>
-
-    <div class="nice-padding">
-        <form class="embed-form" action="" method="POST" novalidate>
-            {% csrf_token %}
-            <ul class="fields">
-                {% for field in form %}
-                    {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
-                {% endfor %}
-                <li><button type="submit" class="button  button-longrunning"><span class="icon icon-spinner"></span><em>{% trans 'Insert' %}</em></button></li>
-            </ul>
-        </form>
-    </div>
-{% endblock %}

src/personalisation/templates/wagtailadmin/embeds/time_rule.html

@@ -1,23 +0,0 @@
-{% extends "wagtailadmin/base.html" %}
-{% load i18n staticfiles %}
-{% block titletag %}{% trans "Time Rule" %}{% endblock %}
-
-
-{% block content %}
-    <div class="nice-padding">
-        <h2>Time</h2>
-        <p>Choose a time segment in which the user visits the site.</p>
-    </div>
-
-    <div class="nice-padding">
-        <form class="embed-form" action="" method="POST" novalidate>
-            {% csrf_token %}
-            <ul class="fields">
-                {% for field in form %}
-                    {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
-                {% endfor %}
-                <li><button type="submit" class="button  button-longrunning"><span class="icon icon-spinner"></span><em>{% trans 'Insert' %}</em></button></li>
-            </ul>
-        </form>
-    </div>
-{% endblock %}

src/personalisation/templates/wagtailadmin/embeds/visit_count_rule.html

@@ -1,23 +0,0 @@
-{% extends "wagtailadmin/base.html" %}
-{% load i18n staticfiles %}
-{% block titletag %}{% trans "Visit Coint Rule" %}{% endblock %}
-
-
-{% block content %}
-    <div class="nice-padding">
-        <h2>Visit count</h2>
-        <p>Define a referring page, domain or query the user has to come from.</p>
-    </div>
-
-    <div class="nice-padding">
-        <form class="embed-form" action="" method="POST" novalidate>
-            {% csrf_token %}
-            <ul class="fields">
-                {% for field in form %}
-                    {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
-                {% endfor %}
-                <li><button type="submit" class="button  button-longrunning"><span class="icon icon-spinner"></span><em>{% trans 'Insert' %}</em></button></li>
-            </ul>
-        </form>
-    </div>
-{% endblock %}

src/personalisation/views.py

@@ -39,31 +39,6 @@ def disable(request, segment_id):
     return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
 
 
-# TODO: Make these requestable from an existing page (the create page)
-# This code might become obsolete.
-
-
-def time_rule_embed(request):
-    """Show the content of the time rule modal."""
-    return render(request, 'wagtailadmin/embeds/time_rule.html', {
-        'form': TimeRuleForm,
-    })
-
-
-def referral_rule_embed(request):
-    """Show the content of the referral rule modal."""
-    return render(request, 'wagtailadmin/embeds/referral_rule.html', {
-        'form': ReferralRuleForm,
-    })
-
-
-def visit_count_rule_embed(request):
-    """Show the content of the visit count rule modal."""
-    return render(request, 'wagtailadmin/embeds/visit_count_rule.html', {
-        'form': VisitCountRuleForm,
-    })
-
-
 class CreateSegmentView(CreateView):
     page_title = _("Add segment")
     form_class = SegmentForm