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-02-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity

Fixed "unnamed" and "enter your name" in userlist

Browse source
This commit is contained in:
mluto 2013-01-25 10:32:09 +01:00
parent 557b5c1ad0
commit 7812d93e74
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/static/js/pad_editor.js
View file

@ -78,6 +78,12 @@ var padeditor = (function()
html10n.bind('localized', function() { html10n.bind('localized', function() {
$("#languagemenu").val(html10n.getLanguage()); $("#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").val(html10n.getLanguage());
$("#languagemenu").change(function() { $("#languagemenu").change(function() {

5
src/static/js/pad_userlist.js
View file

@ -118,7 +118,7 @@ var paduserlist = (function()
} }
else 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(''); 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) if (myUserInfo.name)
{ {
$("#myusernameedit").removeClass("editempty").val( $("#myusernameedit").removeClass("editempty").val(myUserInfo.name);
myUserInfo.name);
} }
else else
{ {

2
src/templates/pad.html
View file

@ -163,7 +163,7 @@
<span id="mycolorpickerpreview" class="myswatchboxhoverable"></span> <span id="mycolorpickerpreview" class="myswatchboxhoverable"></span>
</div> </div>
<div id="myswatchbox"><div id="myswatch"></div></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 id="mystatusform"><input type="text" id="mystatusedit" disabled="disabled"></div>
</div> </div>
<div id="otherusers"> <div id="otherusers">