From 309e3b09942389bd92205fc04d5e73088a30df60 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sat, 31 Mar 2012 18:15:08 +0100
Subject: [PATCH 1/2] fix pitas fix

---
 node/db/PadManager.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/node/db/PadManager.js b/node/db/PadManager.js
index 4e3a31999..5f08b1b1b 100644
--- a/node/db/PadManager.js
+++ b/node/db/PadManager.js
@@ -115,7 +115,13 @@ exports.doesPadExists = function(padId, callback)
   db.get("pad:"+padId, function(err, value)
   {
     if(ERR(err, callback)) return;
-    callback(null, value != null && value.atext);  
+    if(value != null && value.atext){
+      callback(null, true);
+    }
+    else
+    {
+      callback(null, false); 
+    }
   });
 }
 

From c3095bbd1b2e87ef975d88d73889a391a6b78260 Mon Sep 17 00:00:00 2001
From: 0ip <me@factor.cc>
Date: Mon, 9 Apr 2012 15:16:40 +0200
Subject: [PATCH 2/2] improved userlist ux (prevent overlapping of objects)

---
 src/static/css/pad.css        | 1 -
 src/static/js/pad_userlist.js | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index 21f365e24..324303698 100644
--- a/src/static/css/pad.css
+++ b/src/static/css/pad.css
@@ -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;
diff --git a/src/static/js/pad_userlist.js b/src/static/js/pad_userlist.js
index 5a3f9b355..47ee63a7c 100644
--- a/src/static/js/pad_userlist.js
+++ b/src/static/js/pad_userlist.js
@@ -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)