# HG changeset patch # User cavaliet # Date 1363194864 -3600 # Node ID 5007febcce2e028ce9e32d2c32af4b57231bad2b # Parent 90d0a9d14c68b7166664c4df70bebc8b7ca94ebc front group page : filter and pagination. diff -r 90d0a9d14c68 -r 5007febcce2e src/ldt/ldt/ldt_utils/templates/front/front_group.html --- a/src/ldt/ldt/ldt_utils/templates/front/front_group.html Wed Mar 13 12:09:26 2013 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/front/front_group.html Wed Mar 13 18:14:24 2013 +0100 @@ -13,15 +13,63 @@ {% block js_declaration %} {{block.super}} + {% endblock %} {% block body %} {{block.super}} {% comment %} diff -r 90d0a9d14c68 -r 5007febcce2e src/ldt/ldt/ldt_utils/templates/front/front_home.html --- a/src/ldt/ldt/ldt_utils/templates/front/front_home.html Wed Mar 13 12:09:26 2013 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/front/front_home.html Wed Mar 13 18:14:24 2013 +0100 @@ -49,7 +49,7 @@
  • {% if tag_cloud|length > 0 %} diff -r 90d0a9d14c68 -r 5007febcce2e src/ldt/ldt/ldt_utils/views/front.py --- a/src/ldt/ldt/ldt_utils/views/front.py Wed Mar 13 12:09:26 2013 +0100 +++ b/src/ldt/ldt/ldt_utils/views/front.py Wed Mar 13 18:14:24 2013 +0100 @@ -1,4 +1,5 @@ from django.conf import settings +from django.contrib.auth.decorators import login_required from django.contrib.auth.models import Group, User from django.core.paginator import Paginator, InvalidPage, EmptyPage from django.core.urlresolvers import reverse @@ -50,13 +51,27 @@ 'is_gecko': is_gecko}, context_instance=RequestContext(request)) - +@login_required def group_info(request, group_id): # Get the active group group = Group.objects.select_related("profile").get(id=group_id) # Get the projects for this group - project_list = get_group_projects(request.user, group_id, False) + project_list = get_group_projects(request.user, group_id, False, False) + proj_title = request.GET.get("title") + if proj_title is not None: + project_list = project_list.filter(title__icontains=proj_title) + + nb = settings.LDT_FRONT_PROJECTS_PER_PAGE + page = request.GET.get("page") or 1 + if page=="x": + nb = project_list.count() + + paginator = Paginator(project_list, nb) + try: + results = paginator.page(page) + except (EmptyPage, InvalidPage): + results = paginator.page(paginator.num_pages) ## list of contents annotated by the group (or everyone) #everyone = Group.objects.get(name=settings.PUBLIC_GROUP_NAME) @@ -68,7 +83,7 @@ is_gecko = ((request.META['HTTP_USER_AGENT'].lower().find("firefox")) > -1); return render_to_response("front/front_group.html", - {'group': group, 'content_list':None, 'project_list':project_list, 'users':users, + {'group': group, 'content_list':None, 'results':results, 'users':users, 'project_title':proj_title, 'is_gecko': is_gecko}, context_instance=RequestContext(request)) diff -r 90d0a9d14c68 -r 5007febcce2e src/ldt/ldt/settings.py --- a/src/ldt/ldt/settings.py Wed Mar 13 12:09:26 2013 +0100 +++ b/src/ldt/ldt/settings.py Wed Mar 13 18:14:24 2013 +0100 @@ -86,6 +86,7 @@ LDT_MAX_CONTENTS_PER_PAGE = getattr(settings, 'LDT_MAX_CONTENTS_PER_PAGE', 10) LDT_MAX_PROJECTS_PER_PAGE = getattr(settings, 'LDT_MAX_PROJECTS_PER_PAGE', 10) LDT_FRONT_MEDIA_PER_PAGE = getattr(settings, 'LDT_FRONT_MEDIA_PER_PAGE', 9) +LDT_FRONT_PROJECTS_PER_PAGE = getattr(settings, 'LDT_FRONT_PROJECTS_PER_PAGE', 12) AUTO_INDEX_AFTER_SAVE = getattr(settings, 'AUTO_INDEX_AFTER_SAVE', True) LDT_INDEXATION_INSERT_BATCH_SIZE = getattr(settings, 'LDT_INDEXATION_INSERT_BATCH_SIZE', 5000) diff -r 90d0a9d14c68 -r 5007febcce2e src/ldt/ldt/static/ldt/css/front_group.css --- a/src/ldt/ldt/static/ldt/css/front_group.css Wed Mar 13 12:09:26 2013 +0100 +++ b/src/ldt/ldt/static/ldt/css/front_group.css Wed Mar 13 18:14:24 2013 +0100 @@ -37,4 +37,22 @@ .li_membre_groupe p { margin-left: 45px; +} +/* media title search input*/ +#search_title{ + background : url(../img/search.gif) no-repeat; + border: none; + height: 16px; + width: 16px; + cursor: pointer; +} +#input_title{ + border: 1px solid #AAAAAA; + background: transparent; + margin: 0px 7px 10px 0px; +} + +#result_pagination { + border: 0 none; + margin: 5px 0; } \ No newline at end of file