Browse Source

[Adding team to the board] some meaningfuly texts on buttons

Emile NDAGIJIMANA 3 years ago
parent
commit
f840d26faf

+ 15 - 6
client/components/sidebar/sidebar.jade

@@ -95,7 +95,9 @@ template(name="boardOrgGeneral")
         th
           if currentUser.isBoardAdmin
             a.member.orgOrTeamMember.add-member.js-manage-board-addOrg(title="{{_ 'add-members'}}")
-              i.fa.fa-plus
+              i.addTeamFaPlus.fa.fa-plus
+            .divaddfaplusminus
+              | {{_ 'add'}}
       each org in currentBoard.activeOrgs
         +boardOrgRow(orgId=org.orgId)
 
@@ -103,11 +105,18 @@ template(name="boardTeamGeneral")
   table
     tbody
       tr
-        th {{_ 'displayName'}}
+        th
+          b
+            | {{_ 'add-teams'}}
+          br
+          i.addTeamsLabelcss
+            | {{_ 'add-teams-label'}}
         th
           if currentUser.isBoardAdmin
             a.member.orgOrTeamMember.add-member.js-manage-board-addTeam(title="{{_ 'add-members'}}")
-              i.fa.fa-plus
+              i.addTeamFaPlus.fa.fa-plus
+            .divaddfaplusminus
+              | {{_ 'add'}}
       each currentBoard.activeTeams
         +boardTeamRow(teamId=this.teamId)
 
@@ -493,12 +502,12 @@ template(name="removeBoardTeamPopup")
   form
     input.hide#hideTeamId(type="text" value=team._id)
     label
-      | {{_ 'leave-board'}} ?
+      | {{_ 'remove-team-from-table'}}
   br
   hr
   div.buttonsContainer
-    input.primary.wide.leaveBoardBtn#leaveBoardTeamBtn(type="submit" value="{{_ 'leave-board'}}")
-    input.primary.wide.cancelLeaveBoardBtn#cancelLeaveBoardTeamBtn(type="submit" value="{{_ 'Cancel'}}")
+    input.primary.wide.leaveBoardBtn#leaveBoardTeamBtn(type="submit" value="{{_ 'confirm-btn'}}")
+    input.primary.wide.cancelLeaveBoardBtn#cancelLeaveBoardTeamBtn(type="submit" value="{{_ 'cancel'}}")
 
 template(name="addMemberPopup")
   .js-search-member

+ 19 - 0
client/components/sidebar/sidebar.styl

@@ -224,3 +224,22 @@
 .cancelLeaveBoardBtn
   margin-left: 5% !important
   background-color: red !important
+
+.addTeamsLabelcss
+  font-weight: normal;
+
+.js-manage-board-removeTeam
+  box-shadow: 0 0 0 2px #e23210 inset !important
+
+.js-manage-board-addTeam
+  box-shadow: 0 0 0 2px #73ea10 inset !important
+
+.addTeamFaPlus
+  color: green !important
+
+.removeTeamFaMinus
+  color: red !important
+
+.divaddfaplusminus
+  padding-top: 5px;
+  margin-left: 40px;

+ 6 - 2
client/components/users/userAvatar.jade

@@ -32,7 +32,9 @@ template(name="boardOrgRow")
     td
       if currentUser.isBoardAdmin
         a.member.orgOrTeamMember.add-member.js-manage-board-removeOrg(title="{{_ 'remove-from-board'}}")
-          i.fa.fa-minus
+          i.removeTeamFaMinus.fa.fa-minus
+        .divaddfaplusminus
+          | {{_ 'remove-btn'}}
 
 template(name="boardTeamRow")
   tr
@@ -43,7 +45,9 @@ template(name="boardTeamRow")
     td
       if currentUser.isBoardAdmin
         a.member.orgOrTeamMember.add-member.js-manage-board-removeTeam(title="{{_ 'remove-from-board'}}")
-          i.fa.fa-minus
+          i.removeTeamFaMinus.fa.fa-minus
+        .divaddfaplusminus
+          | {{_ 'remove-btn'}}
 
 template(name="boardOrgName")
   svg.avatar.avatar-initials(viewBox="0 0 {{orgViewPortWidth}} 15")

+ 1 - 3
i18n/ar-EG.i18n.json

@@ -271,8 +271,6 @@
     "comment-placeholder": "Write Comment",
     "comment-only": "Comment only",
     "comment-only-desc": "Can comment on cards only.",
-    "comment-delete": "Are you sure you want to delete the comment?",
-    "deleteCommentPopup-title": "Delete comment?",
     "no-comments": "No comments",
     "no-comments-desc": "Can not see comments and activities.",
     "worker": "Worker",
@@ -1089,4 +1087,4 @@
     "help-request": "Help Request",
     "editCardSortOrderPopup-title": "Change Sorting",
     "cardDetailsPopup-title": "Card Details"
-}
+}

+ 1 - 1
i18n/ar.i18n.json

@@ -1089,4 +1089,4 @@
     "help-request": "Help Request",
     "editCardSortOrderPopup-title": "Change Sorting",
     "cardDetailsPopup-title": "Card Details"
