diff --git a/djrill/admin.py b/djrill/admin.py index 5448de7..50073e4 100644 --- a/djrill/admin.py +++ b/djrill/admin.py @@ -2,5 +2,6 @@ from django.contrib import admin from djrill.views import DjrillIndexView, DjrillSendersListView -admin.site.register_view("djrill/senders/", DjrillSendersListView.as_view()) -admin.site.register_view("djrill/", DjrillIndexView.as_view(), "Djrill") +admin.site.register_view("djrill/senders/", DjrillSendersListView.as_view(), + "senders") +admin.site.register_view("djrill/status/", DjrillIndexView.as_view(), "status") diff --git a/djrill/templates/djrill/index.html b/djrill/templates/djrill/index.html index 6502f0b..0c268a3 100644 --- a/djrill/templates/djrill/index.html +++ b/djrill/templates/djrill/index.html @@ -9,7 +9,7 @@ Djrill {% for path, name in custom_list %} - {{ name }} + {{ name|capfirst }} {% endfor %} diff --git a/djrill/templates/djrill/status.html b/djrill/templates/djrill/status.html new file mode 100644 index 0000000..83d7b4e --- /dev/null +++ b/djrill/templates/djrill/status.html @@ -0,0 +1,66 @@ +{% 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 %} + {% endblock %} +
+ {% block search %}{% endblock %} + {% block date_hierarchy %}{% endblock %} + + {% block filters %}{% endblock %} + {% block pagination %}{% endblock %} +
+ {% for term, value in status.items %} +
{{ term|capfirst }}
+
{{ value }}
+ {% endfor %} +
+
+{% endblock %} diff --git a/djrill/views.py b/djrill/views.py index a9143ca..617e361 100644 --- a/djrill/views.py +++ b/djrill/views.py @@ -1,8 +1,7 @@ from django.conf import settings from django.core.exceptions import ImproperlyConfigured -from django.http import HttpResponse from django.utils import simplejson as json -from django.views.generic import View, TemplateView +from django.views.generic import TemplateView try: import requests @@ -41,14 +40,15 @@ class DjrillApiJsonObjectsMixin(object): raise Exception("OH GOD, NO!") -class DjrillIndexView(DjrillApiMixin, View): +class DjrillIndexView(DjrillApiMixin, TemplateView): + template_name = "djrill/status.html" def get(self, request): payload = json.dumps({"key": self.api_key}) - r = requests.post("%s/users/info.json" % self.api_url, data=payload) + req = requests.post("%s/users/info.json" % self.api_url, data=payload) - return HttpResponse(r.content) + return self.render_to_response({"status": json.loads(req.content)}) class DjrillSendersListView(DjrillApiMixin, DjrillApiJsonObjectsMixin,