From 2e7bc8596466abcb7002c73d36ab46246f3c0068 Mon Sep 17 00:00:00 2001 From: Ali Jetha Date: Thu, 7 Oct 2010 18:04:23 -0400 Subject: [PATCH] Listings --- auf_savoirs_en_partage/savoirs/views.py | 11 +++++++-- .../templates/chercheurs/retrieve.html | 11 ++++----- .../templates/savoirs/evenement_index.html | 14 +++++++++++ .../templates/savoirs/ressource_index.html | 25 ++++++++++++++++++++ 4 files changed, 52 insertions(+), 9 deletions(-) diff --git a/auf_savoirs_en_partage/savoirs/views.py b/auf_savoirs_en_partage/savoirs/views.py index 95d6a35..9eb60a1 100644 --- a/auf_savoirs_en_partage/savoirs/views.py +++ b/auf_savoirs_en_partage/savoirs/views.py @@ -109,8 +109,9 @@ def conseils (request): # ressources def ressource_index(request): + ressources = Record.objects.all().order_by('?') return render_to_response ("savoirs/ressource_index.html", \ - Context (), \ + Context ({'ressources':ressources}), \ context_instance = RequestContext(request)) def ressource_retrieve(request, id): @@ -145,8 +146,14 @@ def actualite_index(request): # agenda def evenement_index(request): + try: + erreur_caldav = False + events = evenements() + except: + erreur_caldav = u"Problème de connexion à l'agenda" + events = [] return render_to_response ("savoirs/evenement_index.html", \ - Context (), \ + Context ({'evenements':evenements}), \ context_instance = RequestContext(request)) def evenement(request, id): diff --git a/auf_savoirs_en_partage/templates/chercheurs/retrieve.html b/auf_savoirs_en_partage/templates/chercheurs/retrieve.html index edee005..2ee2d29 100644 --- a/auf_savoirs_en_partage/templates/chercheurs/retrieve.html +++ b/auf_savoirs_en_partage/templates/chercheurs/retrieve.html @@ -97,14 +97,11 @@
Discipline
- - + + -
Adhésion(s) active(s): - {% for g in chercheur.chercheurgroupe_set.all %} - {{g.groupe.nom}}
- {% endfor %} -
Discipline:{{chercheur.discipline}}
+ + {% endif %} diff --git a/auf_savoirs_en_partage/templates/savoirs/evenement_index.html b/auf_savoirs_en_partage/templates/savoirs/evenement_index.html index 1c1d777..d3c0550 100644 --- a/auf_savoirs_en_partage/templates/savoirs/evenement_index.html +++ b/auf_savoirs_en_partage/templates/savoirs/evenement_index.html @@ -1,6 +1,20 @@ {% extends "container_base.html" %} + {% block contenu %}

Agenda

+
+ + + + +{% for e in evenements %} + + + +{% endfor %} +
Nom
{{ e.summary.value|truncatewords:12 }}
+
+ {% endblock %} diff --git a/auf_savoirs_en_partage/templates/savoirs/ressource_index.html b/auf_savoirs_en_partage/templates/savoirs/ressource_index.html index 8c7f4b6..53899e1 100644 --- a/auf_savoirs_en_partage/templates/savoirs/ressource_index.html +++ b/auf_savoirs_en_partage/templates/savoirs/ressource_index.html @@ -1,6 +1,31 @@ {% extends "container_base.html" %} +{% load pagination_tags %} +{% load sorting_tags %} + + +{% autosort ressources %} +{% autopaginate ressources 10 %} + + {% block contenu %}

Ressources

+
+
{% paginate %}
+ + + + + +{% for r in ressources %} + + + + +{% endfor %} +
NomSource
{{ r.title|truncatewords:11 }}{{ r.server }}
+
{% paginate %}
+
+ {% endblock %} -- 1.7.10.4