--- a/src/jocondelab/views/front_office.py	Tue Nov 05 18:03:30 2013 +0100
+++ b/src/jocondelab/views/front_office.py	Wed Nov 06 17:56:19 2013 +0100
@@ -5,11 +5,11 @@
 @author: rvelt
 '''
 
-from core.models import (Notice, Thesaurus, Term)
+from core.models import Notice, Term
 from django.conf import settings
 from django.core.cache import cache
 from django.core.paginator import Paginator
-from django.db.models import Sum, Count
+from django.db.models import Sum
 from django.db.models.query import prefetch_related_objects
 from django.shortcuts import redirect
 from django.utils.http import urlencode
@@ -152,8 +152,8 @@
             # select first image with "_p.jpg"
             selected_image = None
             for i in n.images.all():
-                if i.relative_url.endswith('p.jpg'):
-                    selected_image = settings.JOCONDE_IMG_BASE_URL + i.relative_url
+                if i.main:
+                    selected_image = settings.JOCONDE_IMAGE_BASE_URL + i.relative_url
                     break
             noticedict = {
                 "id": n.id,
@@ -195,7 +195,6 @@
         context = super(NoticeView, self).get_context_data(**kwargs)
         lang = self.request.GET.get('lang',self.request.LANGUAGE_CODE)[:2]
         
-        context["images"] = [settings.JOCONDE_IMG_BASE_URL + i.url for i in self.object.images.exclude(relative_url__endswith='v.jpg').order_by('id')]
         context["title"] = self.object.titr if self.object.titr else self.object.deno
         context["terms_by_thesaurus"] = get_terms_by_thesaurus([self.object], lang)[self.object.pk]
         
@@ -323,7 +322,7 @@
                       "dbpedia_uri": t['dbpedia_uri'],
                       "label": t.get('dbpedia_fields__label',t.get('label','')),
                       "abstract": t['dbpedia_fields__abstract'],
-                      "image_url": "%s%s"%(settings.JOCONDE_IMG_BASE_URL, t.get('image_url',''))
+                      "image_url": "%s%s"%(settings.JOCONDE_IMAGE_BASE_URL, t.get('image_url',''))
                             } for t in terms]
                 context['termcount'] = len(terms)
             else:
@@ -342,7 +341,7 @@
                 tqs = tqs.distinct('label').order_by('label')
                 terms = self.image_extra(tqs).values('image_url','dbpedia_uri','abstract','label')
                 for t in terms:
-                    t['image_url'] = "%s%s"%(settings.JOCONDE_IMG_BASE_URL, t['image_url'])
+                    t['image_url'] = "%s%s"%(settings.JOCONDE_IMAGE_BASE_URL, t['image_url'])
                 context['termcount'] = terms.count()
             context['terms'] = terms