# HG changeset patch # User cavaliet # Date 1359562399 -3600 # Node ID ffd106d9b8e13c583b736c8df31456ff035bd27e # Parent 38611b2c278288961785959c9b9a82692816bc5d Prepare template for real datas. Some fake datas temporary generated in views. diff -r 38611b2c2782 -r ffd106d9b8e1 src/egonomy/templates/egonomy_annotate_picture.html --- a/src/egonomy/templates/egonomy_annotate_picture.html Tue Jan 29 18:42:24 2013 +0100 +++ b/src/egonomy/templates/egonomy_annotate_picture.html Wed Jan 30 17:13:19 2013 +0100 @@ -1,6 +1,7 @@ {% extends "egonomy_base.html" %} {% load static %} {% load i18n %} +{% load thumbnail %} {% block title %}{% trans "Annotate a picture" %}{% endblock %} @@ -8,8 +9,12 @@

Titre de l'image

-
- Photo à annoter +
+ {% thumbnail image.image "476" format="PNG" crop="center" as im %} + + {% empty %} + + {% endthumbnail %}
@@ -17,31 +22,31 @@ - + - + - + - + - + - + - + @@ -62,71 +67,37 @@

{% trans "Fragments from this picture" %}

diff -r 38611b2c2782 -r ffd106d9b8e1 src/egonomy/templates/egonomy_create_fragment.html --- a/src/egonomy/templates/egonomy_create_fragment.html Tue Jan 29 18:42:24 2013 +0100 +++ b/src/egonomy/templates/egonomy_create_fragment.html Wed Jan 30 17:13:19 2013 +0100 @@ -1,6 +1,7 @@ {% extends "egonomy_base.html" %} {% load static %} {% load i18n %} +{% load thumbnail %} {% block title %}{% trans "Create or edit a fragment" %}{% endblock %} @@ -19,28 +20,32 @@ ↺

{% trans 'New fragment' %} :

- + {% thumbnail image.image "476" format="PNG" crop="center" as im %} + + {% empty %} + + {% endthumbnail %}
- +
{% trans "Description" %} :Lorem Ipsum, Ceci est la description de l'œuvre représentée dans l'image.{{ image.description }}
{% trans "Author" %} :Marcel Duchamp{{ image.author }}
{% trans "Period" %} :XXème siècle{{ image.period }}
{% trans "Production site" %} :Paris, France{{ image.production_site }}
{% trans "Localization" %} :Musée du Louvre, Paris.{{ image.localization }}
{% trans "RMN keywords" %} :Art contemporain, Art conceptuel, Cyclisme{{ image.rmn_keywords }}
{% trans "Users keywords" %}
- + - - + + - - + + - - + + @@ -61,71 +66,37 @@

{% trans 'Fragments from this picture' %}

