From b931b16052b1be7bc4958a4b58b9172996c0f215 Mon Sep 17 00:00:00 2001 From: Patrice De Saint Steban Date: Tue, 9 Jan 2018 19:56:55 +0100 Subject: [PATCH 01/11] Notification overflow and remove owner emails --- liste-envies-war/src/main/webapp/css/style.css | 2 ++ liste-envies-war/src/main/webapp/templates/home.html | 2 +- liste-envies-war/src/main/webapp/templates/wishList.html | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/liste-envies-war/src/main/webapp/css/style.css b/liste-envies-war/src/main/webapp/css/style.css index f4d722f3..2d578347 100644 --- a/liste-envies-war/src/main/webapp/css/style.css +++ b/liste-envies-war/src/main/webapp/css/style.css @@ -850,6 +850,8 @@ div.material-icons.form-control-feedback { .notif-menu { padding: 5px; min-width: 250px; + overflow: auto; + max-height: 36em; } .notification .badge { diff --git a/liste-envies-war/src/main/webapp/templates/home.html b/liste-envies-war/src/main/webapp/templates/home.html index 53466f05..45f7289d 100644 --- a/liste-envies-war/src/main/webapp/templates/home.html +++ b/liste-envies-war/src/main/webapp/templates/home.html @@ -62,7 +62,7 @@

{{wishlist.title}}

-

.SEPARATOR_USER {{owner.name}}({{owner.email}}),

+

.SEPARATOR_USER {{owner.name}},

diff --git a/liste-envies-war/src/main/webapp/templates/wishList.html b/liste-envies-war/src/main/webapp/templates/wishList.html index 1bbe6124..de94562c 100644 --- a/liste-envies-war/src/main/webapp/templates/wishList.html +++ b/liste-envies-war/src/main/webapp/templates/wishList.html @@ -29,7 +29,7 @@

.BUTTON_EDIT_LIST de {{owner.name}} ({{owner.email}}) {{owner.name}}, From 38cb313ca38ec1fca3d741860efc5479020b5873 Mon Sep 17 00:00:00 2001 From: Patrice de Saint Steban Date: Mon, 29 Jan 2018 11:35:54 +0100 Subject: [PATCH 02/11] Insert Link option in summernotes. --- liste-envies-war/src/main/webapp/js/controllers/listCtrl.js | 6 ++++-- .../src/main/webapp/js/directive/WishListSettings.js | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/liste-envies-war/src/main/webapp/js/controllers/listCtrl.js b/liste-envies-war/src/main/webapp/js/controllers/listCtrl.js index a9c24b19..3d7f00bc 100644 --- a/liste-envies-war/src/main/webapp/js/controllers/listCtrl.js +++ b/liste-envies-war/src/main/webapp/js/controllers/listCtrl.js @@ -17,7 +17,8 @@ function ListCtrl(wishService, appUserService, wishListService, $routeParams, $l placeholder: "Ajouter une description", toolbar: [ ['style', ['bold', 'italic', 'underline', 'clear', 'color', 'fontsize']], - ['para', ['ul', 'ol', 'paragraph']] + ['para', ['ul', 'ol', 'paragraph']], + ['insert', ['link', 'picture']] ], popover: { image: [ @@ -30,7 +31,8 @@ function ListCtrl(wishService, appUserService, wishListService, $routeParams, $l ], air: [ ['style', ['bold', 'italic', 'underline', 'clear', 'color', 'fontsize']], - ['para', ['ul', 'ol', 'paragraph']] + ['para', ['ul', 'ol', 'paragraph']], + ['insert', ['link', 'picture']] ] }, height: 200 diff --git a/liste-envies-war/src/main/webapp/js/directive/WishListSettings.js b/liste-envies-war/src/main/webapp/js/directive/WishListSettings.js index 24eb51ee..6398b6f1 100644 --- a/liste-envies-war/src/main/webapp/js/directive/WishListSettings.js +++ b/liste-envies-war/src/main/webapp/js/directive/WishListSettings.js @@ -23,7 +23,8 @@ function WishListSettings(WishListTypePicture) { placeholder: "Ajouter une description", toolbar: [ ['style', ['bold', 'italic', 'underline', 'clear', 'color', 'fontsize']], - ['para', ['ul', 'ol', 'paragraph']] + ['para', ['ul', 'ol', 'paragraph']], + ['insert', ['link', 'picture']] ], popover: { image: [ @@ -36,7 +37,8 @@ function WishListSettings(WishListTypePicture) { ], air: [ ['style', ['bold', 'italic', 'underline', 'clear', 'color', 'fontsize']], - ['para', ['ul', 'ol', 'paragraph']] + ['para', ['ul', 'ol', 'paragraph']], + ['insert', ['link', 'picture']] ] }, height: 100 From 2da2e81ef11bacd9685938c8d659ce01f4f6f883 Mon Sep 17 00:00:00 2001 From: Patrice de Saint Steban Date: Wed, 11 Apr 2018 17:43:56 +0200 Subject: [PATCH 03/11] =?UTF-8?q?Suggestion=20dans=20une=20liste=20dont=20?= =?UTF-8?q?on=20est=20pas=20owner=20et=20que=20l'on=20est=20connect=C3=A9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../liste/envies/dto/WishListDto.java | 20 +++++++++++---- .../liste/envies/util/WishRules.java | 22 +++++++++++++++- .../liste/envies/util/WishRulesTest.java | 25 +++++++++++++++++++ 3 files changed, 61 insertions(+), 6 deletions(-) diff --git a/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/dto/WishListDto.java b/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/dto/WishListDto.java index 8d1fab58..e6e2ba6f 100644 --- a/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/dto/WishListDto.java +++ b/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/dto/WishListDto.java @@ -1,13 +1,13 @@ package fr.desaintsteban.liste.envies.dto; +import java.util.Date; +import java.util.List; + +import org.codehaus.jackson.annotate.JsonIgnoreProperties; + import fr.desaintsteban.liste.envies.enums.SharingPrivacyType; import fr.desaintsteban.liste.envies.enums.WishListState; import fr.desaintsteban.liste.envies.enums.WishListType; -import fr.desaintsteban.liste.envies.enums.WishOptionType; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; - -import java.util.Date; -import java.util.List; /** * @@ -32,6 +32,8 @@ public class WishListDto { private WishListState state; + private Boolean canSuggest; + public List getOwners() { return owners; } @@ -119,4 +121,12 @@ public WishListState getState() { public void setState(WishListState state) { this.state = state; } + + public Boolean getCanSuggest() { + return canSuggest; + } + + public void setCanSuggest(Boolean canSuggest) { + this.canSuggest = canSuggest; + } } diff --git a/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/util/WishRules.java b/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/util/WishRules.java index 4aaccc48..05ab7b1e 100644 --- a/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/util/WishRules.java +++ b/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/util/WishRules.java @@ -73,10 +73,11 @@ public static WishListDto applyRules(AppUser user, WishList wishList) { WishListDto dto = wishList.toDto(); fillUsersInWishList(dto, wishList, user, map, true); cleanWishList(wishList, dto, user); + computePermissions(dto, wishList, user); return dto; } - public static List applyRules(AppUser user, List wishList) { + public static List applyRules(AppUser user, List wishList) { Set emails = wishList.stream() .flatMap(list -> list.getUsers().stream()) .filter(userShare -> userShare.getType() == UserShareType.OWNER) @@ -199,6 +200,25 @@ private static void computePermissions(WishDto wishDto, AppUser user, WishList w } } + static void computePermissions(WishListDto dto, WishList wishList, AppUser user) { + WishListState state = computeWishListState(user, wishList); + switch (state) { + case OWNER: + dto.setCanSuggest(false); + dto.setOwner(true); + break; + case SHARED: + case LOGGED: + dto.setCanSuggest(true); + dto.setOwner(false); + break; + default: + dto.setCanSuggest(false); + dto.setOwner(false); + break; + } + } + static WishListState computeWishListState(AppUser user, WishList list) { if (user != null && !isNullOrEmpty(user.getEmail())) { if (list != null) { diff --git a/liste-envies-war/src/test/java/fr/desaintsteban/liste/envies/util/WishRulesTest.java b/liste-envies-war/src/test/java/fr/desaintsteban/liste/envies/util/WishRulesTest.java index 5cb3917b..e2e66142 100644 --- a/liste-envies-war/src/test/java/fr/desaintsteban/liste/envies/util/WishRulesTest.java +++ b/liste-envies-war/src/test/java/fr/desaintsteban/liste/envies/util/WishRulesTest.java @@ -1,6 +1,7 @@ package fr.desaintsteban.liste.envies.util; import fr.desaintsteban.liste.envies.dto.WishDto; +import fr.desaintsteban.liste.envies.dto.WishListDto; import fr.desaintsteban.liste.envies.enums.*; import fr.desaintsteban.liste.envies.model.*; import org.junit.Test; @@ -10,6 +11,8 @@ import static org.fest.assertions.Assertions.assertThat; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class WishRulesTest { @@ -111,6 +114,28 @@ public void testComputeWishOptionType() { assertEquals(WishOptionType.ANONYMOUS, WishRules.computeWishOptionsType(null, wishlist)); } + @Test + public void testComputePermissionWishList() { + WishList wishlist = createDefaultWishList(); + WishListDto dto = new WishListDto(); + + WishRules.computePermissions(dto, wishlist, new AppUser("patrice@desaintsteban.fr")); + assertTrue(dto.getOwner()); + assertFalse(dto.getCanSuggest()); + + WishRules.computePermissions(dto, wishlist, new AppUser("emmanuel@desaintsteban.fr")); + assertFalse(dto.getOwner()); + assertTrue(dto.getCanSuggest()); + + WishRules.computePermissions(dto, wishlist, new AppUser("emeline@desaintsteban.fr")); + assertFalse(dto.getOwner()); + assertTrue(dto.getCanSuggest()); + + WishRules.computePermissions(dto, wishlist, new AppUser(null, "Anonyme")); + assertFalse(dto.getOwner()); + assertFalse(dto.getCanSuggest()); + } + private WishList createDefaultWishList() { WishList list = new WishList(); List users = new ArrayList<>(); From e4f72cd139ebfc2348e0a49ef7ff510c62d716f1 Mon Sep 17 00:00:00 2001 From: manudss Date: Sun, 24 Jun 2018 22:54:11 +0200 Subject: [PATCH 04/11] add force anoyme list + in case anonyme set, add empty participant. --- .../liste/envies/model/WishList.java | 12 ++++++++++++ .../liste/envies/util/WishRules.java | 15 +++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/model/WishList.java b/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/model/WishList.java index 4b0e95f8..4dedeeae 100644 --- a/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/model/WishList.java +++ b/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/model/WishList.java @@ -36,6 +36,9 @@ public class WishList { private SharingPrivacyType privacy; // Option for sharing privacy of the all list. + private boolean forceAnonymus = false; // To force display list as anonymous. for owner it will show the list as anonyme. + + public WishList() { this.privacy = SharingPrivacyType.PRIVATE; } @@ -181,4 +184,13 @@ public void addUser(AppUser user) { if (users == null) users = new ArrayList<>(); users.add(new UserShare(user.getEmail(), UserShareType.SHARED)); } + + + public boolean isForceAnonymus() { + return forceAnonymus; + } + + public void setForceAnonymus(boolean forceAnonymus) { + this.forceAnonymus = forceAnonymus; + } } diff --git a/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/util/WishRules.java b/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/util/WishRules.java index 05ab7b1e..de2ae89a 100644 --- a/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/util/WishRules.java +++ b/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/util/WishRules.java @@ -238,8 +238,11 @@ static WishOptionType computeWishOptionsType(AppUser user, WishList list) { WishListState state = computeWishListState(user, list); switch (state) { case OWNER: + if (list.isForceAnonymus()) { + return WishOptionType.ANONYMOUS; + } //Si une options est définie dans la liste, alors c'est l'option par défaut - if (list.getPrivacy() != null) { + else if (list.getPrivacy() != null) { switch (list.getPrivacy()) { case PRIVATE: return WishOptionType.HIDDEN; @@ -316,7 +319,15 @@ static WishDto cleanWish(WishDto wish, WishOptionType type) { } break; case ANONYMOUS: - wish.setUserTake(null); + if (wish.getUserTake() == null || wish.getUserTake().isEmpty()) { + wish.setUserTake(null); + } else { + PersonParticipantDto anymous = new PersonParticipantDto("", "", "", ""); + ArrayList userTake = new ArrayList<>(); + userTake.add(anymous); + wish.setUserTake(userTake); + } + wish.setGiven(wish.getAllreadyGiven()); if (!ListUtils.isNullOrEmpty(wish.getComments())) { wish.setComments(wish.getComments().stream().filter(comment -> comment.getType() == CommentType.PUBLIC).collect(toList())); From 43573ce1ae9f816900f5526a4e8e361cd97586c0 Mon Sep 17 00:00:00 2001 From: manudss Date: Mon, 25 Jun 2018 00:04:53 +0200 Subject: [PATCH 05/11] add settings to force anonymous --- .../liste/envies/dto/WishListDto.java | 15 ++++++++++++++- .../liste/envies/model/WishList.java | 4 ++++ .../templates/directive/WishListSettings.html | 5 +++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/dto/WishListDto.java b/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/dto/WishListDto.java index e6e2ba6f..1d9b8ef0 100644 --- a/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/dto/WishListDto.java +++ b/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/dto/WishListDto.java @@ -30,6 +30,10 @@ public class WishListDto { private Date date; // date of the event private SharingPrivacyType privacy; // Option for sharing privacy of the all list. + + + private boolean forceAnonymus = false; // To force display list as anonymous. for owner it will show the list as anonyme. + private WishListState state; private Boolean canSuggest; @@ -128,5 +132,14 @@ public Boolean getCanSuggest() { public void setCanSuggest(Boolean canSuggest) { this.canSuggest = canSuggest; - } + } + + public boolean isForceAnonymus() { + return forceAnonymus; + } + + public void setForceAnonymus(boolean forceAnonymus) { + this.forceAnonymus = forceAnonymus; + } + } diff --git a/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/model/WishList.java b/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/model/WishList.java index 4dedeeae..e9843436 100644 --- a/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/model/WishList.java +++ b/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/model/WishList.java @@ -88,6 +88,9 @@ public WishList(WishListDto dto) { setType( dto.getType()); setDate( dto.getDate()); setPrivacy( dto.getPrivacy()); + + setForceAnonymus(dto.isForceAnonymus()); + } public WishListDto toDto() { @@ -100,6 +103,7 @@ public WishListDto toDto() { dto.setDate( getDate()); dto.setPrivacy( getPrivacy()); dto.setOwner(false); + dto.setForceAnonymus(isForceAnonymus()); return dto; } diff --git a/liste-envies-war/src/main/webapp/templates/directive/WishListSettings.html b/liste-envies-war/src/main/webapp/templates/directive/WishListSettings.html index 2583defe..f97d6931 100644 --- a/liste-envies-war/src/main/webapp/templates/directive/WishListSettings.html +++ b/liste-envies-war/src/main/webapp/templates/directive/WishListSettings.html @@ -58,4 +58,9 @@ ... +
+ + + +
From 4d2d357009ec0851a0b5bc4b592e64b5f810eaf8 Mon Sep 17 00:00:00 2001 From: manudss Date: Mon, 25 Jun 2018 22:08:56 +0200 Subject: [PATCH 06/11] correct tests --- .../java/fr/desaintsteban/liste/envies/util/WishRulesTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/liste-envies-war/src/test/java/fr/desaintsteban/liste/envies/util/WishRulesTest.java b/liste-envies-war/src/test/java/fr/desaintsteban/liste/envies/util/WishRulesTest.java index e2e66142..497658f8 100644 --- a/liste-envies-war/src/test/java/fr/desaintsteban/liste/envies/util/WishRulesTest.java +++ b/liste-envies-war/src/test/java/fr/desaintsteban/liste/envies/util/WishRulesTest.java @@ -23,7 +23,7 @@ public void cleanWishAnonyme() { WishDto cleaned = WishRules.cleanWish(wish, WishOptionType.ANONYMOUS); - assertThat(cleaned.getUserTake()).isNull(); + assertThat(cleaned.getUserTake()).hasSize(1); assertThat(cleaned.getComments()).hasSize(1).onProperty("text").contains("Public"); } From e772ea2c9e3908790c33d582d0954d838b133060 Mon Sep 17 00:00:00 2001 From: manudss Date: Mon, 25 Jun 2018 22:39:25 +0200 Subject: [PATCH 07/11] set given when in anonymous --- .../java/fr/desaintsteban/liste/envies/util/WishRules.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/util/WishRules.java b/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/util/WishRules.java index de2ae89a..34af5532 100644 --- a/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/util/WishRules.java +++ b/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/util/WishRules.java @@ -321,14 +321,17 @@ static WishDto cleanWish(WishDto wish, WishOptionType type) { case ANONYMOUS: if (wish.getUserTake() == null || wish.getUserTake().isEmpty()) { wish.setUserTake(null); + wish.setGiven(wish.getAllreadyGiven()); } else { PersonParticipantDto anymous = new PersonParticipantDto("", "", "", ""); ArrayList userTake = new ArrayList<>(); userTake.add(anymous); wish.setUserTake(userTake); + wish.setGiven(true); + wish.setUserGiven(true); } - wish.setGiven(wish.getAllreadyGiven()); + if (!ListUtils.isNullOrEmpty(wish.getComments())) { wish.setComments(wish.getComments().stream().filter(comment -> comment.getType() == CommentType.PUBLIC).collect(toList())); } From 5cd65d72f9f08d0b862960755887a9f5605c8c30 Mon Sep 17 00:00:00 2001 From: manudss Date: Mon, 25 Jun 2018 22:45:16 +0200 Subject: [PATCH 08/11] display anonymous --- .../java/fr/desaintsteban/liste/envies/util/WishRules.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/util/WishRules.java b/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/util/WishRules.java index 34af5532..394aed20 100644 --- a/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/util/WishRules.java +++ b/liste-envies-war/src/main/java/fr/desaintsteban/liste/envies/util/WishRules.java @@ -323,12 +323,11 @@ static WishDto cleanWish(WishDto wish, WishOptionType type) { wish.setUserTake(null); wish.setGiven(wish.getAllreadyGiven()); } else { - PersonParticipantDto anymous = new PersonParticipantDto("", "", "", ""); + PersonParticipantDto anymous = new PersonParticipantDto("", "anonyme", "", ""); ArrayList userTake = new ArrayList<>(); userTake.add(anymous); wish.setUserTake(userTake); wish.setGiven(true); - wish.setUserGiven(true); } From 8dc720dd20526985d6411563e96706f69e0fbe40 Mon Sep 17 00:00:00 2001 From: manudss Date: Mon, 25 Jun 2018 23:06:37 +0200 Subject: [PATCH 09/11] traduction settings force anonymous --- liste-envies-war/src/main/webapp/js/lang/fr-FR.json | 1 + .../src/main/webapp/templates/directive/WishListSettings.html | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/liste-envies-war/src/main/webapp/js/lang/fr-FR.json b/liste-envies-war/src/main/webapp/js/lang/fr-FR.json index 0eac6c1e..ce1b4847 100644 --- a/liste-envies-war/src/main/webapp/js/lang/fr-FR.json +++ b/liste-envies-war/src/main/webapp/js/lang/fr-FR.json @@ -178,6 +178,7 @@ "PUBLIC": "La liste peut être affiché sans être connecté par toute personne connaissant le lien. Il est nécessaire de se connecter pour interagir avec, et voir si une envie est prise.
Toutes les personnes connectés (bénéficiaires compris) voient qui donne une envie.", "DEFAULT": "Selectionnez la visibilité de la liste" }, + "FORCE_ANONYMOUS": "Afficher de manière anonyme si l'envies est déjà offerte.", "DATE": "Date de l'événement", "DATE_INFO": "Pour afficher un compte à rebours jusqu'à l'événement" }, diff --git a/liste-envies-war/src/main/webapp/templates/directive/WishListSettings.html b/liste-envies-war/src/main/webapp/templates/directive/WishListSettings.html index f97d6931..d38bfeb6 100644 --- a/liste-envies-war/src/main/webapp/templates/directive/WishListSettings.html +++ b/liste-envies-war/src/main/webapp/templates/directive/WishListSettings.html @@ -60,7 +60,7 @@
- - + +
From ccd66fe89257e598cdbc758ed6df8cbd9bffb0f8 Mon Sep 17 00:00:00 2001 From: manudss Date: Sun, 29 Jul 2018 21:44:52 +0200 Subject: [PATCH 10/11] =?UTF-8?q?d=C3=A9placer=20boutton=20offert,=20qui?= =?UTF-8?q?=20n'est=20pas=20bien=20compris.=20les=20gens=20cliques=20deux?= =?UTF-8?q?=20fois=20dessus,=20et=20archive=20l'item.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- liste-envies-war/src/main/webapp/js/lang/fr-FR.json | 4 ++-- .../src/main/webapp/templates/directive/WishCard.html | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/liste-envies-war/src/main/webapp/js/lang/fr-FR.json b/liste-envies-war/src/main/webapp/js/lang/fr-FR.json index ce1b4847..913e77ca 100644 --- a/liste-envies-war/src/main/webapp/js/lang/fr-FR.json +++ b/liste-envies-war/src/main/webapp/js/lang/fr-FR.json @@ -111,13 +111,13 @@ "INPUT_PRICE": "Prix", "EDIT": "@:COMMONS.EDIT", "EDIT_OTHER_OPTIONS": "Autres options", - "EDIT_OPTIONS_RECEIVED": "Reçu", + "EDIT_OPTIONS_RECEIVED": "Reçu (archiver)", "EDIT_OPTIONS_DELETE": "Supprimer", "EDIT_OPTIONS_COPY": "Copier", "OFFERED_BY": "Offert par {{name}}    ", "OFFERED": "Déjà offert", "PARTICIPATE": "Participer", - "GIVEN": "Offert", + "GIVEN": "Offert (archiver)", "TO_OFFER": "Offrir", "COMMENTS": "Commmentaires ({{comment_number || 0}})", "ADD_COMMENTS_LABEL": "Ajouter un commmentaire", diff --git a/liste-envies-war/src/main/webapp/templates/directive/WishCard.html b/liste-envies-war/src/main/webapp/templates/directive/WishCard.html index ad4ee9f2..3b3e5750 100644 --- a/liste-envies-war/src/main/webapp/templates/directive/WishCard.html +++ b/liste-envies-war/src/main/webapp/templates/directive/WishCard.html @@ -124,6 +124,16 @@

  • .EDIT_OPTIONS_DELETE
    • + +
    + + +
    -

    From e2bd492f8f67fa0f58d8203cd582fb79beba4dec Mon Sep 17 00:00:00 2001 From: manudss Date: Sun, 29 Jul 2018 21:58:17 +0200 Subject: [PATCH 11/11] =?UTF-8?q?d=C3=A9placer=20boutton=20offert,=20qui?= =?UTF-8?q?=20n'est=20pas=20bien=20compris.=20les=20gens=20cliques=20deux?= =?UTF-8?q?=20fois=20dessus,=20et=20archive=20l'item.=20+=20affichege=20ed?= =?UTF-8?q?it=20other=20button?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/webapp/templates/directive/WishCard.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/liste-envies-war/src/main/webapp/templates/directive/WishCard.html b/liste-envies-war/src/main/webapp/templates/directive/WishCard.html index 3b3e5750..defc2826 100644 --- a/liste-envies-war/src/main/webapp/templates/directive/WishCard.html +++ b/liste-envies-war/src/main/webapp/templates/directive/WishCard.html @@ -125,10 +125,10 @@

    -
    -