# HG changeset patch # User cavaliet # Date 1369232349 -7200 # Node ID badc36cf05d25be9af9e61cdc029fc4a09b21944 # Parent ff669687a0d24192dcc84c393d87d191bbab2b8c load and modify image. create and modify content. diff -r ff669687a0d2 -r badc36cf05d2 src/metadatacomposer/static/metadatacomposer/js/common.js --- a/src/metadatacomposer/static/metadatacomposer/js/common.js Tue May 21 18:01:07 2013 +0200 +++ b/src/metadatacomposer/static/metadatacomposer/js/common.js Wed May 22 16:19:09 2013 +0200 @@ -6,28 +6,24 @@ //open modal $(document).on('click', 'a.open-modal', function(e){ - console.log("ntm 1"); e.preventDefault(); - console.log("ntm 2"); var modalRemote = $(this).attr('href'), typeMedia = $(this).attr('data-type-media'), modalTitleInfo = $(this).attr('data-title'), hideBibliotheque = $(this).hasAttr('data-hide-bibliotheque') ? true : false, titleFront; - console.log("ntm 3"); + switch(typeMedia){ case 'video' : titleFront = ' Vidéo - '+modalTitleInfo; break; case 'image' : titleFront = ' Image - '+modalTitleInfo; break; } $('#modal-template .modal-header h3').html(titleFront); - console.log("ntm 4"); $("#modal-template .modal-body").load(modalRemote, function() { $("#modal-template").modal("show"); if(hideBibliotheque) $("#modal-template").find(".bibliotheque-link").hide(); }); - console.log("ntm 5"); }); diff -r ff669687a0d2 -r badc36cf05d2 src/metadatacomposer/templates/metadatacomposer_home.html --- a/src/metadatacomposer/templates/metadatacomposer_home.html Tue May 21 18:01:07 2013 +0200 +++ b/src/metadatacomposer/templates/metadatacomposer_home.html Wed May 22 16:19:09 2013 +0200 @@ -79,7 +79,11 @@

Dernières vidéos

-
Ajouter une vidéo
+
+ + Ajouter une vidéo +
{% for c in contents %} diff -r ff669687a0d2 -r badc36cf05d2 src/metadatacomposer/templates/metadatacomposer_modal_image.html --- a/src/metadatacomposer/templates/metadatacomposer_modal_image.html Tue May 21 18:01:07 2013 +0200 +++ b/src/metadatacomposer/templates/metadatacomposer_modal_image.html Wed May 22 16:19:09 2013 +0200 @@ -43,9 +43,9 @@
- +
- + Prévisualiser {% if form.image_file.value %}

Image actuelle :

diff -r ff669687a0d2 -r badc36cf05d2 src/metadatacomposer/templates/metadatacomposer_modal_video.html --- a/src/metadatacomposer/templates/metadatacomposer_modal_video.html Tue May 21 18:01:07 2013 +0200 +++ b/src/metadatacomposer/templates/metadatacomposer_modal_video.html Wed May 22 16:19:09 2013 +0200 @@ -1,4 +1,6 @@ {% load static %} +{% load thumbnail %} +{% load composer_tags %}
    @@ -8,32 +10,40 @@
-
+

Informations sur la vidéo

- - - - - + {% csrf_token %} + + + + + + + +
- + - + - +
- - + + + {% if content %} +

Image actuelle :

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

Source 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 ff669687a0d2 -r badc36cf05d2 src/metadatacomposer/templates/partial/resource_content_list.html --- a/src/metadatacomposer/templates/partial/resource_content_list.html Tue May 21 18:01:07 2013 +0200 +++ b/src/metadatacomposer/templates/partial/resource_content_list.html Wed May 22 16:19:09 2013 +0200 @@ -26,7 +26,7 @@ {{ res.content.update_date|date:"Y/m/d" }} - + diff -r ff669687a0d2 -r badc36cf05d2 src/metadatacomposer/templatetags/__init__.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/metadatacomposer/templatetags/__init__.py Wed May 22 16:19:09 2013 +0200 @@ -0,0 +1,1 @@ + diff -r ff669687a0d2 -r badc36cf05d2 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 16:19:09 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 ff669687a0d2 -r badc36cf05d2 src/metadatacomposer/urls.py --- a/src/metadatacomposer/urls.py Tue May 21 18:01:07 2013 +0200 +++ b/src/metadatacomposer/urls.py Wed May 22 16:19:09 2013 +0200 @@ -10,6 +10,7 @@ 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 ff669687a0d2 -r badc36cf05d2 src/metadatacomposer/views.py --- a/src/metadatacomposer/views.py Tue May 21 18:01:07 2013 +0200 +++ b/src/metadatacomposer/views.py Wed May 22 16:19:09 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) @@ -54,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) @@ -84,6 +88,7 @@ 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) @@ -107,6 +112,7 @@ 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) @@ -128,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) @@ -193,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']) @@ -209,6 +238,7 @@ 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)