update hiwater controller

1.项目来源中添加 项目管理机构、管理邮箱、访项目组不管理数据UUID管理功能；
  2.新增管理邮箱条目前台JS自动增减功能；
  3.新增数据UUID条目前台JS自动增减功能；
  4.新增项目管理机构单选功能；

讨论的问题：
   admin_email,exclude_data, 两字段的数据类型自带｛｝似乎不太方便。

application/admin/controllers/DataController.php

@@ -4109,9 +4109,9 @@ group by m.uuid,m.title,m.description) md ON md.uuid=v.uuid
 							'title'=>$metadata['title'],
 							'doi'=>$metadata['doi'],
 							'url'=>"http://" . $_SERVER['HTTP_HOST'].'/data/'.$uuid,
-							'publisher'=>'寒区旱区科学数据中心',
+							'publisher'=>'黑河计划数据管理中心',
 							'title_en'=>$metadata['title_en'],
-							'publisher_en'=>'Cold and Arid Regions Science Data at Lanzhou',
+							'publisher_en'=>'Heihe Plan Science Data Center',
 						);
 					}else{
 						$this->view->data['doi'] = $metadata['doi'];
@@ -4210,7 +4210,7 @@ group by m.uuid,m.title,m.description) md ON md.uuid=v.uuid
 			$doi.='<doi_data>
           <doi>'.$row['doi'].'</doi>
           <timestamp>'.$timestamp.'</timestamp>
