Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-02-11 02:34:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #4103 from Emile840/master

Browse source 
fix bug regarding #4083 (last version add default display:none to checkbox)
This commit is contained in:
Lauri Ojansivu 2021-10-28 15:07:14 +03:00 • committed by GitHub
commit 50a849fccd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
58 changed files with 41670 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/components/settings/peopleBody.styl
View file

@ -60,6 +60,7 @@ table
position: static !important;
visibility: visible !important;
left: 0 !important;
display: block !important;
#divAddOrRemoveTeam
background: green;

21
client/components/sidebar/sidebar.jade
View file

@ -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
client/components/sidebar/sidebar.styl
View file

@ -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;

8
client/components/users/userAvatar.jade
View file

@ -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")