Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 23:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

profile name changed fullname and comma hotfix.

Browse source
This commit is contained in:
Yasar icli 2015-07-18 13:43:59 +03:00
parent 2fb317d753
commit a79599d76c
5 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/components/boards/boardList.js
View file

@ -29,7 +29,7 @@ BlazeComponent.extendComponent({
'click .js-star-board': function(evt) { 'click .js-star-board': function(evt) {
Meteor.user().toggleBoardStar(this._id); Meteor.user().toggleBoardStar(this._id);
evt.preventDefault(); evt.preventDefault();
}, }
}]; }];
} }
}).register('boardList'); }).register('boardList');

2
client/components/cards/details.jade
View file

@ -97,7 +97,7 @@ template(name="cardMembersPopup")
a.name.js-select-member(href="#") a.name.js-select-member(href="#")
+userAvatar(userId=user._id) +userAvatar(userId=user._id)
span.full-name span.full-name
= user.profile.name = user.profile.fullname
| (<span class="username">{{ user.username }}</span>) | (<span class="username">{{ user.username }}</span>)
if isCardMember if isCardMember
i.fa.fa-check i.fa.fa-check

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

@ -53,7 +53,7 @@ template(name="memberPopup")
.info .info
h3.bottom h3.bottom
.js-profile .js-profile
= user.profile.name = user.profile.fullname
p.quiet.bottom @#{user.username} p.quiet.bottom @#{user.username}
if currentUser.isBoardMember if currentUser.isBoardMember
@ -73,7 +73,7 @@ template(name="memberPopup")
template(name="removeMemberPopup") template(name="removeMemberPopup")
p {{_ 'remove-member-pop' name=user.profile.name username=user.username boardTitle=board.title}} p {{_ 'remove-member-pop' name=user.profile.fullname username=user.username boardTitle=board.title}}
button.js-confirm.negate.full(type="submit") {{_ 'remove-member'}} button.js-confirm.negate.full(type="submit") {{_ 'remove-member'}}
template(name="addMemberPopup") template(name="addMemberPopup")
@ -83,10 +83,10 @@ template(name="addMemberPopup")
ul.pop-over-member-list ul.pop-over-member-list
+esEach(index="users") +esEach(index="users")
li.item.js-member-item(class="{{#if isBoardMember }}disabled{{/if}}") li.item.js-member-item(class="{{#if isBoardMember }}disabled{{/if}}")
a.name.js-select-member(title="{{ profile.name }} ({{ username }})") a.name.js-select-member(title="{{ profile.fullname }} ({{ username }})")
+userAvatar(userId=_id) +userAvatar(userId=_id)
span.full-name span.full-name
= profile.name = profile.fullname
| (<span class="username">{{ username }}</span>) | (<span class="username">{{ username }}</span>)
if isBoardMember if isBoardMember
.extra-text.quiet ({{_ 'joined'}}) .extra-text.quiet ({{_ 'joined'}})

4
client/components/sidebar/sidebarFilters.jade
View file

@ -25,7 +25,7 @@ template(name="filterSidebar")
a.name.js-toogle-member-filter a.name.js-toogle-member-filter
+userAvatar(userId=this._id) +userAvatar(userId=this._id)
span.sidebar-list-item-description span.sidebar-list-item-description
= profile.name = profile.fullname
| (<span class="username">{{ username }}</span>) | (<span class="username">{{ username }}</span>)
if Filter.members.isSelected _id if Filter.members.isSelected _id
i.fa.fa-check i.fa.fa-check
@ -62,7 +62,7 @@ template(name="multiselectionSidebar")
a.name.js-toogle-member-multiselection a.name.js-toogle-member-multiselection
+userAvatar(userId=this._id) +userAvatar(userId=this._id)
span.sidebar-list-item-description span.sidebar-list-item-description
= profile.name = profile.fullname
| (<span class="username">{{ username }}</span>) | (<span class="username">{{ username }}</span>)
if allSelectedElementHave 'member' _id if allSelectedElementHave 'member' _id
i.fa.fa-check i.fa.fa-check

4
client/components/users/userHeader.jade
View file

@ -2,8 +2,8 @@ template(name="headerUserBar")
#header-user-bar #header-user-bar
a.header-user-bar-name.js-open-header-member-menu a.header-user-bar-name.js-open-header-member-menu
i.fa.fa-chevron-down i.fa.fa-chevron-down
if currentUser.profile.name if currentUser.profile.fullname
= currentUser.profile.name = currentUser.profile.fullname
else else
= currentUser.username = currentUser.username
a.header-user-bar-avatar.js-change-avatar a.header-user-bar-avatar.js-change-avatar