-          <resource><![CDATA[http://westdc.westgis.ac.cn/data/'.$row['uuid'].']]></resource>
+          <resource><![CDATA[http://www.heihedata.org/data/'.$row['uuid'].']]></resource>
         </doi_data>';
 			$doi.='</database>
     </science_data>

application/admin/views/scripts/data/md-dataset.phtml

@@ -24,16 +24,16 @@
 	{?>
 		<p>主机：<br /><input type="text" id="host" name="host" value="<?= $this->dataset['host']?>" class="full" /></p>
         <p>路径：<br /><input type="text" id="path" name="path" value="<?= $this->dataset['path']?>" class="full" /></p>
-		<p>语言：<br /><input type="radio" name="lang" value="" <?php if ($this->dataset['lang']=='') echo 'checked="checked"'; ?> /> 不限制语言
-		<input type="radio" name="lang" value="cn" <?php if ($this->dataset['lang']=='cn') echo 'checked="checked"'; ?> /> 中文
-		<input type="radio" name="lang" value="en" <?php if ($this->dataset['lang']=='en') echo 'checked="checked"'; ?> /> 英文 </p>
+		<p>语言：<br /><input type="radio" id="lang" name="lang" value="" <?php if ($this->dataset['lang']=='') echo 'checked="checked"'; ?> /> 不限制语言
+		<input type="radio" id="lang" name="lang" value="cn" <?php if ($this->dataset['lang']=='cn') echo 'checked="checked"'; ?> /> 中文
+		<input type="radio" id="lang" name="lang" value="en" <?php if ($this->dataset['lang']=='en') echo 'checked="checked"'; ?> /> 英文 </p>
         <p><button type="button" class="btn btn-green" onclick="updateDataSet()">修改</button></p>
 	<?php }else{ ?>
     	<p>主机：<br /><input type="text" id="host" name="host" value="" class="full" /></p>
         <p>路径：<br /><input type="text" id="path" name="path" value="" class="full" /></p>
-		<p>语言：<br /><input type="radio" name="lang" value="" /> 不限制语言
-		<input type="radio" name="lang" value="cn" /> 中文
-		<input type="radio" name="lang" value="en" /> 英文 </p>			
+		<p>语言：<br /><input type="radio" id="lang" name="lang" value="" /> 不限制语言
+		<input type="radio" id="lang" name="lang" value="cn" /> 中文
+		<input type="radio" id="lang" name="lang" value="en" /> 英文 </p>			
         <p><button type="button" class="btn btn-green" onclick="addDataSet()">添加</button></p>
     <?php } ?>
     </div>

application/config.ini

@@ -5,7 +5,7 @@ db.params.username = gis
 db.params.password = gispassword
 db.params.dbname = metadata
 
-geonetwork.url=http://westdc.westgis.ac.cn/geonetwork/
+geonetwork.url=http://www.heihedata.org/geonetwork/
 geonetwork.adapter = PDO_PGSQL
 geonetwork.params.host = localhost
 geonetwork.params.username = gis
@@ -31,10 +31,10 @@ paths.newsletter=images/newsletter/
 logging.file = /var/www/test.westgis.ac.cn/data/logs/debug.log
 page.limit=10
 import.dir=../data/import
-title.site=寒区旱区科学数据中心
-title.data=数据产品
+title.site=黑河计划数据管理中心
+title.data=数据产品与服务
 title.heihe=黑河计划数据管理中心
-title.yrnmr=黄河上游宁蒙河段综合数据
+title.yrnmr=黄河上游宁蒙河段综合数据平台
 title.glacier=中国冰川资源及其变化调查
 title.review=数据评审
 title.author=数据作者
@@ -169,7 +169,3 @@ routes.news.route = archives/:ptype/:type/:page
 routes.news.defaults.controller = archives
 routes.news.defaults.action = list
 routes.news.defaults.page = 1
-
-routes.qzr.route = qzr/news/:title
-routes.qzr.defaults.controller = qzr
-routes.qzr.defaults.action = news

application/default/controllers/AboutController.php

@@ -4,8 +4,6 @@ class AboutController extends Zend_Controller_Action
 {
     function indexAction()
     {
-		$archives=new Archive($this->db);
-		$this->view->item=$archives->getOneArchive('中心简介','about');		
     }
     function preDispatch()
     {
@@ -46,23 +44,21 @@ class AboutController extends Zend_Controller_Action
     }     
     function termsAction()
     {
-		$archives=new Archive($this->db);
-		$this->view->item=$archives->getOneArchive('使用条款','about');		
     }
     function backgroundAction()    
     {
-		$archives=new Archive($this->db);
-		$this->view->item=$archives->getOneArchive('发展历史','about');
+					$archives=new Archive($this->db);
+					$this->view->item=$archives->getOneArchive('发展历史','about');
     }
     function legalAction()
     {
-		$archives=new Archive($this->db);
-		$this->view->item=$archives->getOneArchive('隐私政策','about');
+					$archives=new Archive($this->db);
+					$this->view->item=$archives->getOneArchive('隐私政策','about');
     }
     function supportusAction()
     {
-		$archives=new Archive($this->db);
-		$this->view->item=$archives->getOneArchive('支持我们','about');
+					$archives=new Archive($this->db);
+					$this->view->item=$archives->getOneArchive('支持我们','about');
     }
     function copyrightAction()
     {

application/default/controllers/DataController.php

@@ -30,21 +30,21 @@ class DataController extends Zend_Controller_Action
     	$state=$this->db->query('select c.code,name,name_zh,count(*) from category c,categorycode cc where c.code=cc.code group by c.code,cc.name,cc.name_zh');
     	$this->view->category=$state->fetchAll();
     	//关键词
-    	$state=$this->db->query("select keyword,count(*) from keyword right join normalmetadata on keyword.id=normalmetadata.id where keytype='place' group by keyword order by count desc limit 20");    	
+    	$state=$this->db->query("select keyword,count(*) from keyword right join heihemetadata on keyword.id=heihemetadata.id where keytype='place' group by keyword order by count desc limit 20");    	
     	$k1=$state->fetchAll();
-    	$state=$this->db->query("select keyword,count(*) from keyword right join normalmetadata on keyword.id=normalmetadata.id  where keytype='theme' group by keyword order by count desc limit 20");
-    	//$state=$this->db->query("select k.keyword,count(k.keyword) from keyword k left join normalmetadata m on k.id=m.id where k.keytype='theme' and (m.uuid in (select uuid from dataorder group by uuid order by count(uuid) desc limit 20)) group by k.keyword order by count(k.keyword) desc limit 20");
+    	$state=$this->db->query("select keyword,count(*) from keyword right join heihemetadata on keyword.id=heihemetadata.id  where keytype='theme' group by keyword order by count desc limit 20");
+    	//$state=$this->db->query("select k.keyword,count(k.keyword) from keyword k left join heihemetadata m on k.id=m.id where k.keytype='theme' and (m.uuid in (select uuid from dataorder group by uuid order by count(uuid) desc limit 20)) group by k.keyword order by count(k.keyword) desc limit 20");
     	$k2=$state->fetchAll();
-    	$state=$this->db->query("select keyword,count(*) from keyword right join normalmetadata on keyword.id=normalmetadata.id  where keytype='discipline' group by keyword order by count desc limit 20");
+    	$state=$this->db->query("select keyword,count(*) from keyword right join heihemetadata on keyword.id=heihemetadata.id  where keytype='discipline' group by keyword order by count desc limit 20");
     	$k3=$state->fetchAll();
-    	$state=$this->db->query("select keyword,count(*) from keyword right join normalmetadata on keyword.id=normalmetadata.id  where keytype='stratum' group by keyword order by count desc limit 20");
+    	$state=$this->db->query("select keyword,count(*) from keyword right join heihemetadata on keyword.id=heihemetadata.id  where keytype='stratum' group by keyword order by count desc limit 20");
     	$k4=$state->fetchAll();
-    	$state=$this->db->query("select keyword,count(*) from keyword right join normalmetadata on keyword.id=normalmetadata.id  where keytype='temporal' group by keyword order by count desc limit 20");
-    	//$state=$this->db->query("select k.keyword,count(k.keyword) from keyword k left join normalmetadata m on k.id=m.id where k.keytype='temporal' and (m.uuid in (select uuid from dataorder group by uuid order by count(uuid) desc limit 20)) group by k.keyword order by count(k.keyword) desc limit 20");
+    	$state=$this->db->query("select keyword,count(*) from keyword right join heihemetadata on keyword.id=heihemetadata.id  where keytype='temporal' group by keyword order by count desc limit 20");
+    	//$state=$this->db->query("select k.keyword,count(k.keyword) from keyword k left join heihemetadata m on k.id=m.id where k.keytype='temporal' and (m.uuid in (select uuid from dataorder group by uuid order by count(uuid) desc limit 20)) group by k.keyword order by count(k.keyword) desc limit 20");
     	$k5=$state->fetchAll();
     	$this->view->keywords=array('place'=>$k1,'theme'=>$k2,'discipline'=>$k3,'stratum'=>$k4,'temporal'=>$k5);
     	//最新10个入库数据
-    	$state=$this->db->query('select id,uuid,title from normalmetadata order by id desc limit 10');
+    	$state=$this->db->query('select id,uuid,title from heihemetadata order by id desc limit 10');
         $this->view->metadata = $state->fetchAll();
         //特色数据      
         
@@ -91,11 +91,11 @@ class DataController extends Zend_Controller_Action
     	if (empty($page)) $page=1;
     	$limit=30;
     	$offset=$limit*($page-1);
-    	$state=$this->db->query('select count(*) from normalmetadata where datatype=0');
+    	$state=$this->db->query('select count(*) from heihemetadata where datatype=0');
     	$row=$state->fetchAll();
     	$sum=$row[0]['count'];
     	$select=$this->db->select();
-    	$select->from('normalmetadata','*')->where('datatype=0')->order('title')->limitPage($page,$limit);
+    	$select->from('heihemetadata','*')->where('datatype=0')->order('title')->limitPage($page,$limit);
     	$this->view->metadata = $this->db->fetchAll($select);
     	$this->view->page=new Pagination($sum,$page,$limit);
 	}
@@ -105,11 +105,11 @@ class DataController extends Zend_Controller_Action
     	if (empty($page)) $page=1;
     	$limit=30;
     	$offset=$limit*($page-1);
-    	$state=$this->db->query('select count(*) from normalmetadata where datatype=1');
+    	$state=$this->db->query('select count(*) from heihemetadata where datatype=1');
     	$row=$state->fetchAll();
     	$sum=$row[0]['count'];
     	$select=$this->db->select();
-    	$select->from('normalmetadata','*')->where('datatype=1')->order('title')->limitPage($page,$limit);
+    	$select->from('heihemetadata','*')->where('datatype=1')->order('title')->limitPage($page,$limit);
     	$this->view->metadata = $this->db->fetchAll($select);
     	$this->view->page=new Pagination($sum,$page,$limit);
 	}
@@ -209,7 +209,7 @@ class DataController extends Zend_Controller_Action
     	if (empty($page)) $page=1;
     	$limit=10;
     	$offset=$limit*($page-1);
-    	$sql='select keyword,count(*),keytype from keyword right join normalmetadata on keyword.id=normalmetadata.id ';
+    	$sql='select keyword,count(*),keytype from keyword right join heihemetadata on keyword.id=heihemetadata.id ';
     	if (!empty($keytype) && ($keytype=='place' || $keytype=='theme' || $keytype=='discipline'||$keytype=='temporal')) $sql.=" where keytype='".$keytype."'";
     	$sql.=' group by keyword,keytype  order by keytype,keyword,count desc';
     	$state=$this->db->query($sql);
@@ -222,13 +222,13 @@ class DataController extends Zend_Controller_Action
     			$key=$row->name;     			
     		}
     		$this->view->codename=$key;
-    		$sql=$this->db->quoteInto('select count(m.id) from normalmetadata m,keyword k where m.id=k.id and k.keyword=?',$key);
+    		$sql=$this->db->quoteInto('select count(m.id) from heihemetadata m,keyword k where m.id=k.id and k.keyword=?',$key);
     		
     		$state=$this->db->query($sql);
     		$row=$state->fetchAll();
 			$sum=$row[0]['count'];
 			$select=$this->db->select();
-			$select->from('normalmetadata','*')->join('keyword','normalmetadata.id=keyword.id')->where('keyword.keyword=?',$key)->order('normalmetadata.title')->limitPage($page,$limit);
+			$select->from('heihemetadata','*')->join('keyword','heihemetadata.id=keyword.id')->where('keyword.keyword=?',$key)->order('heihemetadata.title')->limitPage($page,$limit);
     		//$sql=$db->quoteInto('select m.* from metadata m,keyword k where m.id=k.id and k.keyword=?',$key);
     		//$state=$db->query($sql);
     		$this->view->metadata=$this->db->fetchAll($select);
@@ -275,17 +275,17 @@ class DataController extends Zend_Controller_Action
     		$this->view->codename=$row['name'];
     		if (!empty($keyword))
     		{ 
-    			$sql='select count(m.id) as count from normalmetadata m,dataseries d,keyword k where m.id=d.id and m.id=k.id and d.sid=? and k.keyword=?';
+    			$sql='select count(m.id) as count from heihemetadata m,dataseries d,keyword k where m.id=d.id and m.id=k.id and d.sid=? and k.keyword=?';
     			$row=$this->db->fetchAll($sql,array($id,$keyword));
     			$this->view->codename.="【关键词：".$keyword."】";
     		}else{
-    			$sql='select count(m.id) as count from normalmetadata m,dataseries d where m.id=d.id and d.sid=?';
+    			$sql='select count(m.id) as count from heihemetadata m,dataseries d where m.id=d.id and d.sid=?';
     			$row=$this->db->fetchAll($sql,array($id));
     		}
 			$sum=$row[0]['count'];
 			$select=$this->db->select();
-			$select->from('normalmetadata','*')->join('dataseries','normalmetadata.id=dataseries.id')->where('dataseries.sid=?',$id)->order('normalmetadata.title')->limitPage($page,$limit);
-			if (!empty($keyword)) $select->join('keyword','keyword.id=normalmetadata.id')->where('keyword.keyword=?',$keyword);
+			$select->from('heihemetadata','*')->join('dataseries','heihemetadata.id=dataseries.id')->where('dataseries.sid=?',$id)->order('heihemetadata.title')->limitPage($page,$limit);
+			if (!empty($keyword)) $select->join('keyword','keyword.id=heihemetadata.id')->where('keyword.keyword=?',$keyword);
     		$this->view->metadata=$this->db->fetchAll($select);
     		$this->view->page=new Pagination($sum,$page,$limit);
     		//$this->view->showtools=($sum>$page)?true:false;
@@ -312,11 +312,11 @@ class DataController extends Zend_Controller_Action
     		$where=$this->db->quoteInto('code = ?',$code);
     		$row=$this->db->fetchRow("select * from categorycode where ".$where);
     		$this->view->codename=(empty($row['name_zh'])?$row['name']:$row['name_zh']);
-    		$sql='select count(m.id) from normalmetadata m left join category c on m.id=c.id where c.code=?';
+    		$sql='select count(m.id) from heihemetadata m left join category c on m.id=c.id where c.code=?';
     		$row=$this->db->fetchRow($sql,array($code));
     		$sum=$row['count'];
     		$select=$this->db->select();
-    		$select->from('normalmetadata as m','*')->joinLeft('category as c','m.id=c.id')->where('c.code=?',$code)->order('m.title')->limitPage($page,$this->limit);
+    		$select->from('heihemetadata as m','*')->joinLeft('category as c','m.id=c.id')->where('c.code=?',$code)->order('m.title')->limitPage($page,$this->limit);
     		$this->view->metadata=$this->db->fetchAll($select);
     		$this->view->page=new Pagination($sum,$page,$this->limit);
     	} else {
@@ -330,14 +330,14 @@ class DataController extends Zend_Controller_Action
     function timelineAction()
     {
     	$fn="time1.xml";
-    	$rows=$this->db->fetchAll("select ts_created from normalmetadata order by ts_created desc limit 1");
+    	$rows=$this->db->fetchAll("select ts_created from heihemetadata order by ts_created desc limit 1");
     	$last_update=strtotime($rows[0]['ts_created']);
     	if (!file_exists($fn) || (filemtime($fn)<$last_update))
     	{ 
     	$dateformat="M j Y";
     	$md = new MetadataTable();
     	$db=$md->getAdapter();
-    	$state=$db->query('select id,uuid,description,title,timebegin,timeend from normalmetadata where timebegin is not null order by timebegin');
+    	$state=$db->query('select id,uuid,description,title,timebegin,timeend from heihemetadata where timebegin is not null order by timebegin');
     	$rows=$state->fetchAll();
     	$timexml='<data>';
     	foreach($rows as $row) {
@@ -376,7 +376,7 @@ class DataController extends Zend_Controller_Action
     	$id = (int)$this->_request->getParam('id');
     	$where='';
     	if (!empty($id)) { $where=' where id='.$id; }
-    	$sql='select id,uuid,west,south,north,east,title from normalmetadata'.$where;
+    	$sql='select id,uuid,west,south,north,east,title from heihemetadata'.$where;
     	$state=$db->query($sql);
     	$rows=$state->fetchAll();
     	$geomd=new GeoMetaData();
@@ -400,7 +400,7 @@ class DataController extends Zend_Controller_Action
     */
     function timemapAction()
     {
-    	$sql='select id,uuid,west,south,north,east,title,timebegin,timeend from normalmetadata where timebegin is not null';
+    	$sql='select id,uuid,west,south,north,east,title,timebegin,timeend from heihemetadata where timebegin is not null';
     	$this->view->rows=$this->db->fetchAll($sql);
     }
     /*
@@ -449,7 +449,7 @@ class DataController extends Zend_Controller_Action
                 //'generator' => 'Zend Framework Zend_Feed',
                 'entries' => array()
             );
-		$sql="select * from normalmetadata order by ts_created desc";
+		$sql="select * from heihemetadata order by ts_created desc";
 		$rs=$this->db->fetchAll($sql);
 		$feedArray['published']=strtotime($rs[0]['ts_created']);
 		foreach($rs as $r)
@@ -487,9 +487,9 @@ class DataController extends Zend_Controller_Action
     		$offset=$this->limit*($page-1);
     		$search=new Search($key);
     		$where=$search->sql_expr(array("title","description"));
-    		$row=$this->db->fetchAll("select count(*) from normalmetadata where ".$where);
+    		$row=$this->db->fetchAll("select count(*) from heihemetadata where ".$where);
     		$sum=$row[0]['count'];
-    		$sql="select uuid,title,id,description from normalmetadata where ".$where." order by title limit ? offset ?";
+    		$sql="select uuid,title,id,description from heihemetadata where ".$where." order by title limit ? offset ?";
 			$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
     		$this->view->page=new Pagination($sum,$page,$this->limit);
     		$this->view->key=$key;    
@@ -523,15 +523,15 @@ class DataController extends Zend_Controller_Action
     	$start=$this->_request->getParam('start');
     	$end=$this->_request->getParam('end');
     	if (!empty($key)) {     		
-    		$sql='select count(*) from normalmetadata where east<? and west>? and north<? and south>? and (title ilike ? or description ilike ?)';
+    		$sql='select count(*) from heihemetadata where east<? and west>? and north<? and south>? and (title ilike ? or description ilike ?)';
     		$row=$db->fetchAll($sql,array($e,$w,$n,$s,'%'.$key.'%','%'.$key.'%'));
     	} 	else {
-    		$sql='select count(*) from normalmetadata where east<? and west>? and north<? and south>?';
+    		$sql='select count(*) from heihemetadata where east<? and west>? and north<? and south>?';
     		$row=$db->fetchAll($sql,array($e,$w,$n,$s));
     	}
     		$sum=$row[0]['count'];
     		$select=$db->select();
-    		$select->from('normalmetadata','*')->where('east<?',$e)->where('west>?',$w)->where('north<?',$n)->where('south>?',$s);
+    		$select->from('heihemetadata','*')->where('east<?',$e)->where('west>?',$w)->where('north<?',$n)->where('south>?',$s);
     		if (!empty($key))	$select->where('(title ilike ? or description ilike ?)','%'.$key.'%');
     		$select->order('title')->limit($limit,$offset);
     		$this->view->metadata = $db->fetchAll($select);
@@ -546,7 +546,7 @@ class DataController extends Zend_Controller_Action
     function viewAction()
     {
     	$id = (int)$this->_request->getParam('id');
-    	$sql="select m.*,s.status,g.id as gid,t.filename,i.doi as datadoi,i.authors,i.author_en,i.publisher,i.publisher_en, date_part('year',i.ts_published) as publish_year from normalmetadata m left join mdstatus s on m.uuid=s.uuid 
+    	$sql="select m.*,s.status,g.id as gid,t.filename,i.doi as datadoi,i.authors,i.author_en,i.publisher,i.publisher_en, date_part('year',i.ts_published) as publish_year from heihemetadata m left join mdstatus s on m.uuid=s.uuid 
     	left join thumbnail t on t.id=m.id left join geonetworkmetadata g on m.uuid=g.uuid left join datadoi i on i.uuid=m.uuid where ";
     	if (empty($id)) {
     		$uuid = $this->_request->getParam('uuid');
@@ -655,7 +655,7 @@ where ds.uuid=? )) ) a ) p on r.id=p.refid order by p.place";
        	$sql.=" 1<>1) order by a.ts_created desc limit 10";  	 	 
         $this->view->literature=$this->db->fetchAll($sql);     
 		//相关元数据，根据同名关键词实现
-    	$sql="select distinct(md.uuid),md.title from keyword kw left join normalmetadata md on kw.id=md.id where kw.keyword in (select k.keyword from keyword k left join metadata m on k.id=m.id where m.id=? and k.keytype='theme') and kw.id<>? limit 10";
+    	$sql="select distinct(md.uuid),md.title from keyword kw left join heihemetadata md on kw.id=md.id where kw.keyword in (select k.keyword from keyword k left join metadata m on k.id=m.id where m.id=? and k.keytype='theme') and kw.id<>? limit 10";
     	$this->view->related=$this->db->fetchAll($sql,array($id,$id));
 		//用户下载记录
 		$sql = "select o.ts_created,m.uuid,u.realname,u.unit,oa.project as onlineproject, fa.project as offlineproject 
@@ -1955,11 +1955,11 @@ where ds.uuid=? )) ) a ) p on r.id=p.refid order by p.place";
     	$page=(int)$this->_request->getParam('page');    	
     	if (empty($page)) $page=1;
     	$offset=$this->limit*($page-1);
-    	$state=$this->db->query("select count(*) from normalmetadata");
+    	$state=$this->db->query("select count(*) from heihemetadata");
     	$row=$state->fetchAll();
     	$sum=$row[0]['count'];
     	$select=$this->db->select();
-    	$select->from('normalmetadata as m','m.*')
+    	$select->from('heihemetadata as m','m.*')
    	 	->order('m.title desc')->limitPage($page,9);
     	$this->view->metadata = $this->db->fetchAll($select);
     	$this->view->page=new Pagination($sum,$page,$this->limit);
@@ -2103,7 +2103,7 @@ where ds.uuid=? )) ) a ) p on r.id=p.refid order by p.place";
     {
 			$this->_helper->layout->disableLayout();
 			$this->_helper->viewRenderer->setNoRender();
-			$sql="select title,datatype,filesize,id from normalmetadata";
+			$sql="select title,datatype,filesize,id from heihemetadata";
 			$md=$this->db->fetchAll($sql);
 			foreach($md as $m)
 			{
@@ -2136,7 +2136,7 @@ where ds.uuid=? )) ) a ) p on r.id=p.refid order by p.place";
     	$this->view->organisation=$state->fetchAll();
     	if (!empty($name)) {
     		$this->view->codename=$name;
-    		$sql="select distinct m.* from normalmetadata m left join role r on m.uuid=r.uuid left join responsible s on r.resid=s.id where r.role in ('pointOfContact','resourceProvider','owner') and s.organisation=?";
+    		$sql="select distinct m.* from heihemetadata m left join role r on m.uuid=r.uuid left join responsible s on r.resid=s.id where r.role in ('pointOfContact','resourceProvider','owner') and s.organisation=?";
 	   		$sth = $this->db->prepare($sql);
 			$sth->execute(array($name));
 			$rows = $sth->fetchAll();
@@ -2157,7 +2157,7 @@ where ds.uuid=? )) ) a ) p on r.id=p.refid order by p.place";
 			$sql="select * from fund where id=?";
     		$this->view->fund=$this->db->fetchRow($sql,array($id));
 			if ($this->view->fund) {
-				$sql="select distinct m.* from normalmetadata m left join mdfund mf on m.uuid=mf.uuid where mf.fid=?";
+				$sql="select distinct m.* from heihemetadata m left join mdfund mf on m.uuid=mf.uuid where mf.fid=?";
 				$sth = $this->db->prepare($sql);
 				$sth->execute(array($id));
 				$rows = $sth->fetchAll();
@@ -2190,23 +2190,23 @@ where ds.uuid=? )) ) a ) p on r.id=p.refid order by p.place";
     	$ac = $this->_request->getParam('ac');
     	if ($ac=='unready') {
     		//列出没有DOI的数据
-			$sql="select m.* from normalmetadata m where length(m.doi)<3 and m.uuid not in (select uuid from datadoi) order by m.ts_created desc";
+			$sql="select m.* from heihemetadata m where length(m.doi)<3 and m.uuid not in (select uuid from datadoi) order by m.ts_created desc";
 			$this->view->pageID='doi-unready';
     	} else if ($ac=='prepare') {
     		//列出有DOI但还未进行提交申请的数据
-			$sql="select m.* from normalmetadata m where length(m.doi)>3 and m.uuid not in (select uuid from datadoi) order by m.ts_created desc";
+			$sql="select m.* from heihemetadata m where length(m.doi)>3 and m.uuid not in (select uuid from datadoi) order by m.ts_created desc";
 			$this->view->pageID='doi-prepare';
     	} else if ($ac=='unsubmit') {
     		//列出有DOI并计划提交申请的数据
-			$sql="select m.*,d.doi as datadoi,date(d.ts_created) as ts_created from normalmetadata m left join datadoi d on m.uuid=d.uuid where length(m.doi)>3 and d.ts_created is not null and d.ts_submitted is null order by d.ts_created desc";
+			$sql="select m.*,d.doi as datadoi,date(d.ts_created) as ts_created from heihemetadata m left join datadoi d on m.uuid=d.uuid where length(m.doi)>3 and d.ts_created is not null and d.ts_submitted is null order by d.ts_created desc";
 			$this->view->pageID='doi-unsubmit';
     	} else if ($ac=='submit') {
     		//列出有DOI并计划提交申请的数据
-			$sql="select m.*,d.doi as datadoi,date(d.ts_submitted) as ts_submitted from normalmetadata m left join datadoi d on m.uuid=d.uuid where length(m.doi)>3 and d.ts_submitted is not null and d.ts_published is null order by d.ts_submitted desc,d.ts_created desc";
+			$sql="select m.*,d.doi as datadoi,date(d.ts_submitted) as ts_submitted from heihemetadata m left join datadoi d on m.uuid=d.uuid where length(m.doi)>3 and d.ts_submitted is not null and d.ts_published is null order by d.ts_submitted desc,d.ts_created desc";
 			$this->view->pageID='doi-submit';
     	} else if ($ac=='publish' || empty($ac)) {
     		//默认：列出最新发布的DOI数据
-			$sql="select m.*,d.doi as datadoi,date(d.ts_submitted) as ts_submitted,date(d.ts_published) as ts_published from normalmetadata m left join datadoi d on m.uuid=d.uuid where length(m.doi)>3 and d.ts_published is not null order by d.ts_published desc,d.ts_submitted desc,d.ts_created desc";
+			$sql="select m.*,d.doi as datadoi,date(d.ts_submitted) as ts_submitted,date(d.ts_published) as ts_published from heihemetadata m left join datadoi d on m.uuid=d.uuid where length(m.doi)>3 and d.ts_published is not null order by d.ts_published desc,d.ts_submitted desc,d.ts_created desc";
 			$this->view->pageID='doi-publish';
 		}	
 		$sth = $this->db->prepare($sql);
@@ -2233,7 +2233,7 @@ where ds.uuid=? )) ) a ) p on r.id=p.refid order by p.place";
 				//列出作者的数据
 				$sql="select username,realname from users where id=?";
 				$this->view->author=$this->db->fetchRow($sql,array($id));
-				$sql="select m.* from normalmetadata m left join mdauthor a on a.uuid=m.uuid where a.userid=?";
+				$sql="select m.* from heihemetadata m left join mdauthor a on a.uuid=m.uuid where a.userid=?";
 				$sth = $this->db->prepare($sql);
 				$sth->execute(array($id));
 				$rows = $sth->fetchAll();
@@ -2245,7 +2245,7 @@ where ds.uuid=? )) ) a ) p on r.id=p.refid order by p.place";
 				$this->view->paginator=$paginator;
 			} else {
 				//已经认证过的数据作者
-				$sql="select u.username,u.realname,u.id,count(u.id) as count from mdauthor a left join users u on a.userid=u.id where a.status=1 and a.uuid in (select uuid from normalmetadata) group by u.id,u.username,u.realname";
+				$sql="select u.username,u.realname,u.id,count(u.id) as count from mdauthor a left join users u on a.userid=u.id where a.status=1 and a.uuid in (select uuid from heihemetadata) group by u.id,u.username,u.realname";
 				$sth = $this->db->prepare($sql);
 				$sth->execute();
 				$rows = $sth->fetchAll();
@@ -2264,7 +2264,7 @@ where ds.uuid=? )) ) a ) p on r.id=p.refid order by p.place";
 				//列出数据
 				$sql="select individual as username from responsible where id=?";
 				$this->view->author=$this->db->fetchRow($sql,array($id));
-				$sql="select distinct m.* from normalmetadata m left join role r on m.uuid=r.uuid left join responsible s on r.resid=s.id where r.role in ('pointOfContact','resourceProvider','owner') and s.id=?";
+				$sql="select distinct m.* from heihemetadata m left join role r on m.uuid=r.uuid left join responsible s on r.resid=s.id where r.role in ('pointOfContact','resourceProvider','owner') and s.id=?";
 				$sth = $this->db->prepare($sql);
 				$sth->execute(array($id));
 				$rows = $sth->fetchAll();
@@ -2292,7 +2292,7 @@ where ds.uuid=? )) ) a ) p on r.id=p.refid order by p.place";
 
 	function listAction()
 	{
-		$sql="select m.uuid,m.title,m.citation,m.doi,d.doi as datadoi,d.ts_published,d.authors,d.publisher,date_part('year',d.ts_published) as publish_year from normalmetadata m 
+		$sql="select m.uuid,m.title,m.citation,m.doi,d.doi as datadoi,d.ts_published,d.authors,d.publisher,date_part('year',d.ts_published) as publish_year from heihemetadata m 
 left join mdstatus s on m.uuid=s.uuid 
 left join datadoi d on d.uuid=m.uuid
 where s.status>4 
@@ -2302,16 +2302,16 @@ where s.code in ('heihe','water','hiwater','westee'))
 order by m.title";
 		$this->view->metadata=$this->db->fetchAll($sql);
 		$sql="select m.uuid,m.title,m.citation,m.doi,d.doi as datadoi,d.ts_published,d.authors,d.publisher,date_part('year',d.ts_published) as publish_year 
-		from normalmetadata m left join datadoi d on d.uuid=m.uuid left join mdstatus s on m.uuid=s.uuid where s.status>4 and m.title like '黑河综合遥感联合试验%' order by title";
+		from heihemetadata m left join datadoi d on d.uuid=m.uuid left join mdstatus s on m.uuid=s.uuid where s.status>4 and m.title like '黑河综合遥感联合试验%' order by title";
 		$this->view->water=$this->db->fetchAll($sql);
 		$sql="select m.uuid,m.title,m.citation ,m.doi,d.doi as datadoi,d.ts_published,d.authors,d.publisher,date_part('year',d.ts_published) as publish_year
-		from normalmetadata m left join datadoi d on d.uuid=m.uuid left join mdstatus s on m.uuid=s.uuid where s.status>0 and m.title like '黑河生态水文遥感试验%' order by title";
+		from heihemetadata m left join datadoi d on d.uuid=m.uuid left join mdstatus s on m.uuid=s.uuid where s.status>0 and m.title like '黑河生态水文遥感试验%' order by title";
 		$this->view->hiwater=$this->db->fetchAll($sql);
 		$sql="select m.uuid,m.title,m.citation ,m.doi,d.doi as datadoi,d.ts_published,d.authors,d.publisher,date_part('year',d.ts_published) as publish_year
-		from normalmetadata m left join datadoi d on d.uuid=m.uuid left join mdstatus s on m.uuid=s.uuid left join datasource ds on ds.uuid=m.uuid left join source sr on ds.sourceid=sr.id where sr.code='heihe' and s.status>0 and m.title not like '黑河生态水文遥感试验%' order by title";
+		from heihemetadata m left join datadoi d on d.uuid=m.uuid left join mdstatus s on m.uuid=s.uuid left join datasource ds on ds.uuid=m.uuid left join source sr on ds.sourceid=sr.id where sr.code='heihe' and s.status>0 and m.title not like '黑河生态水文遥感试验%' order by title";
 		$this->view->heihe=$this->db->fetchAll($sql);
 		$sql="select m.uuid,m.title,m.citation ,m.doi,d.doi as datadoi,d.ts_published,d.authors,d.publisher,date_part('year',d.ts_published) as publish_year
-		from normalmetadata m left join datadoi d on d.uuid=m.uuid left join mdstatus s on m.uuid=s.uuid left join datasource ds on ds.uuid=m.uuid left join source sr on ds.sourceid=sr.id where sr.code='westee' and s.status>4 order by title";
+		from heihemetadata m left join datadoi d on d.uuid=m.uuid left join mdstatus s on m.uuid=s.uuid left join datasource ds on ds.uuid=m.uuid left join source sr on ds.sourceid=sr.id where sr.code='westee' and s.status>4 order by title";
 		$this->view->westee=$this->db->fetchAll($sql);
 
 	}

application/default/controllers/HaiheController.php

@@ -49,12 +49,6 @@ class HaiheController extends DataController
 		$this->_helper->viewRenderer('base');
 	}
 
-	function huailaiAction()
-	{
-		$this->getmd(array('怀来县'),'place');
-		$this->_helper->viewRenderer('base');
-	}
-
 	function viewAction()
 	{
 		parent::viewAction();

application/default/controllers/HiwaterController.php

@@ -45,6 +45,9 @@ class HiwaterController extends DataController
 		{
 			$this->view->pageIn = "collapse9";
 		}
+		else if(in_array($acName, array("et", "satelliteet", "basinet"))){
+			$this->view->pageIn = "collapse12";
+		}
 		$this->view->pageID = "hiwater-".$acName;
 		$this->_helper->layout->setLayout('heihe');
 	}
@@ -106,7 +109,7 @@ class HiwaterController extends DataController
 	
 	function aviationAction()
 	{
-		$this->getmdlimited(array('WiDAS','PLMR','Lidar','CASI','热红外高光谱数据'),'航空遥感');
+		$this->getmd(array('航空遥感'));
 		$this->_helper->viewRenderer('base');
 	}
 	function radiometerAction()
@@ -521,6 +524,23 @@ class HiwaterController extends DataController
 		$this->_helper->viewRenderer('base');
 	}
 
+	function etAction(){
+		$this->getmdrestricted(array('地表蒸散发'));
+		$archive = new Archive($this->db);
+		$this->view->info = $archive->getOneArchive('卫星像元/流域尺度地表蒸散发','about');
+		$this->_helper->viewRenderer('base');
+	}
+
+	function satelliteetAction(){
+		$this->getmdrestricted(array('地表蒸散发', '卫星像元尺度'));
+		$this->_helper->viewRenderer('base');
+	}
+
+	function basinetAction(){
+		$this->getmdrestricted(array('地表蒸散发', '区域尺度'));
+		$this->_helper->viewRenderer('base');
+	}
+
 	function listAction()
 	{
 		$sql="select uuid,title from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='hiwater')  order by timebegin,title";

application/default/controllers/IndexController.php

@@ -13,7 +13,7 @@ class IndexController extends Zend_Controller_Action
     function indexAction()
     {
 		//统计数据
-		$sql='select (select count(*) from users) as usernum,(select count(*) from metadata) as metanum,(select count(*) from offlineapp where ts_approved is not null ) as offlinenum';
+		$sql='select (select count(*) from users) as usernum,(select count(*) from heihemetadata) as metanum,(select count(*) from offlineapp where ts_approved is not null ) as offlinenum';
 		$row=$this->db->fetchRow($sql);
 		$this->view->usernum=$row['usernum'];
 		$this->view->metanum=$row['metanum'];
@@ -21,7 +21,7 @@ class IndexController extends Zend_Controller_Action
 		/*$sql='select count(*) from metadata';
 		$row=$this->db->fetchRow($sql);
 		$this->view->metanum=$row['count'];*/
-		$sql="select sum(filesize) as sum,datatype from metadata  group by datatype";
+		$sql="select sum(filesize) as sum,datatype from heihemetadata  group by datatype";
 		$rows=$this->db->fetchAll($sql);
 		foreach($rows as $row)
 		{
@@ -34,12 +34,12 @@ class IndexController extends Zend_Controller_Action
 		$sql="select * from datafeature order by id desc";
 		$this->view->feature=$this->db->fetchRow($sql);
 		//下载最多数据(top 5)
-		$sql="select uuid,title,id from normalmetadata where id in (select m.id from normalmetadata m left join dataorder d on m.uuid=d.uuid where m.datatype=0 group by m.id order by count(d.uuid) desc limit 5)";
+		$sql="select uuid,title,id from heihemetadata where id in (select m.id from heihemetadata m left join dataorder d on m.uuid=d.uuid where m.datatype=0 group by m.id order by count(d.uuid) desc limit 5)";
 		$this->db->setFetchMode(Zend_Db::FETCH_OBJ);
 		$this->view->mdtop=$this->db->fetchAll($sql);
-		$sql="select uuid,title,id from normalmetadata where id in (select m.id from normalmetadata m left join dataorder d on m.uuid=d.uuid where m.datatype=1 group by m.id order by count(d.uuid) desc limit 5)";
+		$sql="select uuid,title,id from heihemetadata where id in (select m.id from heihemetadata m left join dataorder d on m.uuid=d.uuid where m.datatype=1 group by m.id order by count(d.uuid) desc limit 5)";
 		$this->view->offlinemdtop=$this->db->fetchAll($sql);
-		$sql="select m.uuid,m.title,m.id,m.description from normalmetadata m left join thumbnail t on m.id=t.id where length(t.data)>2 order by random()";
+		$sql="select m.uuid,m.title,m.id,m.description from heihemetadata m left join thumbnail t on m.id=t.id where length(t.data)>2 order by random()";
 		$this->view->mdrandom=$this->db->fetchRow($sql); 		
 		//搜索
 		$this->view->addHelperPath('helper','Zend_View_Helper_');
@@ -50,7 +50,7 @@ class IndexController extends Zend_Controller_Action
 		$News = new Archive($this->db);
 		
 		$time = date("Y-m-d H:i:s",time());
-		$sql = "SELECT * FROM archive WHERE is_pub=true AND ts_published<'$time' AND image!='' and id in (select ar_catalog.aid from ar_category left join ar_catalog on ar_category.id=ar_catalog.cid where ar_category.code='featured') order by ts_published desc LIMIT 5";
+		$sql = "SELECT * FROM heihearchive WHERE is_pub=true AND ts_published<'$time' AND image!='' and id in (select ar_catalog.aid from ar_category left join ar_catalog on ar_category.id=ar_catalog.cid where ar_category.code='featured') order by ts_published desc LIMIT 5";
 		$sth = $this->db->query($sql);
 		$rows = $sth->fetchAll(PDO::FETCH_BOTH);
 		
@@ -77,7 +77,7 @@ class IndexController extends Zend_Controller_Action
 		
 		$this->view->list_news = $rows;
 	    
-		$sql="select d.*,m.ts_published as publish_year from datadoi d left join metadata m on d.uuid=m.uuid where length(d.title)>1 and d.ts_published is not null order by ts_published desc limit 4";
+		$sql="select d.*,m.ts_published as publish_year from datadoi d right join heihemetadata m on d.uuid=m.uuid where length(d.title)>1 and d.ts_published is not null order by ts_published desc limit 4";
 		$sth = $this->db->query($sql);
 		$this->view->dois = $sth->fetchAll();
 		

application/default/controllers/NepalquakeController.php

@@ -1,12 +0,0 @@
-<?php
-
-class NepalquakeController extends Zend_Controller_Action 
-{
-    function indexAction()
-    {
-		$this->_helper->ViewRenderer->setNoRender();
-        $this->_helper->layout->disableLayout();
-		$this->_redirect("http://nepalquake.westgis.ac.cn/");
-    }
-}
-

application/default/controllers/QzrController.php

@@ -12,11 +12,8 @@ class QzrController extends DataController
 		
 	function indexAction()
 	{
-		//$sql="select m.uuid,m.title,m.id,m.description from normalmetadata m left join thumbnail t on m.id=t.id where m.uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe')  and length(t.data)>2 order by random() limit 3";
-		//$this->view->meatdata=$this->db->fetchAll($sql);
-		$archive = new Archive($this->db);
-		$this->view->info = $archive->getOneArchive('青藏铁路介绍','about');
-		$this->_helper->viewRenderer('base');
+		$sql="select m.uuid,m.title,m.id,m.description from normalmetadata m left join thumbnail t on m.id=t.id where m.uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe')  and length(t.data)>2 order by random() limit 3";
+		$this->view->meatdata=$this->db->fetchAll($sql);
 	}
 	
 	function newsAction()

application/default/controllers/YrnmrController.php

@@ -15,8 +15,6 @@ class YrnmrController extends DataController
 	{
 		$sql="select m.uuid,m.title,m.id,m.description from normalmetadata m left join thumbnail t on m.id=t.id where m.uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='yrnmr')  and length(t.data)>2 order by random() limit 3";
 		$this->view->meatdata=$this->db->fetchAll($sql);
-		$archive = new Archive($this->db);
-		$this->view->info = $archive->getOneArchive('黄河上游宁蒙河段：数据简介','about');		
 	}
 	
 	/*
@@ -68,113 +66,126 @@ class YrnmrController extends DataController
 	
 	function baseAction()
 	{
-    	$this->getmd(array('基础地理','陆地表层','遥感影像','水文地质','社会经济'));
-		$archive = new Archive($this->db);
-		$this->view->info = $archive->getOneArchive('YRNMR-基础数据','about');			
+    	$page=(int)$this->_request->getParam('page');    	
+    	if (empty($page)) $page=1;
+    	$offset=$this->limit*($page-1);
+    	$state=$this->db->query("select count(*) from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='yrnmr')  and id in (select id from keyword where keytype='theme' and (keyword='冰川' or keyword='沙漠' or keyword='地貌' or keyword='植被' or keyword='草场' or keyword='沙漠化' or keyword='基础地理' or keyword='遥感影像' or keyword='水文地质' or keyword='社会经济' or keyword='人口' or keyword='SWAT' or keyword='NPP' or keyword='WRF' or keyword='辐射' or keyword='NEP'))");
+    	$row=$state->fetchAll();
+    	$sum=$row[0]['count'];
+		$sql="select uuid,title from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='yrnmr')  and id in (select id from keyword where keytype='theme' and (keyword='冰川' or keyword='沙漠' or keyword='地貌' or keyword='植被' or keyword='草场' or keyword='沙漠化' or keyword='基础地理' or keyword='遥感影像' or keyword='水文地质' or keyword='社会经济' or keyword='人口' or keyword='SWAT' or keyword='NPP' or keyword='WRF' or keyword='辐射' or keyword='NEP')) order by timebegin,title limit ? offset ?";
+		$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
+    	$this->view->page=new Pagination($sum,$page,$this->limit);
+    	$this->view->offset=$offset+1; 			
 	}
 
 	function geobaseAction()
 	{
 		$this->getmd('基础地理');
-		$this->_helper->viewRenderer('base');
-		$archive = new Archive($this->db);
-		$this->view->info = $archive->getOneArchive('YRNMR-基础地理','about');		
-	}
-	
-	function landsurfaceAction()
-	{
-		$this->getmd('陆地表层');
-		$this->_helper->viewRenderer('base');
-		$archive = new Archive($this->db);
-		$this->view->info = $archive->getOneArchive('YRNMR-陆地表层','about');		
-	}
-	
-	function rsAction()
-	{
-		$this->getmd('遥感影像');
-		$this->_helper->viewRenderer('base');
-		$archive = new Archive($this->db);
-		$this->view->info = $archive->getOneArchive('YRNMR-遥感影像','about');		
-	}
-	
-	function waterAction()
-	{
-		$this->getmd('水文地质');
-		$this->_helper->viewRenderer('base');
-		$archive = new Archive($this->db);
-		$this->view->info = $archive->getOneArchive('YRNMR-水文地质','about');		
 	}
 
-	function modelAction()
-	{
-		$this->getmd('模型数据');
-		$this->_helper->viewRenderer('base');
-		$archive = new Archive($this->db);
-		$this->view->info = $archive->getOneArchive('YRNMR-模型数据','about');		
-	}
-	
-	function economicAction()
-	{
-		$this->getmd('社会经济');
-		$this->_helper->viewRenderer('base');
-		$archive = new Archive($this->db);
-		$this->view->info = $archive->getOneArchive('YRNMR-社会经济','about');		
-	}
-	
 	function coreAction()
 	{
-		$this->getmd(array('DEM','土地利用','土壤','气象','水文观测','实验'));
-		$this->_helper->viewRenderer('base');
-		$archive = new Archive($this->db);
-		$this->view->info = $archive->getOneArchive('YRNMR-核心数据','about');	
+    	$page=(int)$this->_request->getParam('page');    	
+    	if (empty($page)) $page=1;
+    	$offset=$this->limit*($page-1);
+    	$state=$this->db->query("select count(*) from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='yrnmr')  and id in (select id from keyword where keytype='theme' and (keyword='DEM' or keyword='土地利用' or keyword='土壤' or keyword='气象' or keyword='水文观测' or keyword='灌溉' or keyword='试验'))");
+    	$row=$state->fetchAll();
+    	$sum=$row[0]['count'];
+		$sql="select uuid,title from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='yrnmr')  and id in (select id from keyword where keytype='theme' and (keyword='DEM' or keyword='土地利用' or keyword='土壤' or keyword='气象' or keyword='水文观测' or keyword='灌溉' or keyword='试验')) order by timebegin,title limit ? offset ?";
+		$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
+    	$this->view->page=new Pagination($sum,$page,$this->limit);
+    	$this->view->offset=$offset+1; 	
 	}
 		
 	function demAction()
 	{
 		$this->getmd('DEM');
-		$this->_helper->viewRenderer('base');
-		$archive = new Archive($this->db);
-		$this->view->info = $archive->getOneArchive('YRNMR-DEM','about');			
+	}
+	
+	function rsAction()
+	{
+		$this->getmd('遥感影像');
+	}
+	
+	function waterAction()
+	{
+		$this->getmd('水文地质');
+	}
+	
+	function modelAction()
+	{
+    	$page=(int)$this->_request->getParam('page');    	
+    	if (empty($page)) $page=1;
+    	$offset=$this->limit*($page-1);
+    	$state=$this->db->query("select count(*) from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='yrnmr')  and id in (select id from keyword where keytype='theme' and (keyword='WRF' or keyword='NPP' or keyword='SWAT' or keyword='NEP' or keyword='辐射'))");
+    	$row=$state->fetchAll();
+    	$sum=$row[0]['count'];
+		$sql="select uuid,title from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='yrnmr')  and id in (select id from keyword where keytype='theme' and (keyword='WRF' or keyword='NPP' or keyword='SWAT' or keyword='NEP' or keyword='辐射')) order by timebegin,title limit ? offset ?";
+		$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
+    	$this->view->page=new Pagination($sum,$page,$this->limit);
+    	$this->view->offset=$offset+1; 	
+	}
+	
+	function economicAction()
+	{
+    	$page=(int)$this->_request->getParam('page');    	
+    	if (empty($page)) $page=1;
+    	$offset=$this->limit*($page-1);
+    	$state=$this->db->query("select count(*) from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='yrnmr')  and id in (select id from keyword where keytype='theme' and (keyword='人口' or keyword='社会经济'))");
+    	$row=$state->fetchAll();
+    	$sum=$row[0]['count'];
+		$sql="select uuid,title from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='yrnmr')  and id in (select id from keyword where keytype='theme' and (keyword='人口' or keyword='社会经济')) order by timebegin,title limit ? offset ?";
+		$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
+    	$this->view->page=new Pagination($sum,$page,$this->limit);
+    	$this->view->offset=$offset+1; 
+	}
+	
+	function landsurfaceAction()
+	{
+    	$page=(int)$this->_request->getParam('page');    	
+    	if (empty($page)) $page=1;
+    	$offset=$this->limit*($page-1);
+    	$state=$this->db->query("select count(*) from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='yrnmr')  and id in (select id from keyword where keytype='theme' and (keyword='冰川' or keyword='沙漠' or keyword='地貌' or keyword='植被' or keyword='草场' or keyword='沙漠化'))");
+    	$row=$state->fetchAll();
+    	$sum=$row[0]['count'];
+		$sql="select uuid,title from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='yrnmr')  and id in (select id from keyword where keytype='theme' and (keyword='冰川' or keyword='沙漠' or keyword='地貌' or keyword='植被' or keyword='草场' or keyword='沙漠化')) order by timebegin,title limit ? offset ?";
+		$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
+    	$this->view->page=new Pagination($sum,$page,$this->limit);
+    	$this->view->offset=$offset+1; 	
 	}
 	
 	function landuseAction()
 	{
-		$this->getmd('土地利用');
-		$this->_helper->viewRenderer('base');
-		$archive = new Archive($this->db);
-		$this->view->info = $archive->getOneArchive('YRNMR-土地利用','about');			
+		$this->getmd('土地利用','theme');
 	}
 
 	function soilAction()
 	{
-		$this->getmd('土壤');
-		$this->_helper->viewRenderer('base');
-		$archive = new Archive($this->db);
-		$this->view->info = $archive->getOneArchive('YRNMR-土地利用','about');	
+		$this->getmd('土壤','theme');
 	}
 
 	function meteoAction()
 	{
-		$this->getmd('气象');
-		$this->_helper->viewRenderer('base');
-		$archive = new Archive($this->db);
-		$this->view->info = $archive->getOneArchive('YRNMR-气象','about');	
+		$this->getmd('气象','theme');
 	}
 
+	function hydroAction()
+	{
+		$this->getmd('水文观测','theme');
+	}
+	function irragationAction()
+	{
+		$this->getmd('灌溉','theme');
+	}
+	
 	function expAction()
 	{
-		$this->getmd('实验');
-		$this->_helper->viewRenderer('base');
-		$archive = new Archive($this->db);
-		$this->view->info = $archive->getOneArchive('YRNMR-实验','about');	
+		$this->getmd('实验','theme');
 	}
 
 	function obsAction()
 	{
-		$this->getmd('观测');
-		$this->_helper->viewRenderer('base');
-		$archive = new Archive($this->db);
-		$this->view->info = $archive->getOneArchive('YRNMR-观测','about');	
+		$this->getmd('观测','theme');
 	}
 
 	function listAction()
@@ -186,13 +197,12 @@ class YrnmrController extends DataController
    function tagAction()
    {
     	$key = $this->_request->getParam('key');
-    	$keytype = $this->_request->getParam('keytype');		
     	$page=(int)$this->_request->getParam('page');    	
     	if (empty($page)) $page=1;
     	$offset=$this->limit*($page-1);
     	if (!empty($key)) {
     		$this->view->codename=$key;
-    		$sql=$this->db->quoteInto("select count(k.id) from keyword k left join normalmetadata m on k.id=m.id where m.uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='yrnmr') and k.keyword=?",$key);
+    		$sql=$this->db->quoteInto('select count(id) from keyword where keyword=?',$key);
     		$state=$this->db->query($sql);
     		$row=$state->fetchAll();
 			$sum=$row[0]['count'];
@@ -200,12 +210,17 @@ class YrnmrController extends DataController
 			$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
     		$this->view->page=new Pagination($sum,$page,$this->limit);
     	} else {
-	    	$sql="select k.keyword,count(*),k.keytype from keyword k left join normalmetadata m on k.id=m.id where m.uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='yrnmr') ";
-	    	if (!empty($keytype) && ($keytype=='place' || $keytype=='theme' || $keytype=='discipline'||$keytype=='temporal')) $sql.=" and k.keytype='".$keytype."'";
-	    	$sql.=' group by k.keyword,k.keytype  order by k.keytype,k.keyword,count desc';
-	    	$state=$this->db->query($sql);
-			$this->view->keytype=$keytype;
-	    	$this->view->keywords=$state->fetchAll();
+    		$state=$this->db->query("select keyword.keyword,count(*) from keyword left join normalmetadata m on keyword.id=m.id where keyword.keytype='place' and m.uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='yrnmr')  group by keyword.keyword order by count desc");    	
+    		$k1=$state->fetchAll();
+    		$state=$this->db->query("select k.keyword,count(k.keyword) from keyword k left join normalmetadata m on k.id=m.id where k.keytype='theme' and m.uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='yrnmr')   group by k.keyword order by k.keyword");
+    		$k2=$state->fetchAll();
+    		$state=$this->db->query("select k.keyword,count(k.keyword) from keyword k left join normalmetadata m on k.id=m.id where k.keytype='discipline' and m.uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='yrnmr')   group by k.keyword order by k.keyword");
+    		$k3=$state->fetchAll();
+    		$state=$this->db->query("select k.keyword,count(k.keyword) from keyword k left join normalmetadata m on k.id=m.id where k.keytype='stratum' and m.uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='yrnmr')   group by k.keyword order by k.keyword");
+    		$k4=$state->fetchAll();
+    		$state=$this->db->query("select keyword.keyword,count(*) from keyword left join normalmetadata m on keyword.id=m.id where keyword.keytype='temporal' and m.uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='yrnmr')  group by keyword.keyword order by keyword.keyword");
+    		$k5=$state->fetchAll();
+    		$this->view->keywords=array('place'=>$k1,'theme'=>$k2,'discipline'=>$k3,'stratum'=>$k4,'temporal'=>$k5);    	
     	}
    }
 
@@ -291,113 +306,11 @@ class YrnmrController extends DataController
     	$page=(int)$this->_request->getParam('page');    	
     	if (empty($page)) $page=1;
     	$offset=$this->limit*($page-1);
-		if (!is_array($keyword))
-		{
-			$keyword=array($keyword);
-		}
-		$key="(";
-		foreach($keyword as $k)
-		{
-			$key.="'".$k."',";
-		}
-		$key=substr($key,0,-1);
-		$key.=")";
-		$keyword=$key;
-		
-    	$state=$this->db->query("select count(m.*) from normalmetadata m left join datasource d on m.uuid=d.uuid left join source s on d.sourceid=s.id where s.code='yrnmr' and m.id in (select id from keyword where keytype='".$type."' and keyword in ".$keyword.")");
+    	$state=$this->db->query("select count(m.*) from normalmetadata m left join datasource d on m.uuid=d.uuid left join source s on d.sourceid=s.id where s.code='yrnmr' and m.id in (select id from keyword where keytype='".$type."' and keyword='".$keyword."')");
     	$row=$state->fetchAll();
     	$sum=$row[0]['count'];
     	//@todo: add order with title
-		$sql="select uuid,title from normalmetadata where uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='yrnmr') and id in (select id from keyword where keytype='".$type."' and keyword in ".$keyword.") order by title limit ? offset ?";
-		$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
-    	$this->view->page=new Pagination($sum,$page,$this->limit);
-    	$this->view->offset=$offset+1; 
-	}
-
-	//获取多项条件并列关系的数据并必须满足limited条件
-	//$keyword:字符串或字符串数组
-	//$limited:限制字符串
-	//$without:明确不包含的字符串数组
-	private function getmdlimited($keyword,$limited,$without='')
-	{
-    	$page=(int)$this->_request->getParam('page');    	
-    	if (empty($page)) $page=1;
-    	$offset=$this->limit*($page-1);
-		if (!is_array($keyword))
-		{
-			$keyword=array($keyword);
-		}
-		$key="(";
-		foreach($keyword as $k)
-		{
-			$key.="'".$k."',";
-		}
-		$key=substr($key,0,-1);
-		$key.=")";
-		$keyword=$key;
-		
-		if (!empty($without))
-		{
-			if (!is_array($without))
-			{
-				$without=array($without);
-			}
-			$withoutkey="(";
-			foreach ($without as $wo)
-			{
-				$withoutkey.="'".$wo."',";
-			}
-			$withoutkey=substr($withoutkey,0,-1);
-			$withoutkey.=")";
-		}
-		
-		$sql="select count(m.*) from normalmetadata m left join datasource d on m.uuid=d.uuid left join source s on d.sourceid=s.id
-			where s.code='yrnmr' and m.id in (select id from keyword where keyword='".$limited."')
-			and m.id in (select id from keyword where keyword in ".$keyword.")";
-		if (!empty($without)) $sql.=" and m.id not in (select id from keyword where keyword in $withoutkey)";
-    	$state=$this->db->query($sql);
-    	$row=$state->fetchAll();
-    	$sum=$row[0]['count'];
-    	//@todo: add order with title
-		$sql="select uuid,title from normalmetadata where
-			uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='yrnmr')
-			and id in (select id from keyword where keyword='".$limited."')
-			and id in (select id from keyword where keyword in ".$keyword.")";
-		if (!empty($without)) $sql.=" and id not in (select id from keyword where keyword in $withoutkey)";
-		$sql.=" order by title limit ? offset ?";
-		$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
-    	$this->view->page=new Pagination($sum,$page,$this->limit);
-    	$this->view->offset=$offset+1; 
-	}
-	
-	//获取多项必须满足的条件
-	//$keyword:字符串或字符串数组
-	private function getmdrestricted($keyword)
-	{
-    	$page=(int)$this->_request->getParam('page');    	
-    	if (empty($page)) $page=1;
-    	$offset=$this->limit*($page-1);
-		if (!is_array($keyword))
-		{
-			$keyword=array($keyword);
-		}
-		$key="(";
-		foreach($keyword as $k)
-		{
-			$key.="m.id in (select id from keyword where keyword='".$k."') and ";
-		}
-		$key=substr($key,0,-4);
-		$key.=")";
-		$keyword=$key;
-		
-    	$state=$this->db->query("select count(m.*) from normalmetadata m left join datasource d on m.uuid=d.uuid left join source s on d.sourceid=s.id where s.code='yrnmr' and $keyword");
-    	$row=$state->fetchAll();
-    	$sum=$row[0]['count'];
-    	//@todo: add order with title
-		$sql="select uuid,title from normalmetadata m where m.uuid in
-			(select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='yrnmr')
-			and $keyword 
-			order by title limit ? offset ?";
+		$sql="select uuid,title from normalmetadata where uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='yrnmr') and id in (select id from keyword where keytype='".$type."' and keyword='".$keyword."') order by timebegin,title limit ? offset ?";
 		$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
     	$this->view->page=new Pagination($sum,$page,$this->limit);
     	$this->view->offset=$offset+1; 

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

@@ -13,8 +13,27 @@ $this->breadcrumb()->setSeparator(' > ');
     </div>
     <div class="span9">
     	<div id="content">
-        <h2>中心简介</h2>
-        <?= $this->item['body']; ?>
+            
+            <div class="hero-unit">
+            	<div class="pull-right" style="margin-left:5px;">
+                	<img src="/images/westdc_logo_white.gif" /><br />
+                	<a href="/images/westdc_logo_white.gif">下载LOGO</a>
+            	</div>
+                <p>中国西部环境与生态科学数据中心（“西部数据中心”）受<a href="http://www.nsfc.gov.cn" target="_blank">中国自然科学基金委</a>资助，以中国西部环境与生态科学研究计划（“西部计划”）重点项目的形式立项（编号：90502010），旨在收集和整理“西部计划”各项目执行期间产出数据集，为中国西部环境与生态科学研究，乃至更广泛意义上的地表表层科学研究服务。</p>
+            </div>
+            <h2>
+                <a href="/about/background">项目背景</a></h2>
+            <p>
+                介绍“西部数据中心”项目立项的一些背景，可以理解西部数据中心要做些什么内容，以及采用什么样的实现手段。</p>
+            <h2>
+                项目参与单位</h2>
+            <p>
+                “西部数据中心”以<a href="http://www.casnw.net" target="_blank">中国科学院寒区旱区环境与工程研究所</a>为承担单位，由<a
+                    href="http://www.westgis.ac.cn" target="_blank">遥感与地理信息科学研究室</a>组织实施。参与单位包括<a href="http://www.igsnrr.ac.cn"
+                        target="_blank">中国科学院地理科学与资源研究所</a>。其中“知识积累平台”依托<a href="http://www.llas.ac.cn" target="_blank">中国科学院资源环境科学信息中心</a>实现项目中的文献收集和管理。</p>
+            <h2>
+                <a href="/about/contact">联系我们</a></h2>
+            
         </div>
     </div>
 </div>

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

@@ -7,7 +7,6 @@
         <li id="Nav-about-publication"><a href="/about/publication"><i class="icon-chevron-right"></i>成果发表</a></li>
         <li id="Nav-about-copyright"><a href="/about/copyright"><i class="icon-chevron-right"></i>数据与版权</a></li>
         <li id="Nav-about-legal"><a href="/about/legal"><i class="icon-chevron-right"></i>隐私政策</a></li>
-        <li id="Nav-about-terms"><a href="/about/terms"><i class="icon-chevron-right"></i>使用条款</a></li>
         <li id="Nav-about-supportus"><a href="/about/supportus"><i class="icon-chevron-right"></i>支持我们</a></li>
         <li id="Nav-about-contact"><a href="/about/contact"><i class="icon-chevron-right"></i>联系我们</a></li>
         <li id="Nav-about-link"><a href="/about/link"><i class="icon-chevron-right"></i>友情链接</a></li>

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

@@ -1,21 +1,66 @@
 <?php
-$this->headTitle($this->config->title->site);
-$this->headTitle('使用条款和免责申明');
+	$this->headTitle($this->config->title->site);
+	$this->headTitle('使用条款和免责申明');
 $this->headTitle()->setSeparator(' - ');
-$this->headLink()->appendStylesheet('/css/about.css');
+$this->headLink()->appendStylesheet('/css/terms.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/about">关于本站</a>');
 $this->breadcrumb('使用条款和免责申明');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
-<div class="row">
-	<div class="span3">
-        <?= $this->partial('about/navi.phtml'); ?>
-    </div>
-    <div class="span9">
-    	<div id="content">
-        <h2>使用条款和免责申明</h2>
-        <?= $this->item['body']; ?>
-        </div>
-    </div>
-</div>
+ <div id="print"><a href="javascript:window.print();">打印本页</a></div>&nbsp;
+    <div class="LeftMargin">
+        <p>
+            中国国家自然科学基金委（以下简称“基金委”）“中国西部环境与生态科学数据中心”（以下简称“西部数据中心”）采用“完全与开放”（Full & Open）的数据共享政策，即所有的科学家或研究项目都有权无差别地获得数据中心的数据以及包括数据处理过程等的技术文档，以不高于复制和邮寄成本或免费的形式，向基金委“中国西部环境与生态科学研究计划”（以下简称“西部计划”）内项目和人员，以及对中国西部环境生态科学研究感兴趣的研究团队或个人提供数据。
+        </p>
+        <h2>
+            使用条款</h2>
+        <p>
+            本着尊重知识产权和维护网络安全的原则，我们向数据用户提出以下使用条款：</p>
+        <p>
+            第一条 “西部数据中心”网站上的一切数据和资料版权归数据和资料原生产单位所有。</p>
+        <p>
+            第二条 为保障数据开发者的著作权，用户在使用全部或部分 “西部数据中心”所提供的数据的基础上产出的研究成果中（包括公开发表的论文、论著、数据产品和未公开发表的研究报告、数据产品、系统开发等），须在相关成果的显著位置上明确注明数据来源。除对数据来源署名有特殊要求以外，用户须依据以下规范注明数据来源：</p>
+        <blockquote>
+            <strong>中文成果</strong>：“数据来源于国家自然科学基金委员“中国西部环境与生态科学数据中心”（http://westdc.westgis.ac.cn）</blockquote>
+        <blockquote>
+            <strong>英文成果</strong>：“This data set is provided by Environmental & Ecological Science Data Center
+            for West China, National Natural Science Foundation of China”（http://westdc.westgis.ac.cn）</blockquote>
+        <p>
+            第三条 数据仅供用户用于科研目的，不得用于商业目的。不得将数据转让给第三方，由此引起的一切后果由数据用户承担。</p>
+        <p>
+            第四条 从数据中心获取的数据如属数据保密范围，用户须与“西部数据中心”签署保密协议，并有义务遵守国家相关法律法规，如出现问题，责任由用户完全承担。</p>
+        <p>
+            第五条 用户在申请数据时，应填写真实资料，如用户资料发生变更，应及时更改相关资料。若您提供的资料不齐全或不正确，“西部数据中心”有权拒绝提供服务。
+        </p>
+        <p>
+            第六条 “西部数据中心”用户须遵守中华人民共和国计算机安全、互联网通讯的有关法律法规，用户不得利用西部数据中心网站传输、出版、上载、登载或流通任何非法、有害、恐吓、骚扰、侵权、毁谤、淫秽、中伤、违反他人隐私或宣传权、违反他人知识产权、或者任何其他具攻击性或令人不悦的资料；用户不得以任何方式篡改任何材料或数据，也不得以任何方式干扰本站的运行；用户也不得利用网站收集本站用户的资料。
+        </p>
+        <p>
+            第七条 移动IP文献查询服务客户端（网筝）持有者应严格遵守<a runat="server" href="/netkites/nk-contract.v1.2.pdf" target="_blank" id="a1">网筝（NK-800）使用协议</a>。
+        </p>
+        <p>
+            第八条 “西部数据中心” 提供的网络版期刊全文链接的使用范围仅限于浏览和用于个人学习、研究目的的少量下载与暂时保存。下载（包括印出）的任何材料都含有版权提示信息，为防止该文的全部或部分被用于其它目的，这样的提示信息不得被删改。删改版权提示信息的用户将根据著作权法承担版权侵权责任。
+        </p>
+        <p>
+            第九条 尊重并维护原作者和出版者的知识产权, 并要求获取并使用这些资源的用户认真遵守中国版权法的有关规定，未经版权所有者或者“西部数据中心”许可，严禁任何个人或单位批量下载文献（包括文档）或将它们用于任何商业或其他营利性用途，严禁任何个人或单位私设代理进行非法使用。上述情况一经发现，“西部数据中心”将有权停止违规IP的使用，必要时将通报给有关部门做出处理。
+        </p>
+        <h2>
+            免责申明</h2>
+        <p>
+            第一条 “西部数据中心”对于服务变更，中断而发生的问题不负任何责任。</p>
+        <p>
+            第二条 当政府机关依照法定程序要求数据中心披露个人资料时，本中心将根据执法单位之要求或为公共安全之目的提供个人资料。在此情况下之任何披露，本中心均得免责。
+        </p>
+        <p>
+            第三条 “西部数据中心”可能包含第三方网站链接，但对任何链接网站之内容概不承担责任。西部数据中心仅为便利而提供这些链接，并不保证其任何链接网站之公司或内容的准确性；如若您对第三方网站感兴趣，请阅读第三方网站的使用条款或类似申明。
+        </p>
+        <p>
+            第四条 “西部数据中心”严格筛选系统中提供服务的文献种类和和各种数据资料，但只根据用户的要求提供所需文献和数据资料，不对文献和数据资料的具体内容负责。“西部数据中心”对因使用(或不能使用)本中心资料而导致之任何直接、间接、特殊、偶然或结果性损失概不承担责任。
+        </p>
+        <p>
+            第五条 在使用数据过程中产出的问题或存在疑问，鼓励用户直接与数据生产者进行交流。
+        </p>
+        <p>
+            第六条 “西部数据中心”鼓励用户对本中心的数据进行验证，以完善您的科学研究。</p>
+    </div>

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

@@ -12,12 +12,9 @@ $this->headTitle()->setSeparator(' - ');
 <div class="row">
 <div class="span12">
 <h4><i class="icon-folder-open"></i>专题数据集</h4>
-<a class="btn btn-info" href="/heihe/"><i class="icon-folder-open"></i>黑河计划</a>
+<a class="btn btn-info" href="/heihe/"><i class="icon-folder-open"></i>黑河计划数据管理中心</a>
 <a class="btn btn-info" href="/hiwater"><i class="icon-folder-open"></i>黑河生态水文遥感试验(HiWATER)</a>
-<a class="btn btn-info" href="/water"><i class="icon-folder-open"></i>黑河综合遥感联合试验(WATER)</a>
-<a class="btn btn-info" href="/haihe"><i class="icon-folder-open"></i>海河流域多尺度地表通量与气象要素观测</a>
-<a class="btn btn-info" href="/yrnmr"><i class="icon-folder-open"></i>黄河上游宁蒙河段</a>
-<a class="btn btn-info disabled" href="/glacier"><i class="icon-folder-open"></i>中国冰川资源及其变化调查</a>
+<a class="btn btn-info" href="/water"><i class="icon-folder-open"></i>黑河综合遥感联合试验(WATER)</a> 
 </div>
 <div class="span12">
 <h4><i class="icon-flag"></i>特色导航</h4>
@@ -95,7 +92,7 @@ $this->headTitle()->setSeparator(' - ');
 </div>
 <div class="row">
 	<div class="span6">
-    	<h4><img src="/images/dbs.png" align="absmiddle" />数据导航</h4>
+    	
         <div class="fieldlist">
             <fieldset><legend><a href="/data/category">数据集类别</a></legend>
             <ul class="unstyled inline">
@@ -103,19 +100,19 @@ $this->headTitle()->setSeparator(' - ');
             <li><a href='/data/category/code/<?php echo $cg['code']; ?>'><i class="icon-th-large"></i><?php (empty($cg['name_zh']))?print($cg['name']):print($cg['name_zh']); ?></a><span class="note">(<?php echo $cg['count']; ?>)</span></li>
             <?php endforeach; ?>
             </ul></fieldset>
-        </div>
-		<div class="fieldlist">
-        	<?php if ($this->serie) : ?>
-            <div id='series' class="fieldlist">
-            <fieldset><legend><a href="/data/series">数据集序列</a></legend>
-            <ul class="unstyled inline">
-            <?php foreach($this->serie as $cg) : ?>
-            <li><a href='/data/series/<?php echo $cg['id']; ?>'><i class="icon-list-ol"></i><?php echo $cg['name']; ?></a><span class="note">(<?php echo $cg['count']; ?>)</span></li>
-            <?php endforeach; ?>
-            </ul></fieldset>
-            </div>
-            <?php endif; ?>
-        </div>
+        </div>
+			<h4><img src="/images/Project24x24_24-bit.png" align="absmiddle" />&nbsp;数据服务</h4>
+            <div class="items">
+                <div class="item">
+                    <ul class="unstyled">
+                        <li>-&nbsp;&nbsp;&nbsp;<a href="/data/offlineapp">离线数据服务记录（最近20个）</a></li>
+                        <li>-&nbsp;&nbsp;&nbsp;<a href="/data/request">如何从数据中心申请数据</a></li>
+                        <li>-&nbsp;&nbsp;&nbsp;<a href="/data/submit">如何在数据中心发布数据</a></li>
+                    </ul>
+                </div>
+            
+
+</div>        
     </div><!-- /left -->
     <div class="span6">
         <div class="news_list">
@@ -128,18 +125,7 @@ $this->headTitle()->setSeparator(' - ');
             </ul>
         </div>
 		<div>
-			<h4><img src="/images/Project24x24_24-bit.png" align="absmiddle" />&nbsp;数据服务</h4>
-            <div class="items">
-                <div class="item">
-                    <ul class="unstyled">
-                        <li>-&nbsp;&nbsp;&nbsp;<a href="/data/offlineapp">离线数据服务记录（最近20个）</a></li>
-                        <li>-&nbsp;&nbsp;&nbsp;<a href="/data/request">如何从西部数据中心申请数据</a></li>
-                        <li>-&nbsp;&nbsp;&nbsp;<a href="/data/submit">如何在西部数据中心发布数据</a></li>
-                    </ul>
-                </div>
-            
 
-</div>
 
 </div>
 

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

@@ -606,4 +606,4 @@ function addfavorite(url,title){
 	<p>Cannot find the metadata.</p>
 	<p>没有找到对应的元数据。</p>
 <?php endif;?>
-<script type="text/javascript" src="http://v3.jiathis.com/code_mini/jia.js?uid=1336100079460458" charset="utf-8"></script>
+<script type="text/javascript" src="http://v3.jiathis.com/code_mini/jia.js?uid=1336100079460458" charset="utf-8"></script>

application/default/views/scripts/glacier/view.phtml

@@ -203,7 +203,7 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
                     <li><a href="#service" data-toggle="tab">服务记录</a></li>
                     <li><a href="#recommend" data-toggle="tab" id="recommend_t">给我推荐</a></li>
                 </ul>
-                <div class="tab-content active">
+                <div class="tab-content">
                 	<div id="related" class="tab-pane">
 					</div>
                     <div id="literature" class="tab-pane">

application/default/views/scripts/haihe/navi.phtml

@@ -28,13 +28,6 @@
 			</a>
         </div>
     </div>
-    <div class="accordion-group heihe-accordion-title">
-        <div class="accordion-heading" id="Nav-haihe-huailai">
-			<a class="accordion-toggle" href="/haihe/huailai">
-				怀来站
-			</a>
-        </div>
-    </div>
     <div class="accordion-group heihe-accordion-title">
         <div class="accordion-heading" id="Nav-haihe-document">
 			<a class="accordion-toggle" href="/haihe/document">

application/default/views/scripts/header.phtml

@@ -1,7 +1,7 @@
 <div class="masthead">
   <div class="row">
-  <div class="span5"><a href="/"><img src="/images/westdc-logo-1.png" alt="Westdc Logo" /></a></div>
-  <div class="span5 pull-right">
+  <div class="span5"><a href="/"><img src="/images/heihe-logo.png" alt="Heihe Logo" /></a></div>
+  <div class="span5">
   	<form method="get" action="/search" id="search" style="padding-top:17px;">
             	<div class="input-append">
                 	<input type="text" value="" id="q" name="q" class="span4" placeholder="全文搜索">

application/default/views/scripts/hiwater/navi.phtml

@@ -112,6 +112,25 @@
 			</li>
 		</ul>
 	</li>
+
+	<li class="accordion-group">
+		<div class="tree-toggle accordion-heading">
+			<a href="#" class="detail-link pull-right"><i class="icon-plus"></i></a>
+			<a class="accordion-toggle" href="/hiwater/et" title="查看详细">卫星像元/流域尺度地表蒸散发“相对真值”</a>
+		</div>
+		<ul class="nav nav-list tree" id="collapse12">
+			<li>
+				<div class="tree-toggle accordion-heading">
+					<a href="#" class="detail-link pull-right"><i class="icon-plus"></i></a>
+					<a class="accordion-toggle" href="/hiwater/satelliteet" title="查看详细">卫星像元尺度ET</a>
+				</div>
+				<ul class="nav nav-list tree">
+					<li><a href="/hiwater/satelliteet"><i class="icon-double-angle-right"></i>多测点-卫星像元尺度</a></li>
+				</ul>
+			</li>
+			<li id="Nav-hiwater-sync"><a href="/hiwater/basinet"><i class="icon-double-angle-right"></i>流域尺度ET</a></li>
+		</ul>
+	</li>
 	
 	<li class="accordion-group">
 		<div class="tree-toggle accordion-heading">

application/default/views/scripts/index/index.phtml

@@ -70,8 +70,8 @@
     </ul>
 	<h4>数据服务</h4>
         <span><a href="/data/offlineapp"><i class="icon-user"></i>最近20条离线数据服务记录</a></span><span>(共<?= $this->offlinenum; ?>)</span><br />
-        <span><a href="/data/request"><i class="icon-tint"></i>如何申请数据</a></span>
-        <span><a href="/data/submit"><i class="icon-tint"></i>如何发布数据</a></span>  
+        <span><a class="btn btn-danger" href="/data/request"><i class="icon-tint"></i>如何申请数据</a></span>
+        <span><a class="btn btn-danger" href="/data/submit"><i class="icon-tint"></i>如何发布数据</a></span>  
 
   </div>
   <div class="span8">
@@ -94,7 +94,6 @@
         	<li><a href="/hiwater"  class="btn btn-danger"><i class="icon-folder-open"></i>黑河生态水文遥感试验(HiWATER)</a></li>
 			<li><a href="/heihe" class="btn"><i class="icon-folder-open"></i>黑河计划数据管理中心</a></li>
 			<li><a href="/water" class="btn"><i class="icon-folder-open"></i>黑河综合遥感联合试验(WATER)</a></li>
-			<li><a href="/haihe" class="btn"><i class="icon-folder-open"></i>海河流域多尺度地表通量与气象要素观测</a></li>
         </ul>
        <!-- <hr />
         <h4>友情链接</h4>

application/default/views/scripts/qzr/base.phtml

@@ -1,30 +0,0 @@
-<?php
-$this->headTitle($this->config->title->site);
-$this->headTitle($this->config->title->data);
-$this->headTitle()->setSeparator(' - ');
-$this->headLink()->appendStylesheet('/css/water.css');
-$this->nav[] = array('link'=>"/qzr",'title'=>'青藏铁路');
-?>
-<?= $this->render('breadcrumbs.phtml'); ?>
-<div class="row">
-    <div class="span2">
-    <?= $this->partial('qzr/navi.phtml'); ?>
-    </div>
-    <div class="span10">
-    <?php if ($this->info) : ?>    
-        <div class="well">
-            <?php if(!empty($this->info['body'])) echo $this->info['body'];?>
-        </div>
-    <?php endif; ?>
-        <?php if ($this->metadata) : ?>
-        <?php echo $this->page->getNavigation(); ?>
-        <div id="mdlist">
-            <ol start="<?php echo $this->offset; ?>">
-                <?php foreach($this->metadata as $md) : ?>
-                <li><a href="/qzr/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-                <?php endforeach; ?>
-            </ol>	
-        </div>
-        <?php endif; ?>
-    </div>
-</div>

application/default/views/scripts/qzr/navi.phtml

@@ -1,4 +0,0 @@
-<ul class="nav nav-pills nav-stacked">
-<li id="Nav-qzr-index"><a href="/qzr/">青藏铁路介绍</a></li>
-<li id="Nav-qzr-news"><a href="/qzr/news">相关新闻</a></li>
-</ul>

application/default/views/scripts/qzr/news.phtml

@@ -1,123 +0,0 @@
-<?php
-$config = Zend_Registry::get('config');
-$this->headTitle($config->title->site);
-$this->headTitle($config->title->qzr);
-$this->headTitle()->setSeparator(' - ');
-$this->headLink()->appendStylesheet('/css/water.css');
-$this->theme->AppendPlus($this,'jquery');
-$this->theme->AppendPlus($this,'jplayer');
-$this->headScript()->appendFile("/js/lib/jplayer/add-on/jplayer.playlist.min.js");
-$this->headLink()->appendStylesheet('/js/lib/jplayer/skin/blue.monday/jplayer.blue.monday.css');
-$this->nav[] = array('link'=>"/qzr",'title'=>'青藏铁路');
-?>
-<?= $this->render('breadcrumbs.phtml'); ?>
-<div class='row'>
-<div class='span2'>
-<?= $this->partial('qzr/navi.phtml'); ?>
-</div>
-<div class='span10'>
-<p>视频摘要（Abstract of the video）</p>
-
-<p>Extreme Railway: Qinghai-Tibet Railway Engineer Pasi Lautala takes a look at the hi-tech solutions employed by the Chinese government in building the Qinghai-Tibet railway, which runs all the way from Xining to Lhasa. The 1000 kilometre track was planned over 50 years ago but had to wait until modern technology and engineering know-how could help to overcome the harsh environment of the Tibetan plateau. Permafrost, thin air and sand still threaten the amazing achievement which includes 675 bridges and the world’s highest tunnel. 140,000 labourers built the railway with the help of 2,000 medics who were needed to deal with altitude sickness. Lautala follows the train’s route and looks at the structural solutions devised by China’s top engineers.</p>
-<script type="text/javascript">
-//<![CDATA[
-$(document).ready(function(){
-	
-	new jPlayerPlaylist(
-		{
-			jPlayer: "#jquery_jplayer_1",
-			cssSelectorAncestor: "#jp_container_1"
-		}, 
-		[
-			{
-				title:"National Geographic Megastructures Extreme Railway",
-				artist:"Natioan Geography",
-				free:true,
-				flv: "<?= 'http://'.$_SERVER['SERVER_NAME'] ?>/images/National Geographic Megastructures Extreme Railway.flv",
-			},
-			{
-				title:"寰宇地理：青藏铁路",
-				artist:"中国教育",
-				flv: "<?= 'http://'.$_SERVER['SERVER_NAME'] ?>/images/extreme_railway_chs.flv",
-			}
-		], 
-		{
-			swfPath: "<?= 'http://'.$_SERVER['SERVER_NAME'] ?>/js/lib/jplayer/",
-			supplied: "flv",
-			size: {
-				width: "640px",
-				height: "360px",
-				cssClass: "jp-video-360p"
-			}
-		}
-	);
-	
-});
-//]]>
-</script>
-<div id="jp_container_1" class="jp-video jp-video-270p">
-			<div class="jp-type-playlist">
-				<div id="jquery_jplayer_1" class="jp-jplayer"></div>
-				<div class="jp-gui">
-					<div class="jp-video-play">
-						<a href="javascript:;" class="jp-video-play-icon" tabindex="1">play</a>
-					</div>
-					<div class="jp-interface">
-						<div class="jp-progress">
-							<div class="jp-seek-bar">
-								<div class="jp-play-bar"></div>
-							</div>
-						</div>
-						<div class="jp-current-time"></div>
-						<div class="jp-duration"></div>
-						<div class="jp-controls-holder">
-							<ul class="jp-controls">
-								<li><a href="javascript:;" class="jp-previous" tabindex="1">previous</a></li>
-								<li><a href="javascript:;" class="jp-play" tabindex="1">play</a></li>
-								<li><a href="javascript:;" class="jp-pause" tabindex="1">pause</a></li>
-								<li><a href="javascript:;" class="jp-next" tabindex="1">next</a></li>
-								<li><a href="javascript:;" class="jp-stop" tabindex="1">stop</a></li>
-								<li><a href="javascript:;" class="jp-mute" tabindex="1" title="mute">mute</a></li>
-								<li><a href="javascript:;" class="jp-unmute" tabindex="1" title="unmute">unmute</a></li>
-								<li><a href="javascript:;" class="jp-volume-max" tabindex="1" title="max volume">max volume</a></li>
-							</ul>
-							<div class="jp-volume-bar">
-								<div class="jp-volume-bar-value"></div>
-							</div>
-							<ul class="jp-toggles">
-								<li><a href="javascript:;" class="jp-full-screen" tabindex="1" title="full screen">full screen</a></li>
-								<li><a href="javascript:;" class="jp-restore-screen" tabindex="1" title="restore screen">restore screen</a></li>
-								<li><a href="javascript:;" class="jp-shuffle" tabindex="1" title="shuffle">shuffle</a></li>
-								<li><a href="javascript:;" class="jp-shuffle-off" tabindex="1" title="shuffle off">shuffle off</a></li>
-								<li><a href="javascript:;" class="jp-repeat" tabindex="1" title="repeat">repeat</a></li>
-								<li><a href="javascript:;" class="jp-repeat-off" tabindex="1" title="repeat off">repeat off</a></li>
-							</ul>
-						</div>
-						<div class="jp-title">
-							<ul>
-								<li></li>
-							</ul>
-						</div>
-					</div>
-				</div>
-				<div class="jp-playlist">
-					<ul>
-						<!-- The method Playlist.displayPlaylist() uses this unordered list -->
-						<li></li>
-					</ul>
-				</div>
-				<div class="jp-no-solution">
-					<span>Update Required</span>
-					To play the media you will need to either update your browser to a recent version or update your <a href="http://get.adobe.com/flashplayer/" target="_blank">Flash plugin</a>.
-				</div>
-			</div>
-		</div>
-		<p><a href="/images/National Geographic Megastructures Extreme Railway.avi">National Geographic Megastructures Extreme Railway: AVI版本下载</a><br/>
-		<a href="/images/extreme_railway_chs.avi">寰宇地理：青藏铁路 AVI版本下载</a>
-		</p>
-        
-<p>
-    <?php echo $this->infos['body'];?>
-</p>
-   </div>
-</div>

application/default/views/scripts/yrnmr/base.phtml

@@ -8,28 +8,30 @@ $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
 $this->breadcrumb('<a href="/yrnmr/">'.$this->config->title->yrnmr.'</a>');
 $this->breadcrumb('基础数据');
 $this->breadcrumb()->setSeparator(' > ');
-$this->nav[] = array('link'=>"/yrnmr",'title'=>'黄河上游宁蒙河段');
 ?>
-<?= $this->render('breadcrumbs.phtml'); ?>
 <div class="row">
-    <div class="span2">
+    <div class="span3">
     <?= $this->partial('yrnmr/navi.phtml'); ?>
     </div>
-    <div class="span10">
-    <?php if ($this->info) : ?>    
-        <div class="well">
-            <?php if(!empty($this->info['body'])) echo $this->info['body'];?>
+    <div class="span9">
+        <div id="intro">
+        <p>
+        基础数据指为流域生态-水文研究提供各种自然、生态、水文、社会经济等本底信息的数据，同时还包括了主要的几次科学试验数据、模型数据集等。
+        </p>
+        <p>
+        基础数据主要包括了流域基础地理数据、流域各种专题数据、水文水资源数据、流域科学试验数据、航空遥感和卫星遥感数据、模型数据、社会经济数据等。
+        </p>
         </div>
-    <?php endif; ?>
+        <hr />
         <?php if ($this->metadata) : ?>
         <?php echo $this->page->getNavigation(); ?>
         <div id="mdlist">
-            <ol start="<?php echo $this->offset; ?>">
-                <?php foreach($this->metadata as $md) : ?>
-                <li><a href="/yrnmr/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-                <?php endforeach; ?>
-            </ol>	
+        <ol start="<?php echo $this->offset; ?>">
+            <?php foreach($this->metadata as $md) : ?>
+            <li><a href="/yrnmr/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
+            <?php endforeach; ?>
+        </ol>	
         </div>
         <?php endif; ?>
-    </div>
+	</div>
 </div>

application/default/views/scripts/yrnmr/browse.phtml

@@ -4,14 +4,17 @@
 	$this->headTitle('全部浏览');
 $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
-$this->nav[] = array('link'=>"/yrnmr",'title'=>'黄河上游宁蒙河段');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
+$this->breadcrumb('<a href="/yrnmr/">'.$this->config->title->yrnmr.'</a>');
+$this->breadcrumb('浏览');
+$this->breadcrumb()->setSeparator(' > ');
 ?>
-<?= $this->render('breadcrumbs.phtml'); ?>
 <div class="row">
-    <div class="span2">
+    <div class="span3">
     <?= $this->partial('yrnmr/navi.phtml'); ?>
     </div>
-    <div class="span10">
+    <div class="span9">
 		<?php echo $this->page->getNavigation(); ?>
         <hr />
         <div id="mdlist">

application/default/views/scripts/yrnmr/core.phtml

@@ -0,0 +1,32 @@
+<?php
+$this->headTitle($this->config->title->site);
+$this->headTitle($this->config->title->data);
+$this->headTitle()->setSeparator(' - ');
+$this->headLink()->appendStylesheet('/css/water.css');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
+$this->breadcrumb('<a href="/yrnmr/">'.$this->config->title->yrnmr.'</a>');
+$this->breadcrumb('核心数据');
+$this->breadcrumb()->setSeparator(' > ');
+?>
+<div class="row">
+    <div class="span3">
+    <?= $this->partial('yrnmr/navi.phtml'); ?>
+    </div>
+    <div class="span9">
+        <div id="intro">
+        <p>核心数据指流域生态-水文模型、陆面过程模型、社会经济模型以及其他各类模型所需要的关键性的驱动和参数数据集以及验证、发展和改进模型所需的关键观测数据。</p>
+        </div>
+        <hr />
+        <?php if ($this->metadata) : ?>
+        <?php echo $this->page->getNavigation(); ?>
+        <div id="mdlist">
+        <ol start="<?php echo $this->offset; ?>">
+            <?php foreach($this->metadata as $md) : ?>
+            <li><a href="/yrnmr/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
+            <?php endforeach; ?>
+        </ol>	
+        </div>
+        <?php endif; ?>
+	</div>
+</div>

application/default/views/scripts/yrnmr/dem.phtml

@@ -0,0 +1,33 @@
+<?php
+$this->headTitle($this->config->title->site);
+$this->headTitle($this->config->title->data);
+$this->headTitle()->setSeparator(' - ');
+$this->headLink()->appendStylesheet('/css/water.css');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
+$this->breadcrumb('<a href="/yrnmr/">'.$this->config->title->yrnmr.'</a>');
+$this->breadcrumb('DEM数据');
+$this->breadcrumb()->setSeparator(' > ');
+?>
+<div class="row">
+    <div class="span3">
+    <?= $this->partial('yrnmr/navi.phtml'); ?>
+    </div>
+    <div class="span9">
+        <div id="intro">
+        <p>DEM是数字高程模型的英文简称(Digital Elevation Model)，DEM是地貌形态信息的离散表示，这些信息包含流域网格单元的坡度、坡向以及单元格之间的关系等，是开展流域研究的重要原始资料。</p>
+        <p>数据包括黑河全流域范围各种不同分辨率的数字高程模型（DEM）（栅格大小为30m、90m、1000m和30sec）。</p>
+        </div>
+        <hr />
+        <?php if ($this->metadata) : ?>
+        <?php echo $this->page->getNavigation(); ?>
+        <div id="mdlist">
+        <ol start="<?php echo $this->offset; ?>">
+            <?php foreach($this->metadata as $md) : ?>
+            <li><a href="/yrnmr/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
+            <?php endforeach; ?>
+        </ol>	
+        </div>
+        <?php endif; ?>
+	</div>
+</div>

application/default/views/scripts/yrnmr/document.phtml

@@ -3,15 +3,20 @@ $this->headTitle($this->config->title->site);
 $this->headTitle($this->config->title->data);
 $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
-$this->nav[] = array('link'=>"/yrnmr",'title'=>'黄河上游宁蒙河段');
-$this->theme->AppendPlus($this,'colorbox');
+$this->headScript()->appendFile('/js/jquery-1.7.min.js');
+$this->headScript()->appendFile('/js/jquery.colorbox-min.js');
+$this->headLink()->appendStylesheet('/css/colorbox.css');	
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
+$this->breadcrumb('<a href="/yrnmr/">'.$this->config->title->yrnmr.'</a>');
+$this->breadcrumb('数据文档');
+$this->breadcrumb()->setSeparator(' > ');
 ?>
-<?= $this->render('breadcrumbs.phtml'); ?>
 <div class="row">
-    <div class="span2">
+    <div class="span3">
     <?= $this->partial('yrnmr/navi.phtml'); ?>
     </div>
-    <div class="span10">
+    <div class="span9">
         <div id="intro">
         </div>
         <hr />

application/default/views/scripts/yrnmr/economic.phtml

@@ -0,0 +1,34 @@
+<?php
+$this->headTitle($this->config->title->site);
+$this->headTitle($this->config->title->data);
+$this->headTitle()->setSeparator(' - ');
+$this->headLink()->appendStylesheet('/css/water.css');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
+$this->breadcrumb('<a href="/yrnmr/">'.$this->config->title->yrnmr.'</a>');
+$this->breadcrumb('社会经济数据');
+$this->breadcrumb()->setSeparator(' > ');
+?>
+<div class="row">
+    <div class="span3">
+    <?= $this->partial('yrnmr/navi.phtml'); ?>
+    </div>
+    <div class="span9">
+        <div id="intro">
+        <p>
+        各类社会经济数据。
+        </p>
+        </div>
+        <hr />
+        <?php if ($this->metadata) : ?>
+        <?php echo $this->page->getNavigation(); ?>
+        <div id="mdlist">
+        <ol start="<?php echo $this->offset; ?>">
+            <?php foreach($this->metadata as $md) : ?>
+            <li><a href="/yrnmr/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
+            <?php endforeach; ?>
+        </ol>	
+        </div>
+        <?php endif; ?>
+	</div>
+</div>

application/default/views/scripts/yrnmr/exp.phtml

@@ -0,0 +1,34 @@
+<?php
+$this->headTitle($this->config->title->site);
+$this->headTitle($this->config->title->data);
+$this->headTitle()->setSeparator(' - ');
+$this->headLink()->appendStylesheet('/css/water.css');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
+$this->breadcrumb('<a href="/yrnmr/">'.$this->config->title->yrnmr.'</a>');
+$this->breadcrumb('观测试验数据');
+$this->breadcrumb()->setSeparator(' > ');
+?>
+<div class="row">
+    <div class="span3">
+    <?= $this->partial('yrnmr/navi.phtml'); ?>
+    </div>
+    <div class="span9">
+        <div id="intro">
+        <p>
+        实验数据
+        </p>
+        </div>
+        <hr />
+        <?php if ($this->metadata) : ?>
+        <?php echo $this->page->getNavigation(); ?>
+        <div id="mdlist">
+        <ol start="2">
+            <?php foreach($this->metadata as $md) : ?>
+            <li><a href="/yrnmr/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
+            <?php endforeach; ?>
+        </ol>	
+        </div>
+        <?php endif; ?>
+	</div>
+</div>

application/default/views/scripts/yrnmr/geobase.phtml

@@ -0,0 +1,31 @@
+<?php
+$this->headTitle($this->config->title->site);
+$this->headTitle($this->config->title->data);
+$this->headTitle()->setSeparator(' - ');
+$this->headLink()->appendStylesheet('/css/water.css');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
+$this->breadcrumb('<a href="/yrnmr/">'.$this->config->title->yrnmr.'</a>');
+$this->breadcrumb('基础地理数据');
+$this->breadcrumb()->setSeparator(' > ');
+?>
+<div class="row">
+    <div class="span3">
+    <?= $this->partial('yrnmr/navi.phtml'); ?>
+    </div>
+    <div class="span9">
+        <div id="intro">
+        </div>
+        <hr />
+        <?php if ($this->metadata) : ?>
+        <?php echo $this->page->getNavigation(); ?>
+        <div id="mdlist">
+        <ol start="<?php echo $this->offset; ?>">
+            <?php foreach($this->metadata as $md) : ?>
+            <li><a href="/yrnmr/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
+            <?php endforeach; ?>
+        </ol>	
+        </div>
+        <?php endif; ?>
+	</div>
+</div>

application/default/views/scripts/yrnmr/index.phtml

@@ -3,19 +3,24 @@ $this->headTitle($this->config->title->site);
 $this->headTitle($this->config->title->data);
 $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
-$this->nav[] = array('link'=>"/yrnmr",'title'=>'黄河上游宁蒙河段');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
+$this->breadcrumb($this->config->title->yrnmr);
+$this->breadcrumb()->setSeparator(' > ');
 ?>
-<?= $this->render('breadcrumbs.phtml'); ?>
 <div class="row">
-    <div class="span2">
+    <div class="span3">
     <?= $this->partial('yrnmr/navi.phtml'); ?>
     </div>
-    <div class="span10">
+    <div class="span9">
     <div id="intro">
-            <h1><?php if(!empty($this->info['title'])) echo $this->info['title']; ?></h1>
-            <table>
-                <tr><td><?php if(!empty($this->info['body'])) echo $this->info['body'];?></td></tr>
-            </table>
+    <h1>黄河上游宁蒙河段数据简介</h1>
+    <p>
+    黄河上游宁蒙河段穿越腾格里沙漠、河东沙地、乌兰布和沙漠和库布齐沙漠，长约1000 km，形成典型的沙漠宽谷。该区是我国西北重要的能源基地、粮食产区、回蒙少数民族集居区，是黄河上游风沙水沙活动强烈、河道演变剧烈的关键河段，是黄河上游产水区与中下游河段水沙关系的调节河段，也是上游大型水库联合调度影响显著的河段。近50多年来，由于气候变化、沙漠化发展、水库调蓄、过度用水等，导致黄河水沙关系变异，河槽萎缩，洪凌灾害频发。该河段的水沙形势不仅关系到上游水资源的开发利用和重大水利工程布局，而且危及黄河下游河道安全。目前，在国家重点基础研究规划项目（973项目）“黄河上游沙漠宽谷段风沙水沙过程与调控机理”的支持下，项目组对黄河上游宁蒙河段开展了大量的观测与研究，积累了大量的数据，为该区域风沙、水沙与河道过程研究奠定了数据基础。根据项目需求，该项目第六课题“黄河上游沙漠宽谷段河道冲淤演变趋势预测与调控对策”，基于研究区已有的环境背景资料和本项目的观测实验等资料，构建了黄河上游宁蒙河段多元数据平台。
+    </p>
+    <p>
+    该数据平台包括属性数据集与空间数据集。其中属性数据集包括.dbf属性表、ASCII文本文件、mdb属性数据库、EXCEL文件等，空间数据集主要包括两种空间坐标系统：WGS84坐标系与ALBERS坐标系。其中WGS84坐标系采用原点是地球质心，椭球体为WGS84椭球体，主要考虑到许多来自GPS野外定位测量的数据和国际组织机构发布的空间数据使用这一坐标系；ALBERS坐标系采用Krasovsky椭球体，两根标准纬线分别为北纬25度和北纬47度，中央经线采用东经105度，该坐标系主要在小比例尺而且要求保持等面积特性的数据情况下使用，如小于1:100万比例尺的数据，同时该投影与我国小比例尺专题图的投影是吻合的，有助于和这些数据的配准。
+    </p>
     </div>
     <div id="heihe_ad">
     <h2>已整理数据展示</h2>

application/default/views/scripts/yrnmr/landsurface.phtml

@@ -0,0 +1,32 @@
+<?php
+$this->headTitle($this->config->title->site);
+$this->headTitle($this->config->title->data);
+$this->headTitle()->setSeparator(' - ');
+$this->headLink()->appendStylesheet('/css/water.css');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
+$this->breadcrumb('<a href="/yrnmr/">'.$this->config->title->yrnmr.'</a>');
+$this->breadcrumb('陆地表层数据');
+$this->breadcrumb()->setSeparator(' > ');
+?>
+<div class="row">
+    <div class="span3">
+    <?= $this->partial('yrnmr/navi.phtml'); ?>
+    </div>
+    <div class="span9">
+        <div id="intro">
+        <p>陆地表层数据包括冰川、沙漠、草场、植被、地貌等数据。</p>
+        </div>
+        <hr />
+        <?php if ($this->metadata) : ?>
+        <?php echo $this->page->getNavigation(); ?>
+        <div id="mdlist">
+        <ol start="<?php echo $this->offset; ?>">
+            <?php foreach($this->metadata as $md) : ?>
+            <li><a href="/yrnmr/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
+            <?php endforeach; ?>
+        </ol>	
+        </div>
+        <?php endif; ?>
+	</div>
+</div>

application/default/views/scripts/yrnmr/landuse.phtml

@@ -0,0 +1,32 @@
+<?php
+$this->headTitle($this->config->title->site);
+$this->headTitle($this->config->title->data);
+$this->headTitle()->setSeparator(' - ');
+$this->headLink()->appendStylesheet('/css/water.css');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
+$this->breadcrumb('<a href="/heihe/">'.$this->config->title->yrnmr.'</a>');
+$this->breadcrumb('土地利用数据');
+$this->breadcrumb()->setSeparator(' > ');
+?>
+<div class="row">
+    <div class="span3">
+    <?= $this->partial('yrnmr/navi.phtml'); ?>
+    </div>
+    <div class="span9">
+        <div id="intro">
+        <p>1:10万土地利用数据</p>
+        </div>
+        <hr />
+        <?php if ($this->metadata) : ?>
+        <?php echo $this->page->getNavigation(); ?>
+        <div id="mdlist">
+        <ol start="<?php echo $this->offset; ?>">
+            <?php foreach($this->metadata as $md) : ?>
+            <li><a href="/yrnmr/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
+            <?php endforeach; ?>
+        </ol>	
+        </div>
+        <?php endif; ?>
+	</div>
+</div>

application/default/views/scripts/yrnmr/meteo.phtml

@@ -0,0 +1,34 @@
+<?php
+$this->headTitle($this->config->title->site);
+$this->headTitle($this->config->title->data);
+$this->headTitle()->setSeparator(' - ');
+$this->headLink()->appendStylesheet('/css/water.css');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
+$this->breadcrumb('<a href="/yrnmr/">'.$this->config->title->yrnmr.'</a>');
+$this->breadcrumb('气象观测数据');
+$this->breadcrumb()->setSeparator(' > ');
+?>
+<div class="row">
+    <div class="span3">
+    <?= $this->partial('yrnmr/navi.phtml'); ?>
+    </div>
+    <div class="span9">
+        <div id="intro">
+        <p>
+        观测要素包括日平均气压、最高气压、最低气压、平均气温、最高气温、最低气温、平均相对湿度、最小相对湿度、平均风速、最大风速及风向、极大风速及风向、日照时数、降水量。
+        </p>
+        </div>
+        <hr />
+        <?php if ($this->metadata) : ?>
+        <?php echo $this->page->getNavigation(); ?>
+        <div id="mdlist">
+        <ol start="<?php echo $this->offset; ?>">
+            <?php foreach($this->metadata as $md) : ?>
+            <li><a href="/yrnmr/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
+            <?php endforeach; ?>
+        </ol>	
+        </div>
+        <?php endif; ?>
+	</div>
+</div>

application/default/views/scripts/yrnmr/model.phtml

@@ -0,0 +1,34 @@
+<?php
+$this->headTitle($this->config->title->site);
+$this->headTitle($this->config->title->data);
+$this->headTitle()->setSeparator(' - ');
+$this->headLink()->appendStylesheet('/css/water.css');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
+$this->breadcrumb('<a href="/yrnmr/">'.$this->config->title->yrnmr.'</a>');
+$this->breadcrumb('模型数据');
+$this->breadcrumb()->setSeparator(' > ');
+?>
+<div class="row">
+    <div class="span3">
+    <?= $this->partial('yrnmr/navi.phtml'); ?>
+    </div>
+    <div class="span9">
+        <div id="intro">
+        <p>
+        模型数据
+        </p>
+        </div>
+        <hr />
+        <?php if ($this->metadata) : ?>
+        <?php echo $this->page->getNavigation(); ?>
+        <div id="mdlist">
+        <ol start="<?php echo $this->offset; ?>">
+            <?php foreach($this->metadata as $md) : ?>
+            <li><a href="/yrnmr/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
+            <?php endforeach; ?>
+        </ol>	
+        </div>
+        <?php endif; ?>
+	</div>
+</div>

application/default/views/scripts/yrnmr/navi.phtml

@@ -1,5 +1,5 @@
 <ul class="nav nav-pills nav-stacked">
-	<li id="Nav-yrnmr-index"><a href="/yrnmr/">数据简介</a></li>
+	<li id="Nav-yrnmr-index"><a href="/yrnmr/">黄河上游宁蒙河段数据简介</a></li>
     <li id="Nav-yrnmr-core"><a href="/yrnmr/core">核心数据</a>
         <ul class="nav nav-list nav-stacked heihe-subnav">
             <li id="Nav-yrnmr-dem"><i class="icon-chevron-right"></i><a href="/yrnmr/dem">DEM数据</a></li>
@@ -23,7 +23,9 @@
 </ul>
 <ul class="nav nav-pills nav-stacked">
     <li id="Nav-yrnmr-document"><a href="/yrnmr/document">相关文档</a></li>
+    <li id="Nav-yrnmr-list"><a href="/yrnmr/list">数据列表</a></li>
     <li id="Nav-yrnmr-browse"><a href="/yrnmr/browse">整体浏览</a></li>
+    <li id="Nav-yrnmr-category"><a href="/yrnmr/category">ISO19115分类</a></li>
     <li id="Nav-yrnmr-thumb"><a href="/yrnmr/thumb">缩略图浏览</a></li>
     <li id="Nav-yrnmr-tag"><a href="/yrnmr/tag">关键词导航</a></li>
     <li id="Nav-yrnmr-timeline"><a href="/yrnmr/timeline">时间轴导航</a></li>

application/default/views/scripts/yrnmr/obs.phtml

@@ -0,0 +1,34 @@
+<?php
+$this->headTitle($this->config->title->site);
+$this->headTitle($this->config->title->data);
+$this->headTitle()->setSeparator(' - ');
+$this->headLink()->appendStylesheet('/css/water.css');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
+$this->breadcrumb('<a href="/yrnmr/">'.$this->config->title->yrnmr.'</a>');
+$this->breadcrumb('观测数据');
+$this->breadcrumb()->setSeparator(' > ');
+?>
+<div class="row">
+    <div class="span3">
+    <?= $this->partial('yrnmr/navi.phtml'); ?>
+    </div>
+    <div class="span9">
+        <div id="intro">
+        <p>
+        观测数据
+        </p>
+        </div>
+        <hr />
+        <?php if ($this->metadata) : ?>
+        <?php echo $this->page->getNavigation(); ?>
+        <div id="mdlist">
+        <ol start="2">
+            <?php foreach($this->metadata as $md) : ?>
+            <li><a href="/yrnmr/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
+            <?php endforeach; ?>
+        </ol>	
+        </div>
+        <?php endif; ?>
+	</div>
+</div>

application/default/views/scripts/yrnmr/rs.phtml

@@ -0,0 +1,31 @@
+<?php
+$this->headTitle($this->config->title->site);
+$this->headTitle($this->config->title->data);
+$this->headTitle()->setSeparator(' - ');
+$this->headLink()->appendStylesheet('/css/water.css');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
+$this->breadcrumb('<a href="/yrnmr/">'.$this->config->title->yrnmr.'</a>');
+$this->breadcrumb('遥感数据');
+$this->breadcrumb()->setSeparator(' > ');
+?>
+<div class="row">
+    <div class="span3">
+    <?= $this->partial('yrnmr/navi.phtml'); ?>
+    </div>
+    <div class="span9">
+        <div id="intro">
+        </div>
+        <hr />
+        <?php if ($this->metadata) : ?>
+        <?php echo $this->page->getNavigation(); ?>
+        <div id="mdlist">
+        <ol start="<?php echo $this->offset; ?>">
+            <?php foreach($this->metadata as $md) : ?>
+            <li><a href="/yrnmr/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
+            <?php endforeach; ?>
+        </ol>
+        </div>
+        <?php endif; ?>
+	</div>
+</div>

application/default/views/scripts/yrnmr/search.phtml

@@ -1,22 +1,28 @@
 <?php
 $this->headTitle($this->config->title->site);
 $this->headTitle($this->config->title->data);
+
 $this->headTitle('快速搜索');
 if (!empty($this->codename)) $this->headTitle($this->codename);
 $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
-$this->nav[] = array('link'=>"/yrnmr",'title'=>'黄河上游宁蒙河段');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
+$this->breadcrumb('<a href="/yrnmr/">'.$this->config->title->yrnmr.'</a>');
+$this->breadcrumb('快速搜索');
+$this->breadcrumb()->setSeparator(' > ');
 ?>
-<?= $this->render('breadcrumbs.phtml'); ?>
-<div class="row">
-    <div class="span2">
-    	<?= $this->partial('yrnmr/navi.phtml',array('key'=>$this->key)); ?>
-    </div>
-    <div class='span10'>
+<div id='sidebar'>
+<div id='leftnavi'>
+<?= $this->partial('yrnmr/navi.phtml',array('key'=>$this->key)); ?>
+</div>
+</div>
+<div id='right'>
+<div class="clear">&nbsp;</div>
 <?php if (!empty($this->metadata)) : ?>
 <?php echo $this->page->getNavigation(); ?>
 <hr />
-<div class="mdlist">
+<div id="mdlist">
 <ol start="<?php echo $this->offset; ?>">
 	<?php foreach($this->metadata as $md) : ?>
 	<li><a href="/yrnmr/view/uuid/<?php echo $md['uuid']; ?>" title="<?php echo mb_strlen($md['description'])>400?$this->escape(mb_substr($md['description'],0,400,'UTF-8').'...'):$this->escape($md['description']);?>"><?php echo $md['title']; ?></a></li>
@@ -30,6 +36,4 @@ else :
 <div>
 <p>您的搜索结果为空，请尝试其他关键词进行查询。</p>
 </div>
-<?php endif; ?>
-</div>
-</div>
+<?php endif; ?>

application/default/views/scripts/yrnmr/soil.phtml

@@ -0,0 +1,34 @@
+<?php
+$this->headTitle($this->config->title->site);
+$this->headTitle($this->config->title->data);
+$this->headTitle()->setSeparator(' - ');
+$this->headLink()->appendStylesheet('/css/water.css');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
+$this->breadcrumb('<a href="/yrnmr/">'.$this->config->title->yrnmr.'</a>');
+$this->breadcrumb('土壤数据');
+$this->breadcrumb()->setSeparator(' > ');
+?>
+<div class="row">
+    <div class="span3">
+    <?= $this->partial('yrnmr/navi.phtml'); ?>
+    </div>
+    <div class="span9">
+        <div id="intro">
+        <p>
+        土壤类型数据
+        </p>
+        </div>
+        <hr />
+        <?php if ($this->metadata) : ?>
+        <?php echo $this->page->getNavigation(); ?>
+        <div id="mdlist">
+        <ol start="<?php echo $this->offset; ?>">
+            <?php foreach($this->metadata as $md) : ?>
+            <li><a href="/yrnmr/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
+            <?php endforeach; ?>
+        </ol>	
+        </div>
+        <?php endif; ?>
+	</div>
+</div>    

application/default/views/scripts/yrnmr/tag.phtml

@@ -4,20 +4,23 @@ $this->headTitle($this->config->title->data);
 if (!empty($this->codename)) $this->headTitle($this->codename);
 $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
-$this->nav[] = array('link'=>"/yrnmr",'title'=>'黄河上游宁蒙河段');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
+$this->breadcrumb('<a href="/yrnmr/">'.$this->config->title->yrnmr.'</a>');
+$this->breadcrumb('关键词导航'.(($this->codename)?'：'.$this->codename:''));
+$this->breadcrumb()->setSeparator(' > ');
 ?>
-<?= $this->render('breadcrumbs.phtml'); ?>
 <div class="row">
-    <div class="span2">
-    	<?= $this->partial('yrnmr/navi.phtml'); ?>
+    <div class="span3">
+    <?= $this->partial('yrnmr/navi.phtml'); ?>
     </div>
-    <div class="span10">
+    <div class="span9">
 		<?php if (!empty($this->metadata)) : ?>
         <div id='mdlist'>
         <h1>关键词：<?php echo $this->codename; ?> 【<a href="/yrnmr/tag/">全部关键词</a>】</h1>
         <?php echo $this->page->getNavigation(); ?>
         <hr />
-        <div class="md-list">
+        <div id="mdlist">
         <ol start="<?php echo $this->offset; ?>">
             <?php foreach($this->metadata as $md) : ?>
             <li><a href="/yrnmr/view/uuid/<?php echo $md['uuid']; ?>" title="<?php echo mb_strlen($md['description'])>400?$this->escape(mb_substr($md['description'],0,400,'UTF-8').'...'):$this->escape($md['description']);?>"><?php echo $md['title']; ?></a></li>
@@ -29,27 +32,22 @@ $this->nav[] = array('link'=>"/yrnmr",'title'=>'黄河上游宁蒙河段');
         </div>
         <?php else : ?>
         
-        <div>
+        <div id='links'>
         <?php 
         $keytypezh=array('place'=>'地点关键词','theme'=>'主题关键词','discipline'=>'学科关键词','stratum'=>'地层关键词','temporal'=>'时间关键词');
-        $type='';
-foreach($this->keywords as $cg) : 
-	if ($type!=$cg['keytype']) : 
-		if ($type!='') : ?>
-		</ul>
-		<?php endif; 
-			$type=$cg['keytype'];
-		?>
-<h4><a href="/yrnmr/tag/keytype/<?php echo $type; ?>"><?php echo $keytypezh[$type]; ?></a>
-<?php if ($this->keytype) : ?><a class="pull-right" href="/hiwater/tag"><i class="icon-tags"></i>全部关键词</a> <?php endif; ?></h4>
-<ul class="inline">
-<li><a href='/yrnmr/tag/key/<?php echo urlencode($cg['keyword']); ?>'><i class="icon-tag"></i><?php echo $cg['keyword']; ?></a><span class="note">(<?php echo $cg['count']; ?>)</span></li>
-<?php else : ?>
-<li><a href='/yrnmr/tag/key/<?php echo urlencode($cg['keyword']); ?>'><i class="icon-tag"></i><?php echo $cg['keyword']; ?></a><span class="note">(<?php echo $cg['count']; ?>)</span></li>
-<?php endif; ?>
-<?php endforeach; ?>
-</ul>
-</fieldset></div>
+        foreach($this->keywords as $type=>$kcg) : 
+        if (is_array($kcg) && count($kcg)>0 ) :
+        ?>
+        <fieldset><legend><?php echo $keytypezh[$type]; ?></legend>
+        <ul>
+        <?php foreach($kcg as $cg) : ?> 
+        <li><a href='/yrnmr/tag/key/<?php echo urlencode($cg['keyword']); ?>'><?php echo $cg['keyword']; ?></a><span class="note">(<?php echo $cg['count']; ?>)</span></li>
+        <?php endforeach; ?>
+        
+        </ul>
+        </fieldset>
+        <?php endif;endforeach; ?>
+        </div>
         <?php endif; ?>
-	</div>
-</div>
+        </div>
+</div>

application/default/views/scripts/yrnmr/thumb.phtml

@@ -4,45 +4,37 @@ $this->headTitle($this->config->title->data);
 $this->headTitle('全部浏览');
 $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
+$this->breadcrumb('<a href="/yrnmr/">'.$this->config->title->yrnmr.'</a>');
+$this->breadcrumb('缩略图浏览');
+$this->breadcrumb()->setSeparator(' > ');
 $this->theme->AppendPlus($this,'colorbox');
-$this->theme->AppendPlus($this,'masonry');
-$this->nav[] = array('link'=>"/yrnmr",'title'=>'黄河上游宁蒙河段');
 ?>
-<?= $this->render('breadcrumbs.phtml'); ?>
 <div class="row">
-    <div class="span2">
+    <div class="span3">
     <?= $this->partial('yrnmr/navi.phtml'); ?>
     </div>
-    <div class="span10">
+    <div class="span9">
 		<?php echo $this->page->getNavigation(); ?>
-        <div>
-        <ul class="thumb water-thumb unstyled" id="container">
+        <hr />
+        <div id="mdlist">
         <?php foreach($this->metadata as $md) : ?>
-        <li class="items">
-      		<h4><a href="/yrnmr/view/uuid/<?php echo $md['uuid'];?>"><?= $this->escape($md['title']);?></a></h4>
-            <a href="/service/bigthumb/uuid/<?= $md['uuid'] ?>" class="thumbnail colorbox">
-              <img src="/service/thumb/id/<?php echo $md['id'];?>" alt="">
-            </a>
-            <div class="caption">
-                <p>
-                    <?php echo mb_strlen($md['description'])>120?$this->escape(mb_substr($md['description'],0,120,'UTF-8').'...'):$this->escape($md['description']);?>
-                </p>
-            </div>
-            <span class="pull-right"><a href="/hiwater/view/uuid/<?php echo $md['uuid'];?>" class="btn"><i class="icon-zoom-in"></i>查看</a></span>
-      	</li>
+         <div class="thumb">
+         
+         <div class="thumbtitle">
+         <a href="/yrnmr/view/uuid/<?php echo $md['uuid'];?>"><?php echo $this->escape($md['title']); ?> </a>
+         </div>
+         <a class="colorbox" href="/service/bigthumb/id/<?php echo $md['id'];?>" title="<?php echo $this->escape($md['title']); ?>">
+         <img src="/service/thumb/id/<?php echo $md['id'];?>" alt="<?php echo $this->escape($md['title']);?>" title="<?php echo mb_strlen($md['description'])>400?$this->escape(mb_substr($md['description'],0,400,'UTF-8').'...'):$this->escape($md['description']);?>" />
+         </a>
+         </div>     
         <?php endforeach; ?>
-        </ul>
         </div>
-        <hr class="clearfix" />
+        <hr style="clear:left;"/>
         <?php echo $this->page->getNavigation(); ?>
-    </div>
+	</div>
 </div>
 <script type="text/javascript" charset="utf-8">
-$(document).ready(function(){
-	$(".colorbox").colorbox({rel:"colorbox",photo:"true",transition:"fade"});
-	$(".colorbox").colorbox({photo:"true"});
-});
-$('#container').masonry({
-	itemSelector : '.items',
-});
+$(document).ready(function(){$(".colorbox").colorbox({rel:"colorbox",photo:"true",transition:"fade"});});
 </script>

application/default/views/scripts/yrnmr/timeline.phtml

@@ -4,21 +4,20 @@ $this->headTitle($this->config->title->data);
 $this->headTitle('时间轴导航');
 $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
+$this->breadcrumb('<a href="/yrnmr/">'.$this->config->title->yrnmr.'</a>');
+$this->breadcrumb('时间轴导航');
+$this->breadcrumb()->setSeparator(' > ');
 $this->headScript()->appendFile('/js/timeline_var.js');
 $this->headScript()->appendFile('/js/timeline_js/timeline-api.js');
 $this->headScript()->appendFile('/js/yrnmrtime.js');
-$this->nav[] = array('link'=>"/yrnmr",'title'=>'黄河上游宁蒙河段');
 ?>
-<?= $this->render('breadcrumbs.phtml'); ?>
 <div class="row">
-    <div class="span2">
+    <div class="span3">
     <?= $this->partial('yrnmr/navi.phtml'); ?>
     </div>
-    <div class="span10"> 
+    <div class="span9"> 
 		<div id="tl" class="timeline-default" style="height:600px;"> </div>
 	</div>
-</div>
-<script type="text/javascript" charset="utf-8">
-$('#tl').height($(window).height());
-$("html,body").animate({scrollTop:$('#tl').offset().top},600);
-</script>
+</div>

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

@@ -4,52 +4,61 @@ $this->headTitle($this->config->title->data);
 $this->headTitle('时空导航');
 $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
-$this->headScript()->appendFile('/js/OpenLayers.js');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
+$this->breadcrumb('<a href="/yrnmr/">'.$this->config->title->yrnmr.'</a>');
+$this->breadcrumb('时空联合导航');
+$this->breadcrumb()->setSeparator(' > ');
+//$this->headScript()->appendFile('http://maps.google.cN/maps?file=api&v=2&key='.$this->config->google->maps->api);
 $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?(openlayers)');
+$this->headScript()->appendFile('/js/timemap.2.0.1/lib/mxn/mxn.js?(google)');
 $this->headScript()->appendFile('/js/timemap.2.0.1/timemap.pack.js');
-$this->nav[] = array('link'=>"/yrnmr",'title'=>'黄河上游宁蒙河段');
+$this->theme->AppendPlus($this,'colorbox');
 ?>
-<style>
-img{max-width:none}
-</style>
-<?= $this->render('breadcrumbs.phtml'); ?>
 <div class="row">
-    <div class="span2">
-    	<?= $this->partial('yrnmr/navi.phtml'); ?>
+    <div class="span3">
+    <?= $this->partial('yrnmr/navi.phtml'); ?>
     </div>
-    <div class="span10">
-<div id="timemap">
-	<div id="timeline" style="height:400px;border-bottom:1px solid #abc;"></div> 
-    <div id="map" style="height:400px;"></div>
-</div>
+    <div class="span9">  
+    	<div id="timemap">
+        	<div id="watermap" style="height:500px;width:40%;float:right;"></div>
+        	<div id="timeline" style="height:500px;border-right:1px solid #abc;"></div> 
+		</div>
 	</div>
+</div>
 <script type="text/javascript" charset="utf-8">
-$('#map').height($(window).height()/2);
-$('#timeline').height($(window).height()/2);
-$("html,body").animate({scrollTop:$('#timemap').offset().top},600);
 var tm;
-$(function() {
-      
-    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/"
+$(window).bind("load", function() {  var timeout = setTimeout(function() { initLoader();	}, 100);});  
+//$(window).bind("load", function() {  var timeout = setTimeout(function() { gmaploaded();	}, 1000);});
+function loadMaps() {
+  google.load("maps", "2", {"callback" : tmloaded,"base_domain": "ditu.google.cn"});
+}
+
+function initLoader() {
+  var script = document.createElement("script");
+  script.src = "https://www.google.com/jsapi?key=<?php echo $this->config->google->maps->api; ?>&callback=loadMaps";
+  script.type = "text/javascript";
+  document.getElementsByTagName("head")[0].appendChild(script);
+}
+function tmloaded() {
+		tm = TimeMap.init({
+		mapId: "watermap",               // Id of map div element (required)
+		timelineId: "timeline",     // Id of timeline div element (required)
+		scrollTo: "2000-01-01",
+		options: {
+            eventIconPath: "../images/",
+            mapType:G_HYBRID_MAP,
+            mapCenter: new GLatLng(39,100)
         },
-        datasets: [
+		datasets: [
             {
-                id: "metadata",
-                title: "Metadata",
+            	data:{
                 theme: "orange",
                 // note that the lines below are now the preferred syntax
                 type: "basic",
-                options: {
-                    items: [
-                <?php
-                foreach($this->rows as $row) : ?>
+                value: [
+                <?php foreach($this->rows as $row) : ?>
                         {
                           "start" : "<?php echo $row['timebegin']; ?>",
                           <?php if ($row['timeend']!='') : ?>
@@ -62,11 +71,13 @@ $(function() {
                            },
                           "title" : "<?php echo htmlspecialchars($row['title']); ?>",
                           "options" : {
+                            // set the full HTML for the info window
                             "infoHtml": "<div class='info'><a href=/yrnmr/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; ?>   
-                    ]
+						<?php endforeach; ?>                        
+						]
                 }
             }
         ],
@@ -75,7 +86,8 @@ $(function() {
             Timeline.DateTime.YEAR
         ]
     });
-    
-});
-
-</script>	
+    // manipulate the timemap further here if you like
+    var map=tm.map;
+    map.setCenter(new GLatLng(39,100),7);
+}
+</script>

application/default/views/scripts/yrnmr/water.phtml

@@ -0,0 +1,34 @@
+<?php
+$this->headTitle($this->config->title->site);
+$this->headTitle($this->config->title->data);
+$this->headTitle()->setSeparator(' - ');
+$this->headLink()->appendStylesheet('/css/water.css');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
+$this->breadcrumb('<a href="/yrnmr/">'.$this->config->title->yrnmr.'</a>');
+$this->breadcrumb('水文水资源数据');
+$this->breadcrumb()->setSeparator(' > ');
+?>
+<div class="row">
+    <div class="span3">
+    <?= $this->partial('yrnmr/navi.phtml'); ?>
+    </div>
+    <div class="span9">
+        <div id="intro">
+        <p>
+        水资源
+        </p>
+        </div>
+        <hr />
+        <?php if ($this->metadata) : ?>
+        <?php echo $this->page->getNavigation(); ?>
+        <div id="mdlist">
+        <ol start="<?php echo $this->offset; ?>">
+            <?php foreach($this->metadata as $md) : ?>
+            <li><a href="/yrnmr/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
+            <?php endforeach; ?>
+        </ol>	
+        </div>
+        <?php endif; ?>
+	</div>
+</div>

application/models/Search.php

@@ -66,7 +66,7 @@ class Search
 	function __construct($text='')
 	{
 		require_once '/home/wlx/xunsearch/sdk/php/lib/XS.php'; 
-		$this->xs=new XS('westdc');
+		$this->xs=new XS('heihe');
 		$this->search=$this->xs->search;
 		$this->terms = array();
 		$this->text=$text;

application/models/data/Review.php

@@ -400,7 +400,7 @@ class ReviewListener implements Zend_EventManager_ListenerAggregate
 				$res=$rs->fetch();
 				$mailtp=new EmailText($this->db,'metadata-publish',array('uuid'=>$res['uuid'],'title'=>$res['title']));
 				$mail->setBodyText($mailtp->getBody());
-				$mail->setFrom($config->service->email,'数据服务组');
+				$mail->setFrom($config->service->email,'西部数据中心服务组');
 				foreach($emails as $email)	$mail->addTo($email);
 				$mail->setSubject($mailtp->getSubject());
 				$mail->send();

application/module/Open/Client.php

@@ -46,7 +46,7 @@ class Client extends \Zend_Controller_Plugin_Abstract
 	
 	public function initSource()
 	{
-		$this->source = new Source('westdc');
+		$this->source = new Source('heihedata');
 	}
 	
 	public function getSource()

application/module/Order/Mount/OrderOperate.php

@@ -140,4 +140,4 @@ class OrderOperate implements \Order\Listener\OrderEvents
 		
 	}
 	
-}
+}

htdocs/js/lib/jplayer/skin/blue.monday/jplayer.blue.monday.css

@@ -1,640 +0,0 @@
-/*
- * Skin for jPlayer Plugin (jQuery JavaScript Library)
- * http://www.jplayer.org
- *
- * Skin Name: Blue Monday
- *
- * Copyright (c) 2010-2012 Happyworm Ltd
- * Dual licensed under the MIT and GPL licenses.
- *  - http://www.opensource.org/licenses/mit-license.php
- *  - http://www.gnu.org/copyleft/gpl.html
- *
- * Author: Silvia Benvenuti
- * Skin Version: 4.2 (jPlayer 2.2.0)
- * Date: 22nd October 2012
- */
-
-div.jp-audio,
-div.jp-audio-stream,
-div.jp-video {
-
-	/* Edit the font-size to counteract inherited font sizing.
-	 * Eg. 1.25em = 1 / 0.8em
-	 */
-
-	font-size:1.25em; /* 1.25em for testing in site pages */ /* No parent CSS that can effect the size in the demos ZIP */
-
-	font-family:Verdana, Arial, sans-serif;
-	line-height:1.6;
-	color: #666;
-	border:1px solid #009be3;
-	background-color:#eee;
-}
-div.jp-audio {
-	width:420px;
-}
-div.jp-audio-stream {
-	width:182px;
-}
-div.jp-video-270p {
-	width:480px;
-}
-div.jp-video-360p {
-	width:640px;
-}
-div.jp-video-full {
-	/* Rules for IE6 (full-screen) */
-	width:480px;
-	height:270px;
-	/* Rules for IE7 (full-screen) - Otherwise the relative container causes other page items that are not position:static (default) to appear over the video/gui. */
-	position:static !important; position:relative
-}
-
-/* The z-index rule is defined in this manner to enable Popcorn plugins that add overlays to video area. EG. Subtitles. */
-div.jp-video-full div div {
-	z-index:1000;
-}
-
-div.jp-video-full div.jp-jplayer {
-	top: 0;
-	left: 0;
-	position: fixed !important; position: relative; /* Rules for IE6 (full-screen) */
-	overflow: hidden;
-}
-
-div.jp-video-full div.jp-gui {
-	position: fixed !important; position: static; /* Rules for IE6 (full-screen) */
-	top: 0;
-	left: 0;
-	width:100%;
-	height:100%;
-	z-index:1001; /* 1 layer above the others. */
-}
-
-div.jp-video-full div.jp-interface {
-	position: absolute !important; position: relative; /* Rules for IE6 (full-screen) */
-	bottom: 0;
-	left: 0;
-}
-
-div.jp-interface {
-	position: relative;
-	background-color:#eee;
-	width:100%;
-}
-
-div.jp-audio div.jp-type-single div.jp-interface {
-	height:80px;
-}
-div.jp-audio div.jp-type-playlist div.jp-interface {
-	height:80px;
-}
-
-div.jp-audio-stream div.jp-type-single div.jp-interface {
-	height:80px;
-}
-
-div.jp-video div.jp-interface {
-	border-top:1px solid #009be3;
-}
-
-/* @group CONTROLS */
-
-div.jp-controls-holder {
-	clear: both;
-	width:440px;
-	margin:0 auto;
-	position: relative;
-	overflow:hidden;
-	top:-8px; /* This negative value depends on the size of the text in jp-currentTime and jp-duration */
-}
-
-div.jp-interface ul.jp-controls {
-	list-style-type:none;
-	margin:0;
-	padding: 0;
-	overflow:hidden;
-}
-
-div.jp-audio ul.jp-controls {
-	width: 380px;
-	padding:20px 20px 0 20px;
-}
-
-div.jp-audio-stream ul.jp-controls {
-	width: 142px;
-	padding:20px 20px 0 20px;
-}
-
-div.jp-video div.jp-type-single ul.jp-controls {
-	width: 78px;
-	margin-left: 200px;
-}
-
-div.jp-video div.jp-type-playlist ul.jp-controls {
-	width: 134px;
-	margin-left: 172px;
-}
-div.jp-video ul.jp-controls,
-div.jp-interface ul.jp-controls li {
-	display:inline;
-	float: left;
-}
-
-div.jp-interface ul.jp-controls a {
-	display:block;
-	overflow:hidden;
-	text-indent:-9999px;
-}
-a.jp-play,
-a.jp-pause {
-	width:40px;
-	height:40px;
-}
-
-a.jp-play {
-	background: url("jplayer.blue.monday.jpg") 0 0 no-repeat;
-}
-a.jp-play:hover {
-	background: url("jplayer.blue.monday.jpg") -41px 0 no-repeat;
-}
-a.jp-pause {
-	background: url("jplayer.blue.monday.jpg") 0 -42px no-repeat;
-	display: none;
-}
-a.jp-pause:hover {
-	background: url("jplayer.blue.monday.jpg") -41px -42px no-repeat;
-}
-
-a.jp-stop, a.jp-previous, a.jp-next {
-	width:28px;
-	height:28px;
-	margin-top:6px;
-}
-
-a.jp-stop {
-	background: url("jplayer.blue.monday.jpg") 0 -83px no-repeat;
-	margin-left:10px;
-}
-
-a.jp-stop:hover {
-	background: url("jplayer.blue.monday.jpg") -29px -83px no-repeat;
-}
-
-a.jp-previous {
-	background: url("jplayer.blue.monday.jpg") 0 -112px no-repeat;
-}
-a.jp-previous:hover {
-	background: url("jplayer.blue.monday.jpg") -29px -112px no-repeat;
-}
-
-a.jp-next {
-	background: url("jplayer.blue.monday.jpg") 0 -141px no-repeat;
-}
-a.jp-next:hover {
-	background: url("jplayer.blue.monday.jpg") -29px -141px no-repeat;
-}
-
-/* @end */
-
-/* @group progress bar */
-
-div.jp-progress {
-	overflow:hidden;
-	background-color: #ddd;
-}
-div.jp-audio div.jp-progress {
-	position: absolute;
-	top:32px;
-	height:15px;
-}
-div.jp-audio div.jp-type-single div.jp-progress {
-	left:110px;
-	width:186px;
-}
-div.jp-audio div.jp-type-playlist div.jp-progress {
-	left:166px;
-	width:130px;
-}
-div.jp-video div.jp-progress {
-	top:0px;
-	left:0px;
-	width:100%;
-	height:10px;
-}
-div.jp-seek-bar {
-	background: url("jplayer.blue.monday.jpg") 0 -202px repeat-x;
-	width:0px;
-	height:100%;
-	cursor: pointer;
-}
-div.jp-play-bar {
-	background: url("jplayer.blue.monday.jpg") 0 -218px repeat-x ;
-	width:0px;
-	height:100%;
-}
-
-/* The seeking class is added/removed inside jPlayer */
-div.jp-seeking-bg {
-	background: url("jplayer.blue.monday.seeking.gif");
-}
-
-/* @end */
-
-/* @group volume controls */
-
-
-a.jp-mute,
-a.jp-unmute,
-a.jp-volume-max {
-	width:18px;
-	height:15px;
-	margin-top:12px;
-}
-
-div.jp-audio div.jp-type-single a.jp-mute,
-div.jp-audio div.jp-type-single a.jp-unmute {
-	margin-left: 210px;	
-}
-div.jp-audio div.jp-type-playlist a.jp-mute,
-div.jp-audio div.jp-type-playlist a.jp-unmute {
-	margin-left: 154px;
-}
-
-div.jp-audio-stream div.jp-type-single a.jp-mute,
-div.jp-audio-stream div.jp-type-single a.jp-unmute {
-	margin-left:10px;
-}
-
-div.jp-audio a.jp-volume-max,
-div.jp-audio-stream a.jp-volume-max {
-	margin-left: 56px;	
-}
-
-div.jp-video a.jp-mute,
-div.jp-video a.jp-unmute,
-div.jp-video a.jp-volume-max {
-	position: absolute;
-	top:12px;
-	margin-top:0;
-}
-
-div.jp-video a.jp-mute,
-div.jp-video a.jp-unmute {
-	left: 50px;
-}
-
-div.jp-video a.jp-volume-max {
-	left: 134px;
-}
-
-a.jp-mute {
-	background: url("jplayer.blue.monday.jpg") 0 -170px no-repeat;
-}
-a.jp-mute:hover {
-	background: url("jplayer.blue.monday.jpg") -19px -170px no-repeat;
-}
-a.jp-unmute {
-	background: url("jplayer.blue.monday.jpg") -60px -170px no-repeat;
-	display: none;
-}
-a.jp-unmute:hover {
-	background: url("jplayer.blue.monday.jpg") -79px -170px no-repeat;
-}
-a.jp-volume-max {
-	background: url("jplayer.blue.monday.jpg") 0 -186px no-repeat;
-}
-a.jp-volume-max:hover {
-	background: url("jplayer.blue.monday.jpg") -19px -186px no-repeat;
-}
-
-div.jp-volume-bar {
-	position: absolute;
-	overflow:hidden;
-	background: url("jplayer.blue.monday.jpg") 0 -250px repeat-x;
-	width:46px;
-	height:5px;
-	cursor: pointer;
-}
-div.jp-audio div.jp-volume-bar {
-	top:37px;
-	left:330px;
-}
-div.jp-audio-stream div.jp-volume-bar {
-	top:37px;
-	left:92px;
-}
-div.jp-video div.jp-volume-bar {
-	top:17px;
-	left:72px;
-}
-div.jp-volume-bar-value {
-	background: url("jplayer.blue.monday.jpg") 0 -256px repeat-x;
-	width:0px;
-	height:5px;
-}
-
-/* @end */
-
-/* @group current time and duration */
-
-div.jp-audio div.jp-time-holder {
-	position:absolute;
-	top:50px;
-}
-div.jp-audio div.jp-type-single div.jp-time-holder {
-	left:110px;
-	width:186px;
-}
-div.jp-audio div.jp-type-playlist div.jp-time-holder {
-	left:166px;
-	width:130px;
-}
-
-div.jp-current-time,
-div.jp-duration {
-	width:60px;
-	font-size:.64em;
-	font-style:oblique;
-}
-div.jp-current-time {
-	float: left;
-	display:inline;
-}
-div.jp-duration {
-	float: right;
-	display:inline;
-	text-align: right;
-}
-
-div.jp-video div.jp-current-time {
-	margin-left:20px;
-}
-div.jp-video div.jp-duration {
-	margin-right:20px;
-}
-
-/* @end */
-
-/* @group playlist */
-
-div.jp-title {
-	font-weight:bold;
-	text-align:center;
-}
-
-div.jp-title,
-div.jp-playlist {
-	width:100%;
-	background-color:#ccc;
-	border-top:1px solid #009be3;
-}
-div.jp-type-single div.jp-title,
-div.jp-type-playlist div.jp-title,
-div.jp-type-single div.jp-playlist {
-	border-top:none;
-}
-div.jp-title ul,
-div.jp-playlist ul {
-	list-style-type:none;
-	margin:0;
-	padding:0 20px;
-	font-size:.72em;
-}
-
-div.jp-title li {
-	padding:5px 0;
-	font-weight:bold;
-}
-div.jp-playlist li {
-	padding:5px 0 4px 20px;
-	border-bottom:1px solid #eee;
-}
-
-div.jp-playlist li div {
-	display:inline;
-}
-
-/* Note that the first-child (IE6) and last-child (IE6/7/8) selectors do not work on IE */
-
-div.jp-type-playlist div.jp-playlist li:last-child {
-	padding:5px 0 5px 20px;
-	border-bottom:none;
-}
-div.jp-type-playlist div.jp-playlist li.jp-playlist-current {
-	list-style-type:square;
-	list-style-position:inside;
-	padding-left:7px;
-}
-div.jp-type-playlist div.jp-playlist a {
-	color: #333;
-	text-decoration: none;
-}
-div.jp-type-playlist div.jp-playlist a:hover {
-	color:#0d88c1;
-}
-div.jp-type-playlist div.jp-playlist a.jp-playlist-current {
-	color:#0d88c1;
-}
-
-div.jp-type-playlist div.jp-playlist a.jp-playlist-item-remove {
-	float:right;
-	display:inline;
-	text-align:right;
-	margin-right:10px;
-	font-weight:bold;
-	color:#666;
-}
-div.jp-type-playlist div.jp-playlist a.jp-playlist-item-remove:hover {
-	color:#0d88c1;
-}
-div.jp-type-playlist div.jp-playlist span.jp-free-media {
-	float:right;
-	display:inline;
-	text-align:right;
-	margin-right:10px;
-}
-div.jp-type-playlist div.jp-playlist span.jp-free-media a{
-	color:#666;
-}
-div.jp-type-playlist div.jp-playlist span.jp-free-media a:hover{
-	color:#0d88c1;
-}
-span.jp-artist {
-	font-size:.8em;
-	color:#666;
-}
-
-/* @end */
-
-div.jp-video-play {
-	width:100%;
-	overflow:hidden; /* Important for nested negative margins to work in modern browsers */
-	cursor:pointer;
-	background-color:rgba(0,0,0,0); /* Makes IE9 work with the active area over the whole video area. IE6/7/8 only have the button as active area. */
-}
-div.jp-video-270p div.jp-video-play {
-	margin-top:-270px;
-	height:270px;
-}
-div.jp-video-360p div.jp-video-play {
-	margin-top:-360px;
-	height:360px;
-}
-div.jp-video-full div.jp-video-play {
-	height:100%;
-}
-a.jp-video-play-icon {
-	position:relative;
-	display:block;
-	width: 112px;
-	height: 100px;
-
-	margin-left:-56px;
-	margin-top:-50px;
-	left:50%;
-	top:50%;
-
-	background: url("jplayer.blue.monday.video.play.png") 0 0 no-repeat;
-	text-indent:-9999px;
-}
-div.jp-video-play:hover a.jp-video-play-icon {
-	background: url("jplayer.blue.monday.video.play.png") 0 -100px no-repeat;
-}
-
-
-
-
-
-div.jp-jplayer audio,
-div.jp-jplayer {
-	width:0px;
-	height:0px;
-}
-
-div.jp-jplayer {
-	background-color: #000000;
-}
-
-
-
-
-
-/* @group TOGGLES */
-
-/* The audio toggles are nested inside jp-time-holder */
-
-ul.jp-toggles {
-	list-style-type:none;
-	padding:0;
-	margin:0 auto;
-	overflow:hidden;
-}
-
-div.jp-audio .jp-type-single ul.jp-toggles {
-	width:25px;
-}
-div.jp-audio .jp-type-playlist ul.jp-toggles {
-	width:55px;
-	margin: 0;
-	position: absolute;
-	left: 325px;
-	top: 50px;
-}
-
-div.jp-video ul.jp-toggles {
-	margin-top:10px;
-	width:100px;
-}
-
-ul.jp-toggles li {
-	display:block;
-	float:right;
-}
-
-ul.jp-toggles li a {
-	display:block;
-	width:25px;
-	height:18px;
-	text-indent:-9999px;
-	line-height:100%; /* need this for IE6 */
-}
-
-a.jp-full-screen {
-	background: url("jplayer.blue.monday.jpg") 0 -310px no-repeat;
-	margin-left: 20px;
-}
-
-a.jp-full-screen:hover {
-	background: url("jplayer.blue.monday.jpg") -30px -310px no-repeat;
-}
-
-a.jp-restore-screen {
-	background: url("jplayer.blue.monday.jpg") -60px -310px no-repeat;
-	margin-left: 20px;
-}
-
-a.jp-restore-screen:hover {
-	background: url("jplayer.blue.monday.jpg") -90px -310px no-repeat;
-}
-
-a.jp-repeat {
-	background: url("jplayer.blue.monday.jpg") 0 -290px no-repeat;
-}
-
-a.jp-repeat:hover {
-	background: url("jplayer.blue.monday.jpg") -30px -290px no-repeat;
-}
-
-a.jp-repeat-off {
-	background: url("jplayer.blue.monday.jpg") -60px -290px no-repeat;
-}
-
-a.jp-repeat-off:hover {
-	background: url("jplayer.blue.monday.jpg") -90px -290px no-repeat;
-}
-
-a.jp-shuffle {
-	background: url("jplayer.blue.monday.jpg") 0 -270px no-repeat;
-	margin-left: 5px;
-}
-
-a.jp-shuffle:hover {
-	background: url("jplayer.blue.monday.jpg") -30px -270px no-repeat;
-}
-
-a.jp-shuffle-off {
-	background: url("jplayer.blue.monday.jpg") -60px -270px no-repeat;
-	margin-left: 5px;
-}
-
-a.jp-shuffle-off:hover {
-	background: url("jplayer.blue.monday.jpg") -90px -270px no-repeat;
-}
-
-
-/* @end */
-
-/* @group NO SOLUTION error feedback */
-
-.jp-no-solution {
-	padding:5px;
-	font-size:.8em;
-	background-color:#eee;
-	border:2px solid #009be3;
-	color:#000;
-	display:none;
-}
-
-.jp-no-solution a {
-	color:#000;
-}
-
-.jp-no-solution span {
-	font-size:1em;
-	display:block;
-	text-align:center;
-	font-weight:bold;
-}
-
-/* @end */

htdocs/js/lib/jplayer/skin/circle.skin/circle.player.css

@@ -1,133 +0,0 @@
-/*
- * Project: CirclePlayer
- * http://www.jplayer.org
- *
- * Copyright (c) 2012 Happyworm Ltd
- *
- * Author: Silvia Benvenuti
- * Edited by: Mark J Panaghiston
- * Date: 2nd October 2012
- * Artwork inspired by: http://forrst.com/posts/Untitled-CJz
- */
-
-.cp-container {
-	position:relative;
-	width:104px; /* 200 - (2 * 48) */
-	height:104px;
-	background:url("bgr.jpg") 0 0 no-repeat;
-	padding:48px;
-	-webkit-tap-highlight-color:rgba(0,0,0,0);
-}
-
-.cp-container :focus {
-	border:none;
-	outline:0;
-}
-
-.cp-buffer-1,
-.cp-buffer-2,
-.cp-progress-1,
-.cp-progress-2 {
-	position:absolute;
-	top:0;
-	left:0;
-	width:104px;
-	height:104px;
-	clip:rect(0px,52px,104px,0px);
-
-	-moz-border-radius:52px;
-	-webkit-border-radius:52px;
-	border-radius:52px;
-}
-
-.cp-buffer-1,
-.cp-buffer-2 {
-	background:url("buffer.png") 0 0 no-repeat;
-}
-
-
-/* FALLBACK for .progress
- * (24 steps starting from 1hr filled progress, Decrease second value by 104px for next step)
- * (It needs the container selector to work. Or use div)
- */
-
-.cp-container .cp-fallback {
-	background:url("progress_sprite.jpg") no-repeat;
-	background-position:0 104px; 
-}
-
-.cp-progress-1,
-.cp-progress-2 {
-	background:url("progress.png") 0 0 no-repeat;
-}
-
-.cp-buffer-holder,
-.cp-progress-holder,
-.cp-circle-control {
-	position:absolute;
-	width:104px;
-	height:104px;
-} 
-
-.cp-circle-control {
-	cursor:pointer;
-}
-
-.cp-buffer-holder,
-.cp-progress-holder {
-	clip:rect(0px,104px,104px,52px);
-	display:none;
-}
-
-
-/* This is needed when progress is greater than 50% or for fallback */
-
-.cp-buffer-holder.cp-gt50,
-.cp-progress-holder.cp-gt50,
-.cp-progress-1.cp-fallback{
-	clip:rect(auto, auto, auto, auto);
-}
-
-.cp-controls {
-	margin:0;
-	padding:26px;
-}
-
-.cp-controls li{
-	list-style-type:none;
-	display:block;
-
-	/*IE Fix*/
-	position:absolute;
-}
-
-.cp-controls li a{
-	position:relative;
-	display:block;
-	width:50px;
-	height:50px;
-	text-indent:-9999px;
-	z-index:1;
-	cursor:pointer;
-}
-
-.cp-controls .cp-play {
-	background:url("controls.jpg") 0 0 no-repeat;
-}
-
-.cp-controls .cp-play:hover {
-	background:url("controls.jpg") -50px 0 no-repeat;
-}
-
-.cp-controls .cp-pause {
-	background:url("controls.jpg") 0 -50px no-repeat;
-}
-
-.cp-controls .cp-pause:hover {
-	background:url("controls.jpg") -50px -50px no-repeat;
-}
-
-.cp-jplayer {
-	width:0;
-	height:0;
-}

htdocs/js/lib/jplayer/skin/pink.flag/jplayer.pink.flag.css

@@ -1,670 +0,0 @@
-/*
- * Skin for jPlayer Plugin (jQuery JavaScript Library)
- * http://www.jplayer.org
- *
- * Skin Name: Pink Flag
- *
- * Copyright (c) 2012 Happyworm Ltd
- * Dual licensed under the MIT and GPL licenses.
- *  - http://www.opensource.org/licenses/mit-license.php
- *  - http://www.gnu.org/copyleft/gpl.html
- *
- * Author: Silvia Benvenuti
- * Skin Version: 1.2 (jPlayer 2.2.0)
- * Date: 22nd October 2012
- */
-
-div.jp-audio,
-div.jp-audio-stream,
-div.jp-video {
-
-	/* Edit the font-size to counteract inherited font sizing.
-	 * Eg. 1.25em = 1 / 0.8em
-	 */
-
-	font-size:1.25em; /* 1.25em for testing in site pages */ /* No parent CSS that can effect the size in the demos ZIP */
-
-	font-family:Verdana, Arial, sans-serif;
-	line-height:1.6;
-	color: #fff;
-	border-top:1px solid #554461;
-	border-left:1px solid #554461;
-	border-right:1px solid #180a1f;
-	border-bottom:1px solid #180a1f;
-	background-color:#3a2a45;
-}
-div.jp-audio {
-	width:201px;
-	padding:20px;
-}
-
-div.jp-audio-stream {
-	width:101px;
-	padding:20px 20px 10px 20px;
-}
-
-div.jp-video-270p {
-	width:480px;
-}
-div.jp-video-360p {
-	width:640px;
-}
-div.jp-video-full {
-	/* Rules for IE6 (full-screen) */
-	width:480px;
-	height:270px;
-	/* Rules for IE7 (full-screen) - Otherwise the relative container causes other page items that are not position:static (default) to appear over the video/gui. */
-	position:static !important; position:relative;
-}
-
-/* The z-index rule is defined in this manner to enable Popcorn plugins that add overlays to video area. EG. Subtitles. */
-div.jp-video-full div div {
-	z-index:1000;
-}
-
-div.jp-video-full div.jp-jplayer {
-	top: 0;
-	left: 0;
-	position: fixed !important; position: relative; /* Rules for IE6 (full-screen) */
-	overflow: hidden;
-}
-
-div.jp-video-full div.jp-gui {
-	position: fixed !important; position: static; /* Rules for IE6 (full-screen) */
-	top: 0;
-	left: 0;
-	width:100%;
-	height:100%;
-	z-index:1001; /* 1 layer above the others. */
-}
-div.jp-video-full div.jp-interface {
-	position: absolute !important; position: relative; /* Rules for IE6 (full-screen) */
-	bottom: 0;
-	left: 0;
-}
-
-div.jp-interface {
-	position: relative;
-	width:100%;
-	background-color:#3a2a45; /* Required for the full screen */
-}
-
-
-div.jp-audio .jp-interface {
-	height: 80px;
-	padding-top:30px;
-}
-
-div.jp-audio-stream .jp-interface {
-	height: 50px;
-	padding-top:30px;
-}
-
-/* @group CONTROLS */
-
-div.jp-controls-holder {
-	clear: both;
-	width:440px;
-	margin:0 auto 10px auto;
-	position: relative;
-	overflow:hidden;
-}
-
-div.jp-interface ul.jp-controls {
-	background: url("jplayer.pink.flag.jpg") 0 0 no-repeat;
-	list-style-type:none;
-	padding: 1px 0 2px 1px;
-	overflow:hidden;
-	width: 201px;
-	height: 34px;
-}
-
-div.jp-audio ul.jp-controls,
-div.jp-audio-stream ul.jp-controls {
-	margin:0 auto;
-}
-
-div.jp-audio-stream ul.jp-controls {
-	width: 100px;
-}
-
-div.jp-video ul.jp-controls {
-	margin:0 0 0 115px;
-	float:left;
-	display:inline; /* need this to fix IE6 double margin */
-}
-
-div.jp-interface ul.jp-controls li {
-	display:inline;
-	float: left;
-}
-div.jp-interface ul.jp-controls a {
-	display:block;
-	overflow:hidden;
-	text-indent:-9999px;
-	height: 34px;
-	margin: 0 1px 2px 0;
-	padding: 0;
-}
-
-
-/* @group single player controls */
-
-div.jp-type-single  .jp-controls li a{
-	width: 99px;
-}
-
-div.jp-type-single  .jp-play {
-	background: url("jplayer.pink.flag.jpg") 0px -40px no-repeat;
-}
-
-div.jp-type-single  .jp-play:hover {
-	background: url("jplayer.pink.flag.jpg") -100px -40px no-repeat;
-}
-
-div.jp-type-single  .jp-pause {
-	background: url("jplayer.pink.flag.jpg") 0px -120px no-repeat;
-}
-
-div.jp-type-single  .jp-pause:hover {
-	background: url("jplayer.pink.flag.jpg") -100px -120px no-repeat;
-}
-
-/* The right border is normally in the ul background image. */
-div.jp-audio-stream .jp-play,
-div.jp-audio-stream .jp-pause {
-	border-right:1px solid #180920;
-}
-
-div.jp-type-single  .jp-stop {
-	background: url("jplayer.pink.flag.jpg") 0px -80px no-repeat;
-}
-
-div.jp-type-single  .jp-stop:hover {
-	background: url("jplayer.pink.flag.jpg") -100px -80px no-repeat;
-}
-
-/* @end */
-
-/* @group playlist player controls */
-
-div.jp-type-playlist .jp-controls li a{
-	width: 49px;
-}
-
-div.jp-type-playlist .jp-play {
-	background: url("jplayer.pink.flag.jpg") -24px -40px no-repeat;
-}
-
-div.jp-type-playlist .jp-play:hover {
-	background: url("jplayer.pink.flag.jpg") -124px -40px no-repeat;
-}
-
-div.jp-type-playlist .jp-pause {
-	background: url("jplayer.pink.flag.jpg") -24px -120px no-repeat;
-}
-
-div.jp-type-playlist .jp-pause:hover {
-	background: url("jplayer.pink.flag.jpg") -124px -120px no-repeat;
-}
-
-div.jp-type-playlist .jp-stop {
-	background: url("jplayer.pink.flag.jpg") -24px -80px no-repeat;
-}
-
-div.jp-type-playlist .jp-stop:hover {
-	background: url("jplayer.pink.flag.jpg") -124px -80px no-repeat;
-}
-
-div.jp-type-playlist .jp-previous {
-	background: url("jplayer.pink.flag.jpg") -24px -200px no-repeat;
-}
-
-div.jp-type-playlist .jp-previous:hover {
-	background: url("jplayer.pink.flag.jpg") -124px -200px no-repeat;
-}
-
-div.jp-type-playlist .jp-next {
-	background: url("jplayer.pink.flag.jpg") -24px -160px no-repeat;
-}
-
-div.jp-type-playlist .jp-next:hover {
-	background: url("jplayer.pink.flag.jpg") -124px -160px no-repeat;
-}
-
-/* @end */
-
-/* @end */
-
-
-
-
-/* @group TOGGLES */
-
-ul.jp-toggles {
-	list-style-type:none;
-	padding:0;
-	margin:0 auto;
-	overflow:hidden;
-}
-
-div.jp-audio ul.jp-toggles {
-	width:55px;
-}
-
-div.jp-audio .jp-type-single ul.jp-toggles {
-	width:25px;
-}
-
-div.jp-video ul.jp-toggles {
-	width:100px;
-	margin-top: 10px;
-}
-
-ul.jp-toggles li{
-	display:block;
-	float:right;
-}
-
-ul.jp-toggles li a{
-	display:block;
-	width:25px;
-	height:18px;
-	text-indent:-9999px;
-	line-height:100%; /* need this for IE6 */
-}
-
-.jp-full-screen {
-	background: url("jplayer.pink.flag.jpg") 0 -420px no-repeat;
-	margin-left: 20px;
-}
-
-.jp-full-screen:hover {
-	background: url("jplayer.pink.flag.jpg") -30px -420px no-repeat;
-}
-
-.jp-restore-screen {
-	background: url("jplayer.pink.flag.jpg") -60px -420px no-repeat;
-	margin-left: 20px;
-}
-
-.jp-restore-screen:hover {
-	background: url("jplayer.pink.flag.jpg") -90px -420px no-repeat;
-}
-
-.jp-repeat {
-	background: url("jplayer.pink.flag.jpg") 0 -440px no-repeat;
-}
-
-.jp-repeat:hover {
-	background: url("jplayer.pink.flag.jpg") -30px -440px no-repeat;
-}
-
-.jp-repeat-off {
-	background: url("jplayer.pink.flag.jpg") -60px -440px no-repeat;
-}
-
-.jp-repeat-off:hover {
-	background: url("jplayer.pink.flag.jpg") -90px -440px no-repeat;
-}
-
-.jp-shuffle {
-	background: url("jplayer.pink.flag.jpg") 0 -460px no-repeat;
-	margin-left: 5px;
-}
-
-.jp-shuffle:hover {
-	background: url("jplayer.pink.flag.jpg") -30px -460px no-repeat;
-}
-
-.jp-shuffle-off {
-	background: url("jplayer.pink.flag.jpg") -60px -460px no-repeat;
-	margin-left: 5px;
-}
-
-.jp-shuffle-off:hover {
-	background: url("jplayer.pink.flag.jpg") -90px -460px no-repeat;
-}
-
-
-/* @end */
-
-/* @group progress bar */
-
-/* The seeking class is added/removed inside jPlayer */
-div.jp-seeking-bg {
-	background: url("jplayer.pink.flag.seeking.gif");
-}
-
-.jp-progress {
-	background: url("jplayer.pink.flag.jpg") 0px -240px no-repeat;
-	width: 197px;
-	height: 13px;
-	padding: 0 2px 2px 2px;
-	margin-bottom: 4px;
-	overflow:hidden;
-}
-
-div.jp-video .jp-progress {
-	border-top:1px solid #180a1f;
-	border-bottom: 1px solid #554560;
-	width:100%;
-	background-image: none;
-	padding: 0;
-}
-
-.jp-seek-bar {
-	background: url("jplayer.pink.flag.jpg") 0px -260px repeat-x;
-	width:0px;
-	height: 100%;
-	overflow:hidden;
-	cursor:pointer;
-}
-
-.jp-play-bar {
-	background: url("jplayer.pink.flag.jpg") 0px -280px repeat-x;
-	width:0px;
-	height: 100%;
-	overflow:hidden;
-}
-
-
-/* @end */
-
-/* @group volume controls */
-
-div.jp-interface ul.jp-controls a.jp-mute,
-div.jp-interface ul.jp-controls a.jp-unmute,
-div.jp-interface ul.jp-controls a.jp-volume-max {
-	background: url("jplayer.pink.flag.jpg") 0px -330px no-repeat;
-	position: absolute;
-	width: 16px;
-	height: 11px;
-}
-
-div.jp-audio ul.jp-controls a.jp-mute,
-div.jp-audio ul.jp-controls a.jp-unmute,
-div.jp-audio-stream ul.jp-controls a.jp-mute,
-div.jp-audio-stream ul.jp-controls a.jp-unmute {
-	top:-6px;
-	left: 0;
-}
-
-div.jp-audio ul.jp-controls a.jp-volume-max,
-div.jp-audio-stream ul.jp-controls a.jp-volume-max {
-	top:-6px;
-	right: 0;
-}
-
-
-div.jp-video ul.jp-controls a.jp-mute,
-div.jp-video ul.jp-controls a.jp-unmute {
-	left: 0;
-	top:14px;
-}
-
-div.jp-video ul.jp-controls a.jp-volume-max {
-	left: 84px;
-	top:14px;
-}
-
-div.jp-interface ul.jp-controls a.jp-mute:hover {
-	background: url("jplayer.pink.flag.jpg") -25px -330px no-repeat;
-}
-
-div.jp-interface ul.jp-controls a.jp-unmute {
-	background: url("jplayer.pink.flag.jpg") -60px -330px no-repeat;
-}
-
-div.jp-interface ul.jp-controls a.jp-unmute:hover {
-	background: url("jplayer.pink.flag.jpg") -85px -330px no-repeat;
-}
-
-div.jp-interface ul.jp-controls a.jp-volume-max {
-	background: url("jplayer.pink.flag.jpg") 0px -350px no-repeat;
-}
-
-div.jp-interface ul.jp-controls a.jp-volume-max:hover {
-	background: url("jplayer.pink.flag.jpg") -25px -350px no-repeat;
-}
-
-.jp-volume-bar {
-	background: url("jplayer.pink.flag.jpg") 0px -300px repeat-x;
-	position: absolute;
-	width: 197px;
-	height: 4px;
-	padding: 2px 2px 1px 2px;
-	overflow: hidden;
-}
-
-.jp-volume-bar:hover {
-	cursor:  pointer;
-}
-
-
-div.jp-audio .jp-interface .jp-volume-bar,
-div.jp-audio-stream .jp-interface .jp-volume-bar {
-	top:10px;
-	left: 0;
-}
-
-div.jp-audio-stream .jp-interface .jp-volume-bar {
-	width: 97px;
-	border-right:1px solid #180920;
-	padding-right:1px;
-}
-
-div.jp-video .jp-volume-bar {
-	top: 0;
-	left: 0;
-	width:95px;
-	border-right:1px solid #180920;
-	padding-right:1px;
-	margin-top: 30px;
-}
-
-.jp-volume-bar-value {
-	background: url("jplayer.pink.flag.jpg") 0px -320px repeat-x;
-	height: 4px;
-}
-
-/* @end */
-
-/* @group current time and duration */
-
-.jp-current-time, .jp-duration {
-	width:70px;
-	font-size:.5em;
-	color: #8c7a99;
-}
-
-.jp-current-time {
-	float: left;
-}
-
-.jp-duration {
-	float: right;
-	text-align:right;
-}
-
-.jp-video .jp-current-time {
-	padding-left:20px;
-}
-
-.jp-video .jp-duration {
-	padding-right:20px;
-}
-
-/* @end */
-
-/* @group playlist */
-
-.jp-title ul,
-.jp-playlist ul {
-	list-style-type:none;	
-	font-size:.7em;
-	margin: 0;
-	padding: 0;
-}
-
-.jp-video .jp-title ul {
-	margin: 0 20px 10px;
-}
-
-.jp-video .jp-playlist ul {
-	margin: 0 20px;
-}
-
-.jp-title li,
-.jp-playlist li {
-	position: relative;
-	padding: 2px 0;
-	border-top:1px solid #554461;
-	border-bottom:1px solid #180a1f;
-	overflow: hidden;
-}
-
-.jp-title li{
-	border-bottom:none;
-	border-top:none;
-	padding:0;
-	text-align:center;
-}
-
-/* Note that the first-child (IE6) and last-child (IE6/7/8) selectors do not work on IE */
-
-div.jp-type-playlist div.jp-playlist li:first-child {
-	border-top:none;
-	padding-top:3px;
-}
-
-div.jp-type-playlist div.jp-playlist li:last-child {
-	border-bottom:none;
-	padding-bottom:3px;
-}
-
-div.jp-type-playlist div.jp-playlist a {
-	color: #fff;
-	text-decoration:none;
-}
-
-div.jp-type-playlist div.jp-playlist a:hover {
-	color: #e892e9;
-}
-
-div.jp-type-playlist div.jp-playlist li.jp-playlist-current {
-	background-color: #26102e;
-	margin: 0 -20px;
-	padding: 2px 20px;
-	border-top: 1px solid #26102e;
-	border-bottom: 1px solid #26102e;
-}
-
-div.jp-type-playlist div.jp-playlist li.jp-playlist-current a{
-	color: #e892e9;
-}
-
-div.jp-type-playlist div.jp-playlist a.jp-playlist-item-remove {
-	float:right;
-	display:inline;
-	text-align:right;
-	margin-left:10px;
-	font-weight:bold;
-	color:#8C7A99;
-}
-div.jp-type-playlist div.jp-playlist a.jp-playlist-item-remove:hover {
-	color:#E892E9;
-}
-
-div.jp-type-playlist div.jp-playlist span.jp-free-media {
-	float: right;
-	display:inline;
-	text-align:right;
-	color:#8C7A99;
-}
-
-div.jp-type-playlist div.jp-playlist span.jp-free-media a{
-	color:#8C7A99;
-}
-
-div.jp-type-playlist div.jp-playlist span.jp-free-media a:hover{
-	color:#E892E9;
-}
-span.jp-artist {
-	font-size:.8em;
-	color:#8C7A99;
-}
-
-/* @end */
-
-
-div.jp-video div.jp-video-play {
-	width:100%;
-	overflow:hidden; /* Important for nested negative margins to work in modern browsers */
-	cursor:pointer;
-}
-div.jp-video-270p div.jp-video-play {
-	margin-top:-270px;
-	height:270px;
-}
-div.jp-video-360p div.jp-video-play {
-	margin-top:-360px;
-	height:360px;
-}
-div.jp-video-full div.jp-video-play {
-	height:100%;
-}
-a.jp-video-play-icon {
-	position:relative;
-	display:block;
-	width: 112px;
-	height: 100px;
-
-	margin-left:-56px;
-	margin-top:-50px;
-	left:50%;
-	top:50%;
-
-	background: url("jplayer.pink.flag.video.play.png") 0 0 no-repeat;
-	text-indent:-9999px;
-}
-div.jp-video-play:hover a.jp-video-play-icon {
-	background: url("jplayer.pink.flag.video.play.png") 0 -100px no-repeat;
-}
-
-
-div.jp-jplayer audio,
-div.jp-jplayer {
-	width:0px;
-	height:0px;
-}
-
-div.jp-jplayer {
-	background-color: #000000;
-}
-
-/* @group NO SOLUTION error feedback */
-
-.jp-no-solution {
-	padding:5px;
-	font-size:.8em;
-	background-color:#3a2a45;
-	border-top:2px solid #554461;
-	border-left:2px solid #554461;
-	border-right:2px solid #180a1f;
-	border-bottom:2px solid #180a1f;
-	color:#FFF;
-	display:none;
-}
-
-.jp-no-solution a {
-	color:#FFF;
-}
-
-.jp-no-solution span {
-	font-size:1em;
-	display:block;
-	text-align:center;
-	font-weight:bold;
-}
-/* @end */

tools/wsndata.php

@@ -103,8 +103,8 @@ ini_set('error_log','/tmp/wsn.log');
 				}				
 
 				//获取变量名称
-				$sql="select distinct va.fld_name from tbl_value v left join tbl_variable_info va on v.fld_variable_id=va.fld_variable_id 
-					WHERE v.fld_site_id=$site AND v.fld_time>='$start' AND v.fld_time<'$end'";
+				$sql="select distinct va.fld_name from tbl_site_sensor_variable ssv left join tbl_variable_info va on ssv.fld_variable_id=va.fld_variable_id 
+					WHERE ssv.fld_site_id=$site";
 				if ($variable==1)
 				{
 					$sql.=" and va.fld_variable_id in (select distinct variable from users_pm_down where starttime is not null and result=-1 and type='down' and uid=$uid) ";
@@ -112,6 +112,7 @@ ini_set('error_log','/tmp/wsn.log');
 				$sql.="	order by va.fld_name";
 				$sth=$db->query($sql);
 				$rs=$sth->fetchAll();
+				if (!$rs) continue;
 				$head = "Time";
 				$sql2= "select * from crosstab('SELECT v.fld_time as time,va.fld_name as variablename,v.fld_value as value
 					FROM tbl_value v left join tbl_variable_info va on v.fld_variable_id=va.fld_variable_id

tools/wsnuuid.php

@@ -0,0 +1,110 @@
+<?php
+	set_time_limit(0);
+	error_reporting(-1);
+	ini_set("display_errors",'On');
+	ini_set('error_log','/tmp/wsn.log');
+	$db = new PDO('pgsql:host=210.77.68.40;dbname=observation', "gis", "gispassword");
+
+	$file=array();
+	$basepath='/disk1/WestDC/wsndata/';
+
+	//接收uuid，只生成这个对应的数据
+	if($argc==2)
+	{
+		$uuid = $argv[1];
+	}else{
+		die("Error in parameter.");
+	}
+
+	$sql = "SELECT distinct ys.fld_site_id as site,si.fld_name from tbl_yuan_site ys left join tbl_site_info si on ys.fld_site_id=si.fld_site_id where ys.uuid='$uuid'";
+	$rs = $db->query($sql);
+	$sites = $rs->fetchAll();
+
+	//先为该数据创建一个文件夹
+	$datapath=$basepath.$uuid;
+	if (!file_exists($datapath)) 
+	{
+		$result = mkdir($datapath);
+	}
+
+	
+	//有需要生成的数据
+	if($sites)
+	{
+		foreach($sites as $k=>$v )
+		{
+			//逐个site生成
+			$site = $v['site'];
+			//获取观测点的名称
+			$sitename= $v['fld_name'];
+
+			//在该文件夹下面再建立一个观测点文件夹
+			$sitepath=$datapath.DIRECTORY_SEPARATOR.$sitename;
+			if (!file_exists($sitepath)) 
+			{
+				$result = mkdir($sitepath);
+			}				
+
+			//获取变量名称
+			$sql="select distinct va.fld_name from tbl_site_sensor_variable ssv left join tbl_variable_info va on ssv.fld_variable_id=va.fld_variable_id 
+					WHERE ssv.fld_site_id=$site	order by va.fld_name";
+			$sth=$db->query($sql);
+			$rs=$sth->fetchAll();
+			if (!$rs) continue;
+
+			$head = "Time";
+			$sql2= "select * from crosstab('SELECT v.fld_time as time,va.fld_name as variablename,v.fld_value as value
+					FROM tbl_value v left join tbl_variable_info va on v.fld_variable_id=va.fld_variable_id
+					WHERE v.fld_site_id=$site ORDER BY time',
+					'select distinct va.fld_name from  tbl_variable_info va left join tbl_site_sensor_variable v on v.fld_variable_id=va.fld_variable_id
+					WHERE v.fld_site_id=$site  order by va.fld_name')
+					as ct(time timestamp without time zone";
+			foreach($rs as $k=>$var)
+			{
+				$head.=", ".$var['fld_name'];
+				$sql2.=",v".$k." real";
+			}
+			$head.="\n";
+			$sql2.=")";
+			
+			//获取数据
+			$sth2 = $db->query($sql2);
+			$html="";
+			$datastart=true;
+			$start="";
+			while ($v=$sth2->fetch())
+			{
+				//组装数据
+				if ($datastart)
+				{
+					$start=$v['time'];
+					$endtime=date("Y-m-d",strtotime($start)+24*3600);
+					$datastart=false;
+					$html="";
+				}
+				if ($v['time']>=$start && $v['time']<$endtime)
+				{
+					$html.=$v['time'];
+					foreach ($rs as $k=>$var)
+						$html.=",".$v['v'.$k];
+					$html.="\n";
+				} elseif ($v['time']>=$endtime) {
+					//写入文件
+					$resulttime=date("Ymd",strtotime($start));
+					$fp = fopen($sitepath.DIRECTORY_SEPARATOR.$sitename.$resulttime.".CSV","w+"); 
+					fwrite($fp,$head.$html); //写入数据
+					fclose($fp); //关闭文件句柄
+					$datastart=true;
+				}					 
+			}
+			if (!$datastart)
+			{
+				//写入最后的文件
+				$resulttime=date("Ymd",strtotime($start));
+				$fp = fopen($sitepath.DIRECTORY_SEPARATOR.$sitename.$resulttime.".CSV","w+"); 
+				fwrite($fp,$head.$html); //写入数据
+				fclose($fp); //关闭文件句柄					
+			}
+			print $sitename."\r\n";
+		}
+	}