add extra blocks, horizontal window for children in admin

diff --git a/telemeta/admin.py b/telemeta/admin.py
index 880fa092532d4568e568dd4bfaa4a6da1ec38806..810c6577d8297ffdc4ed340b201da446b539e9a0 100644 (file)
--- a/telemeta/admin.py
+++ b/telemeta/admin.py
@@ -5,19 +5,17 @@ from telemeta.models.location import *
 from telemeta.models.language import *
 from telemeta.models.system import *
 from django.contrib import admin
-from django.forms import CheckboxSelectMultiple
 
 class MediaFondsAdmin(admin.ModelAdmin):
     search_fields = ['title', 'code']
     ordering = ['code']
+    filter_horizontal = ['children']
 
 class MediaCorpusAdmin(admin.ModelAdmin):
     search_fields = ['title', 'code']
     ordering = ['code']
-    formfield_overrides = {
-        models.ManyToManyField: {'widget': CheckboxSelectMultiple}
-        }
-
+    filter_horizontal = ['children']
+    
 class MediaCollectionAdmin(admin.ModelAdmin):
     search_fields = ['title', 'code']
     ordering = ['code']

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index ae1eb94d5e17c7d0901f2fce3b3c4e36a459897c..835925af991a709587fd07debd82580a7cd1a4fc 100644 (file)
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -87,7 +87,7 @@ class MediaResource(ModelCore):
 
 
 class MediaBaseResource(MediaResource):
-    "Describe a base resource"
+    "Describe a media base resource"
 
     title                 = CharField(_('title'), required=True)
     description           = CharField(_('description'))

diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html
index 0b014baa281a76b1f17aef74145e9ee505163b5a..ac719b6a38b656a9b3038ad3ee56a2de4a441bf7 100644 (file)
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@ -20,6 +20,8 @@
 <![endif]-->
 {% endblock %}
 
+{% block extra_stylesheets %}{% endblock %}
+
 {% block javascript %}
 <script src="{% url django.views.i18n.javascript_catalog %}" type="text/javascript"></script>
 <!--<script src="{% url telemeta-js "jquery-1.6.min.js" %}" type="text/javascript"></script>-->
@@ -91,6 +93,8 @@
  {% else %}
   <li><a href="{% url telemeta-home %}" class="blue">{% trans "Home" %}</a></li>
  {% endif %}
+
+ {% block archives %}
  <li><a href="#archives#" class="green">{% trans "Archives" %}</a>
   <ul>
     <li><a href="{% url telemeta-fonds %}">{% trans "Fonds" %}</a></li>
@@ -100,7 +104,12 @@
   </ul>
   <div class="clear"></div>
  </li>
+ {% endblock archives %}
+ 
+ {% block geonav %}
  <li><a href="{% url telemeta-geo-continents %}" class="yellow">{% trans "Geo Navigator" %}</a></li>
+ {% endblock geonav %}
+
  <li><a href="{% url telemeta-search-criteria %}" class="orange">{% trans "Advanced search" %}</a></li>
  {% if user.is_authenticated %}
  <li><a href="{% url telemeta-users %}" class="red">{% trans "Users" %}</a></li>