# HG changeset patch # User cavaliet # Date 1369663706 -7200 # Node ID cc2a710abeafe64214373b7f8466bbf416182631 # Parent e817af4f68ee195a5f6e20671a7f80286a397a29# Parent 0e6e631718ee86cf88ac0e0be1e9f4637ac42d4c Merge with 0e6e631718ee86cf88ac0e0be1e9f4637ac42d4c diff -r 0e6e631718ee -r cc2a710abeaf src/metadatacomposer/templates/metadatacomposer_home.html --- a/src/metadatacomposer/templates/metadatacomposer_home.html Mon May 27 15:24:46 2013 +0200 +++ b/src/metadatacomposer/templates/metadatacomposer_home.html Mon May 27 16:08:26 2013 +0200 @@ -30,13 +30,13 @@
-

+

{% include top_header_partial %}

@@ -64,7 +64,7 @@

Dernières images

+ href="{% url 'composer_modal_image' branding=branding %}" data-hide-bibliotheque=""> Ajouter une image
@@ -82,7 +82,7 @@

Dernières vidéos

+ href="{% url 'composer_modal_video' branding=branding %}" data-hide-bibliotheque=""> Ajouter une vidéo
diff -r 0e6e631718ee -r cc2a710abeaf src/metadatacomposer/templates/metadatacomposer_modal_image.html --- a/src/metadatacomposer/templates/metadatacomposer_modal_image.html Mon May 27 15:24:46 2013 +0200 +++ b/src/metadatacomposer/templates/metadatacomposer_modal_image.html Mon May 27 16:08:26 2013 +0200 @@ -3,13 +3,13 @@
-
+

Informations et source de l'image

