# HG changeset patch # User cavaliet # Date 1370270392 -7200 # Node ID 31b0ac589b45f6ff99203597222687d854672830 # Parent 6af3780b0719c9da1774863f505d9a165400efb0# Parent 807525d1ad8e3856083c318b0ebfa8e3c6f0cab9 Merge with 807525d1ad8e3856083c318b0ebfa8e3c6f0cab9 diff -r 6af3780b0719 -r 31b0ac589b45 integration/home.html --- a/integration/home.html Mon Jun 03 15:47:07 2013 +0200 +++ b/integration/home.html Mon Jun 03 16:39:52 2013 +0200 @@ -33,7 +33,10 @@

Derniers projets

- +
@@ -101,7 +104,8 @@

Dernières vidéos

+ Ajouter une vidéo +
diff -r 6af3780b0719 -r 31b0ac589b45 integration/js/common.js --- a/integration/js/common.js Mon Jun 03 15:47:07 2013 +0200 +++ b/integration/js/common.js Mon Jun 03 16:39:52 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,6 +24,8 @@ $("#modal-template").modal("show"); if(hideBibliotheque) $("#modal-template").find(".bibliotheque-link").hide(); + if(hideAddNew) + $("#modal-template").find(".add-new").hide(); }); }); diff -r 6af3780b0719 -r 31b0ac589b45 integration/modal-bibliotheque-image.html --- a/integration/modal-bibliotheque-image.html Mon Jun 03 15:47:07 2013 +0200 +++ b/integration/modal-bibliotheque-image.html Mon Jun 03 16:39:52 2013 +0200 @@ -2,7 +2,7 @@