merge sanjiangyuan-sub r5210 into sjy-erc

application/default/views/scripts/about/contact.phtml

@@ -18,10 +18,10 @@ $this->breadcrumb()->setSeparator(' > ');
             <div id="offline" class="span4">
     
               <br />
-              青海省草原总站<br />
+              青海省生态环境遥感监测中心<br />
-              西宁市胜利路81号<br />
+			  西宁市南山路16号鸣翠柳山庄20号楼1-111室<br />
-              邮编：810008<br />
+              邮编：810007<br />
-              电话: +86-0971-6153683<br />
+              电话: +86-0971-8235827<br />
               <br />
             </div> 
                                   

application/default/views/scripts/data/timemap.phtml

@@ -3,62 +3,42 @@ $this->headTitle($this->config->title->site);
 $this->headTitle($this->config->title->data);
 $this->headTitle('时空导航');
 $this->headTitle()->setSeparator(' - ');
-//$this->headLink()->appendStylesheet('/css/metadata.css');
+//$this->theme->AppendPlus($this,'google_map_v3');
-$this->theme->AppendPlus($this,'google_map_v3');
+//$this->theme->AppendPlus($this,'colorbox');
-$this->theme->AppendPlus($this,'colorbox');
+$this->headScript()->appendFile('/js/OpenLayers.js');
 $this->headScript()->appendFile('/js/timeline_var.js');
 $this->headScript()->appendFile('/js/timeline_js/timeline-api.js');
-$this->headScript()->appendFile('/js/timemap.2.0.1/lib/mxn/mxn.js?(googlev3)');
+$this->headScript()->appendFile('/js/timemap.2.0.1/lib/mxn/mxn.js?(openlayers)');
 $this->headScript()->appendFile('/js/timemap.2.0.1/timemap.pack.js');
 $this->nav[] = array('link'=>"/data/timemap",'title'=>'时空导航');
 ?>
 <style>
 img{max-width:none}
 </style>
-<div class="row-fluid"><?= $this->partial('data/tools.phtml'); ?></div>      
+<div class="row-fluid"><?= $this->render('breadcrumbs.phtml'); ?><?= $this->partial('data/tools.phtml'); ?></div>      
 <div id="timemap">
-	<div id="timeline" style="height:500px;border-right:1px solid #abc;width:50%;float:left;"></div> 
+	<div id="timeline" style="height:400px;border-bottom:1px solid #abc;"></div> 
-    <div id="map" style="height:500px;"></div>
+    <div id="map" style="height:400px;"></div>
 </div>
 
 <script type="text/javascript" charset="utf-8">
-$('#map').height($(window).height());
+$('#map').height($(window).height()/2);
-$('#timeline').height($(window).height());
+$('#timeline').height($(window).height()/2);
 $("html,body").animate({scrollTop:$('#timemap').offset().top},600);
 var tm;
 $(function() {
-    
+      
-    // make a custom map style
-    var styledMapType = new google.maps.StyledMapType([
-        {
-            featureType: "water",
-            elementType: "all",
-            stylers: [
-              { saturation: 0 },
-              { lightness: 100 }
-            ]
-        },
-        {
-            featureType: "all",
-            elementType: "all",
-            stylers: [
-              { saturation: -100 }
-            ]
-        }
-    ], {
-        name: "white"
-    });
-    
     tm = TimeMap.init({
         mapId: "map",               // Id of map div element (required)
         timelineId: "timeline",     // Id of timeline div element (required)
+		scrollTo:"2012-01-01",
         options: {
             eventIconPath: "../images/"
         },
         datasets: [
             {
-                id: "artists",
+                id: "metadata",
-                title: "Artists",
+                title: "Metadata",
                 theme: "orange",
                 // note that the lines below are now the preferred syntax
                 type: "basic",
@@ -78,8 +58,7 @@ $(function() {
                            },
                           "title" : "<?php echo htmlspecialchars($row['title']); ?>",
                           "options" : {
-                            "infoHtml": "<div class='info'><a href=/heihe/view/uuid/<?php echo $row['uuid']; ?>><?php echo htmlspecialchars($row['title']); ?></a><hr /><img src=/service/thumb/id/<?php echo $row['id']; ?> onclick='$.colorbox({photo:\"true\",href:\"/service/bigthumb/id/<?php echo $row['id']; ?>\"});' /></div>",
+                            "infoHtml": "<div class='info'><a href=/data/view/uuid/<?php echo $row['uuid']; ?>><?php echo htmlspecialchars($row['title']); ?></a><hr /><img src=/service/thumb/id/<?php echo $row['id']; ?> onclick='$.colorbox({photo:\"true\",href:\"/service/bigthumb/id/<?php echo $row['id']; ?>\"});' /></div>",
-                          	"theme":"orange"
                         	}
                         },
 <?php endforeach; ?>   
@@ -89,14 +68,10 @@ $(function() {
         ],
         bandIntervals: [
             Timeline.DateTime.MONTH, 
-            Timeline.DateTime.DECADE
+            Timeline.DateTime.YEAR
         ]
     });
     
-    // set the map to our custom style
-    var gmap = tm.getNativeMap();
-    gmap.mapTypes.set("white", styledMapType);
-    gmap.setMapTypeId("white");
 });
 
 </script>