diff -r 7e3d483e1ba3 -r 45ddd94e1302 src/ldt/ldt/ldt_utils/views/front.py --- a/src/ldt/ldt/ldt_utils/views/front.py Sat Aug 11 01:25:05 2012 +0200 +++ b/src/ldt/ldt/ldt_utils/views/front.py Sat Aug 11 01:27:51 2012 +0200 @@ -1,6 +1,7 @@ from django.conf import settings from django.contrib.auth.models import Group, User from django.http import HttpResponseRedirect +from django.core.paginator import Paginator, InvalidPage, EmptyPage from django.core.urlresolvers import reverse from django.shortcuts import render_to_response from django.template import RequestContext @@ -54,6 +55,8 @@ def all_contents(request): + # Get the page number parameter if possible + page = request.GET.get("page") or 1 # Get the tag parameter if possible tag_label = request.GET.get("tag") # Get all the public contents group @@ -61,6 +64,17 @@ content_list = Content.objects.all() else : content_list = TaggedItem.objects.get_by_model(Content.objects.all(), '"'+tag_label+'"') + + nb = settings.LDT_FRONT_MEDIA_PER_PAGE + if page=="x": + nb = content_list.count() + + paginator = Paginator(content_list, nb) + try: + results = paginator.page(page) + except (EmptyPage, InvalidPage): + results = paginator.page(paginator.num_pages) + # Get the main tag list front_tags = settings.FRONT_TAG_LIST # Get the all tags list @@ -69,7 +83,7 @@ is_gecko = ((request.META['HTTP_USER_AGENT'].lower().find("firefox")) > -1); return render_to_response("front/front_all_contents.html", - {'content_list':content_list, 'tag_label':tag_label, 'front_tags':front_tags, 'tag_cloud':tag_cloud, + {'results':results, 'tag_label':tag_label, 'front_tags':front_tags, 'tag_cloud':tag_cloud, 'is_gecko': is_gecko}, context_instance=RequestContext(request)) @@ -87,17 +101,7 @@ # If project id is not set, we get the default project for the content if project_id is None or project_id == "_": - front_proj = content.front_project - if front_proj: - proj = front_proj - else: - # The main project for the content - proj = Project.safe_objects.filter(contents__in=[content], state=2) - if not proj: - content.create_front_project() - proj = content.front_project - else: - proj = proj[0] + proj = content.get_or_create_front_project() else: proj = Project.safe_objects.get(ldt_id=project_id) diff -r 7e3d483e1ba3 -r 45ddd94e1302 src/ldt/ldt/settings.py --- a/src/ldt/ldt/settings.py Sat Aug 11 01:25:05 2012 +0200 +++ b/src/ldt/ldt/settings.py Sat Aug 11 01:27:51 2012 +0200 @@ -85,6 +85,7 @@ LDT_JSON_DEFAULT_INDENT = 2 LDT_MAX_CONTENTS_PER_PAGE = 10 LDT_MAX_PROJECTS_PER_PAGE = 10 +LDT_FRONT_MEDIA_PER_PAGE = 9 AUTO_INDEX_AFTER_SAVE = getattr(settings, 'AUTO_INDEX_AFTER_SAVE', True) diff -r 7e3d483e1ba3 -r 45ddd94e1302 src/ldt/ldt/static/ldt/css/front_home.css --- a/src/ldt/ldt/static/ldt/css/front_home.css Sat Aug 11 01:25:05 2012 +0200 +++ b/src/ldt/ldt/static/ldt/css/front_home.css Sat Aug 11 01:27:51 2012 +0200 @@ -18,6 +18,11 @@ width: 300px; } +#result_pagination{ + margin: 5px 0; + border: 0 none; +} + /* Communs */ .title_ul { list-style: none; diff -r 7e3d483e1ba3 -r 45ddd94e1302 web/ldtplatform/config.py.tmpl --- a/web/ldtplatform/config.py.tmpl Sat Aug 11 01:25:05 2012 +0200 +++ b/web/ldtplatform/config.py.tmpl Sat Aug 11 01:27:51 2012 +0200 @@ -89,6 +89,7 @@ LDT_JSON_DEFAULT_INDENT = 0 LDT_MAX_CONTENTS_PER_PAGE = 5 LDT_MAX_PROJECTS_PER_PAGE = 5 +LDT_FRONT_MEDIA_PER_PAGE = 9 EMPTY_MEDIA_EXTERNALID = None diff -r 7e3d483e1ba3 -r 45ddd94e1302 web/ldtplatform/settings.py --- a/web/ldtplatform/settings.py Sat Aug 11 01:25:05 2012 +0200 +++ b/web/ldtplatform/settings.py Sat Aug 11 01:27:51 2012 +0200 @@ -185,6 +185,7 @@ LDT_RESULTS_PER_PAGE = 10 LDT_MAX_CONTENTS_PER_PAGE = 10 LDT_MAX_PROJECTS_PER_PAGE = 10 +LDT_FRONT_MEDIA_PER_PAGE = 9 OAUTH_PROVIDER_KEY_SIZE = 32 OAUTH_PROVIDER_SECRET_SIZE = 32