diff --git a/services/web/app/views/project/editor/share.jade b/services/web/app/views/project/editor/share.jade index 510d03e0b2..837ad60c03 100644 --- a/services/web/app/views/project/editor/share.jade +++ b/services/web/app/views/project/editor/share.jade @@ -55,6 +55,7 @@ script(type='text/ng-template', id='shareProjectModalTemplate') display-property="display" key-property="id" add-on-paste="true" + replace-spaces-with-dashes="false" ) auto-complete( source="filterAutocompleteUsers($query)" @@ -148,10 +149,9 @@ script(type="text/ng-template", id="shareAutocompleteTemplate") div(ng-if="data.type == 'user'") i.fa.fa-fw.fa-user | - span(ng-bind-html="$highlight(data.email)") - div.subdued.small(ng-show="data.name", ng-bind-html="$highlight(data.name)") + span(ng-bind-html="$highlight(data.display)") div(ng-if="data.type == 'group'") i.fa.fa-fw.fa-group | span(ng-bind-html="$highlight(data.name)") - div.subdued.small(ng-show="data.member_count") {{ data.memberCount }} members + span.subdued.small(ng-show="data.member_count") ({{ data.member_count }} members) diff --git a/services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee b/services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee index 4d09f7e0b0..1b0ecd06bb 100644 --- a/services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee +++ b/services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee @@ -22,9 +22,6 @@ define [ allowedNoOfMembers = $scope.project.features.collaborators $scope.canAddCollaborators = noOfMembers < allowedNoOfMembers or allowedNoOfMembers == INFINITE_COLLABORATORS - $scope.$watchCollection "inputs.contacts", (value) -> - console.log "EMAILS", value - $scope.autocompleteContacts = [] do loadAutocompleteUsers = () -> $http.get "/user/contacts" @@ -34,7 +31,6 @@ define [ if contact.type == "user" if contact.last_name == "" and contact.first_name = contact.email.split("@")[0] # User has not set their proper name so use email as canonical display property - contact.name = "" contact.display = contact.email else contact.name = "#{contact.first_name} #{contact.last_name}" @@ -59,8 +55,6 @@ define [ $scope.state.error = null $scope.state.inflight = true - console.log "Adding members", members - do addNextMember = () -> if members.length == 0 or !$scope.canAddCollaborators $scope.state.inflight = false diff --git a/services/web/public/stylesheets/components/tags-input.less b/services/web/public/stylesheets/components/tags-input.less index 48b03aa742..49ad1b2de3 100644 --- a/services/web/public/stylesheets/components/tags-input.less +++ b/services/web/public/stylesheets/components/tags-input.less @@ -48,8 +48,7 @@ tags-input .tags .tag-item { border-radius: 3px; } tags-input .tags .tag-item.selected { - background: -webkit-linear-gradient(top, #febbbb 0%, #fe9090 45%, #ff5c5c 100%); - background: linear-gradient(to bottom, #febbbb 0%, #fe9090 45%, #ff5c5c 100%); + background-color: @gray-lighter; } tags-input .tags .tag-item .remove-button { color: @gray-light;