Merge pull request #67 from patou/move_offered_button

Move offered button
patou · Jul 29, 2018 · bf05764 · bf05764
2 parents 54f4f71 + e2bd492
commit bf05764
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 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
@@ -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}} &nbsp;&nbsp;&nbsp;",
     "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
@@ -124,6 +124,16 @@ <h1>
                         <li><a href="javascript:;" ng-click="w.deleteWish()" translate>.EDIT_OPTIONS_DELETE</a></li>
                     </ul>
                 </div>
+
+                <div class="btn-group btn-group-sm edit-button" ng-if="w.wish.given && w.wish.userGiven">
+                    <button type="button" class="btn btn-warning dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" translate translate-attr-title=".EDIT_OTHER_OPTIONS">
+                        <span translate=".EDIT_OTHER_OPTIONS"></span>
+                        <span class="caret"></span>
+                    </button>
+                    <ul class="dropdown-menu">
+                        <li><a href="javascript:;" ng-click="w.receivedWish()" translate>.GIVEN</a></li>
+                    </ul>
+                </div>
                 <button type="button" class="btn btn-warning btn-sm edit-button" ng-if="w.edit && !w.add" ng-click="w.cancelWish()" translate=".CANCEL"></button>
                 <!-- -->
                 <button type="button" class="btn btn-info btn-sm  edit-button copy-button"  ng-if="!w.edit && !w.add"
@@ -136,7 +146,6 @@ <h6 ng-if="w.wish.given"><i class="fa fa-gift"></i>
                         <span translate translate-values="{name: w.wish.userTakeUsers}" ng-if="w.wish.userTakeUsers">.OFFERED_BY</span>
                         <span translate ng-if="w.wish.allreadyGiven">.OFFERED</span>
                         <button type="button" class="btn btn-danger" ng-if="w.wish.userGiven" ng-click="w.cancel(w.wish.id)" translate>.CANCEL</button>
-                        <button type="button" class="btn btn-success" ng-if="w.wish.userGiven" ng-click="w.receivedWish()" translate>.GIVEN</button>
                         <button type="button" class="btn btn-success btn3d" ng-if="!w.wish.userGiven && !w.wish.archived && w.wish.canParticipate" ng-click="w.given(w.wish.id)"><i class="fa fa-gift fa-lg fa-fw"></i><b translate>.PARTICIPATE</b></button>
                     </h6>
                     <button type="button" class="btn btn-success btn3d" ng-if="w.wish.canParticipate && !w.wish.given && w.user" ng-click="w.given(w.wish.id)"><i class="fa fa-gift fa-lg fa-fw"></i><b translate >.TO_OFFER</b></button>