- {% block content_cols %}
+
+
+ {% block content_cols %}
- {% block filters %}
- {% if view.has_filters and all_count %}
-
-
{% trans 'Filter' %}
- {% for spec in view.filter_specs %}{% admin_list_filter view spec %}{% endfor %}
-
- {% endif %}
- {% endblock %}
+ {% block filters %}
+ {% if view.has_filters and all_count %}
+
+
{% trans 'Filter' %}
+ {% for spec in view.filter_specs %}{% admin_list_filter view spec %}{% endfor %}
+
+ {% endif %}
+ {% endblock %}
-
- {% block result_list %}
-
- {% if all_count %}
- {% for segment in object_list %}
-
-
{{ segment }}
-
-
- -
- {% trans "This segmented has been visited" %}
- {{ segment.visit_count|localize }} {% trans "time" %}{{ segment.visit_count|pluralize }}
-
- -
- {% trans "This segment has been active for" %}
- {{ segment.enable_date|days_since:segment.disable_date }} {% trans "day" %}{{ segment.enable_date|days_since:segment.disable_date|pluralize }}
-
-
-
-
-
-
-
-
- {% if user_can_create %}
-
- {% endif %}
-
- {% endfor %}
- {% endif %}
-
- {% if user_can_create %}
- {% blocktrans with url=view.create_url name=view.verbose_name %}
-
- Add a new {{name}}
-
- {% endblocktrans %}
+
+ {% block result_list %}
+ {% if not all_count %}
+
+ {% if no_valid_parents %}
+
{% blocktrans with view.verbose_name_plural as name %}No {{ name }} have been created yet. One of the following must be created before you can add any {{ name }}:{% endblocktrans %}
+
+ {% for type in required_parent_types %}- {{ type|title }}
{% endfor %}
+
+ {% else %}
+
{% blocktrans with view.verbose_name_plural as name %}No {{ name }} have been created yet.{% endblocktrans %}
+ {% if user_can_create %}
+ {% blocktrans with view.create_url as url %}
+ Why not add one?
+ {% endblocktrans %}
+ {% endif %}
{% endif %}
- {% endblock %}
-
+ {% else %}
+ {% result_list %}
+ {% endif %}
+ {% endblock %}
+
- {% block pagination %}
+ {% block pagination %}
+
+
{% blocktrans with page_obj.number as current_page and paginator.num_pages as num_pages %}Page {{ current_page }} of {{ num_pages }}.{% endblocktrans %}
{% if paginator.num_pages > 1 %}
-
-
{% blocktrans with page_obj.number as current_page and paginator.num_pages as num_pages %}Page {{ current_page }} of {{ num_pages }}.{% endblocktrans %}
{% pagination_link_previous page_obj view %}
{% pagination_link_next page_obj view %}
-
{% endif %}
- {% endblock %}
-
+
{% endblock %}
-
+
+ {% endblock %}
- {% endblock %}
+
+{% endblock %}
diff --git a/src/wagtail_personalisation/templatetags/wagtail_personalisation_filters.py b/src/wagtail_personalisation/templatetags/wagtail_personalisation_filters.py
index 1cc8fdf..d408aea 100644
--- a/src/wagtail_personalisation/templatetags/wagtail_personalisation_filters.py
+++ b/src/wagtail_personalisation/templatetags/wagtail_personalisation_filters.py
@@ -1,29 +1,10 @@
from django.template import Library
-from django.utils import timezone
+
+from wagtail_personalisation.utils import count_active_days
register = Library()
@register.filter(name='days_since')
def active_days(enable_date, disable_date):
- """Return the number of days the segment has been active.
-
- :param enable_date: The date the segment was enabled
- :type enable_date: timezone.datetime
- :param disable_date: The date the segment was disabled
- :type disable_date: timezone.datetime
- :returns: The amount of days a segment is/has been active
- :rtype: int
-
- """
- if enable_date is not None:
- if disable_date is None or disable_date <= enable_date:
- # There is no disable date, or it is not relevant.
- delta = timezone.now() - enable_date
- return delta.days
- if disable_date > enable_date:
- # There is a disable date and it is relevant.
- delta = disable_date - enable_date
- return delta.days
-
- return 0
+ return count_active_days(enable_date, disable_date)
diff --git a/src/wagtail_personalisation/utils.py b/src/wagtail_personalisation/utils.py
index 5d420bb..d42876f 100644
--- a/src/wagtail_personalisation/utils.py
+++ b/src/wagtail_personalisation/utils.py
@@ -1,5 +1,7 @@
import time
+from django.utils import timezone
+
def impersonate_other_page(page, other_page):
"""Function to change the page metadata so the user gets to see the
@@ -32,3 +34,27 @@ def create_segment_dictionary(segment):
"timestamp": int(time.time()),
"persistent": segment.persistent
}
+
+
+def count_active_days(enable_date, disable_date):
+ """Return the number of days the segment has been active.
+
+ :param enable_date: The date the segment was enabled
+ :type enable_date: timezone.datetime
+ :param disable_date: The date the segment was disabled
+ :type disable_date: timezone.datetime
+ :returns: The amount of days a segment is/has been active
+ :rtype: int
+
+ """
+ if enable_date is not None:
+ if disable_date is None or disable_date <= enable_date:
+ # There is no disable date, or it is not relevant.
+ delta = timezone.now() - enable_date
+ return delta.days
+ if disable_date > enable_date:
+ # There is a disable date and it is relevant.
+ delta = disable_date - enable_date
+ return delta.days
+
+ return 0
diff --git a/src/wagtail_personalisation/views.py b/src/wagtail_personalisation/views.py
index a31e884..f5134c2 100644
--- a/src/wagtail_personalisation/views.py
+++ b/src/wagtail_personalisation/views.py
@@ -1,7 +1,10 @@
from __future__ import absolute_import, unicode_literals
+from django import forms
+
from django.http import HttpResponseForbidden, HttpResponseRedirect
from django.shortcuts import get_object_or_404, reverse
+from django.utils.translation import ugettext_lazy as _
from wagtail.contrib.modeladmin.options import ModelAdmin, modeladmin_register
from wagtail.contrib.modeladmin.views import IndexView
@@ -13,19 +16,48 @@ class SegmentModelIndexView(IndexView):
pass
+class SegmentModelDashboardView(IndexView):
+ """Placeholder for additional dashboard functionality."""
+ def media(self):
+ return forms.Media(
+ css={'all': ['css/dashboard.css']},
+ js=['js/commons.js', 'js/dashboard.js']
+ )
+
+ def get_template_names(self):
+ return [
+ 'modeladmin/wagtail_personalisation/segment/dashboard.html',
+ 'modeladmin/index.html'
+ ]
+
+
@modeladmin_register
class SegmentModelAdmin(ModelAdmin):
"""The model admin for the Segments administration interface."""
model = Segment
index_view_class = SegmentModelIndexView
+ dashboard_view_class = SegmentModelDashboardView
menu_icon = 'group'
add_to_settings_menu = False
- list_display = ('status', 'name', 'create_date', 'edit_date')
+ list_display = ('name', 'visits', 'active_days', 'status')
index_view_extra_js = ['js/commons.js', 'js/index.js']
index_view_extra_css = ['css/index.css']
form_view_extra_js = ['js/commons.js', 'js/form.js']
form_view_extra_css = ['css/form.css']
+ def index_view(self, request):
+ kwargs = {'model_admin': self}
+ view_class = self.index_view_class
+ return view_class.as_view(**kwargs)(request)
+
+ def visits(self, obj):
+ return _("{visits} visits").format(
+ visits=obj.visit_count)
+
+ def active_days(self, obj):
+ return _("{days} days").format(
+ days=obj.get_active_days())
+
def toggle(request, segment_id):
"""Toggle the status of the selected segment.