merging from HEAD

cards/views.py

@@ -60,6 +60,8 @@ def query(request):
 	return render_to_response('cards/list.html', RequestContext(request, context))
 
 def advanced_query(request):
+	context = { }
+	
 	return render_to_response('cards/advanced_query.html', RequestContext(request, context)) 
 
 def search_by_country(request, country_id):
@@ -92,4 +94,4 @@ def search_by_subcategory(request, subcategory_id):
 	
 	context = { 'cards_list' : cards, 'title' : subcategory.label }
 	
-	return render_to_response('cards/list.html', RequestContext(request, context))
+	return render_to_response('cards/list.html', RequestContext(request, context))

templates/cards/advanced_query.html

@@ -0,0 +1 @@
+{% extends 'base.html' %}

templates/nav_menu.html

@@ -11,7 +11,7 @@
 			</form>
 		</li>
 		<li class="pull-right">
-			<a href="{% url advanced-query %}" title="Recherche avancée" />
+			<a href="{% url advanced-query %}" title="Recherche avancée">Recherche avancée</a>
 		</li>
 		<li class="nav-header">
 			Pays