summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>2019-01-24 15:24:55 +0100
committerBenjamin Tissoires <benjamin.tissoires@redhat.com>2019-01-24 16:51:06 +0100
commit8a48ff96efc29687c8a8c58d02d6741b50c83424 (patch)
tree14fdd59341385fbf2f472af10754bc122144c39e
parent0782c97d4f0ad7f5f22c632927a9484edffe7b93 (diff)
downloadwekan-8a48ff96efc29687c8a8c58d02d6741b50c83424.tar.gz
wekan-8a48ff96efc29687c8a8c58d02d6741b50c83424.tar.bz2
wekan-8a48ff96efc29687c8a8c58d02d6741b50c83424.zip
set card colors: properly set the title of the popups
-rw-r--r--client/components/cards/cardDetails.jade5
-rw-r--r--i18n/en.i18n.json2
2 files changed, 2 insertions, 5 deletions
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade
index c1e771cb..f6cbbba6 100644
--- a/client/components/cards/cardDetails.jade
+++ b/client/components/cards/cardDetails.jade
@@ -234,7 +234,7 @@ template(name="cardDetailsActionsPopup")
li: a.js-due-date {{_ 'editCardDueDatePopup-title'}}
li: a.js-end-date {{_ 'editCardEndDatePopup-title'}}
li: a.js-spent-time {{_ 'editCardSpentTimePopup-title'}}
- li: a.js-set-card-color {{_ 'setCardColor-title'}}
+ li: a.js-set-card-color {{_ 'setCardColorPopup-title'}}
hr
ul.pop-over-list
li: a.js-move-card-to-top {{_ 'moveCardToTop-title'}}
@@ -337,9 +337,6 @@ template(name="cardMorePopup")
a.js-delete(title="{{_ 'card-delete-notice'}}") {{_ 'delete'}}
template(name="setCardColorPopup")
- p.quiet
- span.clearfix
- label {{_ "select-color"}}
form.edit-label
.palette-colors: each colors
span.card-label.palette-color.js-palette-color(class="card-details-{{color}}")
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index 7097af7d..930e88c5 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -517,7 +517,7 @@
"card-end-on": "Ends on",
"editCardReceivedDatePopup-title": "Change received date",
"editCardEndDatePopup-title": "Change end date",
- "setCardColor-title": "Set color",
+ "setCardColorPopup-title": "Set color",
"assigned-by": "Assigned By",
"requested-by": "Requested By",
"board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",