From 858d8e6e7103712656c79e72a22daba4cbd505b3 Mon Sep 17 00:00:00 2001
From: Jordan Hollinger <jordan.hollinger@gmail.com>
Date: Fri, 18 Jan 2013 11:13:03 -0500
Subject: [PATCH 1/3] listAllPads should return an object, not an arraay. issue
 #1374

---
 src/node/db/API.js        | 2 +-
 src/node/db/PadManager.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/node/db/API.js b/src/node/db/API.js
index ee12d1d98..9cad415d0 100644
--- a/src/node/db/API.js
+++ b/src/node/db/API.js
@@ -46,7 +46,7 @@ exports.createGroupPad = groupManager.createGroupPad;
 /**PADLIST FUNCTION****/
 /**********************/
 
-exports.listAllPads = padManager.getPads;
+exports.listAllPads = padManager.listAllPads;
 
 /**********************/
 /**AUTHOR FUNCTIONS****/
diff --git a/src/node/db/PadManager.js b/src/node/db/PadManager.js
index 8cd69a83e..5e0af4643 100644
--- a/src/node/db/PadManager.js
+++ b/src/node/db/PadManager.js
@@ -158,12 +158,12 @@ exports.getPad = function(id, text, callback)
   }
 }
 
-exports.getPads = function(callback)
+exports.listAllPads = function(callback)
 {
   if(callback != null){
-    callback(null,padList.getPads());
+    callback(null,{padIDs: padList.getPads()});
   }else{
-    return padList.getPads();
+    return {padIDs: padList.getPads()};
   }
 }
 

From 9ee5098ad6f0db2dc6b495c316520199c2aae2b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
Date: Sat, 19 Jan 2013 19:17:52 +0000
Subject: [PATCH 2/3] listAllPads needs findKeys from ueberDB 0.1.9

---
 src/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/package.json b/src/package.json
index 81e6ff164..449694ed7 100644
--- a/src/package.json
+++ b/src/package.json
@@ -16,7 +16,7 @@
                       "require-kernel"          : "1.0.5",
                       "resolve"                 : "0.2.x",
                       "socket.io"               : "0.9.x",
-                      "ueberDB"                 : "0.1.x",
+                      "ueberDB"                 : "0.1.9",
                       "async"                   : "0.1.x",
                       "express"                 : "3.x",
                       "connect"                 : "2.4.x",

From 9c364d7d385ddb4e91b419e65731973304c61d10 Mon Sep 17 00:00:00 2001
From: mluto <m@luto.at>
Date: Sun, 20 Jan 2013 13:56:51 +0100
Subject: [PATCH 3/3] Added a template block for #users

---
 src/templates/pad.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/templates/pad.html b/src/templates/pad.html
index a4de8ed8f..274a3b1a0 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -153,6 +153,7 @@
         </div>
 
         <div id="users">
+            <% e.begin_block("userlist"); %>
             <div id="connectionstatus"></div>
             <div id="myuser">
                 <div id="mycolorpicker">
@@ -173,6 +174,7 @@
                 <div id="nootherusers"></div>
             </div>
             <div id="userlistbuttonarea"></div>
+            <% e.end_block(); %>
         </div>
 
         <div id="editorcontainerbox">