diff options
| author | Lauri Ojansivu <x@xet7.org> | 2020-04-27 02:54:40 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2020-04-27 02:54:40 +0300 |
| commit | ee106d1cb41b8e7b4ae757936f0f46688325f685 (patch) | |
| tree | 96d68db8d0d2ec66094cae0363284340ccf1435d /client/components/cards/cardDetails.jade | |
| parent | 8ef435c83e48cbd3df9bf012d60c7833396c4e0a (diff) | |
| download | wekan-ee106d1cb41b8e7b4ae757936f0f46688325f685.tar.gz wekan-ee106d1cb41b8e7b4ae757936f0f46688325f685.tar.bz2 wekan-ee106d1cb41b8e7b4ae757936f0f46688325f685.zip | |
Revert In Progress additional vote features. Translations are not removed.
Thanks to xet7 !
Related https://github.com/wekan/wekan/pull/3048
Diffstat (limited to 'client/components/cards/cardDetails.jade')
| -rw-r--r-- | client/components/cards/cardDetails.jade | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index b4259ae6..ae97e0e9 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -212,8 +212,6 @@ template(name="cardDetails") else .card-label.card-label-green {{ voteCountPositive }} .card-label.card-label-red {{ voteCountNegative }} - unless ($and currentBoard.isPublic voteAllowNonBoardMembers ) - .card-label.card-label-gray {{ voteCount }} {{_ 'r-of' }} {{ currentBoard.activeMembers.length }} +viewer = getVoteQuestion button.card-details-green.js-vote.js-vote-positive(class="{{#if voteState}}voted{{/if}}") {{_ 'vote-for-it'}} @@ -574,15 +572,12 @@ template(name="cardStartVotingPopup") .fields label(for="vote") {{_ 'vote-question'}} input.js-vote-field#vote(type="text" name="vote" value="{{card.getVoteQuestion}}" autofocus) - .check-div - a.flex.js-toggle-vote-public + label(for="vote-public") {{_ 'vote-public'}} + a.js-toggle-vote-public .materialCheckBox#vote-public(name="vote-public") - span {{_ 'vote-public'}} - .check-div - a.flex.js-toggle-vote-allow-non-members - .materialCheckBox#vote-allow-non-members(name="vote-allow-non-members") - span {{_ 'allowNonBoardMembers'}} + button.primary.confirm.js-submit {{_ 'save'}} + //- button.js-remove-color.negate.wide.right {{_ 'delete'}} template(name="positiveVoteMembersPopup") ul.pop-over-list.js-card-member-list |