diff --git a/djrill/templates/djrill/fieldset.html b/djrill/templates/djrill/fieldset.html new file mode 100644 index 0000000..6363aee --- /dev/null +++ b/djrill/templates/djrill/fieldset.html @@ -0,0 +1,29 @@ +
+ {% if fieldset.name %}

{{ fieldset.name }}

{% endif %} + {% if fieldset.description %} +
{{ fieldset.description|safe }}
+ {% endif %} + {% for line in fieldset %} +
+ {% if line.fields|length_is:'1' %}{{ line.errors }}{% endif %} + {% for field in line %} + + {% if not line.fields|length_is:'1' and not field.is_readonly %}{{ field.errors }}{% endif %} + {% if field.is_checkbox %} + {{ field.field }}{{ field.label_tag }} + {% else %} + {{ field.label_tag }} + {% if field.is_readonly %} +

{{ field.contents }}

+ {% else %} + {{ field.field }} + {% endif %} + {% endif %} + {% if field.field.help_text %} +

{{ field.field.help_text|safe }}

+ {% endif %} +
+ {% endfor %} + + {% endfor %} +
diff --git a/djrill/templates/djrill/includes/fieldset.html b/djrill/templates/djrill/includes/fieldset.html new file mode 100644 index 0000000..6363aee --- /dev/null +++ b/djrill/templates/djrill/includes/fieldset.html @@ -0,0 +1,29 @@ +
+ {% if fieldset.name %}

{{ fieldset.name }}

{% endif %} + {% if fieldset.description %} +
{{ fieldset.description|safe }}
+ {% endif %} + {% for line in fieldset %} +
+ {% if line.fields|length_is:'1' %}{{ line.errors }}{% endif %} + {% for field in line %} + + {% if not line.fields|length_is:'1' and not field.is_readonly %}{{ field.errors }}{% endif %} + {% if field.is_checkbox %} + {{ field.field }}{{ field.label_tag }} + {% else %} + {{ field.label_tag }} + {% if field.is_readonly %} +

{{ field.contents }}

+ {% else %} + {{ field.field }} + {% endif %} + {% endif %} + {% if field.field.help_text %} +

{{ field.field.help_text|safe }}

+ {% endif %} +
+ {% endfor %} + + {% endfor %} +
diff --git a/djrill/templates/djrill/senders_list.html b/djrill/templates/djrill/senders_list.html new file mode 100644 index 0000000..b768610 --- /dev/null +++ b/djrill/templates/djrill/senders_list.html @@ -0,0 +1,107 @@ +{% extends "admin/base_site.html" %} +{% load adminmedia admin_list i18n %} +{% load url from future %} +{% block extrastyle %} + {{ block.super }} + + {{ media.css }} + {% if not actions_on_top and not actions_on_bottom %} + + {% endif %} +{% endblock %} + +{% block extrahead %} +{{ block.super }} +{{ media.js }} +{% if action_form %}{% if actions_on_top or actions_on_bottom %} + +{% endif %}{% endif %} +{% endblock %} + +{% block bodyclass %}change-list{% endblock %} + +{% if not is_popup %} + {% block breadcrumbs %} + + {% endblock %} +{% endif %} + +{% block coltype %}flex{% endblock %} + +{% block content %} +
+ {% block object-tools %} + {% if has_add_permission %} + + {% endif %} + {% endblock %} +
+ {% block search %}{% endblock %} + {% block date_hierarchy %}{% endblock %} + + {% block filters %}{% endblock %} + +
+ {% csrf_token %} + + {% block result_list %} + {% if objects %} +
+ + + + {% for header in objects.0.keys %} + + {% endfor %} + + + + + {% for result in objects %} + + {% for item in result.values %} + + {% endfor %} + {% if result.is_enabled and result.approved_at %} + + {% else %} + + {% endif %} + + {% endfor %} + +
{{ header|capfirst }}
{{ item }}
+
+ {% endif %} + {% endblock %} + {% block pagination %}{% endblock %} +
+
+
+{% endblock %} diff --git a/djrill/views.py b/djrill/views.py index 6f1e849..a9143ca 100644 --- a/djrill/views.py +++ b/djrill/views.py @@ -59,4 +59,4 @@ class DjrillSendersListView(DjrillApiMixin, DjrillApiJsonObjectsMixin, def get(self, request): objects = self.get_json_objects() - return self.render_to_response({"objects": objects}) + return self.render_to_response({"objects": json.loads(objects)})