-}
+}

+ 1 - 1
i18n/bg.i18n.json

@@ -1089,4 +1089,4 @@
     "help-request": "Help Request",
     "editCardSortOrderPopup-title": "Change Sorting",
     "cardDetailsPopup-title": "Card Details"
-}
+}

+ 1 - 1
i18n/br.i18n.json

@@ -1089,4 +1089,4 @@
     "help-request": "Help Request",
     "editCardSortOrderPopup-title": "Change Sorting",
     "cardDetailsPopup-title": "Card Details"
-}
+}

+ 1 - 1
i18n/ca.i18n.json

@@ -1089,4 +1089,4 @@
     "help-request": "Help Request",
     "editCardSortOrderPopup-title": "Change Sorting",
     "cardDetailsPopup-title": "Card Details"
-}
+}

+ 1 - 1
i18n/cs.i18n.json

@@ -1089,4 +1089,4 @@
     "help-request": "Help Request",
     "editCardSortOrderPopup-title": "Change Sorting",
     "cardDetailsPopup-title": "Card Details"
-}
+}

+ 1 - 1
i18n/da.i18n.json

@@ -1089,4 +1089,4 @@
     "help-request": "Help Request",
     "editCardSortOrderPopup-title": "Change Sorting",
     "cardDetailsPopup-title": "Card Details"
-}
+}

+ 1 - 1
i18n/de-CH.i18n.json

@@ -1089,4 +1089,4 @@
     "help-request": "Hilfegesuch",
     "editCardSortOrderPopup-title": "Sortierung ändern",
     "cardDetailsPopup-title": "Kartendetails"
-}
+}

+ 1 - 1
i18n/de.i18n.json

@@ -1089,4 +1089,4 @@
     "help-request": "Hilfsgesuch",
     "editCardSortOrderPopup-title": "Sortierung ändern",
     "cardDetailsPopup-title": "Kartendetails"
-}
+}

+ 1 - 1
i18n/el.i18n.json

@@ -1089,4 +1089,4 @@
     "help-request": "Help Request",
     "editCardSortOrderPopup-title": "Change Sorting",
     "cardDetailsPopup-title": "Card Details"
-}
+}

+ 1 - 1
i18n/en-GB.i18n.json

@@ -1089,4 +1089,4 @@
     "help-request": "Help Request",
     "editCardSortOrderPopup-title": "Change Sorting",
     "cardDetailsPopup-title": "Card Details"
-}
+}

+ 1 - 1
i18n/en-IT.i18n.json

@@ -1089,4 +1089,4 @@
     "help-request": "Help Request",
     "editCardSortOrderPopup-title": "Change Sorting",
     "cardDetailsPopup-title": "Card Details"
-}
+}

+ 1 - 1
i18n/eo.i18n.json

@@ -1089,4 +1089,4 @@
     "help-request": "Help Request",
     "editCardSortOrderPopup-title": "Change Sorting",
     "cardDetailsPopup-title": "Card Details"
-}
+}

+ 1 - 1
i18n/es-AR.i18n.json

@@ -1089,4 +1089,4 @@
     "help-request": "Help Request",
     "editCardSortOrderPopup-title": "Change Sorting",
     "cardDetailsPopup-title": "Card Details"
-}
+}

+ 1 - 1
i18n/es-CL.i18n.json

@@ -1089,4 +1089,4 @@
     "help-request": "Help Request",
     "editCardSortOrderPopup-title": "Change Sorting",
     "cardDetailsPopup-title": "Card Details"
-}
+}

+ 1 - 1
i18n/es-LA.i18n.json

@@ -1089,4 +1089,4 @@
     "help-request": "Help Request",
     "editCardSortOrderPopup-title": "Change Sorting",
     "cardDetailsPopup-title": "Card Details"
-}
+}

+ 5 - 7
i18n/es-MX.i18n.json

@@ -118,7 +118,7 @@
     "archived-boards": "Tableros en el archivo",
     "restore-board": "Restaurar el tablero",
     "no-archived-boards": "No Boards in Archive.",
-    "archives": "Archivo",
+    "archives": "Archive",
     "template": "Template",
     "templates": "Templates",
     "template-container": "Template Container",
@@ -212,7 +212,7 @@
     "cardArchivePopup-title": "Archive Card?",
     "cardDetailsActionsPopup-title": "Card Actions",
     "cardLabelsPopup-title": "Labels",
-    "cardMembersPopup-title": "Miembros",
+    "cardMembersPopup-title": "Members",
     "cardMorePopup-title": "More",
     "cardTemplatePopup-title": "Create template",
     "cards": "Cards",
@@ -271,8 +271,6 @@
     "comment-placeholder": "Write Comment",
     "comment-only": "Comment only",
     "comment-only-desc": "Can comment on cards only.",
-    "comment-delete": "Are you sure you want to delete the comment?",
-    "deleteCommentPopup-title": "Delete comment?",
     "no-comments": "No comments",
     "no-comments-desc": "Can not see comments and activities.",
     "worker": "Worker",
