No commit message

No commit message

plugins/globe/views/default/globe/content.php

@@ -5,10 +5,23 @@
 
 
 <script type="text/javascript">var config_url = "<?php echo $CONFIG->url ?>";</script>
+<script type="text/javascript">
+<?php 
+	if(!isset($_REQUEST['display']) || $_REQUEST['display'] == 'featured')
+		echo 'var whatToShowOnMap = "featured";';
+	else if($_REQUEST['display'] == 'friends')
+		echo 'var whatToShowOnMap = "friends";';
+	else
+		echo 'var whatToShowOnMap = "featured";';
+?>
+</script>
 <script type="text/javascript" src="http://globe.poly9.com/api.js"></script>
 <script type="text/javascript" src="<?php echo $CONFIG->url ?>mod/globe/views/default/globe/globefeatured.js"></script>
 <script type="text/javascript" src="<?php echo $CONFIG->url ?>mod/globe/views/default/globe/globecontrol.js"></script>
 
+
 <div id="globeInner" style="opacity:1 !important; display: block !important;width:940px;height:705px;background-color:#000;"></div>
 
+
+
 				
\ No newline at end of file

plugins/globe/views/default/globe/globecontrol.js

@@ -8,18 +8,20 @@ function startMap() {
 	//turn off the overlay
 	this.toggleDashboard();
 	//set the initial zoom level
-	map1.zoomTo(10505000,1.5,"easeInOutQuad");
+	map1.zoomTo(10505000,2.5,"easeInOutQuad");
 	
-	//put in the pins for featured huskers
-	for(counter=0;counter<counterMax;counter++){
-		per = husker[counter];
-		placePin(per.lng,per.lat,per.username,per.location,per.displayname,per.title,per.comment,per.linkname);
-	}
 	
-	//auto fill the globe with featured huskers	
-	counter=Math.floor(Math.random()*counterMax);
-	setTimeout("displayFeatured();",1000);
-
+	if(whatToShowOnMap = 'featured') {
+		//put in the pins for featured huskers
+		for(counter=0;counter<counterMax;counter++){
+			per = husker[counter];
+			placePin(per.lng,per.lat,per.username,per.location,per.displayname,per.title,per.comment,per.linkname);
+		}
+		
+		//auto fill the globe with featured huskers	
+		counter=Math.floor(Math.random()*counterMax);
+		setTimeout("displayFeatured();",1000);
+	}
 };
 
 function displayFeatured(){
@@ -28,7 +30,7 @@ function displayFeatured(){
 	counter++;
 	if(counter>=counterMax)
 		counter=0;
-	setT=setTimeout("displayFeatured()",3000);	
+	setT=setTimeout("displayFeatured()",6000);	
 
 };
 
@@ -43,7 +45,7 @@ function placePin(lng, lat, username, location, displayname, title, comment, lin
 function openLocation(lng, lat, username, location, displayname, title, comment, linkname) { 
 	clearTimeout(setT);
 	var latlng = new FE.LatLng(lat,lng);	
-	setTimeout(function(){map1.panTo(latlng,1.5,"easeInOutQuad")}, 50);
+	setTimeout(function(){map1.panTo(latlng,2.5,"easeInOutQuad")}, 80);
 	label = window.label = new FE.Pushpin(latlng,new FE.Icon(config_url+'mod/customindex/map-pin-12.png'));
 	map1.addOverlay(label);
 	applylabel(latlng, location, title, comment, displayname, username, linkname);