diff -r 38611b2c2782 -r ffd106d9b8e1 src/egonomy/templates/egonomy_home.html --- a/src/egonomy/templates/egonomy_home.html Tue Jan 29 18:42:24 2013 +0100 +++ b/src/egonomy/templates/egonomy_home.html Wed Jan 30 17:13:19 2013 +0100 @@ -16,26 +16,26 @@
  • - {% if img %} - {% if img|is_portrait %} - {% thumbnail img "x110" format="PNG" crop="center" as im %} + {% if img.image %} + {% if img.image|is_portrait %} + {% thumbnail img.image "x110" format="PNG" crop="center" as im %} {% empty %} {% endthumbnail %} {% else %} - {% thumbnail img "110" format="PNG" crop="center" as im %} + {% thumbnail img.image "110" format="PNG" crop="center" as im %} {% empty %} {% endthumbnail %} {% endif %} - {% else %} + {% else %} {% endif %}
    -

    Titre de l'image

     -

    {% trans "Annotated by" %} Julien75

    +

    {{ img.title }}

    +

    {% trans "Annotated by" %} {{ img.author }}

    • {% endfor %} @@ -45,62 +45,38 @@

    {% trans "Last created fragments" %}

    diff -r 38611b2c2782 -r ffd106d9b8e1 src/egonomy/templates/egonomy_view_fragment.html --- a/src/egonomy/templates/egonomy_view_fragment.html Tue Jan 29 18:42:24 2013 +0100 +++ b/src/egonomy/templates/egonomy_view_fragment.html Wed Jan 30 17:13:19 2013 +0100 @@ -1,17 +1,22 @@ {% extends "egonomy_base.html" %} {% load static %} {% load i18n %} +{% load thumbnail %} {% block title %}{% trans "View a fragment" %}{% endblock %} {% block content %}
    -

    Titre du fragment

    +

    {{ fragment.title }}

    - + {% thumbnail fragment.image.image "476" format="PNG" crop="center" as im %} + + {% empty %} + + {% endthumbnail %} - +
    @@ -20,15 +25,15 @@
    {% trans 'Source picture' %} :Titre de l'image source{{ image.title }}
    {% trans 'Title' %} :{% trans "Fragment's title" %} :
    {% trans 'Description' %} :{% trans "Fragment's description" %} :
    {% trans 'Users keywords' %}{% trans 'Users keywords' %} :
    - + - - + + - + @@ -46,71 +51,37 @@

    {% trans "Fragments from this picture" %}

    diff -r 38611b2c2782 -r ffd106d9b8e1 src/egonomy/views.py --- a/src/egonomy/views.py Tue Jan 29 18:42:24 2013 +0100 +++ b/src/egonomy/views.py Wed Jan 30 17:13:19 2013 +0100 @@ -10,36 +10,106 @@ def home(request): + im1 = {"image": ImageFile(open(settings.RMN_PICT_ROOT+"0/00-004125.jpg", 'r'),FileSystemStorage(location=settings.RMN_PICT_ROOT)), "title":"title im 1", "author":"juju"} + im2 = {"image": ImageFile(open(settings.RMN_PICT_ROOT+"0/00-004543.jpg", 'r'),FileSystemStorage(location=settings.RMN_PICT_ROOT)), "title":"title im 2", "author":"loulou"} + im3 = {"image": ImageFile(open(settings.RMN_PICT_ROOT+"0/01-017513.jpg", 'r'),FileSystemStorage(location=settings.RMN_PICT_ROOT)), "title":"title im 3", "author":"juju"} + im4 = {"image": ImageFile(open(settings.RMN_PICT_ROOT+"0/02-009258.jpg", 'r'),FileSystemStorage(location=settings.RMN_PICT_ROOT)), "title":"title im 4", "author":"loulou"} + img_list = [im1,im2,im3,im4,im3,im4,im1,im2] - im1 = ImageFile(open(settings.RMN_PICT_ROOT+"0/00-004125.jpg", 'r'), FileSystemStorage(location=settings.RMN_PICT_ROOT)) - im2 = ImageFile(open(settings.RMN_PICT_ROOT+"1/00-007590.jpg", 'r'), FileSystemStorage(location=settings.RMN_PICT_ROOT)) - im3 = ImageFile(open(settings.RMN_PICT_ROOT+"2/00-001283.jpg", 'r'), FileSystemStorage(location=settings.RMN_PICT_ROOT)) - im4 = ImageFile(open(settings.RMN_PICT_ROOT+"3/00-000023.jpg", 'r'), FileSystemStorage(location=settings.RMN_PICT_ROOT)) - img_list = [im1,im2,im3,im4] + frg1 = {"image": im2, "path":"M 0 .5 L .5 0 L 1 .5 L .5 1 Z", "title":"Fragment X", "author":"juju"} + frg2 = {"image": im3, "path":"M .1 .3 L .5 .1 L .8 .7 Z", "title":"Fragment Y", "author":"loulou"} + frg3 = {"image": im4, "path":"M 0 .5 L .5 0 L 1 .5 L .5 1 Z", "title":"Fragment Z", "author":"juju"} + frg4 = {"image": im1, "path":"M .2 .5 L .7 .2 L .8 .7 Z", "title":"Fragment W", "author":"loulou"} + frg_list = [frg1,frg2,frg3,frg4,frg3,frg4,frg1,frg2] return render_to_response("egonomy_home.html", - {'img_list': img_list}, + {'img_list': img_list, 'fragment_list': frg_list}, context_instance=RequestContext(request)) def annotate_picture(request): + + im1 = {"image": ImageFile(open(settings.RMN_PICT_ROOT+"0/03-007695.jpg", 'r'),FileSystemStorage(location=settings.RMN_PICT_ROOT)), "title":"title im 1", "author":"juju"} + im2 = {"image": ImageFile(open(settings.RMN_PICT_ROOT+"0/03-007696.jpg", 'r'),FileSystemStorage(location=settings.RMN_PICT_ROOT)), "title":"title im 2", "author":"loulou"} + im3 = {"image": ImageFile(open(settings.RMN_PICT_ROOT+"0/03-007697.jpg", 'r'),FileSystemStorage(location=settings.RMN_PICT_ROOT)), "title":"title im 3", "author":"juju"} + im4 = {"image": ImageFile(open(settings.RMN_PICT_ROOT+"0/03-007698.jpg", 'r'),FileSystemStorage(location=settings.RMN_PICT_ROOT)), "title":"title im 4", "author":"loulou"} + img_list = [im1,im2,im3,im4] + from random import choice + im = choice(img_list) + im.update({"description":"Ceci est la description de l'oeuvre representee dans l'image", + "author":"Marcel Duchamp", + "period":"XXeme siecle", + "production_site":"Paris, France", + "localization":"Musee du Louvre, Paris", + "rmn_keywords":"Art contemporain, Art conceptuel, Cyclisme", + "users_keywords":"Modernite, Ready-made"}) + + frg1 = {"image": im, "path":"M 0 .5 L .5 0 L 1 .5 L .5 1 Z", "title":"Fragment X", "author":"juju"} + frg2 = {"image": im, "path":"M .1 .3 L .5 .1 L .8 .7 Z", "title":"Fragment Y", "author":"loulou"} + frg3 = {"image": im, "path":"M 0 .5 L .5 0 L 1 .5 L .5 1 Z", "title":"Fragment Z", "author":"juju"} + frg4 = {"image": im, "path":"M .2 .5 L .7 .2 L .8 .7 Z", "title":"Fragment W", "author":"loulou"} + frg_list = [frg1,frg2,frg3,frg4,frg3,frg4,frg1,frg4,frg3,frg4,frg1,frg2] return render_to_response("egonomy_annotate_picture.html", - {'any_var': "coucou"}, + {'image': im, 'fragment_list': frg_list}, context_instance=RequestContext(request)) def view_fragment(request): + im1 = {"image": ImageFile(open(settings.RMN_PICT_ROOT+"0/04-000035.jpg", 'r'),FileSystemStorage(location=settings.RMN_PICT_ROOT)), "title":"title im 1", "author":"juju"} + im2 = {"image": ImageFile(open(settings.RMN_PICT_ROOT+"0/04-000038.jpg", 'r'),FileSystemStorage(location=settings.RMN_PICT_ROOT)), "title":"title im 2", "author":"loulou"} + im3 = {"image": ImageFile(open(settings.RMN_PICT_ROOT+"0/05-513007.jpg", 'r'),FileSystemStorage(location=settings.RMN_PICT_ROOT)), "title":"title im 3", "author":"juju"} + im4 = {"image": ImageFile(open(settings.RMN_PICT_ROOT+"0/05-513027.jpg", 'r'),FileSystemStorage(location=settings.RMN_PICT_ROOT)), "title":"title im 4", "author":"loulou"} + img_list = [im1,im2,im3,im4] + from random import choice + im = choice(img_list) + im.update({"description":"Ceci est la description de l'oeuvre representee dans l'image", + "author":"Marcel Duchamp", + "period":"XXeme siecle", + "production_site":"Paris, France", + "localization":"Musee du Louvre, Paris", + "rmn_keywords":"Art contemporain, Art conceptuel, Cyclisme", + "users_keywords":"Modernite, Ready-made"}) + + frg1 = {"image": im, "path":"M 0 .5 L .5 0 L 1 .5 L .5 1 Z", "title":"Fragment X", "author":"juju", "users_keywords":"Modernite, Ready-made"} + frg2 = {"image": im, "path":"M .1 .3 L .5 .1 L .8 .7 Z", "title":"Fragment Y", "author":"loulou", "users_keywords":"Modernite, Ready-made"} + frg3 = {"image": im, "path":"M 0 .5 L .5 0 L 1 .5 L .5 1 Z", "title":"Fragment Z", "author":"juju", "users_keywords":"Modernite, Ready-made"} + frg4 = {"image": im, "path":"M .2 .5 L .7 .2 L .8 .7 Z", "title":"Fragment W", "author":"loulou", "users_keywords":"Modernite, Ready-made"} + frg_list = [frg1,frg2,frg3,frg3,frg4,frg4,frg3,frg4,frg1,frg4,frg1] + frg = choice(frg_list) + return render_to_response("egonomy_view_fragment.html", - {'any_var': "coucou"}, + {'fragment': frg, 'fragment_list': frg_list}, context_instance=RequestContext(request)) def create_fragment(request): + im1 = {"image": ImageFile(open(settings.RMN_PICT_ROOT+"0/08-551797.jpg", 'r'),FileSystemStorage(location=settings.RMN_PICT_ROOT)), "title":"title im 1", "author":"juju"} + im2 = {"image": ImageFile(open(settings.RMN_PICT_ROOT+"0/09-508948.jpg", 'r'),FileSystemStorage(location=settings.RMN_PICT_ROOT)), "title":"title im 2", "author":"loulou"} + im3 = {"image": ImageFile(open(settings.RMN_PICT_ROOT+"0/09-509002.jpg", 'r'),FileSystemStorage(location=settings.RMN_PICT_ROOT)), "title":"title im 3", "author":"juju"} + im4 = {"image": ImageFile(open(settings.RMN_PICT_ROOT+"0/09-510583.jpg", 'r'),FileSystemStorage(location=settings.RMN_PICT_ROOT)), "title":"title im 4", "author":"loulou"} + img_list = [im1,im2,im3,im4] + from random import choice + im = choice(img_list) + im.update({"description":"Ceci est la description de l'oeuvre representee dans l'image", + "author":"Marcel Duchamp", + "period":"XXeme siecle", + "production_site":"Paris, France", + "localization":"Musee du Louvre, Paris", + "rmn_keywords":"Art contemporain, Art conceptuel, Cyclisme", + "users_keywords":"Modernite, Ready-made"}) + + frg1 = {"image": im, "path":"M 0 .5 L .5 0 L 1 .5 L .5 1 Z", "title":"Fragment X", "author":"juju"} + frg2 = {"image": im, "path":"M .1 .3 L .5 .1 L .8 .7 Z", "title":"Fragment Y", "author":"loulou"} + frg3 = {"image": im, "path":"M 0 .5 L .5 0 L 1 .5 L .5 1 Z", "title":"Fragment Z", "author":"juju"} + frg4 = {"image": im, "path":"M .2 .5 L .7 .2 L .8 .7 Z", "title":"Fragment W", "author":"loulou"} + frg_list = [frg1,frg2,frg3,frg4,frg3,frg4,frg1,frg4,frg3,frg4,frg1,frg2] + + return render_to_response("egonomy_create_fragment.html", - {'any_var': "coucou"}, + {'image': im, 'fragment_list': frg_list}, context_instance=RequestContext(request))
    {% trans "Source picture" %} :Titre de l'image source{{ fragment.image.title }}
    {% trans "Description" %} :Lorem Ipsum Description du fragment{% trans "Fragment's description" %} :{{ fragment.description }}
    {% trans "Users keywords" %}