From: yomguy Date: Wed, 11 May 2011 10:11:16 +0000 (+0200) Subject: add admin templates, fix location admin X-Git-Tag: 1.1~221 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d5293fb8116e9362df1feb34c9c215bbabba7b65;p=telemeta.git add admin templates, fix location admin --- diff --git a/telemeta/htdocs/images/playlist_title.png b/telemeta/htdocs/images/playlist_title.png index b3cddded..d2a42d31 100644 Binary files a/telemeta/htdocs/images/playlist_title.png and b/telemeta/htdocs/images/playlist_title.png differ diff --git a/telemeta/models/location.py b/telemeta/models/location.py index 4c73f397..131cb682 100644 --- a/telemeta/models/location.py +++ b/telemeta/models/location.py @@ -166,7 +166,7 @@ class LocationAlias(ModelCore): class LocationRelation(ModelCore): "Location relations" location = ForeignKey('Location', related_name="ancestor_relations", verbose_name=_('location')) - ancestor_location = ForeignKey('Location', related_name="descendant_relations", verbose_name=_('ancestor location')) + ancestor_location = ForeignKey('Location', related_name="descendant_relations", verbose_name=_('ancestor location')) is_direct = BooleanField(db_index=True) is_authoritative = BooleanField(_('authoritative')) diff --git a/telemeta/templates/admin/base.html b/telemeta/templates/admin/base.html new file mode 100644 index 00000000..533f0367 --- /dev/null +++ b/telemeta/templates/admin/base.html @@ -0,0 +1,48 @@ + + + +{% 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/telemeta/templates/admin/base_site.html b/telemeta/templates/admin/base_site.html new file mode 100644 index 00000000..966fef70 --- /dev/null +++ b/telemeta/templates/admin/base_site.html @@ -0,0 +1,10 @@ +{% extends "admin/base.html" %} +{% load i18n %} + +{% block title %}{{ title }} | {% trans 'Telemta site admin' %}{% endblock %} + +{% block branding %} +

{% trans 'Telemeta administration' %}

+{% endblock %} + +{% block nav-global %}{% endblock %}