# HG changeset patch # User Anthony Ly # Date 1370350886 -7200 # Node ID c6d543b0f0b636bbe7a6e880ca453b07dd8de82f # Parent 22aca5b735a263ce0e16c4de8f2124c95d370b6a# Parent cf9ff1447944b1042506ae857857a21db9862411 Merge diff -r 22aca5b735a2 -r c6d543b0f0b6 src/metadatacomposer/static/metadatacomposer/js/common.js --- a/src/metadatacomposer/static/metadatacomposer/js/common.js Tue Jun 04 12:50:33 2013 +0200 +++ b/src/metadatacomposer/static/metadatacomposer/js/common.js Tue Jun 04 15:01:26 2013 +0200 @@ -11,6 +11,7 @@ typeMedia = $(this).attr('data-type-media'), modalTitleInfo = $(this).attr('data-title'), hideBibliotheque = $(this).hasAttr('data-hide-bibliotheque') ? true : false, + hideAddNew = $(this).hasAttr('data-hide-add-new') ? true : false, titleFront; switch(typeMedia){ @@ -23,19 +24,22 @@ $("#modal-template").modal("show"); if(hideBibliotheque) $("#modal-template").find(".bibliotheque-link").hide(); + if(hideAddNew) + $("#modal-template").find(".add-new").hide(); }); }); $('.popup').on('click', '.popup-content a', function(e){ - e.preventDefault(); + + if($(this).hasClass('no-prevent')){ + return true; + }else{ + e.preventDefault(); + } if($(this).hasClass('btn-cancel')){ $(this).parents('.popup').modal('hide'); } - if($(this).hasClass('btn-previsualisation')){ - var imgPrev = $(''); - $('.previsualisation').empty().append(imgPrev); - } }); //confirmation suppression diff -r 22aca5b735a2 -r c6d543b0f0b6 src/metadatacomposer/static/metadatacomposer/js/edition.js --- a/src/metadatacomposer/static/metadatacomposer/js/edition.js Tue Jun 04 12:50:33 2013 +0200 +++ b/src/metadatacomposer/static/metadatacomposer/js/edition.js Tue Jun 04 15:01:26 2013 +0200 @@ -498,10 +498,10 @@ var currentTimePlusUnMin = 60 * 1000 + myMedia.currentTime, endAnnotation = (currentTimePlusUnMin + {% include top_header_css %}
@@ -49,7 +50,7 @@
- Voir aperçu + Voir aperçu Sauvegarder le projet
@@ -340,7 +341,7 @@
- + @@ -426,7 +427,7 @@ - + - + - +
Titre annotation 1 Lorem ipsum dolor sit amet, consectetur adipisicing elit. Officiis aliquid non placeat consequuntur fugit minima. @@ -443,7 +444,7 @@
Titre annotation 2 Lorem ipsum dolor sit amet, consectetur adipisicing elit. Officiis aliquid non placeat consequuntur fugit minima. @@ -460,7 +461,7 @@
Titre annotation 3 Lorem ipsum dolor sit amet, consectetur adipisicing elit. Officiis aliquid non placeat consequuntur fugit minima. diff -r 22aca5b735a2 -r c6d543b0f0b6 src/metadatacomposer/templates/metadatacomposer_home.html --- a/src/metadatacomposer/templates/metadatacomposer_home.html Tue Jun 04 12:50:33 2013 +0200 +++ b/src/metadatacomposer/templates/metadatacomposer_home.html Tue Jun 04 15:01:26 2013 +0200 @@ -48,12 +48,16 @@

Derniers projets

-
Ajouter un projet
+
+ + Ajouter un projet +
{% for p in projects %}
- {% thumbnail p.image "140x140" crop="center" format="PNG" as im %}{% empty %}{% endthumbnail %} + {% thumbnail p.image "140x140" crop="center" format="PNG" as im %}{% empty %}{% endthumbnail %}

