From 76504b6be791ec987873cafc24c7019f22c67d1a Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Tue, 19 Feb 2013 14:45:22 -0800
Subject: [PATCH] Allow Html in field-help tooltips. Related to Issue #110.
 Removed HTML from language file and replaced with bbcode.

---
 e107_admin/prefs.php                       |  3 +--
 e107_languages/English/admin/lan_prefs.php |  2 +-
 e107_web/js/core/admin.jquery.js           | 10 ++++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php
index 28b55bf90..cbd675a1a 100644
--- a/e107_admin/prefs.php
+++ b/e107_admin/prefs.php
@@ -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>
diff --git a/e107_languages/English/admin/lan_prefs.php b/e107_languages/English/admin/lan_prefs.php
index 4f65c4ddd..751509d5b 100644
--- a/e107_languages/English/admin/lan_prefs.php
+++ b/e107_languages/English/admin/lan_prefs.php
@@ -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');
diff --git a/e107_web/js/core/admin.jquery.js b/e107_web/js/core/admin.jquery.js
index df4d8232c..8dcf9e63a 100644
--- a/e107_web/js/core/admin.jquery.js
+++ b/e107_web/js/core/admin.jquery.js
@@ -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 } 
 			});
 		
 		});