accueil : ressources

diff --git a/auf_savoirs_en_partage/savoirs/globals.py b/auf_savoirs_en_partage/savoirs/globals.py
index a7f462c..b287ceb 100644 (file)
--- a/auf_savoirs_en_partage/savoirs/globals.py
+++ b/auf_savoirs_en_partage/savoirs/globals.py
@@ -4,9 +4,10 @@
 configuration = {
     'max_actualite': 100,
     'accueil_actualite': 4,
-    'accueil_chercheur': 5,
+    'accueil_chercheur': 10,
     'accueil_evenement': 4,
-    'accueil_sites': 5,
+    'accueil_ressource': 4,
+    'accueil_sites': 4,
     'nombre_par_page_actualite': 10,
     'resultats_par_page': 8, # pas changeable a cause de google
     'engin_recherche': 'sep',

diff --git a/auf_savoirs_en_partage/savoirs/views.py b/auf_savoirs_en_partage/savoirs/views.py
index 82d9948..c37bf69 100644 (file)
--- a/auf_savoirs_en_partage/savoirs/views.py
+++ b/auf_savoirs_en_partage/savoirs/views.py
@@ -30,6 +30,7 @@ def index (request):
     except:
         erreur_caldav = u"Problème de connexion à l'agenda"
         events = []
+    ressources = Record.objects.all().order_by('?')[:configuration['accueil_ressource']]
     chercheurs = Chercheur.objects.all().order_by('?')[:configuration['accueil_chercheur']]
     sites = Site.objects.all().order_by('?')[:configuration['accueil_sites']]
     return render_to_response ("savoirs/index.html", \
@@ -37,6 +38,7 @@ def index (request):
                       "events": events,
                       "erreur_caldav": erreur_caldav,
                       "caldav_url": configuration['calendrier_publique'],
+                      "ressources":ressources,
                       "chercheurs":chercheurs,
                       "sites":sites,
                       }), \
@@ -110,6 +112,15 @@ def ressource_index(request):
     return render_to_response ("savoirs/ressource_index.html", \
             Context (), \
             context_instance = RequestContext(request))
+       
+def ressource_retrieve(request, id):
+    """Notice OAI de la ressource"""
+    ressource = Record.objects.get(id=id)
+    variables = { 'ressource': ressource,
+                }
+    return render_to_response ("savoirs/ressource_retrieve.html", \
+            Context (variables), 
+            context_instance = RequestContext(request))
             
 def informations (request):
     s = sep.SEP()

diff --git a/auf_savoirs_en_partage/templates/savoirs/index.html b/auf_savoirs_en_partage/templates/savoirs/index.html
index 369a75d..e36d3db 100644 (file)
--- a/auf_savoirs_en_partage/templates/savoirs/index.html
+++ b/auf_savoirs_en_partage/templates/savoirs/index.html
@@ -69,6 +69,24 @@
             <ul><li>{{ erreur_caldav }}</li></ul>
         {% endif %}
     </div>
+    <div  id="ressources" class="box">
+        <h4><a href="{% url savoirs.views.ressource_index %}">Ressources</a></h4>
+        
+        <ul class="sous-menu">
+            <li><a href="{% url savoirs.views.ressource_index %}">Toutes les ressources</a></li>
+        </ul>
+        
+        <ul class="liste-de-l-accueil">
+        {% for ressource in ressources %}
+            <li>
+            <a href="{% url savoirs.views.ressource_retrieve ressource.id %}" class="le-titre">{{ ressource.title|truncatewords:20 }}</a>
+            url : {{ ressource.uri|urlizetrunc:40 }}<br />
+            source : {{ ressource.server }}
+            {% if ressource.disciplines.all.count %}<span class="la-date">Disciplines : {{ ressource.disciplines.all|join:", " }}</span>{% endif %}
+            </li>
+        {% endfor %}
+        </ul>
+    </div>
     <div  id="sites" class="box">
         <h4><a href="{% url sitotheque.views.index %}">Sites</a></h4>
         

diff --git a/auf_savoirs_en_partage/templates/savoirs/ressource_retrieve.html b/auf_savoirs_en_partage/templates/savoirs/ressource_retrieve.html
new file mode 100644 (file)
index 0000000..f7a168a
--- /dev/null
+++ b/auf_savoirs_en_partage/templates/savoirs/ressource_retrieve.html
@@ -0,0 +1,11 @@
+{% extends "container_base.html" %}
+
+{% block contenu %}
+<h4>Ressource</h4>
+
+<div class="zone-texte">
+  {% with ressource as r %}
+    {% include "savoirs/resultat.html" %} 
+  {% endwith %}
+</div>
+{% endblock %}

diff --git a/auf_savoirs_en_partage/urls.py b/auf_savoirs_en_partage/urls.py
index fd79344..55709fd 100644 (file)
--- a/auf_savoirs_en_partage/urls.py
+++ b/auf_savoirs_en_partage/urls.py
@@ -40,6 +40,7 @@ urlpatterns = patterns(
     
     # ressources
     (r'^ressources/$', 'savoirs.views.ressource_index'),
+    (r'^ressources/(?P<id>\d+)/$', 'savoirs.views.ressource_retrieve'),
     (r'^informations/$', 'savoirs.views.informations'),
     
     # actualités