Skip to content
Browse files

Merge remote-tracking branch 'origin/i0073'

  • Loading branch information...
2 parents 2fc5513 + 8130b88 commit 3af70a7cf6d367525220d4e384db1186dd89010f @cutsea110 committed Feb 28, 2012
Showing with 9 additions and 7 deletions.
  1. +3 −2 templates/newproject.julius
  2. +6 −5 templates/project.julius
View
5 templates/newproject.julius
@@ -76,7 +76,8 @@ function mkUser(u){
var div = $("<div class='inline user'/>")
.attr({uid: u.id, ident: u.ident, fullname: u.name, eyear: u.entryYear})
.addClass(u.role+' user-logo'),
+ i = $('<div/>').text(u.ident).hide(),
avatar = $("<img class='avatar'/>").attr({src: u.avatar}),
- s =$('<a/>').attr({href: u.uri}).html(u.name+'<br/>('+u.ident+')');
- return div.append(s).append(avatar);
+ s =$('<a/>').attr({href: u.uri}).html(u.name);
+ return div.append(i).append(s).append(avatar);
}
View
11 templates/project.julius
@@ -203,17 +203,18 @@ function mkUser(u, ps){
var div = $("<div class='inline user'/>")
.attr({uid: u.id, ident: u.ident, fullname: u.name, eyear: u.entryYear})
.addClass(u.role+' user-logo'),
+ i = $('<div/>').text(u.ident).hide(),
c = $('<input/>').attr({type:'checkbox'}),
avatar = $("<img class='avatar'/>").attr({src: u.avatar}),
- s =$('<a/>').attr({href: u.uri}).html(u.name+'<br/>('+u.ident+')'),
+ s =$('<a/>').attr({href: u.uri}).html(u.name),
mail = $('<img/>').addClass('mail');
if (ps[u.id]){
switch (ps[u.id].receivemail){
- case 'True':
+ case true:
mail.attr({src: '@{StaticR img_mail_accept_png}', receivemail: 'send'});
break;
- case 'False':
+ case false:
mail.attr({src: '@{StaticR img_mail_error_png}', receivemail: 'stop'});
break;
}
@@ -222,7 +223,7 @@ function mkUser(u, ps){
}
if('#{show (canEditProjectSetting self)}'=='False')
- return div.append(s).append(mail).append(avatar);
+ return div.append(i).append(s).append(mail).append(avatar);
if (ps[u.id])c.attr('checked', true);
c.click(function(){
@@ -235,7 +236,7 @@ function mkUser(u, ps){
.attr({src: mail.attr('src'), receivemail: mail.attr('receivemail')});
}).addClass('clickable');
- return div.append(c).append(s).append(mail).append(avatar);
+ return div.append(i).append(c).append(s).append(mail).append(avatar);
}
function modifyParticipant(c){

0 comments on commit 3af70a7

Please sign in to comment.
Something went wrong with that request. Please try again.