1 files changed, 27 insertions, 8 deletions

diff --git a/plugins/CoreHome/templates/sites_selection.tpl b/plugins/CoreHome/templates/sites_selection.tpl
index 57287a35bd..753ed724f4 100644
--- a/plugins/CoreHome/templates/sites_selection.tpl
+++ b/plugins/CoreHome/templates/sites_selection.tpl
@@ -1,9 +1,28 @@
-<span id="sitesSelection">Site <select name="idSite" onchange='javascript:this.form.submit()'>
-	<optgroup label="Sites">
-	   {foreach from=$sites item=info}
-	   		<option label="{$info.name}" value="{$info.idsite}" {if $idSite==$info.idsite} selected="selected"{/if}>{$info.name}</option>
-	   {/foreach}
-	</optgroup>
-</select>
-{hiddenurl idSite=null}
+<span id="sitesSelectionWrapper" >
+	<span id="selectedSiteName" style="display:none">{$siteName}</span>
+	<span id="sitesSelection" style="position:absolute">Site 
+		<form action="{url idSite=null}" method="get">
+		<select name="idSite">
+		   {foreach from=$sites item=info}
+		   		<option value="{$info.idsite}" {if $idSite==$info.idsite} selected="selected"{/if}>{$info.name}</option>
+		   {/foreach}
+		</select>
+		{hiddenurl idSite=null}
+		<input type="submit" value="go"/>
+		</form>
+	</span>
+
+	{literal}<script language="javascript">
+	$(document).ready(function() {
+		var extraPadding = 0;
+		// if there is only one website, we dont show the arrows image, so no need to add the extra padding
+		if( $('#sitesSelection').find('option').size() > 1)
+		{
+			extraPadding = 21;
+		}
+		var widthSitesSelection = $("#selectedSiteName").width() + 4 + extraPadding;
+		$("#sitesSelectionWrapper").css('padding-right', widthSitesSelection);
+		$("#sitesSelection").fdd2div({CssClassName:"formDiv"});
+	});</script>
+	{/literal}
 </span>
\ No newline at end of file