fix models import, fix csrf_token call, update menu

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index e78933b97be3e84628f2cd8609311ea19c7f4c88..01b362dfc1fc4988d2a9fed3d394cf0e31eadf52 100644 (file)
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -380,6 +380,8 @@ form.login .submit {
 #menu li.yellow { border-bottom: .5em solid #f3ad17; }
 #menu li.orange { border-bottom: .5em solid #e65911; }
 #menu li.darkgreen { border-bottom: .5em solid #006a12; }
+#menu li.black { border-bottom: .5em solid #000000; }
+#menu li.red { border-bottom: .5em solid #DD0000; }
 #menu li.last { border-right: 0px solid #000;  }
 
 #menu :link, #menu :visited {

diff --git a/telemeta/templates/telemeta_default/base.html b/telemeta/templates/telemeta_default/base.html
index dd79dc1327e3bb833acd506d0761ec75294b0c23..066d6931d19571eb680ba2bd5acac3f6f5db0b92 100644 (file)
--- a/telemeta/templates/telemeta_default/base.html
+++ b/telemeta/templates/telemeta_default/base.html
@@ -60,8 +60,9 @@
 <li class="blue"><a href="{% url telemeta-collections %}">{% trans "Collections" %}</a></li>
 <li class="green"><a href="{% url telemeta-items %}">{% trans "Items" %}</a></li>
 <li class="yellow" {% if not user.is_authenticated %} class="last" {% endif %}><a href="{% url telemeta-geo-continents %}">{% trans "Geo Navigator" %}</a></li>
+<li class="orange"><a href="{% url telemeta-search-criteria %}">{% trans "Advanced search" %}</a></li>
 {% if user.is_authenticated %}
-<li class="orange" class="last"><a href="{% url telemeta-admin %}">{% trans "Admin" %}</a></li>
+<li class="red" class="last"><a href="{% url telemeta-admin %}">{% trans "Admin" %}</a></li>
 {% endif %}
 </ul>
 {% endblock %}

diff --git a/telemeta/templates/telemeta_default/enumeration_edit.html b/telemeta/templates/telemeta_default/enumeration_edit.html
index ff9c818d111d3e3ce001a4f9048340a625b74721..5ce44000eb78a5b9552cff0488d2a4e89930c9d7 100644 (file)
--- a/telemeta/templates/telemeta_default/enumeration_edit.html
+++ b/telemeta/templates/telemeta_default/enumeration_edit.html
@@ -7,7 +7,7 @@
  <h4>{% trans "Enumeration" %}: {{ enumeration_name|capfirst }}</h4>
 
  <form class="addnew" id="addenum" method="post"
-        action="{% url telemeta-enumeration-add enumeration_id %}">
+        action="{% url telemeta-enumeration-add enumeration_id %}">{% csrf_token %}
   <fieldset>
    <legend>{% trans "Add entry" %}</legend>
    <div class="field">
@@ -20,7 +20,7 @@
   </fieldset>
  </form>
  {% if enumeration_values %}
- <form method="POST" action="{% url telemeta-enumeration-update enumeration_id %}">
+ <form method="POST" action="{% url telemeta-enumeration-update enumeration_id %}">{% csrf_token %}
   <table class="listing">
    <thead>
     <tr><th class="sel">&nbsp;</th><th>{% trans "Value"%}</th>

diff --git a/telemeta/templates/telemeta_default/enumeration_edit_value.html b/telemeta/templates/telemeta_default/enumeration_edit_value.html
index 80cb3fedecf4f0585380ac8489c2ca3a4d39f75b..a4f1d9a270d9ed0b8321742d7d37c769ab71c13f 100644 (file)
--- a/telemeta/templates/telemeta_default/enumeration_edit_value.html
+++ b/telemeta/templates/telemeta_default/enumeration_edit_value.html
@@ -7,7 +7,7 @@
  <h4>{% trans "Enumeration" %}: {{ enumeration_name|capfirst }}</h4>
 
  <form class="mod" id="addenum" method="post"
-    action="{% url telemeta-enumeration-record-update enumeration_id,enumeration_record.id %}">
+    action="{% url telemeta-enumeration-record-update enumeration_id,enumeration_record.id %}">{% csrf_token %}
   <fieldset>
    <legend>{% trans "Modify an entry" %}</legend>
    <div class="field">

diff --git a/telemeta/templates/telemeta_default/search_criteria.html b/telemeta/templates/telemeta_default/search_criteria.html
index 49f739710dbadc499affc40a415582e863e1033f..740389a405d056b7f7dbccdf08a036e300d62a54 100644 (file)
--- a/telemeta/templates/telemeta_default/search_criteria.html
+++ b/telemeta/templates/telemeta_default/search_criteria.html
@@ -54,7 +54,7 @@ $(document).ready(function () {
 {% block content %}
 <h3>{% trans "Advanced Search" %}</h3>
 
-<form action="{% url telemeta-search %}" id="searchform">
+<form action="{% url telemeta-search %}" id="searchform">{% csrf_token %}
 <fieldset>
 
     <p>

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index eb07278b61f2256edbe74ef955f5e64bc4e91d7e..76cec9ee62b6984d686bf5c76c0e64a5fa63649b 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -54,6 +54,7 @@ from django.forms.models import modelformset_factory
 
 from telemeta.models import MediaItem, Location, MediaCollection, EthnicGroup, MediaCollectionForm, MediaItemForm
 from telemeta.models import dublincore, Enumeration, MediaItemMarker
+import telemeta.models
 import telemeta.interop.oai as oai
 from telemeta.interop.oaidatasource import TelemetaOAIDataSource
 from django.core.exceptions import ObjectDoesNotExist
@@ -461,10 +462,10 @@ class WebView(object):
     
     def __get_admin_context_vars(self):
         return {"enumerations": self.__get_enumerations_list()}
-        
+    
     @login_required
     def admin_index(self, request):
-        return render(request, 'telemeta/admin.html', self. __get_admin_context_vars())
+        return render(request, 'telemeta/admin.html', self.__get_admin_context_vars())
 
     def __get_enumeration(self, id):
         from django.db.models import get_models