{{ p.title }}
{% endfor %} @@ -71,9 +75,21 @@
{% for i in images %}
- {% thumbnail i.image_file "140x140" crop="center" format="PNG" as im %}{% empty %}{% endthumbnail %} + {% thumbnail i.image_file "140x140" crop="center" format="PNG" as im %}{% empty %}{% endthumbnail %}

{{ i.title }}
+ {% endfor %}
@@ -118,6 +134,42 @@ {% endblock %} {% block js_page %} + {% endblock %} {% endblock %} {% analytics %} diff -r 22aca5b735a2 -r c6d543b0f0b6 src/metadatacomposer/templates/metadatacomposer_modal_content_library.html --- a/src/metadatacomposer/templates/metadatacomposer_modal_content_library.html Tue Jun 04 12:50:33 2013 +0200 +++ b/src/metadatacomposer/templates/metadatacomposer_modal_content_library.html Tue Jun 04 15:01:26 2013 +0200 @@ -4,7 +4,7 @@
diff -r 22aca5b735a2 -r c6d543b0f0b6 src/metadatacomposer/templates/metadatacomposer_modal_image.html --- a/src/metadatacomposer/templates/metadatacomposer_modal_image.html Tue Jun 04 12:50:33 2013 +0200 +++ b/src/metadatacomposer/templates/metadatacomposer_modal_image.html Tue Jun 04 15:01:26 2013 +0200 @@ -46,7 +46,7 @@
- Prévisualiser + {% if form.image_file.value %}

Image actuelle :

{% thumbnail form.image_file.value "100" crop="center" format="PNG" as im %}{% empty %}{% endthumbnail %} diff -r 22aca5b735a2 -r c6d543b0f0b6 src/metadatacomposer/templates/metadatacomposer_modal_image_library.html --- a/src/metadatacomposer/templates/metadatacomposer_modal_image_library.html Tue Jun 04 12:50:33 2013 +0200 +++ b/src/metadatacomposer/templates/metadatacomposer_modal_image_library.html Tue Jun 04 15:01:26 2013 +0200 @@ -4,7 +4,7 @@
diff -r 22aca5b735a2 -r c6d543b0f0b6 src/metadatacomposer/templates/metadatacomposer_project_list.html --- a/src/metadatacomposer/templates/metadatacomposer_project_list.html Tue Jun 04 12:50:33 2013 +0200 +++ b/src/metadatacomposer/templates/metadatacomposer_project_list.html Tue Jun 04 15:01:26 2013 +0200 @@ -12,7 +12,11 @@

Liste des projets

-
Ajouter un projet
+
+ + Ajouter un projet +
@@ -99,6 +103,13 @@ Supprimer + {% endblock %} {% block js_page %} diff -r 22aca5b735a2 -r c6d543b0f0b6 src/metadatacomposer/templates/partial/library_content_list.html --- a/src/metadatacomposer/templates/partial/library_content_list.html Tue Jun 04 12:50:33 2013 +0200 +++ b/src/metadatacomposer/templates/partial/library_content_list.html Tue Jun 04 15:01:26 2013 +0200 @@ -5,9 +5,10 @@
{% for res in content_results %}
- + data-description="{{ res.content.description|default_if_none:'' }}" > {% thumbnail res.content.image "140x140" crop="center" format="PNG" as im %}{% empty %}{% endthumbnail %}
{{ res.content.title }}
@@ -16,7 +17,7 @@ \ No newline at end of file diff -r 22aca5b735a2 -r c6d543b0f0b6 src/metadatacomposer/templates/partial/resource_image_list.html --- a/src/metadatacomposer/templates/partial/resource_image_list.html Tue Jun 04 12:50:33 2013 +0200 +++ b/src/metadatacomposer/templates/partial/resource_image_list.html Tue Jun 04 15:01:26 2013 +0200 @@ -15,7 +15,21 @@
{% for res in image_results %} - +
{% thumbnail res.image_file "60x60" crop="center" format="PNG" as im %}{% empty %}{% endthumbnail %} + {% thumbnail res.image_file "60x60" crop="center" format="PNG" as im %}{% empty %}{% endthumbnail %} + + {{ res.title }}