fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #616 from 0ip/develop 

Userlist: users now don't overlap other objects
This commit is contained in:
John McLear 2012-04-09 06:25:29 -07:00
parent 18038ddd50 c3095bbd1b
commit 49b4fdfce3
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/static/css/pad.css
View File

@ -427,7 +427,6 @@ table#otheruserstable { display: none; }
#nootherusers a { color: #3C88FF; }
#otheruserstable td {
border-top: 1px solid #555;
height: 26px;
vertical-align: middle;
padding: 0 2px;

4
src/static/js/pad_userlist.js
View File

@ -1,4 +1,4 @@
/**
+/**
* This code is mostly from the old Etherpad. Please help us to comment this code.
* This helps other people to understand this code better and helps them to improve it.
* TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
@ -120,7 +120,7 @@ var paduserlist = (function()
nameHtml = '<input type="text" class="editempty newinput" value="unnamed" ' + (isNameEditable(data) ? '' : 'disabled="disabled" ') + '/>';
}
return ['<td style="height:', height, 'px" class="usertdswatch"><div class="swatch" style="background:' + data.color + '">&nbsp;</div></td>', '<td style="height:', height, 'px" class="usertdname">', nameHtml, '</td>', '<td style="height:', height, 'px" class="usertdstatus">', padutils.escapeHtml(data.status), '</td>', '<td style="height:', height, 'px" class="activity">', padutils.escapeHtml(data.activity), '</td>'].join('');
return ['<td style="height:', height, 'px" class="usertdswatch"><div class="swatch" style="background:' + data.color + '">&nbsp;</div></td>', '<td style="height:', height, 'px" class="usertdname">', nameHtml, '</td>', '<td style="height:', height, 'px" class="activity">', padutils.escapeHtml(data.activity), '</td>'].join('');
}
function getRowHtml(id, innerHtml)