From f1f29bce4942e0429a98e7dcec6e86dd89853f5c Mon Sep 17 00:00:00 2001
From: diosmosis <benaka.moorthi@gmail.com>
Date: Wed, 20 Feb 2013 23:23:10 +0000
Subject: Refs #1845, added new admin page where users can create their own
 custom JavaScript tracking code snippets and image tracking link HTML.

Notes:
  * Rewrote Site selector widget JS so multiple site selectors could be used on the same page.
  * Added method to ajaxHelper JS class that eases use of bulk request API.
  * Allowed section toggler JS in misc.js to be used w/ input elements as well as links.
  * Fixed bug in menu ordering code where accessing _hasSubMenu results in uasort behaving incorrectly when menu is already sorted.
---
 plugins/UsersManager/templates/UsersManager.js  | 10 ++++++++++
 plugins/UsersManager/templates/UsersManager.tpl |  8 +-------
 2 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'plugins/UsersManager')

diff --git a/plugins/UsersManager/templates/UsersManager.js b/plugins/UsersManager/templates/UsersManager.js
index 6948af6f90..66c2cc8001 100644
--- a/plugins/UsersManager/templates/UsersManager.js
+++ b/plugins/UsersManager/templates/UsersManager.js
@@ -234,4 +234,14 @@ $(document).ready( function() {
 
 	$('.updateAccess')
 		.click( bindUpdateAccess );
+	
+	// when a site is selected, reload the page w/o showing the ajax loading element
+	$('#usersManagerSiteSelect').bind('piwik:siteSelected', function(e, site) {
+		switchSite(
+			site.id,
+			site.name,
+			false /* do not show main ajax loading animation */,
+			true /* do not go to all websites dash */
+		);
+	});
 });
diff --git a/plugins/UsersManager/templates/UsersManager.tpl b/plugins/UsersManager/templates/UsersManager.tpl
index 9034bbcc9c..88ad149c56 100644
--- a/plugins/UsersManager/templates/UsersManager.tpl
+++ b/plugins/UsersManager/templates/UsersManager.tpl
@@ -39,14 +39,8 @@
 		{/capture}
 		{include file="CoreHome/templates/sites_selection.tpl"
 			siteName=$defaultReportSiteName idSite=$idSiteSelected allSitesItemText=$applyAllSitesText
-			allWebsitesLinkLocation=top}
+			allWebsitesLinkLocation=top siteSelectorId="usersManagerSiteSelect" switchSiteOnSelect=false}
 	</section>
-	{literal}<script type="text/javascript">
-		window.autocompleteOnNewSiteSelect = function(siteId, siteName)
-		{
-			switchSite(siteId, siteName, false /* do not show main ajax loading animation */);
-		};
-	</script>{/literal}
 </div>
 
 {ajaxErrorDiv}
-- 
cgit v1.2.3