Dernières images

+ +

{% for i in images %} @@ -75,7 +79,11 @@

Dernières vidéos

+ +

{% for c in contents %} @@ -91,6 +99,13 @@

+ {% endblock %} {% block modal_divs %} {% endblock %} diff -r a0a048ff33a1 -r ec6a5592c617 src/metadatacomposer/templates/metadatacomposer_modal_image.html --- a/src/metadatacomposer/templates/metadatacomposer_modal_image.html Wed May 22 17:09:59 2013 +0200 +++ b/src/metadatacomposer/templates/metadatacomposer_modal_image.html Wed May 22 17:10:38 2013 +0200 @@ -1,4 +1,5 @@ -{% load static %} +{% load static %} +{% load thumbnail %}

Informations et source de l'image

{% csrf_token %} - {% for error in form.errors.name %} + {% if image_pk %}{% endif %} + {% for error in form.errors %} {{ error }} {% endfor %}

Titre :

- +

Description :

- +

- Fichier de l'image : + Fichier de l'image :
(jpg, png)

- + Prévisualiser + {% if form.image_file.value %} +

Image actuelle :

+ {% thumbnail form.image_file.value "100" crop="center" format="PNG" as im %}

{% empty %}

{% endthumbnail %} + {% endif %} +
+

diff -r a0a048ff33a1 -r ec6a5592c617 src/metadatacomposer/templates/metadatacomposer_modal_video.html --- a/src/metadatacomposer/templates/metadatacomposer_modal_video.html Wed May 22 17:09:59 2013 +0200 +++ b/src/metadatacomposer/templates/metadatacomposer_modal_video.html Wed May 22 17:10:38 2013 +0200 @@ -1,4 +1,6 @@ {% load static %} +{% load thumbnail %} +{% load composer_tags %}

- +

Informations sur la vidéo

- - Titre : - - Description : - + {% csrf_token %} + Titre : + + Description : + + + + +

Durée de la vidéo :

- + H - + M - + S

- Vignette de la vidéo : - + Vignette de la vidéo (jpg, png, 1Mo max) : + + {% if content %} +

Image actuelle :

+ {% thumbnail content.image "x60" crop="center" format="PNG" as im %}

{% empty %}

{% endthumbnail %} + {% endif %}

Source de la vidéo

URL de la vidéo : - +

Annuler @@ -50,4 +60,9 @@ max:60, min:0 }); +// Update time input in milliseconds +$('.select-duration .number-spin').change(function(){ + $("#id_content-duration").val( (parseInt($("#video-hour").val()) * 3600000) + (parseInt($("#video-minute").val()) * 60000) + (parseInt($("#video-seconde").val()) * 1000) ); + console.log($("#id_content-duration").val()); +}); \ No newline at end of file diff -r a0a048ff33a1 -r ec6a5592c617 src/metadatacomposer/templates/metadatacomposer_resource_list.html --- a/src/metadatacomposer/templates/metadatacomposer_resource_list.html Wed May 22 17:09:59 2013 +0200 +++ b/src/metadatacomposer/templates/metadatacomposer_resource_list.html Wed May 22 17:10:38 2013 +0200 @@ -24,66 +24,8 @@

- - - - - - - - - - - - - - - - - - - - - - - - - - - -

Aperçu	Titre	Projets associés	Date de modification	Actions
	Titre de l'image qwerty	- - Titre du projet azerty - Titre du projet azerty - Titre du projet azerty - -	14/03/2014	- - - - -
	Titre de l'image azerty	- - Titre du projet azerty - Titre du projet azerty - Titre du projet azerty - -	14/03/2014	- - - - -

+ {% include 'partial/resource_image_list.html' %}

