affichage ressource

diff --git a/auf_savoirs_en_partage/templates/savoirs/index.html b/auf_savoirs_en_partage/templates/savoirs/index.html
index e36d3db..c1cef8e 100644 (file)
--- a/auf_savoirs_en_partage/templates/savoirs/index.html
+++ b/auf_savoirs_en_partage/templates/savoirs/index.html
@@ -79,10 +79,17 @@
         <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 %}
+            <a href="{% url savoirs.views.ressource_retrieve ressource.id %}" class="le-titre">{{ ressource.title|safe|truncatewords:20 }}</a>
+            {% if resssource.creator %}
+                Auteur : {{ ressource.creator }}<br />
+            {% endif %}
+                url : {{ ressource.uri|urlizetrunc:40 }}
+            {% comment %}
+                <br />source : {{ ressource.server }}
+            {% endcomment %}
+            {% if ressource.disciplines.all.count %}
+                <br />Disciplines : {{ ressource.disciplines.all|join:", " }}
+            {% endif %}
             </li>
         {% endfor %}
         </ul>

diff --git a/auf_savoirs_en_partage/templates/savoirs/resultat.html b/auf_savoirs_en_partage/templates/savoirs/resultat.html
index 66887d5..31eb49f 100644 (file)
--- a/auf_savoirs_en_partage/templates/savoirs/resultat.html
+++ b/auf_savoirs_en_partage/templates/savoirs/resultat.html
@@ -3,23 +3,28 @@
   {% if r.creator %}
   <div><span class="lbl">Auteur:</span> {{ r.creator|safe }}</div>
   {% endif %}
-  {% if r.contributors %}
-  <div><span class="lbl">Contributeurs:</span> {{ r.contributors|safe }}</div>
-  {% endif %}
-  {% if r.subject %}
-  <div><span class="lbl">Sujets:</span> {{ r.subject|safe }}</div>
-  {% endif %}
-  {% if r.source %}
-  <div><span class="lbl">Source:</span> {{ r.source|safe }}</div>
-  {% endif %}
-  {% if r.modified %}
-  <div><span class="lbl">Date de modification:</span> {{ r.modified }}</div>
-  {% endif %}
+  {% if r.content %}
   <div class="resultatResume"><span class="lbl">Description:</span> {{ r.content|safe }}</div>
-  {% if r.isbn %}
-  <div><span class="lbl">ISBN:</span> {{ r.isbn|safe }}</div>
-  {% endif %}
-  {% if user.is_authenticated %}
-  <a href="{{ r.admin_url}}" target="_blank">Modifier</a>
   {% endif %}
+  
+  {% comment %}
+      {% if r.contributors %}
+      <div><span class="lbl">Contributeurs:</span> {{ r.contributors|safe }}</div>
+      {% endif %}
+      {% if r.subject %}
+      <div><span class="lbl">Sujets:</span> {{ r.subject|safe }}</div>
+      {% endif %}
+      {% if r.source %}
+      <div><span class="lbl">Source:</span> {{ r.source|safe }}</div>
+      {% endif %}
+      {% if r.modified %}
+      <div><span class="lbl">Date de modification:</span> {{ r.modified }}</div>
+      {% endif %}
+      {% if r.isbn %}
+      <div><span class="lbl">ISBN:</span> {{ r.isbn|safe }}</div>
+      {% endif %}
+      {% if user.is_authenticated %}
+      <a href="{{ r.admin_url}}" target="_blank">Modifier</a>
+      {% endif %}
+  {% endcomment %}
 </div>