diff options
| author | Lauri Ojansivu <x@xet7.org> | 2020-04-26 17:18:41 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2020-04-26 17:18:41 +0300 |
| commit | ff73aa4566fcb96f42eb9ca4d3db7b4ae68a83ed (patch) | |
| tree | d3931724c50d7807f9a905fdf8893b82da1a650a /client/components/cards/cardDetails.jade | |
| parent | 3908fe0ab875cf4b793c884a3d82df2f1a3b2686 (diff) | |
| parent | de993a079d9f528ae1cfe9d4ba8a3a7541d93941 (diff) | |
| download | wekan-ff73aa4566fcb96f42eb9ca4d3db7b4ae68a83ed.tar.gz wekan-ff73aa4566fcb96f42eb9ca4d3db7b4ae68a83ed.tar.bz2 wekan-ff73aa4566fcb96f42eb9ca4d3db7b4ae68a83ed.zip | |
Merge branch 'NicoP-S-master'
Diffstat (limited to 'client/components/cards/cardDetails.jade')
| -rw-r--r-- | client/components/cards/cardDetails.jade | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index ae97e0e9..b4259ae6 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -212,6 +212,8 @@ 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'}} @@ -572,12 +574,15 @@ template(name="cardStartVotingPopup") .fields label(for="vote") {{_ 'vote-question'}} input.js-vote-field#vote(type="text" name="vote" value="{{card.getVoteQuestion}}" autofocus) - label(for="vote-public") {{_ 'vote-public'}} - a.js-toggle-vote-public + .check-div + a.flex.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 |