@@ -148,5 +90,22 @@ } }); }); + $(document).on('click', 'a.image_pagination', function(e){ + e.preventDefault();e.stopPropagation(); + var url = $(this).attr('href'); + $(this).addClass("loader"); + $.ajax({ + url: url, + cache: false, + type: 'GET', + success: function(data, status, request) { + $("#image_list_container").html(data); + }, + error: function(jqXHR, textStatus, errorThrown) { + resp = $.parseJSON(jqXHR.responseText); + alert(resp.message); + } + }); + }); {% endblock %} diff -r a0a048ff33a1 -r ec6a5592c617 src/metadatacomposer/templates/partial/resource_content_list.html --- a/src/metadatacomposer/templates/partial/resource_content_list.html Wed May 22 17:09:59 2013 +0200 +++ b/src/metadatacomposer/templates/partial/resource_content_list.html Wed May 22 17:10:38 2013 +0200 @@ -26,7 +26,7 @@ {{ res.content.update_date|date:"Y/m/d" }} - + diff -r a0a048ff33a1 -r ec6a5592c617 src/metadatacomposer/templates/partial/resource_image_list.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/metadatacomposer/templates/partial/resource_image_list.html Wed May 22 17:10:38 2013 +0200 @@ -0,0 +1,61 @@ +{% load static %} +{% load i18n %} +{% load thumbnail %} +{% load front_tags %} + + + + + + + + + + + + {% for res in image_results %} + + + + + + + + {% endfor %} + +

Aperçu	Titre	Projets associés	Date de modification	Actions
{% thumbnail res.image_file "60x60" crop="center" format="PNG" as im %}{% empty %}{% endthumbnail %}	{{ res.title }}	+ +	{{ res.modification_date\|date:"Y/m/d" }}	+ + + + +

{% trans "Previous" %}
{% trans "Previous" %}
{{i|add:'1'}}
{{i|add:'1'}}
{% trans "Next" %}
{% trans "Next" %}
({% trans "All" %})

