Merge remote-tracking branch 'origin/master'

3 files changed, 6 insertions, 6 deletions

diff --git a/plugins/CoreHome/templates/jquery.ui.autocomplete.css b/plugins/CoreHome/templates/jquery.ui.autocomplete.css
index d4ae0e863e..596337c242 100644
--- a/plugins/CoreHome/templates/jquery.ui.autocomplete.css
+++ b/plugins/CoreHome/templates/jquery.ui.autocomplete.css
@@ -48,7 +48,7 @@
     position: relative;
 }
 
-.ui-menu .ui-menu-item a.ui-state-hover,
+.ui-menu .ui-menu-item a.ui-state-focus,
 .ui-menu .ui-menu-item a.ui-state-active {
     font-weight: normal;
     margin: 0;
@@ -64,7 +64,7 @@
     -webkit-border-radius: 4px;
 }
 
-.ui-menu .ui-menu-item a.ui-state-hover {
+.ui-menu .ui-menu-item a.ui-state-focus {
     background: #ebeae6;
     border: 0;
     border-radius: 0;
diff --git a/plugins/SitesManager/templates/SitesManager.js b/plugins/SitesManager/templates/SitesManager.js
index 24d6afa849..1a55fbfc22 100644
--- a/plugins/SitesManager/templates/SitesManager.js
+++ b/plugins/SitesManager/templates/SitesManager.js
@@ -161,7 +161,7 @@ function SitesManager(_timezones, _currencies, _defaultTimezone, _defaultCurrenc
             var numberOfRows = $('table#editSites')[0].rows.length;
             var newRowId = 'rowNew' + numberOfRows;
             var submitButtonHtml = '<input type="submit" class="addsite submit" value="' + _pk_translate('General_Save_js') + '" />';
-            $(' <tr id="' + newRowId + '">\
+            $($.parseHTML(' <tr id="' + newRowId + '">\
 				<td>&nbsp;</td>\
 				<td><input id="name" value="Name" size="15" /><br/><br/><br/>' + submitButtonHtml + '</td>\
 				<td><textarea cols="25" rows="3" id="urls">http://siteUrl.com/\nhttp://siteUrl2.com/</textarea><br />' + aliasUrlsHelp + keepURLFragmentSelectHTML + '</td>\
@@ -174,7 +174,7 @@ function SitesManager(_timezones, _currencies, _defaultTimezone, _defaultCurrenc
 				<td>' + getEcommerceSelector(0) + '<br />' + ecommerceHelp + '</td>\
 				<td>' + submitButtonHtml + '</td>\
 	  			<td><span class="cancel link_but">' + sprintf(_pk_translate('General_OrCancel_js'), "", "") + '</span></td>\
-	 		</tr>')
+	 		</tr>'))
                 .appendTo('#editSites')
             ;
 
diff --git a/plugins/UsersManager/templates/UsersManager.js b/plugins/UsersManager/templates/UsersManager.js
index 1da9a43943..6d380bd3a7 100644
--- a/plugins/UsersManager/templates/UsersManager.js
+++ b/plugins/UsersManager/templates/UsersManager.js
@@ -209,7 +209,7 @@ $(document).ready(function () {
         var newRowId = numberOfRows + 1;
         newRowId = 'row' + newRowId;
 
-        $(' <tr id="' + newRowId + '">\
+        $($.parseHTML(' <tr id="' + newRowId + '">\
 				<td><input id="useradd_login" value="login?" size="10" /></td>\
 				<td><input id="useradd_password" value="password" size="10" /></td>\
 				<td><input id="useradd_email" value="email@domain.com" size="15" /></td>\
@@ -217,7 +217,7 @@ $(document).ready(function () {
 				<td>-</td>\
 				<td><input type="submit" class="submit adduser"  value="' + _pk_translate('General_Save_js') + '" /></td>\
 	  			<td><span class="cancel">' + sprintf(_pk_translate('General_OrCancel_js'), "", "") + '</span></td>\
-	 		</tr>')
+	 		</tr>'))
             .appendTo('#users')
         ;
         $('#' + newRowId).keypress(submitOnEnter);