Merge branch 'develop' of github.com:ether/etherpad-lite into develop

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****/

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()};
   }
 }
 

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",

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">