summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorYasar icli <hello@yasaricli.com>2015-07-18 13:43:59 +0300
committerYasar icli <hello@yasaricli.com>2015-07-18 13:43:59 +0300
commita79599d76c808520d36aa7c19e366906cb89982c (patch)
tree69c62bf6472a96c529eefaf06e25a99f22c2d274 /client
parent2fb317d753cdf5612d9b90428c223deae683c97b (diff)
downloadwekan-a79599d76c808520d36aa7c19e366906cb89982c.tar.gz
wekan-a79599d76c808520d36aa7c19e366906cb89982c.tar.bz2
wekan-a79599d76c808520d36aa7c19e366906cb89982c.zip
profile name changed fullname and comma hotfix.
Diffstat (limited to 'client')
-rw-r--r--client/components/boards/boardList.js2
-rw-r--r--client/components/cards/details.jade2
-rw-r--r--client/components/sidebar/sidebar.jade8
-rw-r--r--client/components/sidebar/sidebarFilters.jade4
-rw-r--r--client/components/users/userHeader.jade4
5 files changed, 10 insertions, 10 deletions
diff --git a/client/components/boards/boardList.js b/client/components/boards/boardList.js
index 9529af69..f902cc84 100644
--- a/client/components/boards/boardList.js
+++ b/client/components/boards/boardList.js
@@ -29,7 +29,7 @@ BlazeComponent.extendComponent({
'click .js-star-board': function(evt) {
Meteor.user().toggleBoardStar(this._id);
evt.preventDefault();
- },
+ }
}];
}
}).register('boardList');
diff --git a/client/components/cards/details.jade b/client/components/cards/details.jade
index 67ef287b..56c32e84 100644
--- a/client/components/cards/details.jade
+++ b/client/components/cards/details.jade
@@ -97,7 +97,7 @@ template(name="cardMembersPopup")
a.name.js-select-member(href="#")
+userAvatar(userId=user._id)
span.full-name
- = user.profile.name
+ = user.profile.fullname
| (<span class="username">{{ user.username }}</span>)
if isCardMember
i.fa.fa-check
diff --git a/client/components/sidebar/sidebar.jade b/client/components/sidebar/sidebar.jade
index 9f014136..9616e1df 100644
--- a/client/components/sidebar/sidebar.jade
+++ b/client/components/sidebar/sidebar.jade
@@ -53,7 +53,7 @@ template(name="memberPopup")
.info
h3.bottom
.js-profile
- = user.profile.name
+ = user.profile.fullname
p.quiet.bottom @#{user.username}
if currentUser.isBoardMember
@@ -73,7 +73,7 @@ template(name="memberPopup")
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'}}
template(name="addMemberPopup")
@@ -83,10 +83,10 @@ template(name="addMemberPopup")
ul.pop-over-member-list
+esEach(index="users")
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)
span.full-name
- = profile.name
+ = profile.fullname
| (<span class="username">{{ username }}</span>)
if isBoardMember
.extra-text.quiet ({{_ 'joined'}})
diff --git a/client/components/sidebar/sidebarFilters.jade b/client/components/sidebar/sidebarFilters.jade
index a40232d2..c777d724 100644
--- a/client/components/sidebar/sidebarFilters.jade
+++ b/client/components/sidebar/sidebarFilters.jade
@@ -25,7 +25,7 @@ template(name="filterSidebar")
a.name.js-toogle-member-filter
+userAvatar(userId=this._id)
span.sidebar-list-item-description
- = profile.name
+ = profile.fullname
| (<span class="username">{{ username }}</span>)
if Filter.members.isSelected _id
i.fa.fa-check
@@ -62,7 +62,7 @@ template(name="multiselectionSidebar")
a.name.js-toogle-member-multiselection
+userAvatar(userId=this._id)
span.sidebar-list-item-description
- = profile.name
+ = profile.fullname
| (<span class="username">{{ username }}</span>)
if allSelectedElementHave 'member' _id
i.fa.fa-check
diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade
index 6a096658..4a447897 100644
--- a/client/components/users/userHeader.jade
+++ b/client/components/users/userHeader.jade
@@ -2,8 +2,8 @@ template(name="headerUserBar")
#header-user-bar
a.header-user-bar-name.js-open-header-member-menu
i.fa.fa-chevron-down
- if currentUser.profile.name
- = currentUser.profile.name
+ if currentUser.profile.fullname
+ = currentUser.profile.fullname
else
= currentUser.username
a.header-user-bar-avatar.js-change-avatar