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-19 22:23:33 +01:00
Code Issues Projects Releases Wiki Activity

Update strings, add UK strings, fix JS

Browse source
This commit is contained in:
root 2012-12-03 11:35:06 +00:00
parent a74defdab7
commit 84d154b168
3 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/locales/en.ini
View file

@ -21,6 +21,9 @@ 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

12
src/static/js/pad.js
View file

@ -299,9 +299,7 @@ function handshake()
if(!receivedClientVars && obj.accessStatus)
{
$('.passForm').submit(function(){
// THIS BIT DOESNT WORK
alert("I AM BROKEN");
padutils.escapeHtml('require('+JSON.stringify(module.id)).savePassword();
require(module.id).savePassword();
});
if(obj.accessStatus == "deny")
@ -311,14 +309,6 @@ function handshake()
}
else if(obj.accessStatus == "needPassword")
{
/* $("#editorloadingbox").html("<b>You need a password to access this pad</b><br>" +
"<form class='passForm'><input id='passwordinput' type='password' name='password'>"+
"<button type='button' onclick=\"" + padutils.escapeHtml('require('+JSON.stringify(module.id)+").savePassword();") + "\">ok</button></div>");
$("#passwordinput").focus();
$(".passForm").submit(function(){
$('.passForm button').click();
});
*/
$('#loading').hide();
$('#passwordRequired').show();
$("#passwordinput").focus();

6
src/templates/pad.html
View file

@ -185,16 +185,16 @@
<div id="editorcontainer"></div>
<div id="editorloadingbox">
<div id="passwordRequired">
<p data-l10n-id="pad.youneedpasword">You need a password to access this pad</p>
<p data-l10n-id="pad.passwordRequired">You need a password to access this pad</p>
<form class='passForm'>
<input id='passwordinput' type='password' name='password'><input type='submit' value='Submit'>
</form>
</div>
<div id="permissionDenied">
<p data-l10n-id="pad.youdonthavepermission">You do not have permission to access this pad</p>
<p data-l10n-id="pad.permissionDenied">You do not have permission to access this pad</p>
</div>
<div id="wrongPassword">
<p data-l10n-id="pad.wrongpassword">Your password was wrong</p>
<p data-l10n-id="pad.wrongPassword">Your password was wrong</p>
</div>
<p data-l10n-id="pad.loading" id="loading">Loading...</p>
<noscript><strong>Sorry, you have to enable Javascript in order to use this.</strong></noscript>