taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix import user layout

stable
xaviju 2017-03-03 12:09:53 +01:00
parent 4dcbbcac10
commit 8f1b542fe4
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/modules/projects/create/import-project-members/import-project-members.controller.coffee
View File

@ -55,6 +55,8 @@ class ImportProjectMembersController
user = user.set('user', externalUser) user = user.set('user', externalUser)
user = user.set('taigaUser', taigaUser) user = user.set('taigaUser', taigaUser)
console.log user
@.selectedUsers = @.selectedUsers.push(user) @.selectedUsers = @.selectedUsers.push(user)
@.discardSuggestedUser(externalUser) @.discardSuggestedUser(externalUser)

1
app/modules/projects/create/select-import-user-lightbox/select-import-user-lightbox.directive.coffee
View File

@ -19,7 +19,6 @@
SelectImportUserLightboxDirective = (lightboxService, lightboxKeyboardNavigationService) -> SelectImportUserLightboxDirective = (lightboxService, lightboxKeyboardNavigationService) ->
link = (scope, el, attrs, ctrl) -> link = (scope, el, attrs, ctrl) ->
pepe = () ->
scope.$watch 'vm.visible', (visible) -> scope.$watch 'vm.visible', (visible) ->
if visible && !el.hasClass('open') if visible && !el.hasClass('open')
ctrl.start() ctrl.start()

2
app/modules/projects/create/select-import-user-lightbox/select-import-user-lightbox.jade
View File

@ -5,7 +5,7 @@ tg-lightbox-close(on-close="vm.onClose()")
.avatar.empty(ng-if="!vm.user.get('avatar')") {{vm.user.get('full_name')[0].toUpperCase() || vm.user.get('username')[0].toUpperCase()}} .avatar.empty(ng-if="!vm.user.get('avatar')") {{vm.user.get('full_name')[0].toUpperCase() || vm.user.get('username')[0].toUpperCase()}}
.avatar(ng-if="vm.user.get('avatar')") .avatar(ng-if="vm.user.get('avatar')")
img(ng-src="{{vm.user.get('avatar')}}") img(ng-src="{{vm.user.get('avatar')}}")
p {{vm.user.get('full_name') || vm.user.get('username')}} span.candidate-user-name {{vm.user.get('full_name') || vm.user.get('username')}}
h2.title(translate="PROJECT.IMPORT.WHO_IS") h2.title(translate="PROJECT.IMPORT.WHO_IS")

7
app/modules/projects/create/select-import-user-lightbox/select-import-user-lightbox.scss
View File

@ -9,11 +9,8 @@ tg-select-import-user-lightbox {
display: flex; display: flex;
justify-content: center; justify-content: center;
padding-bottom: 1.5rem; padding-bottom: 1.5rem;
p { .candidate-user-name {
margin-bottom: 0; margin-left: .5rem;
}
.empty {
margin-right: .5rem;
} }
.user-list-avatar { .user-list-avatar {
background-color: $red; background-color: $red;