barseghyanartur / django-admin-timeline

A Facebook-like timeline app for Django admin. It's very similar to built-in feature Daily progress, but has nicer templates and infinite scroll. Actions are broken up by day, then by action. It's possible to filter actions by user (multiple select) and content type (multiple select).
https://pypi.python.org/pypi/django-admin-timeline
53 stars 10 forks source link

Template's style blocks should overload base template super #7

Closed thorin-schiffer closed 7 years ago

thorin-schiffer commented 7 years ago

In the case, when the base_site.html template is overloaded and uses extra styles, timeline won't see it, because extrastyle and extrahead blocks overload the parent's ones without calling {{ block.super}}

Should become something like:

{% block extrastyle %}
    {{ block.super }}
    <link rel="stylesheet" type="text/css" href="{% static 'admin_timeline/css/admin_timeline.css' %}"/>
    <link rel="stylesheet" type="text/css"
          href="{% static 'admin_timeline/libs/multiple-select/multiple-select.css' %}"/>
{% endblock extrastyle %}
{% block extrahead %}
    {{ block.super }}
    <script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
    <script src="{% static 'admin/js/core.js' %}"></script>
    <script src="{% static 'admin_timeline/libs/jquery-1.11.2.min.js' %}"></script>
    <script src="{% static 'admin_timeline/libs/multiple-select/jquery.multiple.select.js' %}"></script>
    <script src="{% static 'admin_timeline/js/admin_timeline.js' %}"></script>
{% endblock extrahead %}
{% block coltype %}colMS{% endblock %}
barseghyanartur commented 7 years ago

@eviltnan:

Thanks for bringing this up. I'll check it soon.

barseghyanartur commented 7 years ago

@eviltnan:

Fixed in version 1.6.1.