# HG changeset patch # User cavaliet # Date 1370267227 -7200 # Node ID 6af3780b0719c9da1774863f505d9a165400efb0 # Parent 1c08f6ef565139a30a35e214dd4f68362bc37c4d first edit version diff -r 1c08f6ef5651 -r 6af3780b0719 src/metadatacomposer/static/metadatacomposer/js/edition.js --- a/src/metadatacomposer/static/metadatacomposer/js/edition.js Mon Jun 03 12:52:59 2013 +0200 +++ b/src/metadatacomposer/static/metadatacomposer/js/edition.js Mon Jun 03 15:47:07 2013 +0200 @@ -79,10 +79,10 @@ url_transform: function(src) { return [{ type: "video/mp4", - src: src.replace(/\.[\d\w]+$/,'.mp4') + src: src.replace(/\.[\d\w]+$/,'.mp4').replace('rtmp://media.iri.centrepompidou.fr/ddc_player', 'http://media.iri.centrepompidou.fr') }, { type: "video/webm", - src: src.replace(/\.[\d\w]+$/,'.webm') + src: src.replace(/\.[\d\w]+$/,'.webm').replace('rtmp://media.iri.centrepompidou.fr/ddc_player', 'http://media.iri.centrepompidou.fr') }]; } } diff -r 1c08f6ef5651 -r 6af3780b0719 src/metadatacomposer/templates/metadatacomposer_edit.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/metadatacomposer/templates/metadatacomposer_edit.html Mon Jun 03 15:47:07 2013 +0200 @@ -0,0 +1,863 @@ +{% load static %} +{% load i18n %} +{% load analytics %} +{% load thumbnail %} +{% load front_tags %} + + + + + Aix - Back office > Edition + + + + + + + + +
+
+
+
+

+ {% include top_header_partial %} +

+
+ +
+
+
+
+
+
+
+
+ +
+ + {{ project.title }} +
+ +
+
+ Voir aperçu + Sauvegarder le projet +
+
+
+
+
+
+
+
+
    + +
+
+
+
+
+ +
    + +
