From 5f166e471d65c5235183b7294809152bb8811cc7 Mon Sep 17 00:00:00 2001 From: seba Date: Mon, 3 Oct 2011 02:25:39 +0200 Subject: [PATCH] new admin layout (but still broken) --- k4ever/main/templates/admin/base-admin.orig | 82 ++++++++++++++++++++ k4ever/main/templates/admin/base.html | 83 +++++++++++++++++++++ k4ever/main/templates/base.html | 6 +- 3 files changed, 169 insertions(+), 2 deletions(-) create mode 100644 k4ever/main/templates/admin/base-admin.orig create mode 100644 k4ever/main/templates/admin/base.html diff --git a/k4ever/main/templates/admin/base-admin.orig b/k4ever/main/templates/admin/base-admin.orig new file mode 100644 index 0000000..87f6c87 --- /dev/null +++ b/k4ever/main/templates/admin/base-admin.orig @@ -0,0 +1,82 @@ +{% load url from future %} + + +{% block title %}{% endblock %} + +{% block extrastyle %}{% endblock %} + +{% if LANGUAGE_BIDI %}{% endif %} + +{% block extrahead %}{% endblock %} +{% block blockbots %}{% endblock %} + +{% load i18n %} + + + + +
+ + {% if not is_popup %} + + + + {% block breadcrumbs %}
{% trans 'Home' %}{% if title %} › {{ title }}{% endif %}
{% endblock %} + {% endif %} + + {% if messages %} + + {% endif %} + + +
+ {% block pretitle %}{% endblock %} + {% block content_title %}{% if title %}

{{ title }}

{% endif %}{% endblock %} + {% block content %} + {% block object-tools %}{% endblock %} + {{ content }} + {% endblock %} + {% block sidebar %}{% endblock %} +
+
+ + + {% block footer %}{% endblock %} +
+ + + + diff --git a/k4ever/main/templates/admin/base.html b/k4ever/main/templates/admin/base.html new file mode 100644 index 0000000..0bd7962 --- /dev/null +++ b/k4ever/main/templates/admin/base.html @@ -0,0 +1,83 @@ +{% extends "base.html" %} +{% load url from future %} + +{% block extrastyle %} + + + {% if LANGUAGE_BIDI %}{% endif %} +{% endblock %} + +{% block extrahead %} + + {% block blockbots %}{% endblock %} +{% endblock %} + +{% load i18n %} + +{%block bodyargs%} class="{% if is_popup %}popup {% endif %}{% block bodyclass %}{% endblock %}"{%endblock bodyargs%} + +{%block "content" %} + +
+ + {% if not is_popup %} + + + + {% block breadcrumbs %}
{% trans 'Home' %}{% if title %} › {{ title }}{% endif %}
{% endblock %} + {% endif %} + + {% if messages %} + + {% endif %} + + +
+ {% block pretitle %}{% endblock %} + {% block content_title %}{% if title %}

{{ title }}

{% endif %}{% endblock %} + {% block content %} + {% block object-tools %}{% endblock %} + {{ content }} + {% endblock %} + {% block sidebar %}{% endblock %} +
+
+ + + {% block footer %}{% endblock %} +
+ +{%endblock %} diff --git a/k4ever/main/templates/base.html b/k4ever/main/templates/base.html index 70b0584..41ce0ab 100644 --- a/k4ever/main/templates/base.html +++ b/k4ever/main/templates/base.html @@ -4,6 +4,7 @@ + {% block extrastyle %}{% endblock %} @@ -11,9 +12,10 @@ - Freitagsrundenkasse + {% block extrahead %}{% endblock %} + Freitagsrundenkasse{% block "title" %}{% endblock %} - +