\ No newline at end of file diff -r a0a048ff33a1 -r ec6a5592c617 src/metadatacomposer/templatetags/__init__.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/metadatacomposer/templatetags/__init__.py Wed May 22 17:10:38 2013 +0200 @@ -0,0 +1,1 @@ + diff -r a0a048ff33a1 -r ec6a5592c617 src/metadatacomposer/templatetags/composer_tags.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/metadatacomposer/templatetags/composer_tags.py Wed May 22 17:10:38 2013 +0200 @@ -0,0 +1,68 @@ +from django.template import Library, TemplateSyntaxError + +register = Library() + +@register.filter +def to_hours(value, arg=None): + """Takes an integer value of milliseconds and write the hour duration""" + # Error management + if value is None : + return "" + if not isinstance(value, (int,long,float,str,unicode)) : + raise TemplateSyntaxError('str_duration value error : value must be integer or long or float or string. type = ' + str(type(value))) + if isinstance(value, (str,unicode)) : + try: + value = int(value) + except : + raise TemplateSyntaxError('str_duration value error : can not convert value "' + value + '" into integer') + # We take off the milliseconds + ms = abs(value) + sec = ms//1000 + return (sec//3600) +to_hours.is_safe = True + + +@register.filter +def to_minutes(value, arg=None): + """Takes an integer value of milliseconds and write the hour duration""" + # Error management + if value is None : + return "" + if not isinstance(value, (int,long,float,str,unicode)) : + raise TemplateSyntaxError('str_duration value error : value must be integer or long or float or string. type = ' + str(type(value))) + if isinstance(value, (str,unicode)) : + try: + value = int(value) + except : + raise TemplateSyntaxError('str_duration value error : can not convert value "' + value + '" into integer') + # We take off the milliseconds + ms = abs(value) + sec = ms//1000 + hours = sec//3600 + min = (sec - (hours * 3600))//60 + return min +to_minutes.is_safe = True + + +@register.filter +def to_seconds(value, arg=None): + """Takes an integer value of milliseconds and write the hour duration""" + # Error management + if value is None : + return "" + if not isinstance(value, (int,long,float,str,unicode)) : + raise TemplateSyntaxError('str_duration value error : value must be integer or long or float or string. type = ' + str(type(value))) + if isinstance(value, (str,unicode)) : + try: + value = int(value) + except : + raise TemplateSyntaxError('str_duration value error : can not convert value "' + value + '" into integer') + # We take off the milliseconds + ms = abs(value) + sec = ms//1000 + hours = sec//3600 + min = (sec - (hours * 3600))//60 + sec = (sec - (hours * 3600) - (min*60)) + return sec +to_seconds.is_safe = True + diff -r a0a048ff33a1 -r ec6a5592c617 src/metadatacomposer/urls.py --- a/src/metadatacomposer/urls.py Wed May 22 17:09:59 2013 +0200 +++ b/src/metadatacomposer/urls.py Wed May 22 17:10:38 2013 +0200 @@ -1,13 +1,16 @@ from django.conf.urls.defaults import patterns, url from metadatacomposer.views import MetadataComposerHome, MetadataComposerProjectList,\ MetadataComposerResourceList, MetadataComposerContentPagination,\ - MetadataComposerModalVideo, MetadataComposerModalImage + MetadataComposerModalVideo, MetadataComposerModalImage,\ + MetadataComposerImagePagination urlpatterns = patterns('', url(r'^jsi18n/(?P\S+?)/$', 'django.views.i18n.javascript_catalog', name='jsi18n'), url(r'^(?P.*)/projectlist/$', MetadataComposerProjectList.as_view(), name="composer_project_list"), url(r'^(?P.*)/resourcelist/$', MetadataComposerResourceList.as_view(), name="composer_resource_list"), + url(r'^(?P.*)/imagepage/$', MetadataComposerImagePagination.as_view(), name="composer_image_page"), url(r'^(?P.*)/contentpage/$', MetadataComposerContentPagination.as_view(), name="composer_content_page"), + url(r'^(?P.*)/modalvideo/(?P[\w-]+)$', MetadataComposerModalVideo.as_view(), name="composer_modal_video"), url(r'^(?P.*)/modalvideo/$', MetadataComposerModalVideo.as_view(), name="composer_modal_video"), url(r'^(?P.*)/modalimage/$', MetadataComposerModalImage.as_view(), name="composer_modal_image"), url(r'^(?P.*)/$', MetadataComposerHome.as_view(), name="composer_home"), diff -r a0a048ff33a1 -r ec6a5592c617 src/metadatacomposer/views.py --- a/src/metadatacomposer/views.py Wed May 22 17:09:59 2013 +0200 +++ b/src/metadatacomposer/views.py Wed May 22 17:10:38 2013 +0200 @@ -3,9 +3,11 @@ from django.core.paginator import Paginator, InvalidPage, EmptyPage from django.shortcuts import redirect from django.utils.decorators import method_decorator +from django.views.decorators.cache import never_cache from django.views.generic.base import View, TemplateResponseMixin -from django.views.generic.edit import FormView from ldt.ldt_utils.models import Project, Content +from ldt.ldt_utils.views.content import write_content_base +from ldt.ldt_utils.utils import generate_uuid from metadatacomposer.forms import ImageUploadModelForm from metadatacomposer.models import Image @@ -32,6 +34,7 @@ return "metadatacomposer_home.html" @method_decorator(login_required) + @method_decorator(never_cache) def dispatch(self, *args, **kwargs): return super(MetadataComposerHome, self).dispatch(*args, **kwargs) @@ -40,7 +43,6 @@ projects = Project.safe_objects.filter(owner=request.user).order_by('-modification_date')[:6] images = Image.objects.order_by('-modification_date')[:6] - logger.debug(images) contents = Content.safe_objects.order_by('-update_date')[:6] context = self.get_context_dict(request) @@ -55,6 +57,7 @@ return "metadatacomposer_project_list.html" @method_decorator(login_required) + @method_decorator(never_cache) def dispatch(self, *args, **kwargs): return super(MetadataComposerProjectList, self).dispatch(*args, **kwargs) @@ -85,18 +88,42 @@ return "metadatacomposer_resource_list.html" @method_decorator(login_required) + @method_decorator(never_cache) def dispatch(self, *args, **kwargs): return super(MetadataComposerResourceList, self).dispatch(*args, **kwargs) def get(self, request, branding="iri", **kwargs): self.branding = branding + # We get the first page of images + image_results = get_images(1) # We get the first contents page and theirs projects content_results = get_contents_and_projects(1, request.user) - # We get the first page of images context = self.get_context_dict(request) - context.update({"content_results":content_results}) + context.update({"image_results":image_results, "content_results":content_results}) + return self.render_to_response(context) + + + +class MetadataComposerImagePagination(TemplateResponseMixin, MetadataComposerContextView): + + def get_template_names(self): + return "partial/resource_image_list.html" + + @method_decorator(login_required) + @method_decorator(never_cache) + def dispatch(self, *args, **kwargs): + return super(MetadataComposerImagePagination, self).dispatch(*args, **kwargs) + + def get(self, request, branding="iri", **kwargs): + self.branding = branding + page = request.GET.get("page") or 1 + # Get current contents page and theirs projects + image_results = get_images(page) + + context = self.get_context_dict(request) + context.update({"image_results":image_results}) return self.render_to_response(context) @@ -107,6 +134,7 @@ return "partial/resource_content_list.html" @method_decorator(login_required) + @method_decorator(never_cache) def dispatch(self, *args, **kwargs): return super(MetadataComposerContentPagination, self).dispatch(*args, **kwargs) @@ -122,6 +150,24 @@ +def get_images(page): + + # We get the current's page images + images = Image.objects.order_by('-modification_date') + #nb = getattr(settings, 'METADATACOMPOSER_ELEMENTS_PER_PAGE', 9) + nb = 2 + if page=="x": + nb = images.count() + paginator = Paginator(images, nb) + try: + results = paginator.page(page) + except (EmptyPage, InvalidPage): + results = paginator.page(paginator.num_pages) + + return results + + + def get_contents_and_projects(page, user): # We get the current's page contents @@ -154,13 +200,35 @@ return "metadatacomposer_modal_video.html" @method_decorator(login_required) + @method_decorator(never_cache) def dispatch(self, *args, **kwargs): return super(MetadataComposerModalVideo, self).dispatch(*args, **kwargs) - def get(self, request, branding="iri", **kwargs): + def get(self, request, branding="iri", iri_id=None, **kwargs): self.branding = branding + + # Generate fake id to validate ContentForm + if not iri_id: + iri_id = generate_uuid() + content = None + else: + content = Content.safe_objects.select_related("media_obj").get(iri_id=iri_id) + context = self.get_context_dict(request) + context.update({"iri_id":iri_id, "content":content}) return self.render_to_response(context) + + def post(self, request, branding="iri", iri_id=None, **kwargs): + self.branding = branding + + # We create the media + content_form, media_form, picture_form, form_status, _, current_front_project, e, traceback = write_content_base(request, iri_id) + # And test creation + if (content_form == False and media_form == False and picture_form == False and form_status == False and current_front_project == False): + #message=_("An error occurred - Please try again or contact webmaster") + #title = _("Error") + raise e, None, traceback + return redirect(request.META['HTTP_REFERER']) @@ -170,38 +238,40 @@ return "metadatacomposer_modal_image.html" @method_decorator(login_required) + @method_decorator(never_cache) def dispatch(self, *args, **kwargs): return super(MetadataComposerModalImage, self).dispatch(*args, **kwargs) def get(self, request, branding="iri", **kwargs): self.branding = branding + image_pk = request.GET.get("image") or None # Add form - form = ImageUploadModelForm() + if image_pk: + form = ImageUploadModelForm(instance=Image.objects.get(pk=image_pk)) + else: + form = ImageUploadModelForm() context = self.get_context_dict(request) - context.update({"form":form}) + context.update({"form":form, "image_pk":image_pk}) return self.render_to_response(context) def post(self, request, branding="iri", **kwargs): self.branding = branding # Check form - form = ImageUploadModelForm(request.POST, request.FILES) - logger.debug("COUCOU 1") - logger.debug(form) - logger.debug(form.is_valid()) + if 'image_pk' in request.POST: + form = ImageUploadModelForm(request.POST, request.FILES, instance=Image.objects.get(pk=request.POST['image_pk'])) + else: + form = ImageUploadModelForm(request.POST, request.FILES) if form.is_valid(): - logger.debug("COUCOU 2") # If an image id was in the form, we update the existing image - if 'image_pk' in request.POST: - form = ImageUploadModelForm(request.POST, request.FILES, instance=Image.objects.get(pk=request.POST['image_pk'])) form.save() + return redirect(request.META['HTTP_REFERER']) else: - logger.debug("COUCOU 3") context = self.get_context_dict(request) context.update({"form":form}) - return redirect(request.META['HTTP_REFERER']) + return redirect("composer_modal_image", branding=branding)