+
+ +
+
+ +
+
+
    + + +
    +
    +
    + +
    +
    +

    Liste des chapitres

    + + + + + + + + + + + + + + +
    TitreTagsDébutDuréeFinActions
    +
    + +
    +
    +
    + + + +
    + +
    +
    +

    Ajouter une annotation de type

    +
    + Son + Vidéo + Diaporama + Texte + Liens +
    +
    +
    +

    Liste des annotations

    + + + + + + + + + + + + + + +
    TitreTypeDébutDuréeFinActions
    +
    +
    + +
    + +
    +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + +
    DébutDuréeFin
    4:204:204:20
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    + +
    +

    Liens

    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + +
    URLTitre du lienActions
    + + +
    + + +
    +
    +
    + +
    + +
    +

    Son

    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + + +
    +

    Vidéo

    + + Ajouter une vidéo + + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + +
    TitreTitre de la vidéo Azerty
    Date14 / 05 / 2016
    Durée25 m 35 s
    DescriptionLorem ipsum dolor sit amet, consectetur adipisicing elit. Quidem iste blanditiis ducimus sint nemo aspernatur rem hic facere culpa dolore quis itaque magni voluptates aliquid veritatis non harum quo libero.
    +
    +
    + + +
    +

    Html

    +
    +
    +
    + + +
    +
    + Aperçu +
    +
    +
    + + + +
    +

    Texte

    +
    +
    +
    + +
    +
    + + +
    +

    Diaporama

    + + Ajouter une image + + +
    +
    +
    +
    + +
    + + +
    +
    +
    + + sec +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    AperçuTitreDescriptionActions
    Titre annotation 1Lorem ipsum dolor sit amet, consectetur adipisicing elit. Officiis aliquid non placeat consequuntur fugit minima. + + + + + + + + + +
    +
    Titre annotation 2Lorem ipsum dolor sit amet, consectetur adipisicing elit. Officiis aliquid non placeat consequuntur fugit minima. + + + + + + + + + +
    +
    Titre annotation 3Lorem ipsum dolor sit amet, consectetur adipisicing elit. Officiis aliquid non placeat consequuntur fugit minima. + + + + + + + + + +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + +{% analytics %} + + \ No newline at end of file diff -r 1c08f6ef5651 -r 6af3780b0719 src/metadatacomposer/templates/metadatacomposer_home.html --- a/src/metadatacomposer/templates/metadatacomposer_home.html Mon Jun 03 12:52:59 2013 +0200 +++ b/src/metadatacomposer/templates/metadatacomposer_home.html Mon Jun 03 15:47:07 2013 +0200 @@ -25,7 +25,7 @@ {% block body %} -{% block wrapper %} + {% block wrapper %}
    @@ -100,6 +100,8 @@
    + {% endblock %} + {% block modal_divs %} -{% endblock %} - {% block modal_divs %} - {% endblock %} - {% block js_common %} + {% endblock %} + {% block js_common %} - {% endblock %} - {% block js_page %} + {% endblock %} + {% block js_page %} - {% endblock %} + {% endblock %} {% endblock %} {% analytics %} diff -r 1c08f6ef5651 -r 6af3780b0719 src/metadatacomposer/templates/metadatacomposer_project_list.html --- a/src/metadatacomposer/templates/metadatacomposer_project_list.html Mon Jun 03 12:52:59 2013 +0200 +++ b/src/metadatacomposer/templates/metadatacomposer_project_list.html Mon Jun 03 15:47:07 2013 +0200 @@ -48,7 +48,7 @@ - + diff -r 1c08f6ef5651 -r 6af3780b0719 src/metadatacomposer/urls.py --- a/src/metadatacomposer/urls.py Mon Jun 03 12:52:59 2013 +0200 +++ b/src/metadatacomposer/urls.py Mon Jun 03 15:47:07 2013 +0200 @@ -6,7 +6,7 @@ MetadataComposerRemoveImage, MetadataComposerRemoveContent,\ MetadataComposerRemoveProject, MetadataComposerImage,\ MetadataComposerModalContentLibrary, MetadataComposerPlayer,\ - MetadataComposerPreviewPlayer + MetadataComposerPreviewPlayer, MetadataComposerEdit urlpatterns = patterns('', url(r'^jsi18n/(?P\S+?)/$', 'django.views.i18n.javascript_catalog', name='jsi18n'), @@ -25,6 +25,7 @@ url(r'^(?P.*)/image/(?P[\w-]+)/$', MetadataComposerImage.as_view(), name="composer_image"), url(r'^(?P.*)/player/(?P[\w-]+)/$', MetadataComposerPlayer.as_view(), name="composer_player"), url(r'^(?P.*)/previewplayer/(?P[\w-]+)/$', MetadataComposerPreviewPlayer.as_view(), name="composer_preview_player"), + url(r'^(?P.*)/edit/(?P[\w-]+)/$', MetadataComposerEdit.as_view(), name="composer_edit"), url(r'^(?P.*)/$', MetadataComposerHome.as_view(), name="composer_home"), url(r'^$', MetadataComposerHome.as_view(), name="composer_home"), ) diff -r 1c08f6ef5651 -r 6af3780b0719 src/metadatacomposer/views.py --- a/src/metadatacomposer/views.py Mon Jun 03 12:52:59 2013 +0200 +++ b/src/metadatacomposer/views.py Mon Jun 03 15:47:07 2013 +0200 @@ -446,10 +446,7 @@ class MetadataComposerPlayer(TemplateResponseMixin, MetadataComposerContextView): def get_template_names(self): - if self.template_name and self.template_name!="": - return self.template_name - else: - return "metadatacomposer_player.html" + return "metadatacomposer_player.html" @method_decorator(never_cache) def dispatch(self, *args, **kwargs): @@ -470,10 +467,7 @@ class MetadataComposerPreviewPlayer(TemplateResponseMixin, MetadataComposerContextView): def get_template_names(self): - if self.template_name and self.template_name!="": - return self.template_name - else: - return "metadatacomposer_preview_player.html" + return "metadatacomposer_preview_player.html" @method_decorator(login_required) @method_decorator(never_cache) @@ -492,3 +486,31 @@ +class MetadataComposerEdit(TemplateResponseMixin, MetadataComposerContextView): + + def get_template_names(self): + return "metadatacomposer_edit.html" + + @method_decorator(login_required) + @method_decorator(never_cache) + def dispatch(self, *args, **kwargs): + return super(MetadataComposerEdit, self).dispatch(*args, **kwargs) + + def get(self, request, branding="iri", ldt_id=None, **kwargs): + self.branding = branding + + project = None + if not ldt_id: + return HttpResponseBadRequest("ldt_id parameter must be set.") + else: + project = get_object_or_404(Project.safe_objects, ldt_id=ldt_id) + if project: + if not check_object_perm_for_user(project, "change_project", request.user): + return HttpResponseBadRequest("Current user has no right to edit this project.") + + context = self.get_context_dict(request) + context.update({"ldt_id": ldt_id, "project":project}) + return self.render_to_response(context) + + +