--- a/src/ldt/ldt/ldt_utils/templates/front/front_home.html Wed Jan 11 10:35:47 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_home.html Wed Jan 11 10:56:43 2012 +0100
@@ -19,7 +19,7 @@
{% for content in last_contents %}
<li class="li_media">
<a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}">{% thumbnail content.image "294x165" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}">{% endthumbnail %}</a>
- <div class="bulle_annot">250</div>
+ <div class="bulle_annot">{{ content.nb_annotation }}</div>
<p><a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}"><b>{{content.title}}</b></a></p>
<p>{% trans 'by' %} IRI | {{content.duration_str}}</p>
</li>
@@ -33,7 +33,7 @@
{% for content in most_contents %}
<li class="li_media">
<a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}">{% thumbnail content.image "134x75" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}">{% endthumbnail %}</a>
- <div class="bulle_annot">120</div>
+ <div class="bulle_annot">{{ content.nb_annotation }}</div>
<p><a href="{% url ldt.ldt_utils.views.front.annot_content content.iri_id %}"><b>{% if content.title|length > 69 %}{{content.title|slice:":69"}}...{% else %}{{content.title}}{% endif %}</b></a></p>
<p class="font_11">{% trans 'by' %} IRI | {{content.duration_str}}</p>
</li>
@@ -50,7 +50,7 @@
<a href="{% url ldt.ldt_utils.views.front.group_info group.id %}">{% thumbnail group.profile.image "54x40" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}">{% endthumbnail %}</a>
</div>
<div class="txt_groupes_actifs">
- <div class="bulle_people">57</div>
+ <div class="bulle_people">{{ group.user_set.count }}</div>
<div class="bulle_annot">32</div>
<p><a href="{% url ldt.ldt_utils.views.front.group_info group.id %}" class="under"><b>{{group.name}}</b></a></p>
<p>{% if group.profile.description|length > 69 %}{{group.profile.description|safe|slice:":69"}}...{% else %}{{group.profile.description|safe}}{% endif %}</p>
--- a/src/ldt/ldt/ldt_utils/views/front.py Wed Jan 11 10:35:47 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/views/front.py Wed Jan 11 10:56:43 2012 +0100
@@ -7,15 +7,14 @@
from django.template import RequestContext
from guardian.shortcuts import get_objects_for_group
from ldt.ldt_utils.models import Content, Project
-from ldt.security.utils import add_change_attr
@login_required
def front_home(request):
# Get the 3 last annotated contents
- last_contents = Content.objects.all()[:3]
+ last_contents = Content.objects.order_by('-content_creation_date')[:3]
# Get the most annotated contents
- most_contents = Content.objects.all()[4:12]
+ most_contents = Content.objects.order_by('-nb_annotation')[:8]
# Get the active groups
active_groups = Group.objects.exclude(name=settings.PUBLIC_GROUP_NAME)[:5]