From 1d055f2cd498b3f22a98e02871a82d1950f71369 Mon Sep 17 00:00:00 2001
From: johnyma22 <john@mclear.co.uk>
Date: Fri, 2 Nov 2012 15:15:13 +0000
Subject: [PATCH] make stuff work

---
 src/static/css/admin.css          | 4 +++-
 src/static/js/admin/settings.js   | 7 +++++++
 src/templates/admin/settings.html | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/static/css/admin.css b/src/static/css/admin.css
index 1c9e490ad..b91850a65 100644
--- a/src/static/css/admin.css
+++ b/src/static/css/admin.css
@@ -125,4 +125,6 @@ td, th {
   width:100%;  
   min-height:600px;
 }
-
+#response{
+  display:inline;
+}
diff --git a/src/static/js/admin/settings.js b/src/static/js/admin/settings.js
index efaa78fa9..5be25d871 100644
--- a/src/static/js/admin/settings.js
+++ b/src/static/js/admin/settings.js
@@ -41,7 +41,14 @@ $(document).ready(function () {
     socket.emit("restartEtherpad");
   });
 
+  socket.on('saveprogress', function(progress){
+    $('#response').show();
+    $('#response').text(progress);
+    $('#response').fadeOut('slow');
+  });
+
   socket.emit("load"); // Load the JSON from the server
+
 });
 
 
diff --git a/src/templates/admin/settings.html b/src/templates/admin/settings.html
index eaaf094ca..778afa89c 100644
--- a/src/templates/admin/settings.html
+++ b/src/templates/admin/settings.html
@@ -27,6 +27,7 @@
       <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>
   </body>
 </html>