From 1bf526124d5e7f8949504b7f2ed225b201f66178 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 20 Jan 2013 22:34:27 +0000
Subject: [PATCH 01/32] resolve #1349

---
 src/static/js/admin/plugins.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js
index ddff767bf..2682d97d6 100644
--- a/src/static/js/admin/plugins.js
+++ b/src/static/js/admin/plugins.js
@@ -124,9 +124,16 @@ $(document).ready(function () {
       var version = '0.0.0';
       // hack to access "versions" property of the npm package object
       for (version in data.results[plugin_name].versions) break;
-
       for (attr in plugin) {
-        row.find("." + attr).html(plugin[attr]);
+        if(attr != "name"){ // Hack to rewrite URLS into name
+          row.find("." + attr).html(plugin[attr]);
+        }else{
+          if(plugin['url']){
+            row.find(".name").html("<a href='"+plugin['url'] +"'>"+plugin[attr]+"</a>");
+          }else{
+            row.find(".name").html(plugin["name"]);
+          }
+        }
       }
       row.find(".version").html(version);
       

From 4cbf3869c69f71730e7d298bb42802d9c312a8b0 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 20 Jan 2013 22:36:58 +0000
Subject: [PATCH 02/32] open in external window

---
 src/static/js/admin/plugins.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js
index 2682d97d6..2758290d2 100644
--- a/src/static/js/admin/plugins.js
+++ b/src/static/js/admin/plugins.js
@@ -129,7 +129,7 @@ $(document).ready(function () {
           row.find("." + attr).html(plugin[attr]);
         }else{
           if(plugin['url']){
-            row.find(".name").html("<a href='"+plugin['url'] +"'>"+plugin[attr]+"</a>");
+            row.find(".name").html("<a target='_blank' href='"+plugin['url'] +"'>"+plugin[attr]+"</a>");
           }else{
             row.find(".name").html(plugin["name"]);
           }

From 8bfa8a7e73143270df84fa180ce5656bfa404ed9 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 20 Jan 2013 22:42:32 +0000
Subject: [PATCH 03/32] better urls

---
 src/static/js/admin/plugins.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js
index 2758290d2..b1387aa7f 100644
--- a/src/static/js/admin/plugins.js
+++ b/src/static/js/admin/plugins.js
@@ -129,6 +129,7 @@ $(document).ready(function () {
           row.find("." + attr).html(plugin[attr]);
         }else{
           if(plugin['url']){
+            plugin['url'] = plugin['url'].replace("registry.","");
             row.find(".name").html("<a target='_blank' href='"+plugin['url'] +"'>"+plugin[attr]+"</a>");
           }else{
             row.find(".name").html(plugin["name"]);

From 441dd3785a59a3cd508dd5cf2f3709ce14dd5580 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 20 Jan 2013 23:11:59 +0000
Subject: [PATCH 04/32] fix issue #1110

---
 src/static/js/admin/plugins.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js
index b1387aa7f..8d1901d97 100644
--- a/src/static/js/admin/plugins.js
+++ b/src/static/js/admin/plugins.js
@@ -114,7 +114,11 @@ $(document).ready(function () {
     widget.data('total', data.total);
 
     widget.find('.offset').html(data.query.offset);
-    widget.find('.limit').html(data.query.offset + data.query.limit);
+    if (data.query.offset + data.query.limit > data.total){
+      widget.find('.limit').html(data.total);
+    }else{
+      widget.find('.limit').html(data.query.offset + data.query.limit);
+    }
     widget.find('.total').html(data.total);
 
     widget.find(".results *").remove();

From 159feceb2024b31308e98ad54551aa200dd360c8 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Tue, 22 Jan 2013 18:17:15 +0000
Subject: [PATCH 05/32] fix import without params

---
 src/static/js/pad_impexp.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/static/js/pad_impexp.js b/src/static/js/pad_impexp.js
index 257dfa667..745642569 100644
--- a/src/static/js/pad_impexp.js
+++ b/src/static/js/pad_impexp.js
@@ -212,10 +212,8 @@ var padimpexp = (function()
 
       //get /p/padname
       var pad_root_path = new RegExp(/.*\/p\/[^\/]+/).exec(document.location.pathname);
-      //get http://example.com/p/padname
-      var pad_root_url = document.location.href.replace(document.location.pathname, pad_root_path);
-      //strip out params IE ?noColor=true
-      pad_root_url = pad_root_url.substring(0, pad_root_url.indexOf('?'));
+      //get http://example.com/p/padname without Params
+      var pad_root_url = document.location.protocol + '//' + document.location.host + document.location.pathname;
 
       //i10l buttom import
       $('#importsubmitinput').val(html10n.get("pad.impexp.importbutton"));

From 6ae46ea8e33f40a8f98056f8ce37945e8a3f3a5b Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Tue, 22 Jan 2013 18:28:38 +0000
Subject: [PATCH 06/32] fix issue where url was wrong for install

---
 src/static/js/admin/plugins.js | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js
index 8d1901d97..a8b063041 100644
--- a/src/static/js/admin/plugins.js
+++ b/src/static/js/admin/plugins.js
@@ -47,13 +47,13 @@ $(document).ready(function () {
     $(".do-install").unbind('click').click(function (e) {
       var row = $(e.target).closest("tr");
       doUpdate = true;
-      socket.emit("install", row.find(".name").html());
+      socket.emit("install", row.find(".name").text());
     });
 
     $(".do-uninstall").unbind('click').click(function (e) {
       var row = $(e.target).closest("tr");
       doUpdate = true;
-      socket.emit("uninstall", row.find(".name").html());
+      socket.emit("uninstall", row.find(".name").text());
     });
 
     $(".do-prev-page").unbind('click').click(function (e) {
@@ -129,15 +129,10 @@ $(document).ready(function () {
       // hack to access "versions" property of the npm package object
       for (version in data.results[plugin_name].versions) break;
       for (attr in plugin) {
-        if(attr != "name"){ // Hack to rewrite URLS into name
-          row.find("." + attr).html(plugin[attr]);
+        if(attr == "name"){ // Hack to rewrite URLS into name
+          row.find(".name").html("<a target='_blank' href='https://npmjs.org/package/"+plugin['name']+"'>"+plugin[attr]+"</a>");
         }else{
-          if(plugin['url']){
-            plugin['url'] = plugin['url'].replace("registry.","");
-            row.find(".name").html("<a target='_blank' href='"+plugin['url'] +"'>"+plugin[attr]+"</a>");
-          }else{
-            row.find(".name").html(plugin["name"]);
-          }
+          row.find("." + attr).html(plugin[attr]);
         }
       }
       row.find(".version").html(version);

From b76f084f3a84df7199050acd3f11100c6a824040 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 23 Jan 2013 01:01:35 +0000
Subject: [PATCH 07/32] add eejs block for disconnect

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

diff --git a/src/templates/pad.html b/src/templates/pad.html
index 274a3b1a0..a2f0ffce8 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -328,10 +328,12 @@
                   <p data-l10n-id="pad.modals.deleted.explanation"></p>
                 </div>
                 <div class="disconnected">
+                  <% e.begin_block("disconnected"); %>
                   <h1 data-l10n-id="pad.modals.disconnected"></h1>
                   <h2 data-l10n-id="pad.modals.disconnected.explanation"></h2>
                   <p data-l10n-id="pad.modals.disconnected.cause"></p>
                   <button id="forcereconnect" data-l10n-id="pad.modals.forcereconnect"></button>
+                  <% e.end_block(); %>
                 </div>
                 <form id="reconnectform" method="post" action="/ep/pad/reconnect" accept-charset="UTF-8" style="display: none;">
                     <input type="hidden" class="padId" name="padId">

From 9129c6970a9feba886d9b15e8d6665e8054e2774 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 23 Jan 2013 02:46:57 +0000
Subject: [PATCH 08/32] add a html block eejs so you can add a cache manifest

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

diff --git a/src/templates/pad.html b/src/templates/pad.html
index 274a3b1a0..479409df0 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -3,7 +3,10 @@
     , langs = require("ep_etherpad-lite/node/hooks/i18n").availableLangs
 %>
 <!doctype html>
+<% e.begin_block("htmlHead"); %>
 <html>
+<% e.end_block(); %>
+
         <title><%=settings.title%></title>
         <script>
           /*

From 74185e79abdc6ac35e70304be5294b24be7495b0 Mon Sep 17 00:00:00 2001
From: goldquest <tjwelde@gmail.com>
Date: Wed, 23 Jan 2013 16:36:37 +0100
Subject: [PATCH 09/32] use the existing padimpexp object from the parent
 window

---
 src/node/handler/ImportHandler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/node/handler/ImportHandler.js b/src/node/handler/ImportHandler.js
index b87001416..ac856a604 100644
--- a/src/node/handler/ImportHandler.js
+++ b/src/node/handler/ImportHandler.js
@@ -176,7 +176,7 @@ exports.doImport = function(req, res, padId)
     ERR(err);
   
     //close the connection
-    res.send("<head><script type='text/javascript' src='../../static/js/jquery.js'></script></head><script>$(window).load(function(){if ( (!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf(\"1.8.\") == 0)) ){document.domain = document.domain;}var impexp = window.parent.require('/pad_impexp').padimpexp.handleFrameCall('" + status + "');})</script>", 200);
+    res.send("<head><script type='text/javascript' src='../../static/js/jquery.js'></script></head><script>$(window).load(function(){if ( (!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf(\"1.8.\") == 0)) ){document.domain = document.domain;}var impexp = window.parent.padimpexp.handleFrameCall('" + status + "');})</script>", 200);
   });
 }
 

From 25e1ed2d0cd6ea60668c853bc3f7e168df280b1c Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Wed, 23 Jan 2013 17:40:10 +0100
Subject: [PATCH 10/32] Fix Array.prototype.indexOf for IE8! <3

---
 src/static/js/html10n.js | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/src/static/js/html10n.js b/src/static/js/html10n.js
index b2c4e6195..d0d14814b 100644
--- a/src/static/js/html10n.js
+++ b/src/static/js/html10n.js
@@ -21,6 +21,8 @@
  * IN THE SOFTWARE.
  */
 window.html10n = (function(window, document, undefined) {
+  
+  // fix console
   var console = window.console
   function interceptConsole(method){
       if (!console) return function() {}
@@ -44,6 +46,39 @@ window.html10n = (function(window, document, undefined) {
     , consoleError = interceptConsole('warn')
 
 
+  // fix Array.prototype.instanceOf in, guess what, IE! <3
+  if (!Array.prototype.indexOf) {
+    Array.prototype.indexOf = function (searchElement /*, fromIndex */ ) {
+      "use strict";
+      if (this == null) {
+        throw new TypeError();
+      }
+      var t = Object(this);
+      var len = t.length >>> 0;
+      if (len === 0) {
+        return -1;
+      }
+      var n = 0;
+      if (arguments.length > 1) {
+        n = Number(arguments[1]);
+        if (n != n) { // shortcut for verifying if it's NaN
+            n = 0;
+        } else if (n != 0 && n != Infinity && n != -Infinity) {
+            n = (n > 0 || -1) * Math.floor(Math.abs(n));
+        }
+      }
+      if (n >= len) {
+        return -1;
+      }
+      var k = n >= 0 ? n : Math.max(len - Math.abs(n), 0);
+      for (; k < len; k++) {
+        if (k in t && t[k] === searchElement) {
+            return k;
+        }
+      }
+      return -1;
+    }
+  }
     
   /**
    * MicroEvent - to make any js object an event emitter (server or browser)

From 9fa5b9506edc54df3b3fd6370b122877e4edc256 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Thu, 24 Jan 2013 13:43:42 +0100
Subject: [PATCH 11/32] Add links for installed plugins

---
 src/static/js/admin/plugins.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js
index a8b063041..03f6203b8 100644
--- a/src/static/js/admin/plugins.js
+++ b/src/static/js/admin/plugins.js
@@ -151,7 +151,11 @@ $(document).ready(function () {
       var row = $("#installed-plugin-template").clone();
 
       for (attr in plugin.package) {
-        row.find("." + attr).html(plugin.package[attr]);
+        if(attr == "name"){ // Hack to rewrite URLS into name
+          row.find(".name").html("<a target='_blank' href='https://npmjs.org/package/"+plugin.package['name']+"'>"+plugin.package[attr]+"</a>");
+        }else{
+          row.find("." + attr).html(plugin.package[attr]);
+        }
       }
       $("#installed-plugins").append(row);
     }

From 3719ce7c5d2908886176b32bf923139ed06d7124 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Thu, 24 Jan 2013 13:50:49 +0100
Subject: [PATCH 12/32] [admin] Make links prettier

---
 src/static/css/admin.css | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/static/css/admin.css b/src/static/css/admin.css
index b91850a65..d82da6aa3 100644
--- a/src/static/css/admin.css
+++ b/src/static/css/admin.css
@@ -128,3 +128,13 @@ td, th {
 #response{
   display:inline;
 }
+
+a:link, a:visited, a:hover, a:focus {
+  color: #333333;
+  text-decoration: none;
+  border-bottom: #333333 1px dotted;
+}
+
+a:focus, a:hover {
+  border-bottom: #333333 1px solid;
+}
\ No newline at end of file

From 569fb8d3c8b21ba4f5fcbf49a9995c9396e62bde Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Thu, 24 Jan 2013 16:48:40 +0000
Subject: [PATCH 13/32] silly little bug now resolved

---
 src/static/js/broadcast_slider.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/static/js/broadcast_slider.js b/src/static/js/broadcast_slider.js
index d4fbef81c..83483537f 100644
--- a/src/static/js/broadcast_slider.js
+++ b/src/static/js/broadcast_slider.js
@@ -361,7 +361,11 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded)
           $(self).css('left', newloc);
           // if(getSliderPosition() != Math.floor(newloc * sliderLength / ($("#ui-slider-bar").width()-2)))
           setSliderPosition(Math.floor(newloc * sliderLength / ($("#ui-slider-bar").width() - 2)))
-          self.currentLoc = parseInt($(self).css('left'));
+          if(parseInt($(self).css('left')) < 2){
+            $(self).css('left', '2px');
+          }else{
+            self.currentLoc = parseInt($(self).css('left'));
+          }
         });
       })
 

From 2eccaa2afd9a72bd8be40b090c9d999d9388f5b4 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Thu, 24 Jan 2013 18:46:15 +0100
Subject: [PATCH 14/32] Add a uniform menu to all admin pages

---
 src/static/css/admin.css              | 49 ++++++++++++++++++++++-----
 src/templates/admin/index.html        | 13 +++----
 src/templates/admin/plugins-info.html | 31 +++++++++++------
 src/templates/admin/plugins.html      | 15 +++++---
 src/templates/admin/settings.html     | 24 +++++++++----
 5 files changed, 96 insertions(+), 36 deletions(-)

diff --git a/src/static/css/admin.css b/src/static/css/admin.css
index d82da6aa3..cc3e49344 100644
--- a/src/static/css/admin.css
+++ b/src/static/css/admin.css
@@ -7,18 +7,51 @@ body {
   background: -moz-radial-gradient(circle,#aaa,#eee 60%) center fixed;
   background: -ms-radial-gradient(circle,#aaa,#eee 60%) center fixed;
   background: -o-radial-gradient(circle,#aaa,#eee 60%) center fixed;
-  border-top: 8px solid rgba(51,51,51,.8);
 }
-#wrapper {
-  margin-top: 160px;
+
+#topborder {
+     border-top: 8px solid rgba(51, 51, 51, 0.8);
+     position: fixed;
+     top: 0px;
+     width: 100%;
+}
+
+div.menu {
+   background: none repeat scroll 0% 0% rgba(255, 255, 255, 0.75);
+   box-shadow: 0px -4px 4px rgba(0, 0, 0, 0.3);
+   display: block;
+   float: left;
+   height: 100%;
+   padding: 15px;
+   position: fixed;
+   width: 220px;
+}
+
+div.menu li {
+  list-style: none;
+  margin-left: 3px;
+  line-height: 1.6
+}
+
+div.innerwrapper {
+  display: block;
+  float: right;
+  opacity: 0.9;
   padding: 15px;
-  background: #fff;
-  opacity: .9;
-  box-shadow: 0px 1px 8px rgba(0,0,0,0.3);
-  max-width: 700px;
-  margin: auto;
+  width: 860px;
   border-radius: 0 0 7px 7px;
 }
+
+#wrapper {
+  background: none repeat scroll 0px 0px #FFFFFF;
+  box-shadow: 0px 1px 8px rgba(0, 0, 0, 0.3);
+  margin: auto;
+  max-width: 1150px;
+  min-height: 100%;
+  overflow: auto;
+  padding-left: 15px;
+  opacity: .9;
+}
 h1 {
   font-size: 29px;
 }
diff --git a/src/templates/admin/index.html b/src/templates/admin/index.html
index 5f1d0188e..00e147c9a 100644
--- a/src/templates/admin/index.html
+++ b/src/templates/admin/index.html
@@ -8,13 +8,14 @@
   </head>
   <body>
     <div id="wrapper">
-      <h1>Etherpad Lite Admin Dashboard</h1>
-      <div>
-      <a href="../admin/plugins">Install and Uninstall plugins</a>
-      </div>
-      <div>
-      <a href="../admin/settings">Modify Server and Plugin Settings</a>
+      <div class="menu">
+        <h1>Etherpad lite</h1> 
+        <li><a href="admin/plugins">Plugin manager</a> </li>
+        <li><a href="admin/settings">Settings</a> </li>
+        <li><a href="admin/plugins/info">Troubleshooting information</a> </li>
       </div>
+
     </div>
+    <div id="topborder"></div>
   </body>
 </html>
diff --git a/src/templates/admin/plugins-info.html b/src/templates/admin/plugins-info.html
index 94f94e2ac..94a20220e 100644
--- a/src/templates/admin/plugins-info.html
+++ b/src/templates/admin/plugins-info.html
@@ -10,21 +10,30 @@
   </head>
   <body>
     <div id="wrapper">
-      <h1>Etherpad Lite</h1>
-      <div class="separator"></div>
+      <div class="menu">
+        <h1>Etherpad lite</h1> 
+        <li><a href="../plugins">Plugin manager</a> </li>
+        <li><a href="../settings">Settings</a> </li>
+        <li><a href="../plugins/info">Troubleshooting information</a> </li>
+      </div>
 
-      <h2>Installed plugins</h2>
-      <pre><%- plugins.formatPlugins().replace(", ","\n") %></pre>
+      <div class="innerwrapper">
 
-      <h2>Installed parts</h2>
-      <pre><%= plugins.formatParts() %></pre>
+        <h2>Installed plugins</h2>
+        <pre><%- plugins.formatPlugins().replace(", ","\n") %></pre>
 
-      <h2>Installed hooks</h2>
-      <h3>Server side hooks</h3>
-      <div><%- plugins.formatHooks() %></div>
+        <h2>Installed parts</h2>
+        <pre><%= plugins.formatParts() %></pre>
 
-      <h3>Client side hooks</h3>
-      <div><%- plugins.formatHooks("client_hooks") %></div>
+        <h2>Installed hooks</h2>
+        <h3>Server side hooks</h3>
+        <div><%- plugins.formatHooks() %></div>
+
+        <h3>Client side hooks</h3>
+        <div><%- plugins.formatHooks("client_hooks") %></div>
+        
+      </div>
     </div>
+    <div id="topborder"></div>
   </body>
 </html>
diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html
index 394cf0e06..cb19977d2 100644
--- a/src/templates/admin/plugins.html
+++ b/src/templates/admin/plugins.html
@@ -19,11 +19,14 @@
       <% } %>
 
 
-      <h1>Etherpad Lite</h1>
+       <div class="menu">
+        <h1>Etherpad lite</h1> 
+        <li><a href="plugins">Plugin manager</a> </li>
+        <li><a href="settings">Settings</a> </li>
+        <li><a href="plugins/info">Troubleshooting information</a> </li>
+      </div>
 
-      <a href="plugins/info">Technical information on installed plugins</a>
-
-      <div class="separator"></div>
+      <div class="innerwrapper">
       <h2>Installed plugins</h2>
       <table>
         <thead>
@@ -81,6 +84,8 @@
         <span class="offset"></span>..<span class="limit"></span> of <span class="total"></span>.
         <input type="button" value=">>" class="do-next-page">
       </div>
+      
+      </div>
 
       <div id="progress" class="dialog">
         <h1 class="title">
@@ -90,5 +95,7 @@
         <div class="history"></div>
       </div>
     </div>
+    
+    <div id="topborder"></div>
   </body>
 </html>
diff --git a/src/templates/admin/settings.html b/src/templates/admin/settings.html
index c4f505788..098e0aea1 100644
--- a/src/templates/admin/settings.html
+++ b/src/templates/admin/settings.html
@@ -22,13 +22,23 @@
       <% } %>
 
 
-      <h1>Etherpad Lite Settings</h1>
-      <a href='https://github.com/ether/etherpad-lite/wiki/Example-Production-Settings.JSON'>Example production settings template</a>
-      <a href='https://github.com/ether/etherpad-lite/wiki/Example-Development-Settings.JSON'>Example development settings template</a>
-      <textarea class="settings"></textarea>
-      <input type="button" class="settingsButton" id="saveSettings" value="Save Settings">
-      <input type="button" class="settingsButton" id="restartEtherpad" value="Restart Etherpad">
-      <div id="response"></div>
+      <div class="menu">
+        <h1>Etherpad lite</h1> 
+        <li><a href="plugins">Plugin manager</a> </li>
+        <li><a href="settings">Settings</a> </li>
+        <li><a href="plugins/info">Troubleshooting information</a> </li>
+      </div>
+
+      <div class="innerwrapper">
+        <a href='https://github.com/ether/etherpad-lite/wiki/Example-Production-Settings.JSON'>Example production settings template</a>
+        <a href='https://github.com/ether/etherpad-lite/wiki/Example-Development-Settings.JSON'>Example development settings template</a>
+        <textarea class="settings"></textarea>
+        <input type="button" class="settingsButton" id="saveSettings" value="Save Settings">
+        <input type="button" class="settingsButton" id="restartEtherpad" value="Restart Etherpad">
+        <div id="response"></div>
+      </div>
     </div>
+    
+    <div id="topborder"></div>
   </body>
 </html>

From 7c06dc750c719fee92e76d09d6b5c3da11cee56b Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Thu, 24 Jan 2013 18:46:32 +0100
Subject: [PATCH 15/32] Unify admin page titles

---
 src/templates/admin/index.html        | 2 +-
 src/templates/admin/plugins-info.html | 2 +-
 src/templates/admin/plugins.html      | 2 +-
 src/templates/admin/settings.html     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/templates/admin/index.html b/src/templates/admin/index.html
index 00e147c9a..16ea84279 100644
--- a/src/templates/admin/index.html
+++ b/src/templates/admin/index.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>Etherpad Lite Admin Dashboard</title>
+    <title>Admin Dashboard - Etherpad lite</title>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
     <link rel="stylesheet" href="../static/css/admin.css">
     <script src="../static/js/jquery.js"></script>
diff --git a/src/templates/admin/plugins-info.html b/src/templates/admin/plugins-info.html
index 94a20220e..605b23d38 100644
--- a/src/templates/admin/plugins-info.html
+++ b/src/templates/admin/plugins-info.html
@@ -4,7 +4,7 @@
 
 <html>
   <head>
-    <title>Plugin information</title>
+    <title>Plugin information - Etherpad lite</title>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
     <link rel="stylesheet" href="../../static/css/admin.css">
   </head>
diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html
index cb19977d2..914812a6d 100644
--- a/src/templates/admin/plugins.html
+++ b/src/templates/admin/plugins.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>Plugin manager</title>
+    <title>Plugin manager - Etherpad lite</title>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
     <link rel="stylesheet" href="../static/css/admin.css">
     <script src="../static/js/jquery.js"></script>
diff --git a/src/templates/admin/settings.html b/src/templates/admin/settings.html
index 098e0aea1..be262f243 100644
--- a/src/templates/admin/settings.html
+++ b/src/templates/admin/settings.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>Settings manager</title>
+    <title>Settings - Etherpad lite</title>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
     <link rel="stylesheet" href="../static/css/admin.css">
     <script src="../static/js/jquery.js"></script>

From 1f7140345a7a254f090f32730d4c99c618549e02 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Thu, 24 Jan 2013 20:03:07 +0000
Subject: [PATCH 16/32] index wrapper block

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

diff --git a/src/templates/index.html b/src/templates/index.html
index f0e1beb3f..c3c13db32 100644
--- a/src/templates/index.html
+++ b/src/templates/index.html
@@ -150,6 +150,7 @@
         <link href="static/custom/index.css" rel="stylesheet"> 
 
         <div id="wrapper">
+        <% e.begin_block("indexWrapper"); %>
             <div id="inner">
                 <div id="button" onclick="go2Random()" data-l10n-id="index.newPad"></div>
                 <div id="label" data-l10n-id="index.createOpenPad"></div> 
@@ -158,6 +159,7 @@
                     <button type="submit">OK</button>
                 </form>
             </div>
+        <% e.end_block(); %>
         </div>
 
         <script src="static/custom/index.js"></script>

From fa55cd47598a1813d16ec48e4402f3bebfc43e80 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Thu, 24 Jan 2013 22:39:52 +0100
Subject: [PATCH 17/32] [/admin/plugins] Add real-time on keypress search

also, I reduced the size of the activity indicator
---
 src/static/css/admin.css         | 40 +++++---------------------------
 src/static/js/admin/plugins.js   | 35 +++++++++++++++-------------
 src/templates/admin/plugins.html | 22 +++++++-----------
 3 files changed, 34 insertions(+), 63 deletions(-)

diff --git a/src/static/css/admin.css b/src/static/css/admin.css
index cc3e49344..4669e4b98 100644
--- a/src/static/css/admin.css
+++ b/src/static/css/admin.css
@@ -86,9 +86,6 @@ input[type="button"].do-install, input[type="button"].do-uninstall {
   float: right;
   width: 100px;
 }
-input[type="button"]#do-search {
-  display: block;
-}
 input[type="text"] {
   border-radius: 3px;
   box-sizing: border-box;
@@ -117,41 +114,16 @@ td, th {
 .template {
   display: none;
 }
-.dialog {
-  display: none;
+#progress {
   position: absolute;
-  left: 50%;
-  top: 50%;
-  width: 700px;
-  height: 500px;
-  margin-left: -350px;
-  margin-top: -250px;
-  border: 3px solid #999;
-  background: #eee;
+  bottom: 50px;
 }
-.dialog .title {
-  margin: 0;
-  padding: 2px;
-  border-bottom: 3px solid #999;
-  font-size: 24px;
-  line-height: 24px;
-  height: 24px;
-  overflow: hidden;
-}
-.dialog .title .close {
+#progress .historylink {
   float: right;
-  padding: 1px 10px;
 }
-.dialog .history {
-  background: #222;
-  color: #eee;
-  position: absolute;
-  top: 41px;
-  bottom: 10px;
-  left: 10px;
-  right: 10px;
-  padding: 2px;
-  overflow: auto;
+#progress .history {
+  white-space: pre;
+  font-family: monospace;
 }
 .settings {
   margin-top:10px;
diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js
index 03f6203b8..d0058522b 100644
--- a/src/static/js/admin/plugins.js
+++ b/src/static/js/admin/plugins.js
@@ -25,10 +25,6 @@ $(document).ready(function () {
   }
 
   function updateHandlers() {
-    $("#progress.dialog .close").unbind('click').click(function () {
-      $("#progress.dialog").hide();
-    });
-
     $("form").submit(function(){
       var query = $('.search-results').data('query');
       query.pattern = $("#search-query").val();
@@ -36,8 +32,8 @@ $(document).ready(function () {
       search();
       return false;
     });
-
-    $("#do-search").unbind('click').click(function () {
+    
+    $("#search-query").unbind('keyup').keyup(function () {
       var query = $('.search-results').data('query');
       query.pattern = $("#search-query").val();
       query.offset = 0;
@@ -72,37 +68,44 @@ $(document).ready(function () {
       }
       search();
     });
+    
+    $('#progress .showhistory').unbind('click').click(function() {
+        $("#progress .history").toggle()
+    });
   }
 
   updateHandlers();
 
   socket.on('progress', function (data) {
-    if (data.progress > 0 && $('#progress.dialog').data('progress') > data.progress) return;
+    if (data.progress > 0 && $('#progress').data('progress') > data.progress) return;
 
-    $("#progress.dialog .close").hide();
-    $("#progress.dialog").show();
+    $("#progress .history").hide();
+    $("#progress").show();
 
-    $('#progress.dialog').data('progress', data.progress);
+    $('#progress').data('progress', data.progress);
 
     var message = "Unknown status";
     if (data.message) {
       message = "<span class='status'>" + data.message.toString() + "</span>";
     }
     if (data.error) {
-      message = "<span class='error'>" + data.error.toString() + "<span>";            
+      data.progress = 1;
     }
-    $("#progress.dialog .message").html(message);
-    $("#progress.dialog .history").append("<div>" + message + "</div>");
+    
+    $("#progress .message").html(message);
+    $("#progress .history").append("<div>" + message + "</div>");
 
     if (data.progress >= 1) {
+      $("#progress").hide();
+      $("#progress .history").html('');
+      
       if (data.error) {
-        $("#progress.dialog .close").show();
-      } else {
+        alert('An error occurred: '+data.error+' -- the server log might know more...');
+      }else {
         if (doUpdate) {
           doUpdate = false;
           socket.emit("load");
         }
-        $("#progress.dialog").hide();
       }
     }
   });
diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html
index 914812a6d..12f801580 100644
--- a/src/templates/admin/plugins.html
+++ b/src/templates/admin/plugins.html
@@ -18,12 +18,16 @@
         </div>
       <% } %>
 
-
        <div class="menu">
         <h1>Etherpad lite</h1> 
         <li><a href="plugins">Plugin manager</a> </li>
         <li><a href="settings">Settings</a> </li>
         <li><a href="plugins/info">Troubleshooting information</a> </li>
+        
+        <div id="progress">
+          <p><img src="../static/img/loading.gif" alt=""/>&nbsp;&nbsp;<span class="message"></span> <a class="showhistory" href="javascript:void(0)">(show&nbsp;progress)</a></p>
+          <div class="history"></div>
+        </div>
       </div>
 
       <div class="innerwrapper">
@@ -53,11 +57,12 @@
 
       <div class="paged listing search-results">
         <div class="separator"></div>
-        <h2>Search for plugins to install</h2>
+        
+        <h2>Available plugins</h2>
         <form>
-          <input type="text" name="search" placeholder="Search term" id="search-query">
-          <input type="button" value="Search" id="do-search">
+          <input type="text" name="search" placeholder="Search for plugins to install" id="search-query">
         </form>
+
         <table>
           <thead>
             <tr>
@@ -86,16 +91,7 @@
       </div>
       
       </div>
-
-      <div id="progress" class="dialog">
-        <h1 class="title">
-          Please wait: <span class="message"></span>
-        <input type="button" class="close" value="Close">
-        </h1>
-        <div class="history"></div>
-      </div>
     </div>
-    
     <div id="topborder"></div>
   </body>
 </html>

From 23dd4c73e225eac8a624d43e7590cef405956b2a Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Thu, 24 Jan 2013 22:40:31 +0100
Subject: [PATCH 18/32] pluginfw/installer.js: Don't freak out users with
 cryptic errors, just use the error message

---
 src/static/js/pluginfw/installer.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/static/js/pluginfw/installer.js b/src/static/js/pluginfw/installer.js
index e491f0771..eb10f8afd 100644
--- a/src/static/js/pluginfw/installer.js
+++ b/src/static/js/pluginfw/installer.js
@@ -15,7 +15,10 @@ var withNpm = function (npmfn, final, cb) {
       cb({progress: 0.5, message:message.msg + ": " + message.pref});
     });
     npmfn(function (er, data) {
-      if (er) return cb({progress:1, error:er.code + ": " + er.path});
+      if (er) {
+        console.error(er);
+        return cb({progress:1, error: er.message});
+      }
       if (!data) data = {};
       data.progress = 1;
       data.message = "Done.";

From 3e793b8a633977885a9ad195851cf634b98f0f3c Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Thu, 24 Jan 2013 23:00:56 +0100
Subject: [PATCH 19/32] [/admin/plugins] remove progress history

---
 src/static/css/admin.css         | 7 -------
 src/static/js/admin/plugins.js   | 9 +--------
 src/templates/admin/plugins.html | 5 +----
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/src/static/css/admin.css b/src/static/css/admin.css
index 4669e4b98..0d9471268 100644
--- a/src/static/css/admin.css
+++ b/src/static/css/admin.css
@@ -118,13 +118,6 @@ td, th {
   position: absolute;
   bottom: 50px;
 }
-#progress .historylink {
-  float: right;
-}
-#progress .history {
-  white-space: pre;
-  font-family: monospace;
-}
 .settings {
   margin-top:10px;
   width:100%;  
diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js
index d0058522b..ed38fc4e7 100644
--- a/src/static/js/admin/plugins.js
+++ b/src/static/js/admin/plugins.js
@@ -68,10 +68,6 @@ $(document).ready(function () {
       }
       search();
     });
-    
-    $('#progress .showhistory').unbind('click').click(function() {
-        $("#progress .history").toggle()
-    });
   }
 
   updateHandlers();
@@ -79,25 +75,22 @@ $(document).ready(function () {
   socket.on('progress', function (data) {
     if (data.progress > 0 && $('#progress').data('progress') > data.progress) return;
 
-    $("#progress .history").hide();
     $("#progress").show();
 
     $('#progress').data('progress', data.progress);
 
     var message = "Unknown status";
     if (data.message) {
-      message = "<span class='status'>" + data.message.toString() + "</span>";
+      message = data.message.toString();
     }
     if (data.error) {
       data.progress = 1;
     }
     
     $("#progress .message").html(message);
-    $("#progress .history").append("<div>" + message + "</div>");
 
     if (data.progress >= 1) {
       $("#progress").hide();
-      $("#progress .history").html('');
       
       if (data.error) {
         alert('An error occurred: '+data.error+' -- the server log might know more...');
diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html
index 12f801580..a85db557a 100644
--- a/src/templates/admin/plugins.html
+++ b/src/templates/admin/plugins.html
@@ -24,10 +24,7 @@
         <li><a href="settings">Settings</a> </li>
         <li><a href="plugins/info">Troubleshooting information</a> </li>
         
-        <div id="progress">
-          <p><img src="../static/img/loading.gif" alt=""/>&nbsp;&nbsp;<span class="message"></span> <a class="showhistory" href="javascript:void(0)">(show&nbsp;progress)</a></p>
-          <div class="history"></div>
-        </div>
+        <div id="progress"><img src="../static/img/loading.gif" alt=""/>&nbsp;&nbsp;<span class="message"></span></div>
       </div>
 
       <div class="innerwrapper">

From 82e681fb14e5b7dbd5b726803cf114f453787acd Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Thu, 24 Jan 2013 22:39:32 +0000
Subject: [PATCH 20/32] Update settings.json.template

---
 settings.json.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.json.template b/settings.json.template
index 04c097517..4b18d7800 100644
--- a/settings.json.template
+++ b/settings.json.template
@@ -101,5 +101,5 @@
   "loglevel": "INFO",
 
   // restrict socket.io transport methods
-  "socketTransportProtocols" : ['xhr-polling', 'jsonp-polling', 'htmlfile']
+  "socketTransportProtocols" : ["xhr-polling", "jsonp-polling", "htmlfile"]
 }

From 7812d93e74dc1f76ae989454f9b746e3ac74ca15 Mon Sep 17 00:00:00 2001
From: mluto <m@luto.at>
Date: Fri, 25 Jan 2013 10:32:09 +0100
Subject: [PATCH 21/32] Fixed "unnamed" and "enter your name" in userlist

---
 src/static/js/pad_editor.js   | 6 ++++++
 src/static/js/pad_userlist.js | 5 ++---
 src/templates/pad.html        | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/static/js/pad_editor.js b/src/static/js/pad_editor.js
index f4778802d..b828711e5 100644
--- a/src/static/js/pad_editor.js
+++ b/src/static/js/pad_editor.js
@@ -78,6 +78,12 @@ var padeditor = (function()
       
       html10n.bind('localized', function() {
         $("#languagemenu").val(html10n.getLanguage());
+        $('input[data-l10n-id]').each(function(key, input)
+          {
+            input = $(input);
+            if(input.hasClass("editempty"))
+              input.val(_(input.attr("data-l10n-id")));
+          });
       })
       $("#languagemenu").val(html10n.getLanguage());
       $("#languagemenu").change(function() {
diff --git a/src/static/js/pad_userlist.js b/src/static/js/pad_userlist.js
index 40e87a4f7..d051182b9 100644
--- a/src/static/js/pad_userlist.js
+++ b/src/static/js/pad_userlist.js
@@ -118,7 +118,7 @@ var paduserlist = (function()
       }
       else
       {
-        nameHtml = '<input type="text" class="editempty newinput" value="'+_('pad.userlist.unnamed')+'" ' + (isNameEditable(data) ? '' : 'disabled="disabled" ') + '/>';
+        nameHtml = '<input data-l10n-id="pad.userlist.unnamed" type="text" class="editempty newinput" value="'+_('pad.userlist.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="activity">', padutils.escapeHtml(data.activity), '</td>'].join('');
@@ -710,8 +710,7 @@ var paduserlist = (function()
     {
       if (myUserInfo.name)
       {
-        $("#myusernameedit").removeClass("editempty").val(
-        myUserInfo.name);
+        $("#myusernameedit").removeClass("editempty").val(myUserInfo.name);
       }
       else
       {
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 274a3b1a0..6b5b179a8 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -163,7 +163,7 @@
                     <span id="mycolorpickerpreview" class="myswatchboxhoverable"></span>
                 </div>
                 <div id="myswatchbox"><div id="myswatch"></div></div>
-                <div id="myusernameform"><input type="text" id="myusernameedit" disabled="disabled"></div>
+                <div id="myusernameform"><input type="text" id="myusernameedit" disabled="disabled" data-l10n-id="pad.userlist.entername"></div>
                 <div id="mystatusform"><input type="text" id="mystatusedit" disabled="disabled"></div>
             </div>
             <div id="otherusers">

From 509f564cd762143cc9cad1f5d17f6a52b5588a4c Mon Sep 17 00:00:00 2001
From: mluto <m@luto.at>
Date: Fri, 25 Jan 2013 17:06:57 +0100
Subject: [PATCH 22/32] re-formated onelined en.json

---
 src/locales/en.json | 114 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 113 insertions(+), 1 deletion(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 37e07a154..15feae644 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1 +1,113 @@
-{"index.newPad":"New Pad","index.createOpenPad":"or create/open a Pad with the name:","pad.toolbar.bold.title":"Bold (Ctrl-B)","pad.toolbar.italic.title":"Italic (Ctrl-I)","pad.toolbar.underline.title":"Underline (Ctrl-U)","pad.toolbar.strikethrough.title":"Strikethrough","pad.toolbar.ol.title":"Ordered list","pad.toolbar.ul.title":"Unordered List","pad.toolbar.indent.title":"Indent","pad.toolbar.unindent.title":"Outdent","pad.toolbar.undo.title":"Undo (Ctrl-Z)","pad.toolbar.redo.title":"Redo (Ctrl-Y)","pad.toolbar.clearAuthorship.title":"Clear Authorship Colors","pad.toolbar.import_export.title":"Import/Export from/to different file formats","pad.toolbar.timeslider.title":"Timeslider","pad.toolbar.savedRevision.title":"Saved Revisions","pad.toolbar.settings.title":"Settings","pad.toolbar.embed.title":"Embed this pad","pad.toolbar.showusers.title":"Show the users on this pad","pad.colorpicker.save":"Save","pad.colorpicker.cancel":"Cancel","pad.loading":"Loading...","pad.passwordRequired":"You need a password to access this pad","pad.permissionDenied":"You do not have permission to access this pad","pad.wrongPassword":"Your password was wrong","pad.settings.padSettings":"Pad Settings","pad.settings.myView":"My View","pad.settings.stickychat":"Chat always on screen","pad.settings.colorcheck":"Authorship colors","pad.settings.linenocheck":"Line numbers","pad.settings.fontType":"Font type:","pad.settings.fontType.normal":"Normal","pad.settings.fontType.monospaced":"Monospace","pad.settings.globalView":"Global View","pad.settings.language":"Language:","pad.importExport.import_export":"Import/Export","pad.importExport.import":"Upload any text file or document","pad.importExport.importSuccessful":"Successful!","pad.importExport.export":"Export current pad as:","pad.importExport.exporthtml":"HTML","pad.importExport.exportplain":"Plain text","pad.importExport.exportword":"Microsoft Word","pad.importExport.exportpdf":"PDF","pad.importExport.exportopen":"ODF (Open Document Format)","pad.importExport.exportdokuwiki":"DokuWiki","pad.importExport.abiword.innerHTML":"You only can import from plain text or html formats. For more advanced import features please <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">install abiword</a>.","pad.modals.connected":"Connected.","pad.modals.reconnecting":"Reconnecting to your pad..","pad.modals.forcereconnect":"Force reconnect","pad.modals.userdup":"Opened in another window","pad.modals.userdup.explanation":"This pad seems to be opened in more than one browser window on this computer.","pad.modals.userdup.advice":"Reconnect to use this window instead.","pad.modals.unauth":"Not authorized","pad.modals.unauth.explanation":"Your permissions have changed while viewing this page. Try to reconnect.","pad.modals.looping":"Disconnected.","pad.modals.looping.explanation":"There are communication problems with the synchronization server.","pad.modals.looping.cause":"Perhaps you connected through an incompatible firewall or proxy.","pad.modals.initsocketfail":"Server is unreachable.","pad.modals.initsocketfail.explanation":"Couldn't connect to the synchronization server.","pad.modals.initsocketfail.cause":"This is probably due to a problem with your browser or your internet connection.","pad.modals.slowcommit":"Disconnected.","pad.modals.slowcommit.explanation":"The server is not responding.","pad.modals.slowcommit.cause":"This could be due to problems with network connectivity.","pad.modals.deleted":"Deleted.","pad.modals.deleted.explanation":"This pad has been removed.","pad.modals.disconnected":"You have been disconnected.","pad.modals.disconnected.explanation":"The connection to the server was lost","pad.modals.disconnected.cause":"The server may be unavailable. Please notify us if this continues to happen.","pad.share":"Share this pad","pad.share.readonly":"Read only","pad.share.link":"Link","pad.share.emebdcode":"Embed URL","pad.chat":"Chat","pad.chat.title":"Open the chat for this pad.","pad.chat.loadmessages": "Load more messages","timeslider.pageTitle":"{{appTitle}} Timeslider","timeslider.toolbar.returnbutton":"Return to pad","timeslider.toolbar.authors":"Authors:","timeslider.toolbar.authorsList":"No Authors","timeslider.toolbar.exportlink.title":"Export","timeslider.exportCurrent":"Export current version as:","timeslider.version":"Version {{version}}","timeslider.saved":"Saved {{month}} {{day}}, {{year}}","timeslider.dateformat":"{{month}}/{{day}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}","timeslider.month.january":"January","timeslider.month.february":"February","timeslider.month.march":"March","timeslider.month.april":"April","timeslider.month.may":"May","timeslider.month.june":"June","timeslider.month.july":"July","timeslider.month.august":"August","timeslider.month.september":"September","timeslider.month.october":"October","timeslider.month.november":"November","timeslider.month.december":"December","pad.savedrevs.marked":"This revision is now marked as a saved revision","pad.userlist.entername":"Enter your name","pad.userlist.unnamed":"unnamed","pad.userlist.guest":"Guest","pad.userlist.deny":"Deny","pad.userlist.approve":"Approve","pad.editbar.clearcolors":"Clear authorship colors on entire document?","pad.impexp.importbutton":"Import Now","pad.impexp.importing":"Importing...","pad.impexp.confirmimport":"Importing a file will overwrite the current text of the pad. Are you sure you want to proceed?","pad.impexp.convertFailed":"We were not able to import this file. Please use a different document format or copy paste manually","pad.impexp.uploadFailed":"The upload failed, please try again","pad.impexp.importfailed":"Import failed","pad.impexp.copypaste":"Please copy paste","pad.impexp.exportdisabled":"Exporting as {{type}} format is disabled. Please contact your system administrator for details."}
\ No newline at end of file
+{
+  "index.newPad": "New Pad",
+  "index.createOpenPad": "or create/open a Pad with the name:",
+  "pad.toolbar.bold.title": "Bold (Ctrl-B)",
+  "pad.toolbar.italic.title": "Italic (Ctrl-I)",
+  "pad.toolbar.underline.title": "Underline (Ctrl-U)",
+  "pad.toolbar.strikethrough.title": "Strikethrough",
+  "pad.toolbar.ol.title": "Ordered list",
+  "pad.toolbar.ul.title": "Unordered List",
+  "pad.toolbar.indent.title": "Indent",
+  "pad.toolbar.unindent.title": "Outdent",
+  "pad.toolbar.undo.title": "Undo (Ctrl-Z)",
+  "pad.toolbar.redo.title": "Redo (Ctrl-Y)",
+  "pad.toolbar.clearAuthorship.title": "Clear Authorship Colors",
+  "pad.toolbar.import_export.title": "Import/Export from/to different file formats",
+  "pad.toolbar.timeslider.title": "Timeslider",
+  "pad.toolbar.savedRevision.title": "Saved Revisions",
+  "pad.toolbar.settings.title": "Settings",
+  "pad.toolbar.embed.title": "Embed this pad",
+  "pad.toolbar.showusers.title": "Show the users on this pad",
+  "pad.colorpicker.save": "Save",
+  "pad.colorpicker.cancel": "Cancel",
+  "pad.loading": "Loading...",
+  "pad.passwordRequired": "You need a password to access this pad",
+  "pad.permissionDenied": "You do not have permission to access this pad",
+  "pad.wrongPassword": "Your password was wrong",
+  "pad.settings.padSettings": "Pad Settings",
+  "pad.settings.myView": "My View",
+  "pad.settings.stickychat": "Chat always on screen",
+  "pad.settings.colorcheck": "Authorship colors",
+  "pad.settings.linenocheck": "Line numbers",
+  "pad.settings.fontType": "Font type:",
+  "pad.settings.fontType.normal": "Normal",
+  "pad.settings.fontType.monospaced": "Monospace",
+  "pad.settings.globalView": "Global View",
+  "pad.settings.language": "Language:",
+  "pad.importExport.import_export": "Import/Export",
+  "pad.importExport.import": "Upload any text file or document",
+  "pad.importExport.importSuccessful": "Successful!",
+  "pad.importExport.export": "Export current pad as:",
+  "pad.importExport.exporthtml": "HTML",
+  "pad.importExport.exportplain": "Plain text",
+  "pad.importExport.exportword": "Microsoft Word",
+  "pad.importExport.exportpdf": "PDF",
+  "pad.importExport.exportopen": "ODF (Open Document Format)",
+  "pad.importExport.exportdokuwiki": "DokuWiki",
+  "pad.importExport.abiword.innerHTML": "You only can import from plain text or html formats. For more advanced import features please <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">install abiword</a>.",
+  "pad.modals.connected": "Connected.",
+  "pad.modals.reconnecting": "Reconnecting to your pad..",
+  "pad.modals.forcereconnect": "Force reconnect",
+  "pad.modals.userdup": "Opened in another window",
+  "pad.modals.userdup.explanation": "This pad seems to be opened in more than one browser window on this computer.",
+  "pad.modals.userdup.advice": "Reconnect to use this window instead.",
+  "pad.modals.unauth": "Not authorized",
+  "pad.modals.unauth.explanation": "Your permissions have changed while viewing this page. Try to reconnect.",
+  "pad.modals.looping": "Disconnected.",
+  "pad.modals.looping.explanation": "There are communication problems with the synchronization server.",
+  "pad.modals.looping.cause": "Perhaps you connected through an incompatible firewall or proxy.",
+  "pad.modals.initsocketfail": "Server is unreachable.",
+  "pad.modals.initsocketfail.explanation": "Couldn't connect to the synchronization server.",
+  "pad.modals.initsocketfail.cause": "This is probably due to a problem with your browser or your internet connection.",
+  "pad.modals.slowcommit": "Disconnected.",
+  "pad.modals.slowcommit.explanation": "The server is not responding.",
+  "pad.modals.slowcommit.cause": "This could be due to problems with network connectivity.",
+  "pad.modals.deleted": "Deleted.",
+  "pad.modals.deleted.explanation": "This pad has been removed.",
+  "pad.modals.disconnected": "You have been disconnected.",
+  "pad.modals.disconnected.explanation": "The connection to the server was lost",
+  "pad.modals.disconnected.cause": "The server may be unavailable. Please notify us if this continues to happen.",
+  "pad.share": "Share this pad",
+  "pad.share.readonly": "Read only",
+  "pad.share.link": "Link",
+  "pad.share.emebdcode": "Embed URL",
+  "pad.chat": "Chat",
+  "pad.chat.title": "Open the chat for this pad.",
+  "pad.chat.loadmessages": "Load more messages",
+  "timeslider.pageTitle": "{{appTitle}} Timeslider",
+  "timeslider.toolbar.returnbutton": "Return to pad",
+  "timeslider.toolbar.authors": "Authors:",
+  "timeslider.toolbar.authorsList": "No Authors",
+  "timeslider.toolbar.exportlink.title": "Export",
+  "timeslider.exportCurrent": "Export current version as:",
+  "timeslider.version": "Version {{version}}",
+  "timeslider.saved": "Saved {{month}} {{day}}, {{year}}",
+  "timeslider.dateformat": "{{month}}/{{day}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
+  "timeslider.month.january": "January",
+  "timeslider.month.february": "February",
+  "timeslider.month.march": "March",
+  "timeslider.month.april": "April",
+  "timeslider.month.may": "May",
+  "timeslider.month.june": "June",
+  "timeslider.month.july": "July",
+  "timeslider.month.august": "August",
+  "timeslider.month.september": "September",
+  "timeslider.month.october": "October",
+  "timeslider.month.november": "November",
+  "timeslider.month.december": "December",
+  "pad.savedrevs.marked": "This revision is now marked as a saved revision",
+  "pad.userlist.entername": "Enter your name",
+  "pad.userlist.unnamed": "unnamed",
+  "pad.userlist.guest": "Guest",
+  "pad.userlist.deny": "Deny",
+  "pad.userlist.approve": "Approve",
+  "pad.editbar.clearcolors": "Clear authorship colors on entire document?",
+  "pad.impexp.importbutton": "Import Now",
+  "pad.impexp.importing": "Importing...",
+  "pad.impexp.confirmimport": "Importing a file will overwrite the current text of the pad. Are you sure you want to proceed?",
+  "pad.impexp.convertFailed": "We were not able to import this file. Please use a different document format or copy paste manually",
+  "pad.impexp.uploadFailed": "The upload failed, please try again",
+  "pad.impexp.importfailed": "Import failed",
+  "pad.impexp.copypaste": "Please copy paste",
+  "pad.impexp.exportdisabled": "Exporting as {{type}} format is disabled. Please contact your system administrator for details."
+}
\ No newline at end of file

From 763864539ffce2ed1b60be0e63bcb060deafe712 Mon Sep 17 00:00:00 2001
From: mluto <m@luto.at>
Date: Fri, 25 Jan 2013 17:41:33 +0100
Subject: [PATCH 23/32] Use 'html10n' instead of '_', i10nzed "unnamed
 author(s)"

---
 src/locales/en.json               | 2 ++
 src/static/js/broadcast_slider.js | 7 ++++++-
 src/static/js/pad_editor.js       | 3 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 15feae644..eea35cc53 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -95,6 +95,8 @@
   "timeslider.month.october": "October",
   "timeslider.month.november": "November",
   "timeslider.month.december": "December",
+  "timeslider.unnamedauthor": "{{num}} unnamed author",
+  "timeslider.unnamedauthors": "{{num}} unnamed authors",
   "pad.savedrevs.marked": "This revision is now marked as a saved revision",
   "pad.userlist.entername": "Enter your name",
   "pad.userlist.unnamed": "unnamed",
diff --git a/src/static/js/broadcast_slider.js b/src/static/js/broadcast_slider.js
index 83483537f..221666de0 100644
--- a/src/static/js/broadcast_slider.js
+++ b/src/static/js/broadcast_slider.js
@@ -193,7 +193,12 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded)
       });
       if (numAnonymous > 0)
       {
-        var anonymousAuthorString = numAnonymous + " unnamed author" + (numAnonymous > 1 ? "s" : "")
+        var anonymousAuthorString;
+        if(numAnonymous == 1)
+          anonymousAuthorString = html10n.get("timeslider.unnamedauthor", { num: numAnonymous });
+        else
+          anonymousAuthorString = html10n.get("timeslider.unnamedauthors", { num: numAnonymous });
+        
         if (numNamed !== 0){
           authorsList.append(' + ' + anonymousAuthorString);
         } else {
diff --git a/src/static/js/pad_editor.js b/src/static/js/pad_editor.js
index b828711e5..553245ea1 100644
--- a/src/static/js/pad_editor.js
+++ b/src/static/js/pad_editor.js
@@ -78,11 +78,12 @@ var padeditor = (function()
       
       html10n.bind('localized', function() {
         $("#languagemenu").val(html10n.getLanguage());
+        // translate the value of 'unnamed' and 'Enter your name' textboxes in the userlist
         $('input[data-l10n-id]').each(function(key, input)
           {
             input = $(input);
             if(input.hasClass("editempty"))
-              input.val(_(input.attr("data-l10n-id")));
+              input.val(html10n.get(input.attr("data-l10n-id")));
           });
       })
       $("#languagemenu").val(html10n.getLanguage());

From 046fac9fa9c1a4cb2677d09ade9c181750f5a6d4 Mon Sep 17 00:00:00 2001
From: mluto <m@luto.at>
Date: Fri, 25 Jan 2013 20:38:24 +0100
Subject: [PATCH 24/32] Added a comment to clearify *why* this works

---
 src/static/js/pad_editor.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/static/js/pad_editor.js b/src/static/js/pad_editor.js
index 553245ea1..dd0cbbbb7 100644
--- a/src/static/js/pad_editor.js
+++ b/src/static/js/pad_editor.js
@@ -79,6 +79,9 @@ var padeditor = (function()
       html10n.bind('localized', function() {
         $("#languagemenu").val(html10n.getLanguage());
         // translate the value of 'unnamed' and 'Enter your name' textboxes in the userlist
+        // this does not interfere with html10n's normal value-setting because html10n just ingores <input>s
+        // also, a value which has been set by the user will be not overwritten since a user-edited <input>
+        // does *not* have the editempty-class
         $('input[data-l10n-id]').each(function(key, input)
           {
             input = $(input);

From cb2b93b1339d27a21e3937ab58ea1614d7118b04 Mon Sep 17 00:00:00 2001
From: mluto <m@luto.at>
Date: Sat, 26 Jan 2013 14:35:26 +0100
Subject: [PATCH 25/32] Added getChatHistory and getChatHead (api+code+doc)

---
 doc/api/http_api.md            | 28 +++++++++++
 src/node/db/API.js             | 88 ++++++++++++++++++++++++++++++++++
 src/node/handler/APIHandler.js | 39 +++++++++++++++
 3 files changed, 155 insertions(+)

diff --git a/doc/api/http_api.md b/doc/api/http_api.md
index 0d2cc3756..a7fc0bedd 100644
--- a/doc/api/http_api.md
+++ b/doc/api/http_api.md
@@ -292,6 +292,34 @@ returns the text of a pad formatted as HTML
   * `{code: 0, message:"ok", data: {html:"Welcome Text<br>More Text"}}`
   * `{code: 1, message:"padID does not exist", data: null}`
 
+### Chat
+#### getChatHistory(padID, [start, end])
+ * API >= 1.2.7
+
+returns
+
+* a part of the chat history, when `start` and `end` are given
+* the whole chat histroy, when no extra parameters are given
+
+
+*Example returns:*
+
+* `{"code":0,"message":"ok","data":{"messages":[{"text":"foo","userId":"a.foo","time":1359199533759,"userName":"test"},{"text":"bar","userId":"a.foo","time":1359199534622,"userName":"test"}]}}`
+* `{code: 1, message:"start is higher or equal to the current chatHead", data: null}`
+* `{code: 1, message:"padID does not exist", data: null}`
+
+#### getChatHead(padID)
+ * API >= 1.2.7
+
+returns the chatHead (last number of the last chat-message) of the pad
+
+
+*Example returns:*
+
+* `{code: 0, message:"ok", data: {chatHead: 42}}`
+* `{code: 1, message:"padID does not exist", data: null}`
+
+
 ### Pad
 Group pads are normal pads, but with the name schema GROUPID$PADNAME. A security manager controls access of them and its forbidden for normal pads to include a $ in the name. 
 
diff --git a/src/node/db/API.js b/src/node/db/API.js
index 9cad415d0..cee63a9e1 100644
--- a/src/node/db/API.js
+++ b/src/node/db/API.js
@@ -277,6 +277,77 @@ exports.setHTML = function(padID, html, callback)
   });
 }
 
+/******************/
+/**CHAT FUNCTIONS */
+/******************/
+
+/**
+getChatHistory(padId, start, end), returns a part of or the whole chat-history of this pad
+
+Example returns:
+
+{"code":0,"message":"ok","data":{"messages":[{"text":"foo","userId":"a.foo","time":1359199533759,"userName":"test"},
+                                             {"text":"bar","userId":"a.foo","time":1359199534622,"userName":"test"}]}}
+
+{code: 1, message:"start is higher or equal to the current chatHead", data: null}
+
+{code: 1, message:"padID does not exist", data: null}
+*/
+exports.getChatHistory = function(padID, start, end, callback)
+{
+  if(start && end)
+  {
+    if(start < 0)
+    {
+      callback(new customError("start is below zero","apierror"));
+      return;
+    }
+    if(end < 0)
+    {
+      callback(new customError("end is below zero","apierror"));
+      return;
+    }
+    if(start > end)
+    {
+      callback(new customError("start is higher than end","apierror"));
+      return;
+    }
+  }
+  
+  //get the pad
+  getPadSafe(padID, true, function(err, pad)
+  {
+    if(ERR(err, callback)) return;
+    var chatHead = pad.chatHead;
+    
+    // fall back to getting the whole chat-history if a parameter is missing
+    if(!start || !end)
+    {
+	  start = 0;
+	  end = pad.chatHead - 1;
+    }
+    
+    if(start >= chatHead)
+    {
+      callback(new customError("start is higher or equal to the current chatHead","apierror"));
+      return;
+    }
+    if(end >= chatHead)
+    {
+      callback(new customError("end is higher or equal to the current chatHead","apierror"));
+      return;
+    }
+    
+    // the the whole message-log and return it to the client
+    pad.getChatMessages(start, end,
+      function(err, msgs)
+      {
+        if(ERR(err, callback)) return;
+        callback(null, {messages: msgs});
+      });
+  });
+}
+
 /*****************/
 /**PAD FUNCTIONS */
 /*****************/
@@ -567,6 +638,23 @@ exports.checkToken = function(callback)
   callback();
 }
 
+/**
+getChatHead(padID) returns the chatHead (last number of the last chat-message) of the pad
+
+Example returns:
+
+{code: 0, message:"ok", data: {chatHead: 42}}
+{code: 1, message:"padID does not exist", data: null}
+*/
+exports.getChatHead = function(padID, callback)
+{
+  //get the pad
+  getPadSafe(padID, true, function(err, pad)
+  {
+    if(ERR(err, callback)) return;
+    callback(null, {chatHead: pad.chatHead});
+  });
+}
 
 /******************************/
 /** INTERNAL HELPER FUNCTIONS */
diff --git a/src/node/handler/APIHandler.js b/src/node/handler/APIHandler.js
index ae93e933f..6085edbf7 100644
--- a/src/node/handler/APIHandler.js
+++ b/src/node/handler/APIHandler.js
@@ -174,6 +174,45 @@ var version =
   , "listAllGroups"             : []
   , "checkToken"                : []
   }
+, "1.2.7":
+  { "createGroup"               : []
+  , "createGroupIfNotExistsFor" : ["groupMapper"]
+  , "deleteGroup"               : ["groupID"]
+  , "listPads"                  : ["groupID"]
+  , "listAllPads"               : []
+  , "createPad"                 : ["padID", "text"]
+  , "createGroupPad"            : ["groupID", "padName", "text"]
+  , "createAuthor"              : ["name"]
+  , "createAuthorIfNotExistsFor": ["authorMapper" , "name"]
+  , "listPadsOfAuthor"          : ["authorID"]
+  , "createSession"             : ["groupID", "authorID", "validUntil"]
+  , "deleteSession"             : ["sessionID"]
+  , "getSessionInfo"            : ["sessionID"]
+  , "listSessionsOfGroup"       : ["groupID"]
+  , "listSessionsOfAuthor"      : ["authorID"]
+  , "getText"                   : ["padID", "rev"]
+  , "setText"                   : ["padID", "text"]
+  , "getHTML"                   : ["padID", "rev"]
+  , "setHTML"                   : ["padID", "html"]
+  , "getRevisionsCount"         : ["padID"]
+  , "getLastEdited"             : ["padID"]
+  , "deletePad"                 : ["padID"]
+  , "getReadOnlyID"             : ["padID"]
+  , "setPublicStatus"           : ["padID", "publicStatus"]
+  , "getPublicStatus"           : ["padID"]
+  , "setPassword"               : ["padID", "password"]
+  , "isPasswordProtected"       : ["padID"]
+  , "listAuthorsOfPad"          : ["padID"]
+  , "padUsersCount"             : ["padID"]
+  , "getAuthorName"             : ["authorID"]
+  , "padUsers"                  : ["padID"]
+  , "sendClientsMessage"        : ["padID", "msg"]
+  , "listAllGroups"             : []
+  , "checkToken"                : []
+  , "getChatHistory"            : ["padID"]
+  , "getChatHistory"            : ["padID", "start", "end"]
+  , "getChatHead"               : ["padID"]
+  }
 };
 
 /**

From 9d0672c1c811bfac6b922c042a2ef76f1ea0711d Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sat, 26 Jan 2013 20:04:33 +0000
Subject: [PATCH 26/32] not a perfect css fix but stops the overflow when
 screen is less than 1000px

---
 src/static/css/admin.css | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/static/css/admin.css b/src/static/css/admin.css
index 0d9471268..53c97f035 100644
--- a/src/static/css/admin.css
+++ b/src/static/css/admin.css
@@ -38,8 +38,10 @@ div.innerwrapper {
   float: right;
   opacity: 0.9;
   padding: 15px;
-  width: 860px;
-  border-radius: 0 0 7px 7px;
+  max-width: 860px;
+  bordr-radius: 0 0 7px 7px;
+  margin-left:250px;
+  min-width:400px;
 }
 
 #wrapper {
@@ -135,4 +137,4 @@ a:link, a:visited, a:hover, a:focus {
 
 a:focus, a:hover {
   border-bottom: #333333 1px solid;
-}
\ No newline at end of file
+}

From 1290fa36c3b341e3e4e746ab5348897c9f223f52 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sat, 26 Jan 2013 20:05:37 +0000
Subject: [PATCH 27/32] typo fix

---
 src/static/css/admin.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/static/css/admin.css b/src/static/css/admin.css
index 53c97f035..b2cf4b5df 100644
--- a/src/static/css/admin.css
+++ b/src/static/css/admin.css
@@ -39,7 +39,7 @@ div.innerwrapper {
   opacity: 0.9;
   padding: 15px;
   max-width: 860px;
-  bordr-radius: 0 0 7px 7px;
+  border-radius: 0 0 7px 7px;
   margin-left:250px;
   min-width:400px;
 }

From 0549a4fec7c8128b0bcb67639ca9baa2ce2d2322 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Sat, 26 Jan 2013 22:13:28 +0100
Subject: [PATCH 28/32] Add checkUpdates endpoinnt for /admin/plugins

---
 src/node/hooks/express/adminplugins.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/node/hooks/express/adminplugins.js b/src/node/hooks/express/adminplugins.js
index 97a0d602f..7e221cf1e 100644
--- a/src/node/hooks/express/adminplugins.js
+++ b/src/node/hooks/express/adminplugins.js
@@ -2,6 +2,9 @@ var path = require('path');
 var eejs = require('ep_etherpad-lite/node/eejs');
 var installer = require('ep_etherpad-lite/static/js/pluginfw/installer');
 var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins');
+var _ = require('underscore');
+var semver = require('semver');
+var async = require('async');
 
 exports.expressCreateServer = function (hook_name, args, cb) {
   args.app.get('/admin/plugins', function(req, res) {
@@ -25,8 +28,26 @@ exports.socketio = function (hook_name, args, cb) {
     if (!socket.handshake.session.user || !socket.handshake.session.user.is_admin) return;
 
     socket.on("load", function (query) {
+      // send currently installed plugins
       socket.emit("installed-results", {results: plugins.plugins});
+      socket.emit("progress", {progress:1});
     });
+    
+    socket.on("checkUpdates", function() {
+      socket.emit("progress", {progress:0, message:'Checking for plugin updates...'});
+      // Check plugins for updates
+      installer.search({offset: 0, pattern: '', limit: 500}, /*useCache:*/true, function(data) { // hacky
+        if (!data.results) return;
+        var updatable = _(plugins.plugins).keys().filter(function(plugin) {
+          if(!data.results[plugin]) return false;
+          var latestVersion = data.results[plugin]['dist-tags'].latest
+          var currentVersion = plugins.plugins[plugin].package.version
+          return semver.gt(latestVersion, currentVersion)
+        });
+        socket.emit("updatable", {updatable: updatable});
+        socket.emit("progress", {progress:1});
+      });
+    })
 
     socket.on("search", function (query) {
       socket.emit("progress", {progress:0, message:'Fetching results...'});

From 541aeb3a984ef3d884dfb6aeb4f6a41740bc63c1 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Sat, 26 Jan 2013 22:15:19 +0100
Subject: [PATCH 29/32] /admin/plugins: Display an update button for all
 plugins that are outdated

---
 src/static/css/admin.css       |  2 +-
 src/static/js/admin/plugins.js | 43 ++++++++++++++++++++++++++--------
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/src/static/css/admin.css b/src/static/css/admin.css
index 0d9471268..0edf4bcd6 100644
--- a/src/static/css/admin.css
+++ b/src/static/css/admin.css
@@ -82,7 +82,7 @@ input[type="button"] {
   padding: 4px 6px;
   margin: 0;
 }
-input[type="button"].do-install, input[type="button"].do-uninstall {
+table input[type="button"] {
   float: right;
   width: 100px;
 }
diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js
index ed38fc4e7..a973875ce 100644
--- a/src/static/js/admin/plugins.js
+++ b/src/static/js/admin/plugins.js
@@ -22,6 +22,7 @@ $(document).ready(function () {
 
   var search = function () {
     socket.emit("search", $('.search-results').data('query'));
+    tasks++;
   }
 
   function updateHandlers() {
@@ -40,16 +41,18 @@ $(document).ready(function () {
       search();
     });
 
-    $(".do-install").unbind('click').click(function (e) {
+    $(".do-install, .do-update").unbind('click').click(function (e) {
       var row = $(e.target).closest("tr");
       doUpdate = true;
       socket.emit("install", row.find(".name").text());
+      tasks++;
     });
 
     $(".do-uninstall").unbind('click').click(function (e) {
       var row = $(e.target).closest("tr");
       doUpdate = true;
       socket.emit("uninstall", row.find(".name").text());
+      tasks++;
     });
 
     $(".do-prev-page").unbind('click').click(function (e) {
@@ -72,11 +75,9 @@ $(document).ready(function () {
 
   updateHandlers();
 
+  var tasks = 0;
   socket.on('progress', function (data) {
-    if (data.progress > 0 && $('#progress').data('progress') > data.progress) return;
-
     $("#progress").show();
-
     $('#progress').data('progress', data.progress);
 
     var message = "Unknown status";
@@ -90,7 +91,12 @@ $(document).ready(function () {
     $("#progress .message").html(message);
 
     if (data.progress >= 1) {
-      $("#progress").hide();
+      tasks--;
+      if (tasks <= 0) {
+        // Hide the activity indicator once all tasks are done
+        $("#progress").hide();
+        tasks = 0;
+      }
       
       if (data.error) {
         alert('An error occurred: '+data.error+' -- the server log might know more...');
@@ -98,6 +104,7 @@ $(document).ready(function () {
         if (doUpdate) {
           doUpdate = false;
           socket.emit("load");
+          tasks++;
         }
       }
     }
@@ -121,9 +128,7 @@ $(document).ready(function () {
     for (plugin_name in data.results) {
       var plugin = data.results[plugin_name];
       var row = widget.find(".template tr").clone();
-      var version = '0.0.0';
-      // hack to access "versions" property of the npm package object
-      for (version in data.results[plugin_name].versions) break;
+      
       for (attr in plugin) {
         if(attr == "name"){ // Hack to rewrite URLS into name
           row.find(".name").html("<a target='_blank' href='https://npmjs.org/package/"+plugin['name']+"'>"+plugin[attr]+"</a>");
@@ -131,7 +136,7 @@ $(document).ready(function () {
           row.find("." + attr).html(plugin[attr]);
         }
       }
-      row.find(".version").html(version);
+      row.find(".version").html( data.results[plugin_name]['dist-tags'].latest );
       
       widget.find(".results").append(row);
     }
@@ -141,6 +146,7 @@ $(document).ready(function () {
 
   socket.on('installed-results', function (data) {
     $("#installed-plugins *").remove();
+
     for (plugin_name in data.results) {
       if (plugin_name == "ep_etherpad-lite") continue; // Hack...
       var plugin = data.results[plugin_name];
@@ -156,9 +162,26 @@ $(document).ready(function () {
       $("#installed-plugins").append(row);
     }
     updateHandlers();
+
+    socket.emit('checkUpdates');
+    tasks++;
   });
+  
+  socket.on('updatable', function(data) {
+    $('#installed-plugins>tr').each(function(i,tr) {
+      var pluginName = $(tr).find('.name').text()
+      
+      if (data.updatable.indexOf(pluginName) >= 0) {
+        var actions = $(tr).find('.actions')
+        actions.append('<input class="do-update" type="button" value="Update" />')
+        actions.css('width', 200)
+      }
+    })
+    updateHandlers();
+  })
 
   socket.emit("load");
+  tasks++;
+  
   search();
-
 });

From 77403942eebdf9f6f103a858ceec72899d68574b Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 27 Jan 2013 03:08:21 +0000
Subject: [PATCH 30/32] fix make file issue

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 4e870a452..c63bb0bfb 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ out/doc/assets/%: doc/assets/%
 out/doc/%.html: doc/%.md
 	mkdir -p $(@D)
 	node tools/doc/generate.js --format=html --template=doc/template.html $< > $@
-	cat $@ | sed 's/__VERSION__/${VERSION}/' > $@
+	sed -i 's/__VERSION__/${VERSION}/' $@
 
 clean:
 	rm -rf out/

From 6f743c6ee21dc96a286d2f52c3902bce11f7e19d Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 27 Jan 2013 16:45:01 +0000
Subject: [PATCH 31/32] make makefile work for darwin(mac)

---
 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c63bb0bfb..09dbf0f3e 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ outdoc_files = $(addprefix out/,$(doc_sources:.md=.html))
 docassets = $(addprefix out/,$(wildcard doc/assets/*))
 
 VERSION = $(shell node -e "console.log( require('./src/package.json').version )") 
+UNAME := $(shell uname -s)
 
 docs: $(outdoc_files) $(docassets)
 
@@ -14,7 +15,10 @@ out/doc/assets/%: doc/assets/%
 out/doc/%.html: doc/%.md
 	mkdir -p $(@D)
 	node tools/doc/generate.js --format=html --template=doc/template.html $< > $@
-	sed -i 's/__VERSION__/${VERSION}/' $@
+	ifeq ($(UNAME),Darwin)
+		sed -i '' 's/__VERSION__/${VERSION}/' $@
+	else
+		sed -i 's/__VERSION__/${VERSION}/' $@
 
 clean:
 	rm -rf out/

From d478ae23863f85dd1918e4b9494a717592bd60fd Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 27 Jan 2013 16:59:52 +0000
Subject: [PATCH 32/32] take two at fixin Mac issue

---
 Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 09dbf0f3e..b656d5d9b 100644
--- a/Makefile
+++ b/Makefile
@@ -15,10 +15,11 @@ out/doc/assets/%: doc/assets/%
 out/doc/%.html: doc/%.md
 	mkdir -p $(@D)
 	node tools/doc/generate.js --format=html --template=doc/template.html $< > $@
-	ifeq ($(UNAME),Darwin)
-		sed -i '' 's/__VERSION__/${VERSION}/' $@
-	else
-		sed -i 's/__VERSION__/${VERSION}/' $@
+ifeq ($(UNAME),Darwin)
+	sed -i '' 's/__VERSION__/${VERSION}/' $@
+else
+	sed -i 's/__VERSION__/${VERSION}/' $@
+endif
 
 clean:
 	rm -rf out/