]> git.parisson.com Git - telemeta.git/commitdiff
add admin templates, fix location admin
authoryomguy <yomguy@parisson.com>
Wed, 11 May 2011 10:11:16 +0000 (12:11 +0200)
committeryomguy <yomguy@parisson.com>
Wed, 11 May 2011 10:11:16 +0000 (12:11 +0200)
telemeta/htdocs/images/playlist_title.png
telemeta/models/location.py
telemeta/templates/admin/base.html [new file with mode: 0644]
telemeta/templates/admin/base_site.html [new file with mode: 0644]

index b3cddded3159edda066e51a35cb9663d74186f9c..d2a42d3182d6f9c9454ec58e3b02306aa7ba134f 100644 (file)
Binary files a/telemeta/htdocs/images/playlist_title.png and b/telemeta/htdocs/images/playlist_title.png differ
index 4c73f39752ee45dc0e4988ca59ebcc3efa972d45..131cb68275c341deddda24b3fd220d1d84d5f3f8 100644 (file)
@@ -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 (file)
index 0000000..533f036
--- /dev/null
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="{{ LANGUAGE_CODE }}" xml:lang="{{ LANGUAGE_CODE }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
+<head>
+<title>{% block title %}{% endblock %}</title>
+<link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% load adminmedia %}{% admin_media_prefix %}css/base.css{% endblock %}" />
+{% block extrastyle %}{% endblock %}
+<!--[if lte IE 7]><link rel="stylesheet" type="text/css" href="{% block stylesheet_ie %}{% load adminmedia %}{% admin_media_prefix %}css/ie.css{% endblock %}" /><![endif]-->
+{% if LANGUAGE_BIDI %}<link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% admin_media_prefix %}css/rtl.css{% endblock %}" />{% endif %}
+<script type="text/javascript">window.__admin_media_prefix__ = "{% filter escapejs %}{% admin_media_prefix %}{% endfilter %}";</script>
+{% block extrahead %}{% endblock %}
+{% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE" />{% endblock %}
+</head>
+{% load i18n %}
+
+<body class="{% if is_popup %}popup {% endif %}{% block bodyclass %}{% endblock %}">
+
+<!-- Container -->
+<div id="container">
+
+    {% if not is_popup %}
+    {% block breadcrumbs %}<div class="breadcrumbs"><a href="/">{% trans 'Home' %}</a>{% if title %} &rsaquo; {{ title }}{% endif %}</div>{% endblock %}
+    {% endif %}
+
+        {% if messages %}
+        <ul class="messagelist">{% for message in messages %}
+          <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+       {% endfor %}</ul>
+        {% endif %}
+
+    <!-- Content -->
+    <div id="content" class="{% block coltype %}colM{% endblock %}">
+        {% block pretitle %}{% endblock %}
+        {% block content_title %}{% if title %}<h1>{{ title }}</h1>{% endif %}{% endblock %}
+        {% block content %}
+        {% block object-tools %}{% endblock %}
+        {{ content }}
+        {% endblock %}
+        {% block sidebar %}{% endblock %}
+        <br class="clear" />
+    </div>
+    <!-- END Content -->
+
+    {% block footer %}<div id="footer"></div>{% endblock %}
+</div>
+<!-- END Container -->
+
+</body>
+</html>
diff --git a/telemeta/templates/admin/base_site.html b/telemeta/templates/admin/base_site.html
new file mode 100644 (file)
index 0000000..966fef7
--- /dev/null
@@ -0,0 +1,10 @@
+{% extends "admin/base.html" %}
+{% load i18n %}
+
+{% block title %}{{ title }} | {% trans 'Telemta site admin' %}{% endblock %}
+
+{% block branding %}
+<h1 id="site-name">{% trans 'Telemeta administration' %}</h1>
+{% endblock %}
+
+{% block nav-global %}{% endblock %}