1
0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00

Allow Html in field-help tooltips. Related to Issue #110. Removed HTML from language file and replaced with bbcode.

This commit is contained in:
Cameron
2013-02-19 14:45:22 -08:00
parent 73fc4b4e2b
commit 76504b6be7
3 changed files with 8 additions and 7 deletions

View File

@@ -1120,8 +1120,7 @@ $text .= "
<td>".PRFLAN_192.":</td>
<td>
".$frm->text('predefinedLoginName', $pref['predefinedLoginName'], 50)."
<div class='field-help'>".PRFLAN_193."</div>
<div class='field-help'>".PRFLAN_194."</div>
<div class='field-help'><div style='text-align:left'>".PRFLAN_193."<br />".str_replace("[br]","<br /> ",PRFLAN_194)."</div></div>
</td>
</tr>
<tr>

View File

@@ -199,7 +199,7 @@ define('PRFLAN_190', 'Salted');
define('PRFLAN_191', '(md5 is usually adequate for an Intranet, and often for other sites)');
define('PRFLAN_192', 'Generate random predefined login names according to a pattern');
define('PRFLAN_193', 'To allow users to set their own login names, leave blank');
define('PRFLAN_194', '# - alpha<br />. - numeric<br />* - alphanumeric<br />Other chars used as entered.');
define('PRFLAN_194', '# alpha[br]. numeric[br]* alphanumeric[br]Other chars used as entered.');
define('PRFLAN_195', 'Changed values:');
define('PRFLAN_196', 'Log all page accesses');
define('PRFLAN_197', 'Auto-login new user after clicking on signup link');

View File

@@ -30,13 +30,15 @@ $(document).ready(function()
var t = $(this).nextAll(".field-help");
t.hide();
// alert('hello');
$(this).tooltip({title: function() {
var tip = t.text();
return tip;
$(this).tooltip({
title: function() {
var tip = t.html();
return tip;
},
fade: true,
html: true,
placement: 'right'
placement: 'right',
delay: { show: 300, hide: 600 }
});
});