@@ -479,7 +477,7 @@
     "log-in": "Log In",
     "loginPopup-title": "Log In",
     "memberMenuPopup-title": "Member Settings",
-    "members": "Miembros",
+    "members": "Members",
     "menu": "Menu",
     "move-selection": "Move selection",
     "moveCardPopup-title": "Move Card",
@@ -758,7 +756,7 @@
     "r-top-of": "Top of",
     "r-bottom-of": "Bottom of",
     "r-its-list": "its list",
-    "r-archive": "Archivar",
+    "r-archive": "Move to Archive",
     "r-unarchive": "Restore from Archive",
     "r-card": "card",
     "r-add": "Agregar",
@@ -1089,4 +1087,4 @@
     "help-request": "Help Request",
     "editCardSortOrderPopup-title": "Change Sorting",
     "cardDetailsPopup-title": "Card Details"
-}
+}

+ 1 - 1
i18n/es-PE.i18n.json

@@ -1089,4 +1089,4 @@
     "help-request": "Help Request",
     "editCardSortOrderPopup-title": "Change Sorting",
     "cardDetailsPopup-title": "Card Details"
-}
+}

+ 1 - 1
i18n/es-PY.i18n.json

@@ -1089,4 +1089,4 @@
     "help-request": "Help Request",
     "editCardSortOrderPopup-title": "Change Sorting",
     "cardDetailsPopup-title": "Card Details"
-}
+}

+ 1 - 1
i18n/es.i18n.json

@@ -1089,4 +1089,4 @@
     "help-request": "Help Request",
     "editCardSortOrderPopup-title": "Change Sorting",
     "cardDetailsPopup-title": "Card Details"
-}
+}

+ 1 - 1
i18n/eu.i18n.json

@@ -1089,4 +1089,4 @@
     "help-request": "Help Request",
     "editCardSortOrderPopup-title": "Change Sorting",
     "cardDetailsPopup-title": "Card Details"
-}
+}

+ 2 - 4
i18n/fa-IR.i18n.json

@@ -201,7 +201,7 @@
     "poker-forty": "40",
     "poker-oneHundred": "100",
     "poker-unsure": "?",
-    "poker-finish": "پایان",
+    "poker-finish": "Finish",
     "poker-result-votes": "Votes",
     "poker-result-who": "Who",
     "poker-replay": "Replay",
@@ -271,8 +271,6 @@
     "comment-placeholder": "Write Comment",
     "comment-only": "Comment only",
     "comment-only-desc": "Can comment on cards only.",
-    "comment-delete": "Are you sure you want to delete the comment?",
-    "deleteCommentPopup-title": "Delete comment?",
     "no-comments": "No comments",
     "no-comments-desc": "Can not see comments and activities.",
     "worker": "Worker",
@@ -1089,4 +1087,4 @@
     "help-request": "Help Request",
     "editCardSortOrderPopup-title": "Change Sorting",
     "cardDetailsPopup-title": "Card Details"
-}
+}

+ 1 - 1
i18n/fa.i18n.json

@@ -1089,4 +1089,4 @@
     "help-request": "Help Request",
     "editCardSortOrderPopup-title": "Change Sorting",
     "cardDetailsPopup-title": "Card Details"
-}
+}

+ 1 - 1
i18n/fr-CH.i18n.json

@@ -1089,4 +1089,4 @@
     "help-request": "Help Request",
     "editCardSortOrderPopup-title": "Change Sorting",
     "cardDetailsPopup-title": "Card Details"
-}
+}

+ 3 - 3
i18n/fr.i18n.json

@@ -294,7 +294,7 @@
     "createCustomField": "Créer un champ personnalisé",
     "createCustomFieldPopup-title": "Créer un champ personnalisé",
     "current": "actuel",
-    "custom-field-delete-pop": "Cette action est irréversible. Elle supprimera ce champ personnalisé de toutes les cartes et détruira son historique.",
+    "custom-field-delete-pop": "Cette action n'est pas réversible. Elle supprimera ce champ personnalisé de toutes les cartes et détruira son historique.",
     "custom-field-checkbox": "Case à cocher",
     "custom-field-currency": "Devise",
     "custom-field-currency-option": "Code devise",
@@ -471,7 +471,7 @@
     "listImportCardsTsvPopup-title": "Importer un fichier Excel CSV/TSV",
     "listMorePopup-title": "Plus",
     "link-list": "Lien vers cette liste",
-    "list-delete-pop": "Toutes les actions seront supprimées du fil d'activité et il ne sera plus possible de les récupérer. Cela est irréversible.",
+    "list-delete-pop": "Toutes les actions seront supprimées du fil d'activité et il ne sera plus possible de les récupérer. Cette action est irréversible.",
     "list-delete-suggest-archive": "Vous pouvez archiver une liste pour l'enlever du tableau tout en conservant son activité.",
     "lists": "Listes",
     "swimlanes": "Couloirs",
@@ -1089,4 +1089,4 @@
     "help-request": "Demande d'aide",
     "editCardSortOrderPopup-title": "Modifier le tri",
     "cardDetailsPopup-title": "Détails de la carte"
-}
+}