libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-20 06:29:53 +01:00
Code Issues Projects Releases Wiki Activity

make stuff work

Browse source
This commit is contained in:
johnyma22 2012-11-02 15:15:13 +00:00
parent 3ca450fefc
commit 1d055f2cd4
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/static/css/admin.css
View file

@ -125,4 +125,6 @@ td, th {
width:100%; width:100%;
min-height:600px; min-height:600px;
} }
#response{
display:inline;
}

7
src/static/js/admin/settings.js
View file

@ -41,7 +41,14 @@ $(document).ready(function () {
socket.emit("restartEtherpad"); 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 socket.emit("load"); // Load the JSON from the server
}); });

1
src/templates/admin/settings.html
View file

@ -27,6 +27,7 @@
<textarea class="settings"></textarea> <textarea class="settings"></textarea>
<input type="button" class="settingsButton" id="saveSettings" value="Save Settings"> <input type="button" class="settingsButton" id="saveSettings" value="Save Settings">
<input type="button" class="settingsButton" id="restartEtherpad" value="Restart Etherpad"> <input type="button" class="settingsButton" id="restartEtherpad" value="Restart Etherpad">
<div id="response"></div>
</div> </div>
</body> </body>
</html> </html>