From a04d8c8d6ae0c8cca7e678eb9a332c14e085b6df Mon Sep 17 00:00:00 2001
From: sgiehl <stefangiehl@gmail.com>
Date: Wed, 26 Oct 2011 20:15:38 +0000
Subject: [PATCH] show loading icon in siteselection while switching site

git-svn-id: http://dev.piwik.org/svn/trunk@5377 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
 plugins/CoreHome/templates/autocomplete.js     | 13 +++++++++++--
 plugins/CoreHome/templates/sites_selection.tpl |  2 +-
 themes/default/common.css                      |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/plugins/CoreHome/templates/autocomplete.js b/plugins/CoreHome/templates/autocomplete.js
index fcdd0e57c2..01cf44e743 100644
--- a/plugins/CoreHome/templates/autocomplete.js
+++ b/plugins/CoreHome/templates/autocomplete.js
@@ -11,6 +11,16 @@ $('.but').bind('click', function(e)
 		$('#websiteSearch').autocomplete('search', $('#websiteSearch').val() + '%%%');
 	return false;
 });
+
+function switchSite(id, name)
+{
+    $("#sitesSelectionSearch .custom_select_block").toggleClass("custom_select_block_show");
+    $('.custom_select_main_link').text(name);
+    $('.custom_select_main_link').addClass('custom_select_loading');
+    broadcast.propagateNewPage('idSite='+id );
+    return false;
+}
+
 $(function() {
 	if($('#websiteSearch').length == 0)
 	{
@@ -35,13 +45,12 @@ $(function() {
 		select: function(event, ui) {
 			if(piwik.idSite == ui.item.id)
 			{
-				hide();
 				$("#sitesSelectionSearch .custom_select_block").toggleClass("custom_select_block_show");
 			}
 			else
 			{
 				if(ui.item.id > 0) {
-					broadcast.propagateNewPage('idSite='+ui.item.id );
+				    switchSite(ui.item.id, ui.item.name);
 				} else {
 					reset();
 				}
diff --git a/plugins/CoreHome/templates/sites_selection.tpl b/plugins/CoreHome/templates/sites_selection.tpl
index 36dcb92456..8f4d33c3c0 100644
--- a/plugins/CoreHome/templates/sites_selection.tpl
+++ b/plugins/CoreHome/templates/sites_selection.tpl
@@ -8,7 +8,7 @@
             <div id="custom_select_container">
             <ul class="custom_select_ul_list" >
                 {foreach from=$sites item=info}
-                    <li {if $idSite==$info.idsite} style="display: none"{/if}><a href="index.php?module=CoreHome&amp;action=index&amp;idSite={$info.idsite}&amp;period={$period}&amp;date={$rawDate}" siteid="{$info.idsite}" onclick="broadcast.propagateNewPage( 'idSite={$info.idsite}');">{$info.name}</a></li>
+                    <li {if $idSite==$info.idsite} style="display: none"{/if}><a href="index.php?module=CoreHome&amp;action=index&amp;idSite={$info.idsite}&amp;period={$period}&amp;date={$rawDate}" siteid="{$info.idsite}" onclick="switchSite({$info.idsite}, $(this).text());">{$info.name}</a></li>
 				{/foreach}
             </ul>
             </div>
diff --git a/themes/default/common.css b/themes/default/common.css
index 04bea43198..eca12047a9 100644
--- a/themes/default/common.css
+++ b/themes/default/common.css
@@ -265,7 +265,7 @@ a {
 }
 
 .sites_autocomplete .custom_select_loading{
-	background: url(images/loading-blue.gif) no-repeat right 0;
+	background: url(images/loading-blue.gif) no-repeat right 3px;
 }
 
 .sites_autocomplete .custom_select_ul_list{
-- 
GitLab