-
{% csrf_token %} + {% csrf_token %} {% if image_pk %}{% endif %} {% for error in form.errors %} {{ error }} diff -r 0e6e631718ee -r cc2a710abeaf src/metadatacomposer/templates/metadatacomposer_modal_image_library.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/metadatacomposer/templates/metadatacomposer_modal_image_library.html Mon May 27 16:08:26 2013 +0200 @@ -0,0 +1,13 @@ +{% load static %} +{% load thumbnail %} +
+
+ +
+
+ {% include 'partial/library_image_list.html' %} +
+
\ No newline at end of file diff -r 0e6e631718ee -r cc2a710abeaf src/metadatacomposer/templates/metadatacomposer_modal_video.html --- a/src/metadatacomposer/templates/metadatacomposer_modal_video.html Mon May 27 15:24:46 2013 +0200 +++ b/src/metadatacomposer/templates/metadatacomposer_modal_video.html Mon May 27 16:08:26 2013 +0200 @@ -8,9 +8,9 @@
  • Ajouter une video
    • -
    +
    - +

    Informations sur la vidéo

    {% csrf_token %} diff -r 0e6e631718ee -r cc2a710abeaf src/metadatacomposer/templates/metadatacomposer_resource_list.html --- a/src/metadatacomposer/templates/metadatacomposer_resource_list.html Mon May 27 15:24:46 2013 +0200 +++ b/src/metadatacomposer/templates/metadatacomposer_resource_list.html Mon May 27 16:08:26 2013 +0200 @@ -19,7 +19,8 @@

    Liste des images

    - + Ajouter une image
    @@ -34,7 +35,7 @@

    Liste des vidéos

    - + Ajouter une vidéo
    @@ -107,5 +108,22 @@ } }); }); + $(document).on('click', 'a.image_pagination_library', 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_library").html(data); + }, + error: function(jqXHR, textStatus, errorThrown) { + resp = $.parseJSON(jqXHR.responseText); + alert(resp.message); + } + }); + }); {% endblock %} diff -r 0e6e631718ee -r cc2a710abeaf src/metadatacomposer/templates/partial/library_image_list.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/metadatacomposer/templates/partial/library_image_list.html Mon May 27 16:08:26 2013 +0200 @@ -0,0 +1,38 @@ +{% load static %} +{% load i18n %} +{% load thumbnail %} +{% load front_tags %} +
    + {% for i in image_results %} +
    + {% thumbnail i.image_file "140x140" crop="center" format="PNG" as im %}{% empty %}{% endthumbnail %} +
    {{ i.title }}
    +
    + {% endfor %} +
    + \ No newline at end of file diff -r 0e6e631718ee -r cc2a710abeaf src/metadatacomposer/templates/partial/resource_content_list.html --- a/src/metadatacomposer/templates/partial/resource_content_list.html Mon May 27 15:24:46 2013 +0200 +++ b/src/metadatacomposer/templates/partial/resource_content_list.html Mon May 27 16:08:26 2013 +0200 @@ -26,7 +26,7 @@ {{ res.content.update_date|date:"Y/m/d" }} - + @@ -38,7 +38,7 @@ \ No newline at end of file diff -r 0e6e631718ee -r cc2a710abeaf src/metadatacomposer/templates/partial/resource_image_list.html --- a/src/metadatacomposer/templates/partial/resource_image_list.html Mon May 27 15:24:46 2013 +0200 +++ b/src/metadatacomposer/templates/partial/resource_image_list.html Mon May 27 16:08:26 2013 +0200 @@ -24,7 +24,7 @@ {{ res.modification_date|date:"Y/m/d" }} - + @@ -36,7 +36,7 @@ \ No newline at end of file diff -r 0e6e631718ee -r cc2a710abeaf src/metadatacomposer/urls.py --- a/src/metadatacomposer/urls.py Mon May 27 15:24:46 2013 +0200 +++ b/src/metadatacomposer/urls.py Mon May 27 16:08:26 2013 +0200 @@ -2,7 +2,7 @@ from metadatacomposer.views import MetadataComposerHome, MetadataComposerProjectList,\ MetadataComposerResourceList, MetadataComposerContentPagination,\ MetadataComposerModalVideo, MetadataComposerModalImage,\ - MetadataComposerImagePagination + MetadataComposerImagePagination, MetadataComposerModalImageLibrary urlpatterns = patterns('', url(r'^jsi18n/(?P\S+?)/$', 'django.views.i18n.javascript_catalog', name='jsi18n'), @@ -13,6 +13,7 @@ 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.*)/modalimagelibrary/$', MetadataComposerModalImageLibrary.as_view(), name="composer_modal_image_library"), url(r'^(?P.*)/$', MetadataComposerHome.as_view(), name="composer_home"), url(r'^$', MetadataComposerHome.as_view(), name="composer_home"), ) diff -r 0e6e631718ee -r cc2a710abeaf src/metadatacomposer/views.py --- a/src/metadatacomposer/views.py Mon May 27 15:24:46 2013 +0200 +++ b/src/metadatacomposer/views.py Mon May 27 16:08:26 2013 +0200 @@ -110,7 +110,10 @@ class MetadataComposerImagePagination(TemplateResponseMixin, MetadataComposerContextView): def get_template_names(self): - return "partial/resource_image_list.html" + if self.template_name and self.template_name!="": + return self.template_name + else: + return "partial/resource_image_list.html" @method_decorator(login_required) @method_decorator(never_cache) @@ -120,9 +123,13 @@ def get(self, request, branding="iri", **kwargs): self.branding = branding page = request.GET.get("page") or 1 + mode = request.GET.get("mode") or "resource" # Get current contents page and theirs projects image_results = get_images(page) + if mode=="library": + self.template_name = "partial/library_image_list.html" + context = self.get_context_dict(request) context.update({"image_results":image_results}) return self.render_to_response(context) @@ -276,3 +283,22 @@ +class MetadataComposerModalImageLibrary(TemplateResponseMixin, MetadataComposerContextView): + + def get_template_names(self): + return "metadatacomposer_modal_image_library.html" + + @method_decorator(login_required) + @method_decorator(never_cache) + def dispatch(self, *args, **kwargs): + return super(MetadataComposerModalImageLibrary, self).dispatch(*args, **kwargs) + + def get(self, request, branding="iri", **kwargs): + self.branding = branding + + context = self.get_context_dict(request) + context.update({"image_results":get_images(1)}) + return self.render_to_response(context) + + +