Index: /oceandb/jQuery_Prototype/data/get_data.php
===================================================================
--- /oceandb/jQuery_Prototype/data/get_data.php	(revision 69)
+++ /oceandb/jQuery_Prototype/data/get_data.php	(revision 70)
@@ -1,5 +1,5 @@
 <?
   require_once('../db-config/connect-mysql.php');
-  $query = "SELECT data_type.serial AS type_id, maincase_new.owner_org, maincase_new.loc1_lon, maincase_new.loc1_lat FROM data_type, maincase_new, maincase_detail WHERE maincase_detail.maincase_id = maincase_new.serial AND maincase_detail.type_id = data_type.serial AND type_id =" . $_GET['type_id'] . " AND owner_org = '" . $_GET['owner_org'] . "' ORDER BY loc1_lon, loc1_lat";
+  $query = "SELECT data_type.serial AS type_id, maincase_new.owner_org, maincase_new.loc1_lon, maincase_new.loc1_lat, maincase_new.description, maincase_new.website FROM data_type, maincase_new, maincase_detail WHERE maincase_detail.maincase_id = maincase_new.serial AND maincase_detail.type_id = data_type.serial AND type_id =" . $_GET['type_id'] . " AND owner_org = '" . $_GET['owner_org'] . "' ORDER BY loc1_lon, loc1_lat";
   if ($database_connect) mysql_select_db($database_connect) or die('USE '.$database_connect.' failed!');
   $result = mysql_query($query) or die("Query failed! $query");
@@ -11,5 +11,5 @@
     {
       $col= mysql_fetch_row($result);
-      echo "{ \"type_id\" : " . $col[0] . ", \"owner_org\" : \"" . $col[1] . "\", \"loc1_lon\" : \"" . $col[2] . "\", \"loc1_lat\" : \"" . $col[3] . "\"},\n";
+      echo "{ \"type_id\" : " . $col[0] . ", \"owner_org\" : \"" . $col[1] . "\", \"loc1_lon\" : \"" . $col[2] . "\", \"loc1_lat\" : \"" . $col[3] . "\", \"description\" : \"" . $col[4] . "\", \"website\" : \"" . $col[5] . "\"},\n";
     }
     echo "]";
Index: /oceandb/jQuery_Prototype/script/oceandb.js
===================================================================
--- /oceandb/jQuery_Prototype/script/oceandb.js	(revision 69)
+++ /oceandb/jQuery_Prototype/script/oceandb.js	(revision 70)
@@ -43,6 +43,6 @@
       }
       // 根據 type_id 逐一加入 owner_org
-      $("#map-menu-" + item.type_id).append("<li><input type='checkbox' id='map-menu-" 
-		     + item.type_id + "-" + count +"'>"
+      $("#map-menu-" + item.type_id).append("<li><input type='checkbox' "
+		     + "id='map-menu-" + item.type_id + "-" + count +"'>"
 		     + item.owner_org + "</input></li>");
 
@@ -60,7 +60,16 @@
 	    $.each(json,function(i,item){
 	      if(checked) {
-		map.addOverlay(new GMarker(new GLatLng(item.loc1_lat, item.loc1_lon)));
+		var latlon = new GLatLng(item.loc1_lat, item.loc1_lon);
+		var marker = new GMarker(latlon);
+		GEvent.addListener(marker, 'click', function() {
+		  map.openInfoWindowHtml(latlon, "參考連結：<a href='" 
+		  + item.website + "' target='_NEW'>" + item.website + "</a>"
+		  + "<iframe width='640' height='300' src='" 
+		  + item.website + "'/>");
+		});
+		map.addOverlay(marker);
 	      } else {
 		map.clearOverlays();
+		map.closeInfoWindow();
 	      }
 	    });