Listings

diff --git a/auf_savoirs_en_partage/savoirs/views.py b/auf_savoirs_en_partage/savoirs/views.py
index 95d6a35..9eb60a1 100644 (file)
--- 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 (file)
--- a/auf_savoirs_en_partage/templates/chercheurs/retrieve.html
+++ b/auf_savoirs_en_partage/templates/chercheurs/retrieve.html
@@ -97,14 +97,11 @@
         <h5>Discipline</h5>
         <table>
             <tr>
-                <td class="label">Adhésion(s) active(s):</td>
-                <td>
-                {% for g in chercheur.chercheurgroupe_set.all %}
-                    {{g.groupe.nom}}<br />
-                {% endfor %}
-                </td>
+                <td class="label">Discipline:</td>
+                <td>{{chercheur.discipline}}</td>
             </tr>
-        </table>        
+        </table>
+        {% 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 (file)
--- 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 %}
 <h4>Agenda</h4>
 
+<div class="contenu-wrapper">
+<table id="repertoire">
+    <tr>
+        <th>Nom</th>
+    </tr>
+{% for e in evenements %}
+    <tr class="{% cycle 'odd' 'notodd' %}">
+        <td>{{ e.summary.value|truncatewords:12 }}</td>
+    </tr>
+{% endfor %}
+</table>
+</div>
+
 {% 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 (file)
--- 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 %}
 <h4>Ressources</h4>
 
+<div class="contenu-wrapper">
+<div class="centre">{% paginate %}</div>
+<table id="repertoire">
+    <tr>
+        <th>Nom</th>
+        <th>Source</th>
+    </tr>
+{% for r in ressources %}
+    <tr class="{% cycle 'odd' 'notodd' %}">
+        <td><a href="{% url savoirs.views.ressource_retrieve r.id %}" class="le-titre">{{ r.title|truncatewords:11 }}</a></td>
+        <td>{{ r.server }}</td>
+    </tr>
+{% endfor %}
+</table>
+<div class="centre">{% paginate %}</div>
+</div>
+
 {% endblock %}