merge heihedata updates: from r3970 to r4321.

application/admin/controllers/DataController.php

@@ -1,6 +1,9 @@
 <?php
 use Helpers\View as view;
 use Reference\Reference;
+use Reference\Ris;
+use Reference\RisOutput;
+use Helpers\dbh;
 use \Files\Files;
 
 class Admin_DataController extends Zend_Controller_Action 
@@ -1126,6 +1129,7 @@ class Admin_DataController extends Zend_Controller_Action
 		$keyword = $this->view->q = trim($this->_getParam('q'));
 		$order = $this->view->search_order = trim($this->_getParam('order'));
 		$sort = $this->view->search_sort = trim($this->_getParam('sort'));
+		$field = $this->view->search_field = $this->_getParam('field');
 		
 		$reference = new Reference();
 		
@@ -1134,6 +1138,11 @@ class Admin_DataController extends Zend_Controller_Action
 			$reference->keyword = $keyword;
 		}
 		
+		if(!empty($field))
+		{
+			$reference->field = $field;
+		}
+		
 		if(!empty($order))
 		{
 			$reference->order = $order;
@@ -1144,19 +1153,40 @@ class Admin_DataController extends Zend_Controller_Action
 			$reference->sort = $sort;
 		}
 		
+		$this->view->reference = $reference;
+		$this->view->page = $this->_getParam('page');
+		$this->view->pagelimit = 12;
+		
 		//文献首页
 		if(empty($ac))
 		{
 			$this->view->referenceType = $reference->referenceType();			
-			view::addPaginator($reference->fetchReferences(),$this,12);
+			view::addPaginator($reference->fetchReferences(),$this, $this->view->pagelimit);
+			$this->view->years = $reference->countByYear();
 			return true;
 		}
 		else if ($ac == "water")
 		{
 			$this->view->referenceType = $reference->referenceType();
-			view::addPaginator($reference->fetchThemeReferences('water'),$this,10);
+			view::addPaginator($reference->fetchThemeReferences('water'),$this,$this->view->pagelimit);
 			return true;
 		}
+		else if ($ac == "westdc")
+		{
+			$this->view->referenceType = $reference->referenceType();
+			view::addPaginator($reference->fetchWestdcReferences(),$this,$this->view->pagelimit);
+			return true;
+		}
+		else if ($ac == "todo")
+		{
+			$this->view->referenceType = $reference->referenceType();
+			view::addPaginator($reference->fetchTodoReferences(),$this,$this->view->pagelimit);
+			return true;
+		}
+		
+		unset($this->view->reference);
+		unset($this->view->page);
+		unset($this->view->pagelimit);
 		
 		//添加
 		if($ac == "add")
@@ -1326,6 +1356,81 @@ class Admin_DataController extends Zend_Controller_Action
 			}
 		}
 		
+		//ris更新单篇
+		if($ac == "singleris")
+		{
+			$this->_helper->viewRenderer('ref-singleris');
+			$id = (int)$this->_getParam('id');
+			$this->view->ristext = $this->_getParam('ristext');
+			
+			if($id < 1)
+			{
+				view::Post($this,"参数错误!",-1);
+				return true;
+			}
+			
+			$this->view->referenceData = $reference->getOneReferenceData($id);
+			
+			if(!empty($submit))
+			{
+				$ris = new Ris();
+				$data = $ris->loadout();
+				
+				if(count($data) < 1)
+				{
+					view::Post($this,"输入的RIS信息有误".'<a href="/admin/data/ref/ac/add/id/'.$id.'">查看详细</a>',-1);
+					return true;
+				}
+				
+				if($ris->updateWithRis($id,$data[0]) === true)
+				{
+					view::Post($this,"编辑成功！".'<a href="/admin/data/ref/ac/add/id/'.$id.'">查看详细</a>',-2);
+					return true;
+				}else{
+					view::Post($this,"编辑失败！".'<a href="/admin/data/ref/ac/add/id/'.$id.'">查看详细</a>',-1);
+					return true;
+				}
+			}
+			
+			return true;
+		}//ris单篇更新
+		
+		//ris导出
+		if($ac == "risoutput")
+		{
+			$this->_helper->viewRenderer('ref-risoutput');
+			$this->view->years = $reference->countByYear();
+			
+			if(!empty($submit))
+			{
+				$mode = $this->_getParam('mode');
+				
+				$risOutput = new RisOutput();
+				$preData = $risOutput->preRead($mode);
+				
+				$risData = $risOutput->processArrayDataToRisData($preData);
+				
+				$risText = $risOutput->output($risData);
+				
+				echo "<pre>";
+				echo $risText;
+				echo "</pre>";
+			}
+		}//ris output
+		
+		if($ac == "ristest")
+		{
+			$this->_helper->viewRenderer('ref-ris');
+			$submit = $this->_getParam('submit');
+			
+			if(!empty($submit))
+			{
+				$ris = new \Reference\Ris();
+				view::Dump($ris->processRis(NULL,$this->_getParam('ristext')),false);
+			}
+		}
+
+		
 	}//文献管理 refAction()
 	
     /*
@@ -1788,8 +1893,8 @@ class Admin_DataController extends Zend_Controller_Action
 			
 			$id = $this->_getParam('attupdate');
 			
-			$files=new files();
+			$files=new Files();
-			$msg = $files -> upload($this->view->config->upload,$_FILES['Filedata'],empty($uuid)?'file':'md');
+			$msg = $files -> upload($_FILES['Filedata'],empty($uuid)?'file/':'md/',true);
 			
 			if(empty($msg['error']))
 			{
@@ -1797,7 +1902,7 @@ class Admin_DataController extends Zend_Controller_Action
 				$filename = $msg['db_path'];
 				$filesize = $msg['file_size'];
 				$filedesc = $this->_request->getParam('filedesc');
-				$filetype = $msg['file_type'];
+				$filetype = 'md';
 				$realname = $msg['realname'];
 				
 				
@@ -2116,8 +2221,8 @@ class Admin_DataController extends Zend_Controller_Action
 				exit();
 			}
 			
-			$files=new files();
+			$files=new Files();
-			$msg = $files -> upload($this->view->config->upload,$_FILES['Filedata'],empty($uuid)?'file':'md');
+			$msg = $files -> upload($_FILES['Filedata'],empty($uuid)?'file/':'md/',true);
 			
 			if(empty($msg['error']))
 			{
@@ -2125,7 +2230,7 @@ class Admin_DataController extends Zend_Controller_Action
 				$filename = $msg['db_path'];
 				$filesize = $msg['file_size'];
 				$filedesc = $this->_request->getParam('filedesc');
-				$filetype = $msg['file_type'];
+				$filetype = 'md';
 				$realname = $msg['realname'];
 				
 				
@@ -2184,10 +2289,6 @@ class Admin_DataController extends Zend_Controller_Action
 				$rs = $this->db->query($sql);
 				$atts = $rs->fetchAll();
 				
-				foreach($atts as $k=>$v)
-				{					
-					$atts[$k]['html']= $v['realname'].'['. round($v['filesize']/1024,2) .' kb]<input type="hidden" name="atts[]" value="'.$v['id'].'" /><div class="cancel"><a href="javascript:;" id="deletebtn_'.$v['id'].'"><img border="0" src="/static/js/uploadify/cancel.png" /></a></div>';
-				}
 				echo Zend_Json::encode($atts);
 				exit();
 			}else
@@ -3899,6 +4000,11 @@ class Admin_DataController extends Zend_Controller_Action
 					}else{
 						$this->view->data['doi'] = $metadata['doi'];
 						$this->view->data['info'] = $doi->data_process_out($this->view->data);
+						if(empty($this->view->data['ts_published']))
+						{
+							$this->view->data['title'] = $metadata['title'];
+							$this->view->data['title_en'] = $metadata['title_en'];
+						}
 					}
 				}else{
 					$this->view->data = $doi->view($uuid);

application/admin/controllers/DownController.php

@@ -4,6 +4,7 @@ use Files\Files;
 use Files\Output;
 use Files\Listener\FileListener;
 use Order\Manager\Offlineapp;
+use Order\Manager\Application;
 use data\DataService;
 use Mail\Mail;
 
@@ -374,8 +375,8 @@ class Admin_DownController extends Zend_Controller_Action
 				$mail->setSubject($mailtp->getSubject());
 				$addrs=array();
 				$addrs[] = 'nztong@lzb.ac.cn';
-				$addrs[] = 'wjian@lzb.ac.cn';
+				$addrs[] = 'wangliangxu@lzb.ac.cn';
-				$addrs[] = 'lixin@lzb.ac.cn';			
+				$addrs[] = 'wulizong@lzb.ac.cn';			
 				$mail->addTo($addrs);
 				$mail->addCc($this->view->config->service->email,'西部数据中心服务组');
 				$mail->createAttachment($filecontent,'application/octet-stream',Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64, 'offlineapp.pdf');
@@ -874,8 +875,10 @@ class Admin_DownController extends Zend_Controller_Action
 				if ($form->isValid($formdata)) {
 					$uploadedData = $form->getValues();
 					$pdf = basename($form->pdf->getFileName());
-					$sql="insert into offlineapp (username,email,unit,phone,address,postcode,project,pdflink,datalist,ts_created,ts_approved) values(?,?,?,?,?,?,?,?,?,?,now())";
+					$sql="insert into offlineapp (username,email,unit,phone,address,postcode,project,pdflink,datalist,ts_created,ts_approved,project_id,project_title,project_type) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
-					$this->db->query($sql,array($formdata['username'],$formdata['email'],$formdata['unit'],$formdata['phone'],$formdata['address'],$formdata['postcode'],$formdata['project'],$pdf,$formdata['datalist'],$formdata['ts_approved']));
+					$this->db->query($sql,array($formdata['username'],$formdata['email'],$formdata['unit'],$formdata['phone'],$formdata['address'],$formdata['postcode'],
+								    $formdata['project'],$pdf,$formdata['datalist'],$formdata['ts_approved']),$formdata['ts_approved'],
+							 $formdata['project_id'],$formdata['project_title'],$formdata['project_type']);
 					$this->messenger->addMessage('提示信息：您已经成功添加该离线服务记录。');
 					$this->_redirect('/admin/down/offline');
 				} else {
@@ -896,11 +899,14 @@ class Admin_DownController extends Zend_Controller_Action
 					$pdf = basename($form->pdf->getFileName());
 					$sql="update offlineapp set username=?,email=?,unit=?,phone=?,address=?,postcode=?,project=?,";
 					if ($form->pdf->isUploaded()) $sql.="pdflink=?,";
-					$sql.="datalist=?,ts_approved=? where id=?";
+					$sql.="datalist=?,ts_approved=?,project_id=?,project_title=?,project_type=? where id=?";
 					$param=array($formdata['username'],$formdata['email'],$formdata['unit'],$formdata['phone'],$formdata['address'],$formdata['postcode'],$formdata['project']);
 					if ($form->pdf->isUploaded()) $param[]=$pdf;
 					$param[]=$formdata['datalist'];
 					$param[]=$formdata['ts_approved'];
+					$param[]=$formdata['project_id'];
+					$param[]=$formdata['project_title'];
+					$param[]=$formdata['project_type'];
 					$param[]=$edit;
 					$this->db->query($sql,$param);
 					$this->messenger->addMessage('提示信息：您已经编辑添加该记录。');
@@ -1049,9 +1055,15 @@ class Admin_DownController extends Zend_Controller_Action
   
 			//设置当前活动sheet的名称  
 			$objActSheet->setTitle('离线服务记录');
+			if (date('m')==1)
+			{
+				$ym=(date('Y')-1).'-12-1';
+			} else {
+				$ym=date('Y-').(date('m')-1).'-1';
+			}
 			$sql="select o.username,o.unit,o.phone,o.address,o.postcode,o.project,regexp_replace(o.datalist,'\(.+?MB\)','','g') as datalist,date(o.ts_approved) as date,o.email,o.project_id,o.project_type,o.project_title,sum(m.filesize) as filesize
 								from offlineapp o left join dataorder d on o.id=d.offlineappid left join metadata m on d.uuid=m.uuid
-								where o.ts_approved>='".date('Y-').(date('m')-1)."-1' and o.ts_approved<'".date('Y-m')."-1' and o.pdflink is not null and o.ts_approved is not null and d.status=5 group by o.id order by o. ts_approved
+								where o.ts_approved>='".$ym."' and o.ts_approved<'".date('Y-m')."-1' and o.pdflink is not null and o.ts_approved is not null and d.status=5 group by o.id order by o. ts_approved
 								";  
 			$re = $this->db->query($sql);
 			$rows = $re->fetchAll();
@@ -1080,7 +1092,7 @@ class Admin_DownController extends Zend_Controller_Action
 			$objActSheet->setTitle('在线服务记录');  
 			$sql="select o.username,o.unit,o.phone,o.address,o.postcode,o.project,date(o.ts_created) as date,o.email,o.project_id,o.project_type,o.project_title,m.filesize,m.title
 						from onlineapp o left join dataorder d on o.id=d.onlineappid left join metadata m on d.uuid=m.uuid
-						where o.ts_created>='".date('Y-').(date('m')-1)."-1' and o.ts_created<'".date('Y-m')."-1'  and d.status=0 order by o. ts_created
+						where o.ts_created>='".$ym."' and o.ts_created<'".date('Y-m')."-1'  and d.status=0 order by o. ts_created
 						";  
 			$re = $this->db->query($sql);
 			$rows = $re->fetchAll();
@@ -1137,16 +1149,15 @@ class Admin_DownController extends Zend_Controller_Action
 									->setBody($objWriter->save('php://output'));*/    
 		}
 		
-		$select=$this->db->select();
-		$select->from('offlineapp')->where('ts_approved is not null')->where('pdflink is not null')->where('status>=0')->order('ts_created desc');
-		$paginator = Zend_Paginator::factory($select);
-		$paginator->setCurrentPageNumber($this->_getParam('page'));
-		$paginator->setItemCountPerPage($this->view->config->page->max);
-		$paginator->setView($this->view);
-		Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination.phtml');
-		$this->view->paginator=$paginator;
-		
 		$this->view->page = $this->_getParam('page');
+		
+		$application = new Application();
+		
+		$this->view->q = $application->keyword = $this->_getParam('q');
+		$application->filter = $this->_getParam('filter');
+		view::addPaginator($application->passed(),$this,20);
+		
+		return true;
 	}
 	//在线数据下载情况，仅针对onlineapp表，自2011-9-8开始记录。
 	function onlineAction()
@@ -1364,7 +1375,7 @@ class Admin_DownController extends Zend_Controller_Action
 		$sql = "select distinct u.email
 				from dataorder d
 				LEFT JOIN users u on d.userid = u.id
-				WHERE u.email IS NOT NULL
+				WHERE u.email IS NOT NULL and d.status in (0,5) and d.ts_approved is not null
 				AND d.uuid=?
 				GROUP BY u.email";
 				

application/admin/controllers/ReviewController.php

@@ -761,7 +761,7 @@ class Admin_ReviewController extends Zend_Controller_Action
 				if (is_numeric($ids))
 				{
 					$sql="select distinct u.email,m.title,m.uuid from mdstatus s left join metadata m on s.uuid=m.uuid 
-						left join mdauthor a on s.uuid=a.uuid left join users u on a.userid=u.id where s.id=? order by u.email";
+						right join mdauthor a on s.uuid=a.uuid left join users u on a.userid=u.id where s.id=? order by u.email";
 					$rs=$this->db->query($sql,array($ids));
 					$rows=$rs->fetchAll();
 					if ($rows)
@@ -805,9 +805,10 @@ class Admin_ReviewController extends Zend_Controller_Action
 			$this->view->keyword = $keyword;
 		}
 		
-		$sql = "select m.id,md.title,md.uuid,u.username,u.realname,m.status,m.ts_created from mdstatus m
+		$sql = "select m.id,md.title,md.uuid,u.username,u.realname,m.status,m.ts_created,gn.id as gnid from mdstatus m
 				right join metadata md on md.uuid=m.uuid
 				left join users u on u.id=m.userid
+				left join geonetworkmetadata gn on m.uuid=gn.uuid
 				where status=0 $searchjoin order by m.ts_created desc";
 				
 		$re = $this->db->query($sql);
@@ -909,7 +910,7 @@ class Admin_ReviewController extends Zend_Controller_Action
 		$sql = "select m.id,md.title,md.uuid,u.username,u.realname,m.status,m.ts_finished from mdstatus m
 				right join metadata md on md.uuid=m.uuid
 				left join users u on u.id=m.userid
-				where status=5 $searchjoin";
+				where status=5 $searchjoin order by m.ts_finished desc";
 				
 		$re = $this->db->query($sql);
 		$rows = $re->fetchAll();

application/admin/controllers/StatController.php

@@ -195,7 +195,32 @@ class Admin_StatController extends Zend_Controller_Action
 	//按用户统计
 	function userAction(){
 		
-		$ac = $this->_getParam('ac');
+		$this->view->ac = $ac = $this->_getParam('ac');
+		
+		if($ac == "new")
+		{
+			$this->_helper->viewRenderer('user-new');
+			$this->view->year = $year = !empty($this->_getParam('year')) ? $this->_getParam('year'):date("Y");
+			$this->view->by = $by = !empty($this->_getParam('by')) ? $this->_getParam('by'):"month";
+			$userStatistics = new \Statistics\User();
+			
+			if($by == "month")
+			{
+				$this->view->data = $userStatistics->getNewUsersByMonth($year);
+			}
+			
+			if($by == "year")
+			{
+				$this->view->data = $userStatistics->getNewUsersByYear($year);
+			}
+			
+			if($by == "monthavg")
+			{
+				$this->view->data = $userStatistics->getAverageSingupByMonth($year);
+			}
+			
+			return true;
+		}
 		
 		if($ac == "get")
 		{

application/admin/views/scripts/data/attachmentsadd.phtml

@@ -7,12 +7,7 @@
 	$this->breadcrumb('<a href="/admin">后台首页</a>');
 	$this->breadcrumb('数据管理');
 	$this->breadcrumb()->setSeparator(' > ');
-	$this->headLink()->appendStylesheet('/static/js/uploadify/uploadify.css');
+	$this->theme->AppendPlus($this,"uploadify");
-	$this->headScript()->appendFile('/static/js/jquery-1.7.2.min.js');
-	$this->headScript()->appendFile('/js/jquery.colorbox-min.js');
-	$this->headLink()->appendStylesheet('/css/colorbox.css');
-	$this->headScript()->appendFile('/static/js/uploadify/swfobject.js');
-	$this->headScript()->appendFile('/static/js/uploadify/jquery.uploadify.v2.1.4.min.js');
 ?>
 <div id="leftPanel">
 <?= $this->partial('data/left.phtml'); ?>
@@ -30,73 +25,87 @@
     <input type="hidden" name="submit" value="1" />
     
     <p>注:可选择多个文件<br />
-	<ul id="datalist"></ul>
+	<div id="datalist">
+    </div>
 	<input id="file_upload" name="Filedata" type="file" />
-    <input type="button" class="btn btn-small" onclick="$('#file_upload').uploadifyUpload();" value="上传" />
     </p>
 
     </form>   
 </div>
 <script>
-$(document).ready(function() {
+var _this = {
-$('#file_upload').uploadify({
+	SessionID : '<?php echo session_id(); ?>'
-        'uploader'  : '/static/js/uploadify/uploadify.swf',
+};
-		'scriptData': {'PHPSESSID' : '<?php echo session_id(); ?>'},
+var uploader;
-        'script'    : '/admin/data/upload/<?php if(!empty($this->uuid)) echo "uuid/".$this->uuid; ?>',
+var param;
-        'cancelImg' : '/static/js/uploadify/cancel.png',
+param = {
-        'folder'    : '/uploads',
+	"PHPSESSID" : _this.SessionID,
-		'multi'     : true,
+	"multi" : 'yes'
-        'auto'      : false,
+};
-		'displayData' : 'speed',
+$(function() {
-		'buttonImg'   : '/static/js/uploadify/selectfile.gif',
+    $('#file_upload').uploadify({
-		'onComplete'  : function(event, ID, fileObj, response, data) {
+        'swf'      : '/js/lib/uploadify/uploadify.swf',
-						var obj = jQuery.parseJSON(response);
+        'uploader' : '/admin/data/upload/<?php if(!empty($this->uuid)) echo "uuid/".$this->uuid; ?>',
-						var html;
+		'multi'	   : true,
-						if(obj.error=='')
+		'auto'	   : true,
-						{html = obj.html;}else{html = obj.error;}
+		'fileTypeExts' : '*',
-						  $('<li/>', {
+		'onUploadSuccess' : function(file, data, response) {
-							  	"id":'uploadedItem_'+obj.attid,
+            upload.onsuccess(file, data, response);
-							    "class":'uploadifyQueueItem',
+        },
-								"html": html
+		'onUploadStart' : function(file) {
-							}).appendTo('#datalist');
+            $('#file_upload').uploadify('settings','formData',param);
-							$('#deletebtn_'+obj.attid).bind('click', function() {
+        } 
-							  	deleteatt(obj.attid);
+    });
-							});
+});
-						},
+var upload = {
-		'onError'     : function (event,ID,fileObj,errorObj) {
+	onsuccess : function(file, data, response){
-						  alert(errorObj.type + ' Error: ' + errorObj.info);
+		_data = $.parseJSON(data);
-						}
+		if(!$.isEmptyObject(_data.error))
-      });
+		{
-	  function deleteatt(id){
+			alert(_data.error);
-			$.ajax({
+		}else{
-				'type': "POST",
+			$('#datalist').append(upload.makeFileHtml(_data));
-				'url': "/admin/data/attachments/",
-				'data': 'uuid=<?php echo $this->uuid?>&mdattdel='+id,
-				'success': function(data){
-					if(data==null){Alert('遇到错误，请重试');return false;}
-					if(data.error!=null){Alert(data.error);return false;}
-					if(data.status==1){$('#uploadedItem_'+id).fadeOut("slow");}
-				},
-				'beforeSend':function(){},
-				'complete':function(){},
-				'timeout': 20000,
-				'dataType': 'json',
-				'error': function(){Alert('处理中出现问题，请重试');}
-			});
 		}
+	},
+	makeFileHtml : function(data){
+		return   '<div class="alert alert-success">'
+		  		+ '<button type="button" class="close" data-dismiss="alert" onclick="upload.deleteFile('+data.id+')"><i class="icon-trash icon-white"></i></button>'
+		  		+ '<a href="/service/attach/id/' + data.id + '">' +data.realname + '</a>'
+				+'<input type="hidden" name="attid" value="'+data.id+'"></input>'
+				+'</div>';
+	},
+	deleteFile : function(id){
+		$.ajax({
+			'type':"POST",
+			'url':'/admin/data/attachments/',
+			'data':'uuid=<?php echo $this->uuid?>&mdattdel='+id,
+			'success':function(data){
+				if(typeof(data) == 'undefined')
+				{
+					alert("数据源错误，请联系管理员");
+					return false;
+				}
 				
+				if(!$.isEmptyObject(data.error))
+				{
+					alert(data.error);
+					return false;
+				}
+			},
+			'timeout': 30000,
+			'error': function(){
+				alert('附件删除出错');
+			 }
+		});
+	}
+};
+
+$(document).ready(function() {		
 	 $.getJSON("/admin/data/getatts/uuid/<?php echo $this->uuid;?>", function(data) {
 		  if(data)
 		  {
 			  $.each(data, function(key, val) {
-							$('<li/>', {
+					$('#datalist').append(upload.makeFileHtml(val));
-							  	"id":'uploadedItem_'+val['id'],
-							    "class":'uploadifyQueueItem',
-								"html": val['html']
-							}).appendTo('#datalist');
-							$('#deletebtn_'+val['id']).bind('click', function() {
-							  	deleteatt(val['id']);
-							});
 			  });
 		  }
 		});

application/admin/views/scripts/data/doi-add.phtml

@@ -29,41 +29,47 @@ $this->theme->AppendPlus($this,'colorbox');
         	<?php if(!empty($this->msg)) { ?>
             	<?= $this->msg ?>
             <?php } else{ ?>
+                <div class="alert alert-info">
+                <button type="button" class="close" data-dismiss="alert">&times;</button>
+                <h4>提示</h4>
+                如果元数据中标题发生了变更，在DOI中也需要变更时需要在这里点击“提交”按钮才能生效
+                </div>
            <form class="form-horizontal" method="post">
               <div class="control-group">
                 <label class="control-label" for="doi">doi</label>
                 <div class="controls">
-                  <input type="text" id="doi" name="doi" readonly="readonly" value="<?= (isset($this->data['doi'])&&!empty($this->data['doi'])) ? $this->data['doi']:"doi:10.3972/westdc.x.2013.db" ?>" />
+                  <input type="text" id="doi" name="doi" readonly="readonly"  class="input-block-level" 
+                  value="<?= (isset($this->data['doi'])&&!empty($this->data['doi'])) ? $this->data['doi']:"doi:10.3972/westdc.x.2013.db" ?>" />
                 </div>
               </div>
               <div class="control-group">
                 <label class="control-label" for="uuid">uuid</label>
                 <div class="controls">
-                  <input type="text" id="uuid" name="uuid" readonly="readonly" value="<?= isset($this->data['uuid']) ? $this->data['uuid']:"" ?>" />
+                  <input type="text" id="uuid" name="uuid" readonly="readonly" value="<?= isset($this->data['uuid']) ? $this->data['uuid']:"" ?>" class="input-block-level" />
                 </div>
               </div>
               <div class="control-group">
                 <label class="control-label" for="publisher">发布者</label>
                 <div class="controls">
-                  <input type="text" id="publisher" name="publisher" value="<?= isset($this->data['publisher']) ? $this->data['publisher']:"" ?>" />
+                  <input type="text" id="publisher" name="publisher" value="<?= isset($this->data['publisher']) ? $this->data['publisher']:"" ?>"  class="input-block-level" />
                 </div>
               </div>
               <div class="control-group">
                 <label class="control-label" for="url">url</label>
                 <div class="controls">
-                  <input type="text" id="url" name="url" value="<?= isset($this->data['url']) ? $this->data['url']:"" ?>" />
+                  <input type="text" id="url" name="url" value="<?= isset($this->data['url']) ? $this->data['url']:"" ?>"  class="input-block-level"/>
                 </div>
               </div>
               <div class="control-group">
                 <label class="control-label" for="title">标题</label>
                 <div class="controls">
-                  <input type="text" id="title" name="title" readonly="readonly" value="<?= isset($this->data['title']) ? $this->data['title']:"" ?>" />
+                  <input type="text" id="title" name="title" readonly="readonly" value="<?= isset($this->data['title']) ? $this->data['title']:"" ?>" class="input-block-level"/>
                 </div>
               </div>
               <div class="control-group">
                 <label class="control-label" for="title_en">英文标题</label>
                 <div class="controls">
-                  <input type="text" id="title_en" name="title_en" readonly="readonly" value="<?= isset($this->data['title_en']) ? $this->data['title_en']:"" ?>" />
+                  <input type="text" id="title_en" name="title_en" readonly="readonly" value="<?= isset($this->data['title_en']) ? $this->data['title_en']:"" ?>" class="input-block-level" />
                 </div>
               </div>
               <div class="control-group">

application/admin/views/scripts/data/left.phtml

@@ -1,5 +1,5 @@
-<ul>
+<ul class="nav nav-pills nav-stacked well">
-<li class="title">数据管理</li>
+<span class="label"><h4>数据管理</h4></span>
 <li><a href="/admin/data/md">元数据管理</a></li>
 <li><a href="/admin/data/newdata">新建元数据</a></li>
 <li><a href="/admin/data/author">数据作者管理</a></li>

application/admin/views/scripts/data/ref-mdref-form.phtml

@@ -15,6 +15,7 @@
             <label class="control-label" for="inputUuid">元数据UUID</label>
             <div class="controls">
                 <input type="text" name="uuid" id="inputUuid" placeholder="UUID">
+                <span class="help-block"><a href="javascript:void(0);" onclick="$(this).parent('span').prev('input').val('e31f5ea7-a4af-4ae3-9ac1-1a84132c4338')">设为数据中心文献</a></span>
             </div>
         </div>
         <div class="control-group">

application/admin/views/scripts/data/ref-nav.phtml

@@ -1,8 +1,11 @@
 <ul class="nav nav-tabs">
     <li <?= empty($this->ac) ? 'class="active"':"" ?>><a href="/admin/data/ref">浏览所有</a></li>
     <li <?= $this->ac=="water" ? 'class="active"':"" ?>><a href="/admin/data/ref/ac/water">WATER文献</a></li>
+	<li <?= $this->ac=="westdc" ? 'class="active"':"" ?>><a href="/admin/data/ref/ac/westdc">数据中心文献</a></li>
+	<li <?= $this->ac=="todo" ? 'class="active"':"" ?>><a href="/admin/data/ref/ac/todo">待处理文献</a></li>
     <li <?= $this->ac=="add" ? 'class="active"':"" ?>><a href="/admin/data/ref/ac/add">单篇添加</a></li>
     <li <?= $this->ac=="multiupload" ? 'class="active"':"" ?>><a href="/admin/data/ref/ac/multiupload">批量上传</a></li>
     <li <?= $this->ac=="files" ? 'class="active"':"" ?>><a href="/admin/data/ref/ac/files">文件管理</a></li>
     <li <?= $this->ac=="ris" ? 'class="active"':"" ?>><a href="/admin/data/ref/ac/ris">RIS导入</a></li>
+    <li <?= $this->ac=="risoutput" ? 'class="active"':"" ?>><a href="/admin/data/ref/ac/risoutput">RIS导出</a></li>
 </ul>

application/admin/views/scripts/data/ref-ris.phtml

@@ -39,7 +39,7 @@ table thead tr th {background:#EBF2F6;}
               <div class="control-group">
                 <label class="control-label" for="inputPassword">RIS文本</label>
                 <div class="controls">
-                  <textarea class="input-block-level" name="ristest" rows="5"></textarea>
+                  <textarea class="input-block-level" name="ristext" rows="5"></textarea>
                 </div>
               </div>
               <div class="form-actions">

application/admin/views/scripts/data/ref-risoutput.phtml

@@ -0,0 +1,50 @@
+<?php
+$this->headTitle($this->config->title->site);
+$this->headTitle('后台管理');
+$this->headTitle()->setSeparator(' - ');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/admin/data">数据管理</a>');
+$this->breadcrumb('文献管理');
+$this->breadcrumb()->setSeparator(' > ');
+$this->theme->AppendPlus($this,'colorbox');
+$this->theme->AppendPlus($this,"uploadify");
+$this->theme->AppendPlus($this,'admin_plugin');
+?>
+<style>
+table thead tr th {background:#EBF2F6;}
+</style>
+<div class="row-fluid">
+    <div class="span2">
+        <?= $this->partial('data/left.phtml'); ?>
+    </div>
+	<div class="span10">
+        <div>
+            <?= $this->partial('data/ref-nav.phtml',array('ac'=>$this->ac)); ?>
+        </div>
+        <?php if(!empty($this->error)) { ?>
+        	<?= $this->error ?>
+        <?php } ?>
+        <?php if(!empty($this->msg)) { ?>
+            <?= $this->msg ?>
+        <?php } else{ ?>
+        	<h3>RIS导出</h3>
+            <hr />
+            
+            <div>
+            <?php if(!empty($this->years)) { ?>
+            	按年份　：
+				<?php foreach($this->years as $k=>$v){ ?>
+                <a class="btn btn-info" href="?field[year]=<?= $v['year'] ?>"><?= empty($v['year']) ? "未知":$v['year'] ?>(<?= $v['num'] ?>)</a>
+                <?php } ?>
+                <hr />
+            <?php } ?>
+            </div>
+            
+            <div>
+            	其它方式：<a class="btn btn-info" href="?submit=1&mode=all">全部</a>
+            </div>
+            
+        <?php } ?>
+    </div>
+</div>
+<!-- //页面内容 -->

application/admin/views/scripts/data/ref-singleris.phtml

@@ -0,0 +1,63 @@
+<?php
+$this->headTitle($this->config->title->site);
+$this->headTitle('后台管理');
+$this->headTitle()->setSeparator(' - ');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/admin/data">数据管理</a>');
+$this->breadcrumb('文献管理');
+$this->breadcrumb()->setSeparator(' > ');
+$this->theme->AppendPlus($this,'colorbox');
+$this->theme->AppendPlus($this,"uploadify");
+$this->theme->AppendPlus($this,'admin_plugin');
+?>
+<style>
+table thead tr th {background:#EBF2F6;}
+</style>
+<div class="row-fluid">
+    <div class="span2">
+        <?= $this->partial('data/left.phtml'); ?>
+    </div>
+	<div class="span10">
+        <div>
+            <?= $this->partial('data/ref-nav.phtml',array('ac'=>$this->ac)); ?>
+        </div>
+        <?php if(!empty($this->error)) { ?>
+        	<?= $this->error ?>
+        <?php } ?>
+        <?php if(!empty($this->msg)) { ?>
+            <?= $this->msg ?>
+        <?php } else{ ?>
+        	<h3><?= empty($this->referenceData['title']) ? $this->referenceData['reference'] : $this->referenceData['title'] ?></h3>
+            <hr />
+        	<?php if(empty($this->data)) {  ?>
+            <form class="form-horizontal" method="post" enctype="multipart/form-data">
+              <div class="control-group">
+                <label class="control-label" for="inputPassword">RIS文本</label>
+                <div class="controls">
+                  <textarea class="input-block-level" name="ristext" rows="5"><?= $this->ristext ?></textarea>
+                  <span class="help-block">* 此功能是使用单个文献的 RIS 文本导入并覆盖以前填写过的信息</span>
+                </div>
+              </div>
+              <div class="form-actions">
+              	<input type="hidden" name="submit" value="1" />
+              	<button type="submit" class="btn btn-primary">导入</button>
+              </div>
+            </form>
+            <?php }else{ ?>
+            <?php
+			foreach($this->data as $k=>$ref)
+			{
+				echo '<ul>';
+				foreach($ref as $index=>$value)
+				{
+					$v = is_array($value) ? join("|",$value) : $value;
+					echo '<li>'.$index .":". $v .'</li>';
+				}
+				echo "</ul>";
+			}
+			?>
+            <?php } ?>
+        <?php } ?>
+    </div>
+</div>
+<!-- //页面内容 -->

application/admin/views/scripts/data/ref.phtml

@@ -37,6 +37,17 @@ table thead tr th {background:#EBF2F6;}
         <?php if(!empty($this->msg)) { ?>
             <?= $this->msg ?>
         <?php } else{ ?>
+        
+        <?php if($this->ac == 'westdc'){ ?>
+        	<button type="button" class="btn btn-success" onclick="$('#mdref')[0].reset();mdref.edit('','','e31f5ea7-a4af-4ae3-9ac1-1a84132c4338',0,0)">添加数据中心文献</button>
+        <?php } ?>
+        
+        <?php if(!empty($this->years)) { ?>
+			<?php foreach($this->years as $k=>$v){ ?>
+            <a class="btn btn-info" href="?field[year]=<?= $v['year'] ?>"><?= empty($v['year']) ? "未知":$v['year'] ?>(<?= $v['num'] ?>)</a>
+            <?php } ?>
+        <?php } ?>
+            
         <div id="datalist">
             <?php if (count($this->paginator)): ?>
 			<table class="table table-bordered table-striped">
@@ -45,8 +56,7 @@ table thead tr th {background:#EBF2F6;}
                         <th>标题
                         <a href="?order=title&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
                         <a href="?order=title&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>
-                        </th>
+                         年份
-                        <th>年份
                         <a href="?order=year&sort=ASC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-up"></i></a>
                         <a href="?order=year&sort=DESC&q=<?php if(!empty($this->q)) echo $this->q; ?>"><i class="icon-arrow-down"></i></a>
                         </th>
@@ -58,35 +68,36 @@ table thead tr th {background:#EBF2F6;}
                     </tr>
                 </thead>
                 <tbody>
-                <?php $autoindex=0;
+                <?php 
+				if($this->page > 1)
+				{
+					$autoindex = ($this->page - 1) * $this->pagelimit;
+				}else{
+					$autoindex=0;
+				}
                 foreach ($this->paginator as $item): 
                 $autoindex++;?>
                 <tr id="DataLine_<?= $item['id']?>">
-                <?php if(!empty($item['title']) || !empty($item['year'])) { ?>
+                	<td>
-				
+			[<?= $autoindex ?>]&nbsp;
-                	<td><?= $item['title'] ?></td>
+			<?php if ($item['ris']) :
-                	<td><?= $item['year'] ?></td>
+			    echo $item['reference'];
+			else :
+			?>
+                        {<?php $authors = $this->reference->getAuthorByReference($item['id'],true); echo count($authors) ? join(",",$authors):'<font color="#CC0000">未知作者</font>'; ?>}&nbsp;
+						{<?= empty($item['title']) ? '<font color="#CC0000">未知标题</font>':$item['title'] ?>}&nbsp;
+                        {<?= empty($item['publisher']) ? '<font color="#CC0000">未知期刊</font>':$item['publisher'] ?>}&nbsp;
+                        {<?= empty($item['year']) ? '<font color="#CC0000">未知年份</font>':$item['year'] ?>}&nbsp;
+			<?php endif; ?>
+                    </td>
                     <td><?= date("Y-m-d H:i",strtotime($item['ts_created'])) ?></td>
-                    <td rowspan="2">
+                    <td>
                         <a href="/admin/data/ref/ac/add/id/<?= $item['id']?>">编辑</a>
+                        <a href="/admin/data/ref/ac/singleris/id/<?= $item['id'] ?>">RIS编辑</a>
                         <a href="/admin/data/ref/ac/data/id/<?= $item['id'] ?>">数据</a>(<a href="javascript:void(0);" onclick="$('#mdref')[0].reset();mdref.edit('',<?= $item['id']?>,'',0,0)">+</a>)
                         <a href="/admin/data/ref/ac/deleteref/id/<?= $item['id']?>">删除</a>
                     </td>
                 </tr>
-                <tr>
-                	<td colspan="2"><?= $item['reference'] ?></td>
-                </tr>
-                <?php } ?>
-                <?php if(empty($item['title']) && empty($item['year'])) { ?>
-                	<td colspan="2"><?= $item['reference'] ?></td>
-                    <td><?= date("Y-m-d H:i",strtotime($item['ts_created'])) ?></td>
-                    <td>
-                        <a href="/admin/data/ref/ac/add/id/<?= $item['id']?>">编辑</a>
-                        <a href="/admin/data/ref/ac/data/id/<?= $item['id'] ?>">数据</a>
-                        <a href="/admin/data/ref/ac/deleteref/id/<?= $item['id']?>">删除</a>
-                    </td>
-                </tr>
-                <?php } ?>
             	<?php endforeach; ?>
             </tbody>
 			</table>

application/admin/views/scripts/down/left.phtml

@@ -1,7 +1,6 @@
-<ul>
+<ul class="nav nav-pills nav-stacked well">
-<li class="title">申请管理与在线下载记录</li>
+<span class="label"><h4>申请管理与在线下载记录</h4></span>
 <li><a href="/admin/down/offlineapp">离线数据申请管理</a></li>
-<li><a href="/admin/down/offlineapps">离线数据申请管理(新)</a></li>
 <li><a href="/admin/down/offline">离线数据服务记录</a></li>
 <li><a href="/admin/down/fixoffline">手动同步离线申请用户与网站帐号</a></li>
 <li><a href="/admin/down/online">在线数据下载记录（从20110908开始）</a></li>

application/admin/views/scripts/down/offline.phtml

@@ -2,63 +2,85 @@
 	$this->headTitle($this->config->title->site);
 	$this->headTitle('后台管理');
 	$this->headTitle()->setSeparator(' - ');
-	$this->headLink()->appendStylesheet('/css/admin.css');
 	$this->breadcrumb('<a href="/">首页</a>');
 	$this->breadcrumb('<a href="/admin">后台首页</a>');
 	$this->breadcrumb('<a href="/admin/down">申请管理</a>');
-	$this->headScript()->appendFile('/js/jquery-1.7.min.js');
+	$this->Theme->AppendPlus($this,'colorbox');
-	$this->headScript()->appendFile('/js/jquery.colorbox-min.js');
+	$this->Theme->AppendPlus($this,'uploadify');
-	$this->headLink()->appendStylesheet('/css/author.css');
-	$this->headLink()->appendStylesheet('/css/colorbox.css');
 	$this->breadcrumb('离线数据申请管理</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div id="leftPanel">
+<style>
-<?= $this->partial('down/left.phtml'); ?>
+table thead tr th {background:#EBF2F6;color:#444;}
-</div>
+.high{background:#444;color:#FFF;}
-<div id="rightPanel">
+</style>
-<?php if ($this->msg or $this->messages) :?>
+<div class="row-fluid">
-<div id="message">
+    <div class="span3">
-<?php if ($this->msg) : ?>
+        <?= $this->partial('down/left.phtml'); ?>
-	<p><?php echo $this->msg; ?></p>
+    </div>
-<?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
+<div class="span9">
-	<p><?php echo $msg; ?></p>
+	<?php if ($this->msg or $this->messages) :?>
-<?php endforeach;endif; ?>
+    <div id="message">
-</div>
+    <?php if ($this->msg) : ?>
-<?php endif; ?>
+        <p><?php echo $this->msg; ?></p>
-<div class="right_title">离线数据服务记录</div>
+    <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
-<a href="/admin/down/offline/add/1">添加新的离线服务记录</a> | <a href="/admin/down/offline/down/1">下载所有离线服务记录</a> | <a href="/admin/down/offline/update/1" onclick="return confirm('该操作需要较长时间，请不要中途刷新页面，是否确定继续？')">自动匹配离线下载用户与网站用户</a> | <a href="/admin/down/offline/emaillist/1">下载服务用户邮箱列表</a>
+        <p><?php echo $msg; ?></p>
-| <a href="/admin/down/offline/monthreport/1">下载上月服务记录(科技部上报)</a>
+    <?php endforeach;endif; ?>
+    </div>
+    <?php endif; ?>
+    
+	<h4>离线数据服务记录</h4>
+        
+        <div class="pull-left">
+		<a href="/admin/down/offline/add/1" class="btn btn-info">添加新的离线服务记录</a> 
+        <a href="/admin/down/offline/down/1" class="btn btn-info">下载所有离线服务记录</a> 
+        <a href="/admin/down/offline/update/1" class="btn btn-info" onclick="return confirm('该操作需要较长时间，请不要中途刷新页面，是否确定继续？')">自动匹配离线下载用户与网站用户</a> 
+        <a href="/admin/down/offline/emaillist/1" class="btn btn-info">下载服务用户邮箱列表</a> 
+        <a href="/admin/down/offline/monthreport/1" class="btn btn-info">下载上月服务记录(科技部上报)</a>
+        </div>
+		<div class="input-append pull-right">
+            <form id="datasearch" class="search_form" action="">
+                <input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />
+                <input type="hidden" name="order" value="<?php if(!empty($this->search_order)) echo $this->search_order; ?>" />
+                <input type="hidden" name="sort" value="<?php if(!empty($this->search_sort)) echo $this->search_sort; ?>" />
+                <button type="submit" class="btn" id="search_btn">搜索</button>
+            </form>
+        </div>
 <?php if (count($this->paginator)): ?>
-<table>
+<table class="table table-bordered table-hover">
-<thead><tr>
+<thead>
-	<th width='70'>姓名</th>
+	<tr>
-	<th width='150'>单位</th>
+	<th width="52">姓名</th>
-	<th width='150'>地址</th>
+	<th>单位</th>
-	<th width='50'>邮编</th>
+	<th>地址</th>
-	<th width='300'>用途</th>
+	<th>邮编</th>
-	<th width='300'>数据清单</th>
+	<th>用途</th>
-	<th width='120'>申请时间</th>
+	<th>数据清单</th>
-	<th width='100'>操作</th>
+	<th>申请时间</th>
+	<th>操作</th>
 	</tr></thead>
 	<tbody>
 	<?php $autoindex=0;?>
 	<?php foreach ($this->paginator as $item): ?>
 	<?php $autoindex++;?>
   <tr class="<?php if($autoindex%2 == 0) echo 'even'; else echo 'odd'; ?>">
-  <td><a href="/admin/user/show/id/<?php echo $item['userid'];?>"><img src="/images/user.gif" /></a> <a href="/admin/down/user/show/<?php echo $item['userid'];?>"><?= $item['username']?></a> </td>
+  <td><a href="/admin/down/user/show/<?php echo $item['userid'];?>"><?= $item['username']?></a></td>
   <td><?= $item['unit']; ?></td>
   <td><?= $item['address']; ?></td>
   <td><?= $item['postcode']; ?></td>
-  <td><textarea readonly="readonly" style="width:300px;height:100px;border:none;font-size:12px;<?php if($autoindex%2 == 0) echo 'background:#CCCCCC;'; else echo 'background:#FFF;'; ?>"><?= $item['project'].'['.$item['project_title'].' | '.$item['project_type'].' | '.$item['project_id'].']'; ?></textarea></td>
+  <td><textarea readonly="readonly" style="width:280px;height:100px;border:none;font-size:12px;"><?= $item['project'].'['.$item['project_title'].' | '.$item['project_type'].' | '.$item['project_id'].']'; ?></textarea></td>
-  <td><textarea readonly="readonly" style="width:300px;height:100px;border:none;font-size:12px;<?php if($autoindex%2 == 0) echo 'background:#CCCCCC;'; else echo 'background:#FFF;'; ?>"><?= $item['datalist']; ?></textarea></td>
+  <td><textarea readonly="readonly" style="width:280px;height:100px;border:none;font-size:12px;"><?= $item['datalist']; ?></textarea></td>
   <td><?= date('Y-m-d',strtotime($item['ts_created'])); ?></td>
   <td>
- <a href="/admin/down/offline/edit/<?= $item['id']; ?><?php if(empty($this->page))  "" ; else echo  "/page/".$this->page; ?>">编辑</a> | 
+	<a href="/admin/down/offline/edit/<?= $item['id']; ?><?php if(empty($this->page))  "" ; else echo  "/page/".$this->page; ?>">编辑</a> | 
- <a href="/admin/down/offline/delete/<?= $item['id']; ?>" title="该操作将删除此记录并且删除与此记录有关的申请记录！请谨慎操作" onclick="return confirm('请仅删除测试用途的离线服务记录！')">删除</a> | 
+	<a href="/admin/down/offline/delete/<?= $item['id']; ?>" title="该操作将删除此记录并且删除与此记录有关的申请记录！请谨慎操作" onclick="return confirm('请仅删除测试用途的离线服务记录！')">删除</a> | 
- <a href="/admin/down/offlineapp/view/<?= $item['id']; ?>">PDF</a> | 
+	<a href="/admin/down/offlineapp/view/<?= $item['id']; ?>">PDF</a> | 
- <a href="/admin/down/offline/show/<?= $item['id']; ?>">详细</a> |
+	<a href="/admin/down/offline/show/<?= $item['id']; ?>">详细</a> |
- <a href="javascript:action('finish',<?= $item['id']; ?>);" onclick="return confirm('确定确定重新通过该申请?')">重新通过</a>
+	<a href="javascript:action('finish',<?= $item['id']; ?>);" onclick="return confirm('确定确定重新通过该申请?')">重新通过</a> | 
+	<a href="javascript:void(0);" onclick="upload.showUploadForm(<?= $item['id'] ?>);">上传签字申请表</a>
+<?php if(!empty($item['applicationform'])) { ?>
+	 | <a href="/admin/down/applicationform/ac/view/?link=<?= urlencode($item['applicationform'])?>">查看签字申请表</a>
+<?php }?>
  </td> 
   </tr>
 <?php endforeach; ?>
@@ -66,6 +88,64 @@
 <?php endif; ?>
 <div class="pagenavi"><?= $this->paginator; ?></div>
 </div>
+</div><!-- row -->
+<div id="upload-form" class="modal hide fade" tabindex="-1" aria-hidden="true">
+    <div class="modal-header">
+    	<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+    	<h3 id="myModalLabel">申请表上传</h3>
+    </div>
+    <div class="modal-body">
+    	<form id="application-form">
+        	<div id="fsUploadProgress">允许上传30M以内的 PDF 文件</div>
+        	<input type="file" name="Filedata" id="file_upload" />
+        </form>
+    </div>
+    <div class="modal-footer">
+    	<button class="btn" data-dismiss="modal" aria-hidden="true">取消上传</button>
+    	<button class="btn btn-primary">上传完成</button>
+    </div>
+</div>
+<script>
+//var param = {};
+//var upload_count = 0;
+var uploader;
+var param;
+$(function() {
+    $('#file_upload').uploadify({
+        'swf'      : '/js/lib/uploadify/uploadify.swf',
+        'uploader' : '/admin/down/uploadapplicationform',
+		'multi'	   : false,
+		'auto'	   : true,
+		'fileTypeExts' : '*.pdf; *.jpg',
+		'onUploadSuccess' : function(file, data, response) {
+            upload.onsuccess(file, data, response);
+        },
+		'onUploadStart' : function(file) {
+            $('#file_upload').uploadify('settings','formData',param);
+        } 
+    });
+});
+
+var upload = {
+	onsuccess : function(file, data, response){
+		_data = $.parseJSON(data);
+		if(!$.isEmptyObject(_data.error))
+		{
+			alert(_data.error);
+		}else{
+			$('#upload-form').modal('hide');
+			window.location = window.location;
+		}
+	},
+	showUploadForm : function(id){
+		$('#upload-form').modal('show');
+		param = {
+			"PHPSESSID" : "<?php echo session_id(); ?>",
+			'orderid' : id
+		};
+	}
+};
+</script>
  <script>
 function action(name,id){
 	var url;

application/admin/views/scripts/down/offlineapp.phtml

@@ -2,55 +2,58 @@
 	$this->headTitle($this->config->title->site);
 	$this->headTitle('后台管理');
 	$this->headTitle()->setSeparator(' - ');
-	$this->headLink()->appendStylesheet('/css/admin.css');
 	$this->breadcrumb('<a href="/">首页</a>');
 	$this->breadcrumb('<a href="/admin">后台首页</a>');
 	$this->breadcrumb('<a href="/admin/down">申请管理</a>');
 	$this->Theme->AppendPlus($this,'colorbox');
 	$this->Theme->AppendPlus($this,'uploadify');
-	$this->headLink()->appendStylesheet('/css/author.css');
 	$this->breadcrumb('离线数据申请管理</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div id="leftPanel">
+<div class="row-fluid">
-<?= $this->partial('down/left.phtml'); ?>
+    <div class="span3">
-</div>
+    	<?= $this->partial('down/left.phtml'); ?>
-<div id="rightPanel">
+    </div>
+	<div class="span9">
+		<?php if ($this->msg or $this->messages) :?>
+        <div id="message">
+        <?php if ($this->msg) : ?>
+            <p><?php echo $this->msg; ?></p>
+        <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
+            <p><?php echo $msg; ?></p>
+        <?php endforeach;endif; ?>
+        </div>
+        <?php endif; ?>
 
-<?php if ($this->msg or $this->messages) :?>
+        <h4>离线数据申请管理</h4>
-<div id="message">
-<?php if ($this->msg) : ?>
-	<p><?php echo $this->msg; ?></p>
-<?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
-	<p><?php echo $msg; ?></p>
-<?php endforeach;endif; ?>
-</div>
-<?php endif; ?>
         
-<div class="right_title">离线数据申请管理</div>
+        <div style="overflow:hidden">
+            <div class="pull-left">
+            <a href="/admin/down/offlineapp/reset/-1" onclick="return confirm('是否重置该申请？')" class="btn btn-info">重置1年前的所有未收到申请表的记录</a>
+            <a href="/admin/down/offlineapp/status/4" class="btn btn-info">已收到的申请</a>
+            <a href="/admin/down/offlineapp/status/-1" class="btn btn-info">已拒绝的申请</a>
+            <a href="/admin/down/offlineapp/ac/pending" class="btn btn-info">待处理的申请</a>  
+            <a href="/admin/down/offline" class="btn btn-info">已通过的申请(离线服务记录)</a> 
+            </div>
             
-<a href="/admin/down/offlineapp/reset/-1" onclick="return confirm('是否重置该申请？')">重置1年前的所有未收到申请表的记录</a>
+            <div class="input-append pull-right">
- | <a href="/admin/down/offlineapp/status/4">已收到的申请</a>
+                <form id="datasearch" class="search_form" action="">
- | <a href="/admin/down/offlineapp/status/-1">已拒绝的申请</a>
+                    <input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />
- | <a href="/admin/down/offlineapp/ac/pending">待处理的申请</a>  
+                    <input type="hidden" name="order" value="<?php if(!empty($this->search_order)) echo $this->search_order; ?>" />
- | <a href="/admin/down/offline">已通过的申请(离线服务记录)</a> 
+                    <input type="hidden" name="sort" value="<?php if(!empty($this->search_sort)) echo $this->search_sort; ?>" />
- <div class="search">
+                    <button type="submit" class="btn" id="search_btn">搜索</button>
-	<form action="/admin/down/offlineapp" method="get">
+                </form>
-    <input name="search" value="1" type="hidden">
+            </div>
-    	<ul>
+		</div>
-    	<li><input name="q" value="" type="text" placeholder="搜索关键字"></li>
+    
-    	<li><input class="searchbtn" value="搜索" type="submit"></li>
+ 		<div id="datalist" style="overflow:hidden">
-    	</ul>
-    </form>
- </div>
- <div id="datalist">
 		<?php
 		if (count($this->paginator)): 
-		echo "<ul>";
+		echo '<ul class="unstyled">';
 			$autoindex=0;
 			foreach ($this->paginator as $item): 
 			$autoindex++;?>
-			<li id="list_<?php echo $item['id'];?>">
+			<li id="list_<?php echo $item['id'];?>" class="well well-small">
 				<p>
                 <?= $autoindex ?>. 
                 <a href="mailto:<?= $item['email']; ?>?subject=答复数据申请问题"><?= $item['username']; ?></a> | 
@@ -90,6 +93,7 @@
 		endif; ?>
         <div class="pagenavi"><?= $this->paginator; ?></div>
     </div>
+    </div>
  </div>
 <div id="upload-form" class="modal hide fade" tabindex="-1" aria-hidden="true">
     <div class="modal-header">

application/admin/views/scripts/down/offlineapps-notreceived.phtml

@@ -54,7 +54,7 @@ table thead tr th {background:#EBF2F6;color:#444;}
         <td>
         	<a href="/admin/down/offlineapps/ac/view/?offlineappid=<?= $item['id'] ?>">查看详细</a>
         	<a href="/admin/down/offlineapps/ac/receive/?offlineappid=<?= $item['id'] ?>">接收</a>
-            <a href="/admin/down/offlineapps/ac/return/?offlineappid=<?= $item['id'] ?>">退回</a>
+            <a href="/admin/down/offlineapps/ac/deny/offlineappid/<?= $item['id'] ?>">退回</a>
             <a href="javascript:void(0);" onclick="upload.showUploadForm(<?= $item['id'] ?>);">上传申请表</a>
             <a href="/admin/down/offlineapps/ac/resetappform/?offlineappid=<?= $item['id'] ?>" onclick="return confirm('是否确认重置该用户的申请表?')">重置申请表</a>
         </td>

application/admin/views/scripts/news/left.phtml

@@ -1,5 +1,5 @@
-<ul class="nav nav-list">
+<ul class="nav nav-pills nav-stacked well">
-<li class="title">新闻中心</li>
+<span class="label"><h4>新闻中心</h4></span>
 <li><a href="/admin/news">新闻中心首页</a></li>
 <li><a href="/admin/news/catlog">栏目管理</a></li>
 <li><a href="/admin/news/catlog/add/1">栏目添加</a></li>

application/admin/views/scripts/review/draft.phtml

@@ -44,9 +44,10 @@ table thead tr th {background:#EBF2F6;color:#444;}
             <?php foreach ($this->paginator as $item): ?>
             <tr>
             <td><input type="checkbox" name="update[]" value="<?php echo $item['id']; ?>"/></td>
-            <td><a href="/data/<?php echo $item['uuid'];?>"><?php echo $item['title']; ?></a></td>
+            <td><?php echo $item['title']; ?>【<a href="/service/geonetwork?url=metadata.show?id=<?php echo $item['gnid'];?>">GeoNetwork查看</a>】</td>
             <td><?php echo date("Y-m-d H:i",strtotime($item['ts_created']));?></td>
-            <td><a href="/admin/review/draft/update/<?php echo $item['id']; ?>">接收</a>
+            <td><a href="/admin/review/draft/update/<?php echo $item['id']; ?>">接收</a> |
+	    <a href="/admin/review/accept/cancel/<?php echo $item['id']; ?>">取消评审</a>
             </td>
             </tr>
             <?php endforeach; ?>

application/admin/views/scripts/stat/left.phtml

@@ -1,5 +1,5 @@
-<ul>
+<ul class="nav nav-pills nav-stacked well">
-<li class="title">信息统计</li>
+<span class="label"><h4>信息统计</h4></span>
 <li><a href="/admin/stat/">统计概况</a></li>
 <li><a href="/admin/stat/unit">分单位统计</a></li>
 <li><a href="/admin/stat/month">分月统计</a></li>

application/admin/views/scripts/stat/month.phtml

@@ -40,6 +40,9 @@
     <a href="/admin/stat/month/y/2010">2010</a>
     <a href="/admin/stat/month/y/2011">2011</a>
     <a href="/admin/stat/month/y/2012">2012</a>
+    <a href="/admin/stat/month/y/2013">2013</a>
+    <a href="/admin/stat/month/y/2014">2014</a>
+    <a href="/admin/stat/month/y/2015">2015</a>
 </div>
 <div class="charts">
 <div class="title"  id="title_online"><?php echo $this->y.'年按月在线下载条数（有用途记录，且无数据重复）统计';?></div>

application/admin/views/scripts/stat/user-nav.phtml

@@ -0,0 +1,4 @@
+<ul class="nav nav-tabs">
+    <li <?= empty($this->ac) ? 'class="active"':"" ?>><a href="/admin/stat/user">概况</a></li>
+    <li <?= $this->ac == "new" ? 'class="active"':"" ?>><a href="/admin/stat/user/ac/new">新用户</a></li>
+</ul>

application/admin/views/scripts/stat/user-new.phtml

@@ -0,0 +1,190 @@
+<?php
+	$this->headTitle($this->config->title->site);
+	$this->headTitle('后台管理');
+	$this->headTitle()->setSeparator(' - ');
+	$this->theme->AppendPlus($this,'jquery');
+	$this->theme->AppendPlus($this,'colorbox');
+	$this->headLink()->appendStylesheet('/css/jquery.jqplot.css');
+	$this->breadcrumb('<a href="/">首页</a>');
+	$this->breadcrumb('<a href="/admin">后台首页</a>');
+	$this->breadcrumb()->setSeparator(' > ');
+?>
+<script language="javascript" type="text/javascript" src="/static/js/plot/jquery.jqplot.js"></script>
+<script language="javascript" type="text/javascript" src="/static/js/plot/plugins/jqplot.barRenderer.js"></script>
+<script language="javascript" type="text/javascript" src="/static/js/plot/plugins/jqplot.pieRenderer.js"></script>
+<script language="javascript" type="text/javascript" src="/static/js/plot/plugins/jqplot.categoryAxisRenderer.js"></script>
+<script language="javascript" type="text/javascript" src="/static/js/plot/plugins/jqplot.highlighter.js"></script>
+<script language="javascript" type="text/javascript" src="/static/js/plot/plugins/jqplot.pointLabels.js"></script>
+<div class="row-fluid">
+    <div class="span2">
+    <?= $this->partial('stat/left.phtml'); ?>
+    </div>
+    <div class="span10">
+    
+    	<?= $this->partial('stat/user-nav.phtml',array('ac'=>$this->ac)); ?>
+
+        <div class="cp">
+        	方式：
+        	<a href="/admin/stat/user/ac/new/by/month<?= $this->year ? "/year/".$this->year:"" ?>" class="btn btn-info <?= $this->by == "month" ? "disabled":"" ?>">按月</a>
+            <a href="/admin/stat/user/ac/new/by/year<?= $this->year ? "/year/".$this->year:"" ?>" class="btn btn-info <?= $this->by == "year" ? "disabled":"" ?>">按年</a>
+            <a href="/admin/stat/user/ac/new/by/monthavg<?= $this->year ? "/year/".$this->year:"" ?>" class="btn btn-info <?= $this->by == "monthavg" ? "disabled":"" ?>">月均值</a>
+        </div>
+        
+        <div>
+        	年份：
+        	<?php if(in_array($this->by,array("year","monthavg") )) {?><a href="/admin/stat/user/ac/new/by/<?= $this->by ?>/year/-1" class="btn btn-info">所有</a><?php } ?>
+        	<?php for($i = (int)date("Y");$i>=2004 ;$i--)
+			{
+				$active = $this->year == $i ? "disabled":"";
+				echo '<a href="/admin/stat/user/ac/new/by/'.$this->by.'/year/'.$i.'" class="btn btn-info '.$active.'">'.$i.'</a>';
+			}
+			?>
+        </div>
+        
+        <?php if($this->by == 'month' && !empty($this->data)){ ?>
+        
+        	<hr />
+     		<h4><?= $this->year ?>的按月新用户注册量统计</h4>
+        	<div class="row-fluid">
+                <div class="span3">
+                    <table class="table table-bordered table-striped">
+                        <thead>
+                            <tr>
+                                <th>月份</th>
+                                <th>增量</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                        <?php foreach($this->data as $k=>$v) {?>
+                            <tr><td><?= $v['date_part'] ?></td><td><?= $v['count'] ?></td></tr>
+                        <?php } ?>
+                    </tbody>
+                    </table>
+                </div>
+                <div class="span9">
+                	<!-- 统计图表 -->
+                   	<script type="text/javascript">
+					$(function () {
+						<?php
+						$vars = array();
+						$month = array();
+						foreach ($this->data as $v)
+						{
+							$vars[] = $v['count'];
+							$month[]= "'".$v['date_part']."'";
+						}
+						?>
+							var s1 = [<?php echo join(',',$vars); ?>];
+							var ticks = [<?php echo join(',',$month); ?>];
+							
+							plot1 = $.jqplot('chart_div_year_seq', [s1], {
+								seriesDefaults:{
+									renderer:$.jqplot.BarRenderer,
+									pointLabels: { show: true }
+								},
+								axes: {
+									xaxis: {
+										renderer: $.jqplot.CategoryAxisRenderer,
+										ticks: ticks
+									}
+								},
+								highlighter: { show: false }
+							});
+					});
+					</script>
+                    
+                    <div class="content" id="chart_div_year_seq"></div>
+ 
+                </div>
+       		</div>
+        
+        <?php } ?>
+        
+        <?php if($this->by == 'year' && !empty($this->data)){ ?>
+        
+        	<hr />
+     		<h4><?= $this->year == -1 ? "所有":$this->year ?>的新用户注册量统计</h4>
+        	<div class="row-fluid">
+                <div class="span3">
+                    <table class="table table-bordered table-striped">
+                        <thead>
+                            <tr>
+                                <th>年份</th>
+                                <th>增量</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                        <?php foreach($this->data as $k=>$v) {?>
+                            <tr><td><?= $v['date_part'] ?></td><td><?= $v['count'] ?></td></tr>
+                        <?php } ?>
+                    </tbody>
+                    </table>
+                </div>
+                <div class="span9">
+                	<!-- 统计图表 -->
+                    <script type="text/javascript">
+					$(function () {
+						<?php
+						$vars = array();
+						$month = array();
+						foreach ($this->data as $v)
+						{
+							$vars[] = $v['count'];
+							$month[]= "'".$v['date_part']."'";
+						}
+						?>
+							var s1 = [<?php echo join(',',$vars); ?>];
+							var ticks = [<?php echo join(',',$month); ?>];
+							
+							plot1 = $.jqplot('chart_div_year_seq', [s1], {
+								seriesDefaults:{
+									renderer:$.jqplot.BarRenderer,
+									pointLabels: { show: true }
+								},
+								axes: {
+									xaxis: {
+										renderer: $.jqplot.CategoryAxisRenderer,
+										ticks: ticks
+									}
+								},
+								highlighter: { show: false }
+							});
+					});
+					</script>
+                    
+                    <div class="content" id="chart_div_year_seq"></div>
+                </div>
+       		</div>
+        
+        <?php } ?>
+        
+        <?php if($this->by == 'monthavg' && !empty($this->data)){ ?>
+        
+        	<hr />
+     		<h4><?= $this->year ?>的月均用户注册量</h4>
+        	<div class="row-fluid">
+                <div class="span3">
+                    <table class="table table-bordered table-striped">
+                        <thead>
+                            <tr>
+                                <th>年份</th>
+                                <th>月均</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                        <?php foreach($this->data as $k=>$v) {?>
+                            <tr><td><?= $v['date_part'] ?></td><td><?= $v['count'] ?></td></tr>
+                        <?php } ?>
+                    </tbody>
+                    </table>
+                </div>
+                <div class="span9">
+                	<!-- 统计图表 -->
+                    
+                </div>
+       		</div>
+        
+        <?php } ?>
+        
+    </div>
+</div>

application/admin/views/scripts/stat/user.phtml

@@ -10,49 +10,39 @@
 	$this->breadcrumb('<a href="/admin">后台首页</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<style>
+<div class="row-fluid">
-.charts{margin:30px 0px;}
+    <div class="span2">
-.charts .title{color:#003366;}
+    <?= $this->partial('stat/left.phtml'); ?>
-.cp {line-height:24px;}
+    </div>
-.cp ul li{float:left;margin:0px 0px;}
+    <div class="span10">
-.cp a{color:#4bb2c5;line-height:24px;padding:5px;}
-.cp a.active,.cp a:hover{color:#FFF;background:#4bb2c5;}
-</style>
-<div id="leftPanel">
-<?= $this->partial('stat/left.phtml'); ?>
-</div>
-<div id="rightPanel">
     
-<div class="cp">
+    	<?= $this->partial('stat/user-nav.phtml',array('ac'=>$this->ac)); ?>
-	<ul>
-        <li>
-            <a href="/admin/stat/user/ac/get/down/csv">导出csv格式</a>
-        </li>
-        <li>
-            <a href="/admin/stat/user/ac/get/down/json">导出JSON格式</a>
-        </li>
-    </ul>
-</div>
-<div id="unitdata">
-<b>点击列名进行排序</b>
-</div>
-<div class="dataTables_wrapper">
-    <table id="datatable" class="table table-bordered table-striped table_vam dataTable">
-        <thead>
-            <tr>
-                <th>ID</th>
-                <th>用户</th>
-                <th>离线申请次数</th>
-                <th>在线申请次数</th>
-                <th>总申请次数</th>
-            </tr>
-        </thead>
-        <tbody>
         
-        </tbody>
+        <div class="cp">
-    </table>
+        	<a href="/admin/stat/user/ac/get/down/csv" class="btn btn-info">导出csv格式</a>
-</div>
+            <a href="/admin/stat/user/ac/get/down/json" class="btn btn-info">导出JSON格式</a>
+        </div>
+        <div id="unitdata">
+        <b>点击列名进行排序</b>
+        </div>
+        <div class="dataTables_wrapper">
+            <table id="datatable" class="table table-bordered table-striped table_vam dataTable">
+                <thead>
+                    <tr>
+                        <th>ID</th>
+                        <th>用户</th>
+                        <th>离线申请次数</th>
+                        <th>在线申请次数</th>
+                        <th>总申请次数</th>
+                    </tr>
+                </thead>
+                <tbody>
                 
+                </tbody>
+            </table>
+        </div>
+    
+    </div>
 </div>
 <script>
 $(document).ready(function() {

application/admin/views/scripts/sys/left.phtml

@@ -1,5 +1,5 @@
-<ul>
+<ul class="nav nav-pills nav-stacked well">
-<li class="title">系统管理</li>
+<span class="label"><h4>系统管理</h4></span>
 <li><a href="/admin/sys/emailtext">邮件模板管理</a></li>
 <!--<li><a href="/admin/sys/seekspace">文献平台同步</a></li>-->
 <li><a href="/admin/sys/message">管理消息</a></li>

application/admin/views/scripts/user/left.phtml

@@ -1,5 +1,5 @@
-<ul>
+<ul class="nav nav-pills nav-stacked well">
-	<li class="title">用户管理</li>
+	<span class="label"><h4>用户管理</h4></span>
 	<li><a href="/admin/user/">用户管理首页</a></li>
 	<li><a href="/admin/user/list">普通用户列表</a></li>
 	<li><a href="/admin/user/adminlist">管理员列表</a></li>

application/admin/views/scripts/watermd/left.phtml

@@ -1,4 +1,4 @@
-<ul>
+<ul class="nav nav-pills nav-stacked well">
 <li><a href="/admin/watermd/replace">正则替换工具</a></li>
 <li><a href="/admin/watermd/citetitle">引用的标题替换</a></li>
 <li><a href="/admin/watermd/filesize">文件大小处理</a></li>

application/default/controllers/AboutController.php

@@ -86,7 +86,7 @@ class AboutController extends Zend_Controller_Action
     	$siteid="e31f5ea7-a4af-4ae3-9ac1-1a84132c4338";//site uuid from geonetowrk
     	if(empty($ac))
     	{
-    		$sql="select * from mdref mr left join reference r on mr.refid=r.id where mr.uuid=? order by r.id desc";
+    		$sql="select * from mdref mr left join reference r on mr.refid=r.id where mr.uuid=? and mr.reftype=0 order by r.year desc,r.title asc";
     		$sth = $this->db->prepare($sql);
 			$sth->execute(array($siteid));
 			$rows = $sth->fetchAll();

application/default/controllers/AccountController.php

@@ -100,9 +100,11 @@ class AccountController extends Zend_Controller_Action
 		
 		$tohref = $this->_request->getParam('href');
 		
-		if(($options['module']=="default" && $options['controller'] == "account" && $options['action'] == "login"))
+		if($_SERVER['REQUEST_URI'] !== "/account/login")
 		{
 			$this->view->href = $_SERVER['REQUEST_URI'];
+		}else{
+			$this->view->href = "/";
 		}
 		
 		if(!empty($tohref))

application/default/controllers/DataController.php

@@ -605,12 +605,20 @@ class DataController extends Zend_Controller_Action
     	$sql="select * from onlineresource where uuid=? and (linkage not like '%ftp.westgis%') and name<>'元数据地址'";
     	$sql=$this->db->quoteInto($sql,$uuid);
     	$this->view->resources=$this->db->fetchAll($sql);
-    	//建议参考文献
+    	//相关文献：作者建议
     	$sql="select r.* from reference r left join mdref m on m.refid=r.id where m.uuid=? and m.reftype=0 order by m.place";
     	$sql=$this->db->quoteInto($sql,$uuid);
     	$this->view->ref=$this->db->fetchAll($sql);
+    	//数据的参考文献
+    	$sql="select r.* from reference r left join mdref m on m.refid=r.id where m.uuid=? and m.reftype=2 order by m.place";
+    	$sql=$this->db->quoteInto($sql,$uuid);
+    	$this->view->dataref=$this->db->fetchAll($sql);
+    	//数据的专题文献
+    	$sql="select r.* from reference r left join mdref m on m.refid=r.id where m.uuid=? and m.reftype=4 order by m.place";
+    	$sql=$this->db->quoteInto($sql,$uuid);
+    	$this->view->themeref=$this->db->fetchAll($sql);
     	//用户发表文献
-    	$sql="select r.* from reference r left join mdref m on m.refid=r.id where m.uuid=? and m.reftype=1";
+    	$sql="select r.* from reference r left join mdref m on m.refid=r.id where m.uuid=? and m.reftype=1 order by r.language asc,r.year desc,r.ts_created desc limit 15";
     	$sql=$this->db->quoteInto($sql,$uuid);
     	$this->view->userref=$this->db->fetchAll($sql);
     	//多篇引用形式：hiwater
@@ -689,7 +697,7 @@ class DataController extends Zend_Controller_Action
 	//检查特殊数据服务是否存在
 	private function checkDataService($uuid)
 	{
-		$order = new \Order\mount\OrderOperate();
+		$order = new \Order\Mount\OrderOperate();
 		$service = $order->getDataService($uuid);
 		
 		if(empty($service))

application/default/controllers/GlacierController.php

@@ -25,8 +25,8 @@ class GlacierController 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='glacier')  and length(t.data)>2 order by random() limit 3";
+		$archive = new Archive($this->db);
-		$this->view->meatdata=$this->db->fetchAll($sql);
+		$this->view->info = $archive->getOneArchive('中国冰川资源及其变化调查-项目简介','about');
 	}
 	
 	/*
@@ -78,187 +78,148 @@ class GlacierController extends DataController
 	
 	function geobaseAction()
 	{
-    	$page=(int)$this->_request->getParam('page');    	
+		$archive = new Archive($this->db);
-    	if (empty($page)) $page=1;
+		$this->view->info = $archive->getOneArchive('中国冰川资源及其变化调查-基础数据','about');
-    	$offset=$this->limit*($page-1);
+		$this->getmd(array('遥感影像','DEM'));
-    	$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='glacier')  and id in (select id from keyword where keytype='theme' and (keyword='遥感影像' or keyword='DEM'))");
+		$this->_helper->viewRenderer('base');		
-    	$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='glacier')  and id in (select id from keyword where keytype='theme' and (keyword='遥感影像' or keyword='DEM')) 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');
+		$archive = new Archive($this->db);
+		$this->view->info = $archive->getOneArchive('中国冰川资源及其变化调查-DEM','about');
+		$this->_helper->viewRenderer('base');
 	}
 	
 	function rsAction()
 	{
 		$this->getmd('遥感影像');
+		$archive = new Archive($this->db);
+		$this->view->info = $archive->getOneArchive('中国冰川资源及其变化调查-遥感影像','about');
+		$this->_helper->viewRenderer('base');		
 	}
 	
 	function inventoryAction()
 	{
-    	$page=(int)$this->_request->getParam('page');    	
+    	$this->getmd(array('冰川编目','冰湖编目'));
-    	if (empty($page)) $page=1;
+		$archive = new Archive($this->db);
-    	$offset=$this->limit*($page-1);
+		$this->view->info = $archive->getOneArchive('中国冰川资源及其变化调查-冰川冰湖编目','about');
-    	$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='glacier')  and id in (select id from keyword where keytype='theme' and (keyword='冰川编目' or keyword='冰湖编目'))");
+		$this->_helper->viewRenderer('base');				
-    	$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='glacier')  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 glacierAction()
 	{
 		$this->getmd('冰川编目');
+		$archive = new Archive($this->db);
+		$this->view->info = $archive->getOneArchive('中国冰川资源及其变化调查-冰川编目','about');
+		$this->_helper->viewRenderer('base');
 	}
 	
 	function lakeAction()
 	{
 		$this->getmd('冰湖编目');
+		$archive = new Archive($this->db);
+		$this->view->info = $archive->getOneArchive('中国冰川资源及其变化调查-冰湖编目','about');
+		$this->_helper->viewRenderer('base');
 	}
 	
 	function fieldAction()
 	{
-    	$page=(int)$this->_request->getParam('page');    	
+		$this->getmd(array('水文','流量','水质','同位素','径流','水位','气象','雨量','GPS',
-    	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='glacier')  and id in (select id from keyword where keytype='theme' 
+		$archive = new Archive($this->db);
-    		and (keyword='水文' or keyword='流量' or keyword='水质' or keyword='同位素' or keyword='径流' or keyword='水位' or keyword='气象' or keyword='雨量' or keyword='GPS'
+		$this->view->info = $archive->getOneArchive('中国冰川资源及其变化调查-野外考察与定位观测','about');
-    		or keyword='雷达' or keyword='雷达测厚' or keyword='冰川厚度' or keyword='物质平衡' or keyword='花杆' or keyword='运动速度' or keyword='花杆消融观测' or keyword='冰舌' 
+		$this->_helper->viewRenderer('base');		
-    		or keyword='冰雪物理过程' 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='glacier')  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='GPS'
-    		or keyword='雷达' or keyword='雷达测厚' or keyword='冰川厚度' or keyword='物质平衡' or keyword='花杆' or keyword='运动速度' or keyword='花杆消融观测' or keyword='冰舌' 
-    		or keyword='冰雪物理过程' 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 meteoAction()
 	{
-    	$page=(int)$this->_request->getParam('page');    	
+		$this->getmd(array('气象','雨量'));
-    	if (empty($page)) $page=1;
+		$archive = new Archive($this->db);
-    	$offset=$this->limit*($page-1);
+		$this->view->info = $archive->getOneArchive('中国冰川资源及其变化调查-气象','about');
-    	$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='glacier')  and id in (select id from keyword where keytype='theme' and (keyword='气象' or keyword='雨量'))");
+		$this->_helper->viewRenderer('base');
-    	$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='glacier')  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 hydroAction()
 	{
-    	$page=(int)$this->_request->getParam('page');    	
+		$this->getmd(array('水文','流量','水质','同位素','径流','水位'));
-    	if (empty($page)) $page=1;
+		$archive = new Archive($this->db);
-    	$offset=$this->limit*($page-1);
+		$this->view->info = $archive->getOneArchive('中国冰川资源及其变化调查-水文','about');
-    	$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='glacier')  and id in (select id from keyword where keytype='theme' and (keyword='水文' or keyword='流量' or keyword='水质' or keyword='同位素' or keyword='径流' or keyword='水位'))");
+		$this->_helper->viewRenderer('base');	
-    	$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='glacier')  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 gpsAction()
 	{
 		$this->getmd('GPS','theme');
+		$archive = new Archive($this->db);
+		$this->view->info = $archive->getOneArchive('中国冰川资源及其变化调查-GPS','about');
+		$this->_helper->viewRenderer('base');		
 	}
 
 	function lidarAction()
 	{
-    	$page=(int)$this->_request->getParam('page');    	
+		$this->getmd(array('雷达','雷达测厚','冰川厚度'));
-    	if (empty($page)) $page=1;
+		$archive = new Archive($this->db);
-    	$offset=$this->limit*($page-1);
+		$this->view->info = $archive->getOneArchive('中国冰川资源及其变化调查-雷达测厚','about');
-    	$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='glacier')  and id in (select id from keyword where keytype='theme' and (keyword='雷达' or keyword='雷达测厚' or keyword='冰川厚度'))");
+		$this->_helper->viewRenderer('base');	
-    	$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='glacier')  and id in (select id from keyword where keytype='theme' and (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 materialAction()
 	{
-    	$page=(int)$this->_request->getParam('page');    	
+		$this->getmd(array('物质平衡','花杆'));
-    	if (empty($page)) $page=1;
+		$archive = new Archive($this->db);
-    	$offset=$this->limit*($page-1);
+		$this->view->info = $archive->getOneArchive('中国冰川资源及其变化调查-物质平衡','about');
-    	$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='glacier')  and id in (select id from keyword where keytype='theme' and (keyword='物质平衡' or keyword='花杆'))");
+		$this->_helper->viewRenderer('base');		
-    	$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='glacier')  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 movementAction()
 	{
-    	$page=(int)$this->_request->getParam('page');    	
+		$this->getmd(array('运动速度','花杆消融观测','冰舌'));
-    	if (empty($page)) $page=1;
+		$archive = new Archive($this->db);
-    	$offset=$this->limit*($page-1);
+		$this->view->info = $archive->getOneArchive('中国冰川资源及其变化调查-冰川运动','about');
-    	$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='glacier')  and id in (select id from keyword where keytype='theme' and (keyword='运动速度' or keyword='花杆消融观测' or keyword='冰舌'))");
+		$this->_helper->viewRenderer('base');		
-    	$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='glacier')  and id in (select id from keyword where keytype='theme' and (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 physicalAction()
 	{
-    	$page=(int)$this->_request->getParam('page');    	
+		$this->getmd(array('冰雪物理过程','冰温'));
-    	if (empty($page)) $page=1;
+		$archive = new Archive($this->db);
-    	$offset=$this->limit*($page-1);
+		$this->view->info = $archive->getOneArchive('中国冰川资源及其变化调查-冰雪物理过程','about');
-    	$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='glacier')  and id in (select id from keyword where keytype='theme' and (keyword='冰雪物理过程' or keyword='冰温'))");
+		$this->_helper->viewRenderer('base');	
-    	$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='glacier')  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 photogrammetryAction()
 	{
-    	$page=(int)$this->_request->getParam('page');    	
+		$this->getmd(array('摄影测量','照片'));
-    	if (empty($page)) $page=1;
+		$archive = new Archive($this->db);
-    	$offset=$this->limit*($page-1);
+		$this->view->info = $archive->getOneArchive('中国冰川资源及其变化调查-近景摄影测量','about');
-    	$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='glacier')  and id in (select id from keyword where keytype='theme' and (keyword='摄影测量' or keyword='照片'))");
+		$this->_helper->viewRenderer('base');
-    	$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='glacier')  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 vegetationAction()
 	{
 		$this->getmd('植被');
+		$archive = new Archive($this->db);
+		$this->view->info = $archive->getOneArchive('中国冰川资源及其变化调查-植被调查','about');
+		$this->_helper->viewRenderer('base');
 	}
 	
 	function frozensoilAction()
 	{
 		$this->getmd('冻土');
+		$archive = new Archive($this->db);
+		$this->view->info = $archive->getOneArchive('中国冰川资源及其变化调查-冻土调查','about');
+		$this->_helper->viewRenderer('base');
 	}
 	
 	function quatemaryAction()
 	{
 		$this->getmd('第四纪');
+		$archive = new Archive($this->db);
+		$this->view->info = $archive->getOneArchive('中国冰川资源及其变化调查-第四纪','about');
+		$this->_helper->viewRenderer('base');
 	}
 
 	function listAction()
@@ -270,12 +231,13 @@ class GlacierController 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(id) from keyword where keyword=?',$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='glaicer') and k.keyword=?",$key);
     		$state=$this->db->query($sql);
     		$row=$state->fetchAll();
 			$sum=$row[0]['count'];
@@ -283,17 +245,12 @@ class GlacierController extends DataController
 			$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
     		$this->view->page=new Pagination($sum,$page,$this->limit);
     	} else {
-    		$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='glacier')  group by keyword.keyword order by count desc");    	
+	    	$sql="select k.keyword,count(*),k.keytype from keyword k left join normalmetadata m on k.id=m.id where length(k.keyword)>0 and m.uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='glacier') ";
-    		$k1=$state->fetchAll();
+	    	if (!empty($keytype) && ($keytype=='place' || $keytype=='theme' || $keytype=='discipline'||$keytype=='temporal')) $sql.=" and k.keytype='".$keytype."'";
-    		$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='glacier')   group by k.keyword order by k.keyword");
+	    	$sql.=' group by k.keyword,k.keytype  order by k.keytype,k.keyword,count desc';
-    		$k2=$state->fetchAll();
+	    	$state=$this->db->query($sql);
-    		$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='glacier')   group by k.keyword order by k.keyword");
+			$this->view->keytype=$keytype;
-    		$k3=$state->fetchAll();
+	    	$this->view->keywords=$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='glacier')   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='glacier')  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);    	
     	}
    }
 
@@ -376,14 +333,58 @@ class GlacierController extends DataController
     
 	private function getmd($keyword,$type='theme')
 	{
-    	$page=(int)$this->_request->getParam('page');    	
+		$page=(int)$this->_request->getParam('page');    	
-    	if (empty($page)) $page=1;
+	    if (empty($page)) $page=1;
-    	$offset=$this->limit*($page-1);
+	    $offset=$this->limit*($page-1);
-    	$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='glacier' and m.id in (select id from keyword where keytype='".$type."' and keyword='".$keyword."')");
+		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='glacier' and m.id in (select id from keyword where keytype='".$type."' and keyword in ".$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='glacier') and id in (select id from keyword where keytype='".$type."' and keyword='".$keyword."') order by timebegin,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='glacier') and id in (select id from keyword where keytype='".$type."' and keyword in ".$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; 
+	}
+	
+	//获取多项条件并列关系的数据并必须满足limited条件
+	//$keyword:字符串或字符串数组
+	//$limited:限制字符串
+	private function getmdlimited($keyword,$limited)
+	{
+    	$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='glacier' and m.id in (select id from keyword where keyword='".$limited."') and m.id in (select id from keyword where keyword in ".$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='glacier') and id in (select id from keyword where keyword='".$limited."') and id in (select id from keyword where 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; 

application/default/controllers/HaiheController.php

@@ -0,0 +1,85 @@
+<?php
+class HaiheController extends DataController 
+{
+	private $limit=20;
+	
+	function preDispatch()
+	{
+    	parent::preDispatch();
+		$this->debug = 1;
+		$acName = $this->_request->getActionName();
+		$this->view->pageID = "haihe-".$acName;
+		//$this->_helper->layout->setLayout('heihe');
+	}
+		
+	function indexAction()
+	{
+		$archive = new Archive($this->db);
+		$this->view->info = $archive->getOneArchive('海河流域多尺度地表通量与气象要素观测数据集','about');
+	}
+	
+	function documentAction()
+	{
+		$page=(int)$this->_request->getParam('page');    	
+	    	if (empty($page)) $page=1;
+	    	$offset=$this->limit*($page-1);
+	    	$row=$this->db->fetchAll("select count(*) from reference where id in (select refid from mdref where uuid in (select uuid from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='haihe') ))");
+	    	$sum=$row[0]['count'];
+		$sql="select * from reference where id in (select refid from mdref where uuid in (select uuid from normalmetadata where  uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='haihe') )) order by reference limit ? offset ?";
+		$this->view->refs=$this->db->fetchAll($sql,array($this->limit,$offset));
+	    	$this->view->page=new Pagination($sum,$page,$this->limit,"文献");
+	    	$this->view->offset=$offset+1; 	
+	}
+
+	function daxingAction()
+	{
+		$this->getmd(array('大兴区'),'place');
+		$this->_helper->viewRenderer('base');
+	}
+	
+	function miyunAction()
+	{
+		$this->getmd(array('密云'),'place');
+		$this->_helper->viewRenderer('base');
+	}
+
+	function guantaoAction()
+	{
+		$this->getmd(array('馆陶县'),'place');
+		$this->_helper->viewRenderer('base');
+	}
+
+	function viewAction()
+	{
+		parent::viewAction();
+		$this->_helper->viewRenderer('haihe/view');
+	}
+	
+	private function getmd($keyword,$type='theme')
+	{
+		$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='haihe' and m.id in (select id from keyword where keytype='".$type."' and keyword in ".$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='haihe') 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; 
+	}	
+}

application/default/controllers/HeiheController.php

@@ -1167,7 +1167,10 @@ class HeiheController extends DataController
 			}
     	} else {
     		//提供全部分类列表
-			$sql="select f.id,f.title,f.fund_id,f.fund_type,f.ts_created,count(m.id) as datacount,sum(md.filesize) as filesize from fund f left join mdfund m on f.id=m.fid left join metadata md on m.uuid=md.uuid left join heiheproject hp on f.fund_id=hp.code where hp.id is not null and m.uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe') group by f.id,f.title,f.fund_id,f.fund_type,f.ts_created order by f.ts_created desc";
+			$sql="select f.id,f.title,f.fund_id,f.fund_type,f.ts_created,count(m.id) as datacount,sum(md.filesize) as filesize
+			from fund f left join mdfund m on f.id=m.fid left join metadata md on m.uuid=md.uuid left join heiheproject hp on f.fund_id=hp.code
+			where hp.id is not null and m.uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='heihe')
+			group by f.id,f.title,f.fund_id,f.fund_type,f.ts_created order by f.fund_id asc";
 			$sth = $this->db->prepare($sql);
 			$sth->execute();
 			$rows = $sth->fetchAll();

application/default/controllers/HiwaterController.php

@@ -153,12 +153,12 @@ class HiwaterController extends DataController
 	
 	function demdsmAction()
 	{
-		$this->getmd(array('DEM','DSM','DOM'),"数据产品");
+		$this->getmdlimited(array('DEM','DSM','DOM'),"数据产品");
 		$this->_helper->viewRenderer('base');
 	}
 	function reflectanceAction()
 	{
-		$this->getmd(array('地表反照率','地表反射率'),"数据产品");
+		$this->getmdlimited(array('地表反照率','地表反射率'),"数据产品");
 		$this->_helper->viewRenderer('base');
 	}
 	function vegtypeairAction()
@@ -168,17 +168,17 @@ class HiwaterController extends DataController
 	}
 	function vegparamAction()
 	{
-		$this->getmd(array("",'植被结构参数'),"数据产品");
+		$this->getmdlimited(array("",'植被结构参数'),"数据产品");
 		$this->_helper->viewRenderer('base');
 	}
 	function soilmoistureAction()
 	{
-		$this->getmd(array('','土壤水分'),"数据产品");
+		$this->getmdlimited(array('','土壤水分'),"数据产品");
 		$this->_helper->viewRenderer('base');
 	}
 	function temperatureAction()
 	{
-		$this->getmd(array('','地表温度'),"数据产品");
+		$this->getmdlimited(array('','地表温度'),"数据产品");
 		$this->_helper->viewRenderer('base');
 	}
 
@@ -197,7 +197,8 @@ class HiwaterController extends DataController
 	}
 	function normalAction()
 	{
-		$this->getmdlimited(array('西支','黄藏寺','黄草沟','峨堡','景阳岭','阿柔阳坡','阿柔阴坡','戈壁站','神沙窝沙漠站','花寨子荒漠站','张掖湿地站'),'水文气象');
+		$this->getmdlimited(array('景阳岭站','峨堡站','黄草沟站','阿柔阴坡站','阿柔阳坡站','黄藏寺站','大沙龙站','寺大隆站','排露沟林前气象站','水源涵养林研究院观测站','巴吉滩戈壁站','神沙窝沙漠站','张掖湿地站',
+		'花寒子荒漠站','五里墩气象站','四道桥混合林站','四道桥胡杨林站','四道桥裸地站','四道桥农田站','黑河上游生态-水文试验研究站','临泽内陆河流域研究站','阿拉善荒漠生态-水文实验研究站'),'水文气象');
 		$this->_helper->viewRenderer('base');
 	}
 

application/default/controllers/KnowledgeController.php

@@ -12,70 +12,96 @@ class KnowledgeController extends Zend_Controller_Action
     	$this->view->messages = $this->messenger->getMessages();
     	$this->view->theme=new Theme();
     }
-	function datacenterAction()
+    function datacenterAction()
- {
+    {
     	$siteid="e31f5ea7-a4af-4ae3-9ac1-1a84132c4338";//site uuid from geonetowrk
-   		$sql="select * from mdref mr left join reference r on mr.refid=r.id where mr.uuid=? order by r.id desc";
+   	$sql="select * from mdref mr left join reference r on mr.refid=r.id where mr.uuid=? order by r.year desc, reference desc";
-   		$sth = $this->db->prepare($sql);
+   	$sth = $this->db->prepare($sql);
-			$sth->execute(array($siteid));
+	$sth->execute(array($siteid));
-			$rows = $sth->fetchAll();
+	$rows = $sth->fetchAll();
-		$paginator = Zend_Paginator::factory($rows);
+	$paginator = Zend_Paginator::factory($rows);
-		$paginator->setCurrentPageNumber($this->_getParam('page'));
+	$paginator->setCurrentPageNumber($this->_getParam('page'));
-		$paginator->setItemCountPerPage(10);
+	$paginator->setItemCountPerPage(10);
-		$paginator->setView($this->view);
+	$paginator->setView($this->view);
-		Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
+	Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
-		$this->view->paginator=$paginator;
+	$this->view->paginator=$paginator;
-	}   	        
+    }
-	function userAction()
+    function waterAction()
- {
+    {
- 		$sql="select * from reference where id in (select refid from mdref where reftype=1 and uuid in (select uuid from normalmetadata)) order by id desc";
+   	$sql="select * from reference where id in (select refid from mdref where uuid in (select uuid from en.normalmetadata)) order by year desc, reference desc";
- 		$sth = $this->db->prepare($sql);
+   	$sth = $this->db->prepare($sql);
- 	 $sth->execute();
+	$sth->execute();
-		$rows = $sth->fetchAll();
+	$rows = $sth->fetchAll();
-		$paginator = Zend_Paginator::factory($rows);
+	$paginator = Zend_Paginator::factory($rows);
-		$paginator->setCurrentPageNumber($this->_getParam('page'));
+	$paginator->setCurrentPageNumber($this->_getParam('page'));
-		$paginator->setItemCountPerPage(10);
+	$paginator->setItemCountPerPage(10);
-		$paginator->setView($this->view);
+	$paginator->setView($this->view);
-		Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
+	Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
-		$this->view->paginator=$paginator;
+	$this->view->paginator=$paginator;
-	}   
+    }
-	function authorAction()
- {
- 		$sql="select * from reference where id in (select refid from mdref where reftype=0 and uuid in (select uuid from normalmetadata)) order by id desc";
- 		$sth = $this->db->prepare($sql);
- 	 $sth->execute();
-		$rows = $sth->fetchAll();
-		$paginator = Zend_Paginator::factory($rows);
-		$paginator->setCurrentPageNumber($this->_getParam('page'));
-		$paginator->setItemCountPerPage(10);
-		$paginator->setView($this->view);
-		Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
-		$this->view->paginator=$paginator;
-	}
 
-	function westplanAction()
+    function userAction()
- {
+    {
- 		$sql="select distinct array_to_string(array(select author from knl_author t where t.item_id=c.item_id order by place asc),'; ') as author,c.title,c.publisher,c.ts_created,c.ts_issued,c.item_id,c.url from knl_article c where c.url <>'' order by ts_created desc";
+	$uuid=$this->_request->getParam('uuid');
- 		$sth = $this->db->prepare($sql);
+	if (preg_match('/([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})/',$uuid))
- 	 $sth->execute();
+	{
-		$rows = $sth->fetchAll();
+	    $sql="select uuid,title from metadata where uuid='$uuid'";
-		$paginator = Zend_Paginator::factory($rows);
+	    $sth = $this->db->prepare($sql);
-		$paginator->setCurrentPageNumber($this->_getParam('page'));
+	    $sth->execute();
-		$paginator->setItemCountPerPage(10);
+	    $this->view->md = $sth->fetch();
-		$paginator->setView($this->view);
+	    $sql="select * from reference where id in (select refid from mdref where reftype=1 and uuid='$uuid') order by year desc, reference desc";
-		Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
+	} else 
-		$this->view->paginator=$paginator;
+	    $sql="select * from reference where id in (select refid from mdref where reftype=1 and uuid in (select uuid from normalmetadata)) order by year desc, reference desc";
- }
+	$sth = $this->db->prepare($sql);
- function searchAction()
+	$sth->execute();
- {
+	$rows = $sth->fetchAll();
-		$key=$this->_request->getParam('q');
+	$paginator = Zend_Paginator::factory($rows);
-		$source=$this->_request->getParam('searchsource');
+	$paginator->setCurrentPageNumber($this->_getParam('page'));
-		if(preg_match("/\"|'|<|>/",$key))
+	$paginator->setItemCountPerPage(10);
-		{
+	$paginator->setView($this->view);
-			$data=array('<'=>'&lt;','>'=>'&gt;',	"\'"=>'’',	"\""=>'”');
+	Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
+	$this->view->paginator=$paginator;
+    }   
 
-			$patterns = array();
+    function authorAction()
-			$replacements = array();
+    {
+	$sql="select * from reference where id in (select refid from mdref where reftype=0 and uuid in (select uuid from normalmetadata)) order by year desc, reference desc";
+	$sth = $this->db->prepare($sql);
+	$sth->execute();
+	$rows = $sth->fetchAll();
+	$paginator = Zend_Paginator::factory($rows);
+	$paginator->setCurrentPageNumber($this->_getParam('page'));
+	$paginator->setItemCountPerPage(10);
+	$paginator->setView($this->view);
+	Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
+	$this->view->paginator=$paginator;
+    }
+
+    function westplanAction()
+    {
+	$sql="select distinct array_to_string(array(select author from knl_author t where t.item_id=c.item_id order by place asc),'; ') as author,c.title,c.publisher,c.ts_created,c.ts_issued,c.item_id,c.url from knl_article c where c.url <>'' order by ts_created desc";
+	$sth = $this->db->prepare($sql);
+	$sth->execute();
+	$rows = $sth->fetchAll();
+	$paginator = Zend_Paginator::factory($rows);
+	$paginator->setCurrentPageNumber($this->_getParam('page'));
+	$paginator->setItemCountPerPage(10);
+	$paginator->setView($this->view);
+	Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
+	$this->view->paginator=$paginator;
+    }
+    
+    function searchAction()
+    {
+	$key=$this->_request->getParam('q');
+	$author = (int)$this->_request->getParam('author');
+	$place = (int)$this->_request->getParam('place');
+	$source=$this->_request->getParam('searchsource');
+	if(preg_match("/\"|'|<|>/",$key))
+	{
+	    $data=array('<'=>'&lt;','>'=>'&gt;',	"\'"=>'’',	"\""=>'”');
+	    $patterns = array();
+	    $replacements = array();
 			foreach($data as $k=>$v)
 			{
 					$patterns[]='/'.$k.'/i';
@@ -86,12 +112,15 @@ class KnowledgeController extends Zend_Controller_Action
 			$key=preg_replace($patterns, $replacements, $key);
 		}
 		
-  	if (!empty($key) && $source=='datasource') {
+  	if (!empty($key)) {
     		$search=new SimpleSearch($key);
     		$where=$search->sql_expr(array("reference"));
-    		$sql="select * from reference where ".$where." order by id desc";
+    		$sql="select * from reference where ".$where." order by year desc, reference desc";
+	} else if ($author && $place) {
+	    $sql="select * from reference where id in (select a1.id from ref_author a1,ref_author a2 where a1.firstname=a2.firstname and a1.lastname=a2.lastname and a2.id=$author and a2.place=$place)";
+	}
  		$sth = $this->db->prepare($sql);
- 	 $sth->execute();
+		$sth->execute();
 		$rows = $sth->fetchAll();
 		$paginator = Zend_Paginator::factory($rows);
 		$paginator->setCurrentPageNumber($this->_getParam('page'));
@@ -102,23 +131,25 @@ class KnowledgeController extends Zend_Controller_Action
     		$this->view->key=$key;
     		$this->view->source=$source;
     		$this->_helper->viewRenderer('search-data');
-    	}
+    	  	
-    	else if (!empty($key) && $source=='westsource') {
+    }
-    		$search=new SimpleSearch($key);
+    
-    		$where=$search->sql_expr(array("c.title","a.author"));
+    function paperAction()
-    		$sql="select distinct a.author,c.title,c.publisher,c.ts_created,c.ts_issued,c.item_id,c.url from knl_article c left join knl_author a on c.item_id=a.item_id where c.url <>'' and a.place=1 and $where order by ts_created desc";
+    {
- 		$sth = $this->db->prepare($sql);
+        $id = (int)$this->_request->getParam('id');
- 	 $sth->execute();
+	$sql="select * from reference where id=$id";
-		$rows = $sth->fetchAll();
+		$sth = $this->db->prepare($sql);
-		$paginator = Zend_Paginator::factory($rows);
+		$sth->execute();
-		$paginator->setCurrentPageNumber($this->_getParam('page'));
+		$this->view->paper = $sth->fetch();
-		$paginator->setItemCountPerPage(10);
+		
-		$paginator->setView($this->view);
+		$sql="select * from ref_author where id=$id order by place";
-		Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
+		$sth = $this->db->prepare($sql);
-		$this->view->paginator=$paginator;
+		$sth->execute();
-    		$this->view->key=$key;
+		$this->view->author = $sth->fetchAll();
-    		$this->view->source=$source;
+		
-    		//$this->_helper->viewRenderer('search-data');    		
+		$sql="select * from ref_tag where id=$id";
-    	}
+		$sth = $this->db->prepare($sql);
- 	}
+		$sth->execute();
+		$this->view->tag = $sth->fetchAll();
+    }
 }

application/default/controllers/OpenController.php

@@ -0,0 +1,165 @@
+<?php
+use \Helpers\View as view;
+use \Open\App;
+use \Open\Open;
+use \Open\OAuth2\Server;
+
+class OpenController extends \Zend_Controller_Action 
+{
+	private $config = NULL;
+	private $db = NULL;
+	private $open = NULL;
+	
+	function preDispatch()
+    {
+    	$this->view->config = $this->config = \Zend_Registry::get('config');
+		$this->db = \Zend_Registry::get('db');
+		$this->view->theme = new Theme();
+		$this->_helper->layout->setLayout('layout-open');
+    } 
+	
+    function indexAction()
+    {
+		$this->view->pageID = "open-index";
+    }
+	
+	//我的应用
+	function myappAction()
+	{
+		$this->view->pageID = "open-myapp";
+		
+		$app = new App();
+		
+		$user_state = $app->checkinfo();
+		if( $user_state !== true)
+		{
+			view::post($this,$user_state,"/account/edit");
+		}
+		
+		$ac = $this->_getParam('ac');
+		$id = $this->_getParam('id');
+		$submit = $this->_getParam('submit');
+		
+		if(empty($ac))
+		{
+			$this->view->myapp = $app->getUserApp();
+			return true;
+		}
+		
+		if($ac == "create")
+		{
+			$this->_helper->viewRenderer('myapp-create');
+			
+			$this->view->appStatus = $app->appStatus();
+			
+			if(!empty($id))
+			{
+				$this->view->info = $app->getAppInfo($id);
+			}
+			
+			if(!empty($submit))
+			{
+				if(empty($id))
+				{
+					$status = $app->appCreate();
+				}else{
+					$this->view->info = $app->getAppCreateParam();
+					$status = $app->appCreate($id);
+				}
+				
+				if($status !== true && !is_numeric($status))
+				{
+					$this->view->error = view::Error($status);
+				}else{
+					if(!empty($id))
+						view::Post($this,"修改成功!",'/open/myapp/ac/view/id/'.$id);
+					else
+						view::Post($this,"添加成功！","/open/myapp/ac/view/id/".$status);
+				}
+				
+			}
+			return true;
+		}
+		
+		if($ac == "delete")
+		{
+			$status = $app->delete($id);
+			if($status !== true)
+			{
+				view::Post($this,$status,"/open/myapp");
+			}else{
+				view::Post($this,'删除成功',"/open/myapp");
+			}
+			return false;
+		}
+		
+		if($ac == "view")
+		{
+			$this->_helper->viewRenderer('myapp-view');
+			$this->view->data = $app->getAppInfo($id);
+			$this->view->appStatus = $app->appStatus();
+			return true;
+		}
+		
+	}
+	
+	function authenticateAction()
+	{
+		$this->_helper->layout->disableLayout();
+		$this->_helper->viewRenderer->setNoRender();
+		
+		$data = array(
+			'client_id' => $this->_getParam('client_id'),
+			'redirect_uri' => $this->_getParam('redirect_uri'),
+			'client_secret' => $this->_getParam('client_secret'),
+			'host' => $_SERVER['HTTP_HOST'],
+			'ip' => $_SERVER['REMOTE_ADDR']
+		);
+
+		$server = new Server();
+		
+		$status = $server->clientCredentials($data['client_id'],$data['client_secret']);
+		
+		if($status !== true)
+		{
+			echo $status;
+		}else{
+			
+		}
+		
+	}
+	
+	function authorizeAction()
+	{
+		$submit = $this->_getParam('submit');
+		
+		if(empty($submit))
+		{
+			return true;
+		}
+		
+		$sv = new open\server();
+		$server = $sv->bootstrap();
+		
+		$request = OAuth2\Request::createFromGlobals();
+		$response = new OAuth2\Response();
+		
+		// validate the authorize request
+		if (!$server->validateAuthorizeRequest($request, $response)) {
+			$response->send();
+			die;
+		}
+		
+		// print the authorization code if the user has authorized your client
+		$is_authorized = ($_POST['authorized'] === 'yes');
+		$server->handleAuthorizeRequest($request, $response, $is_authorized);
+		if ($is_authorized) {
+		  // this is only here so that you get to see your code in the cURL request. Otherwise, we'd redirect back to the client
+		  $code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=')+5, 40);
+		  exit("SUCCESS! Authorization Code: $code");
+		}
+		$response->send();
+	}
+	
+}
+

application/default/controllers/ServiceController.php

@@ -314,11 +314,8 @@ class ServiceController extends Zend_Controller_Action
 				$citation=$row['mcitation'];
 			} else if ($row['citation'])
 			{
-				if (empty($row['datadoi']))
+				$citation=$row['citation'];
-				{
+				if (!empty($row['datadoi']) && !strpos($row['citation'],$row['datadoi']))
-					$citation=$row['citation'];
-				}
-				elseif (!strpos($row['citation'],$row['datadoi']))
 				{
 					$citation='<li>文章引用：'.$row['citation'].'</li>';
 					$citation.="<li>数据的引用：";
@@ -722,11 +719,8 @@ class ServiceController extends Zend_Controller_Action
 			$cit=$row['mcitation'];
 		} else if ($row['citation'])
 		{
-			if (empty($row['datadoi']))
+			$cit=$row['citation'];
-			{
+			if (!empty($row['datadoi']) && !strpos($row['citation'],$row['datadoi']))
-				$cit=$row['citation'];
-			}
-			elseif (!strpos($row['citation'],$row['datadoi']))
 			{
 				$cit='文章引用：'.$row['citation'];
 				$cit.="\r\n数据的引用：";
@@ -1405,7 +1399,7 @@ class ServiceController extends Zend_Controller_Action
 		
 		$pageSize = 10;//每页容量
 		
-		$sql = "select md.title,md.uuid from mdref mr
+		$sql = "select distinct md.title,md.uuid from mdref mr
 				right join normalmetadata md on md.uuid=mr.uuid
 				 where mr.refid=$id";
 		$pagnation="";
@@ -1454,6 +1448,24 @@ class ServiceController extends Zend_Controller_Action
 		echo $pagnation;
 	}//文档页面相关数据
 	
+	function refdatacountAction()
+	{
+		if(view::isXmlHttpRequest($this))
+		{
+			$id = (int)$this->_getParam('id');
+			if($id < 1){
+				echo 0;
+				return;
+			}
+			$sql = "select count(distinct md.id) as total from mdref mr
+					right join normalmetadata md on md.uuid=mr.uuid
+					 where mr.refid=$id";
+			$rs = $this->db->query($sql);
+			$row = $rs->fetch();
+			echo $row['total'];
+		}
+	}
+
 	function tagdatalistAction(){
 		
 		$this->_helper->layout->disableLayout();
@@ -1649,6 +1661,8 @@ class ServiceController extends Zend_Controller_Action
 		$this->_helper->layout->disableLayout();
 		$this->_helper->viewRenderer->setNoRender();
 		$uuid=$this->_request->getParam('uuid');
+		//文献id
+		$id=(int)$this->_request->getParam('id');
 		$lang=$this->_request->getParam('lang');
 		$ris='';
 		if ($lang=='cn' && !empty($uuid))
@@ -1690,6 +1704,10 @@ class ServiceController extends Zend_Controller_Action
 			$ris.='M3  - doi:'.$row['doi']."\r\n";
 			$ris.='DO  - doi:'.$row['doi']."\r\n";
 			$ris.='ER  -'."\r\n";			
+		} else if ($id) {
+			$sql="select ris from reference where id=$id";
+			$row=$this->db->fetchRow($sql);
+			$ris=$row['ris'];		
 		}
 		if (!empty($ris))
 		{
@@ -1789,4 +1807,96 @@ class ServiceController extends Zend_Controller_Action
 		return true;  
 	}
 	
+	public function dciAction()
+	{
+		$this->_helper->layout->disableLayout();
+		$this->_helper->viewRenderer->setNoRender();
+		//must have doi to output dci
+		$uuid=$this->_request->getParam('uuid');
+		
+		$xml='<?xml version="1.0" encoding="utf-8"?>
+<DigitalContentData>
+  <DataRecord>
+    <Header>
+      <DateProvided>'.date("Y-m-d").'</DateProvided>
+      <RepositoryName>Cold and Arid Regions Science Data Center at Lanzhou</RepositoryName>
+      <Owner>CARD-WDS</Owner>
+      <RecordIdentifier>'.$uuid.'</RecordIdentifier>
+    </Header>
+    <BibliographicData>
+      <AuthorList>';
+	
+		$sql="select d.title_en,d.doi,author_en,d.ts_published,m.description,m.timebegin,m.timeend
+		from datadoi d left join en.normalmetadata m on d.uuid=m.uuid where d.uuid=".$this->db->quote($uuid);
+		$row=$this->db->fetchRow($sql);
+		$authors=explode(',',str_replace('"','',substr($row['author_en'],1,-1)));
+		$i=0;
+		foreach($authors as $a)
+		{
+			$i=$i+1;
+			$xml.='<Author seq="'.$i.'" AuthorRole="Author">';
+			$xml.='<AuthorName>'.$a.'</AuthorName></Author>';
+		}
+		$xml.='
+      </AuthorList>
+      <TitleList>
+        <ItemTitle TitleType="English title"><![CDATA['.$row['title_en'].']]></ItemTitle>
+      </TitleList>
+      <Source>
+        <SourceURL>http://card.westgis.ac.cn/data/'.$uuid.'</SourceURL>
+        <SourceRepository AbbreviatedRepository="CARD">CARD</SourceRepository>
+        <PublicationYear>'.date('Y',strtotime($row['ts_published'])).'</PublicationYear>
+      </Source>
+      <LanguageList>
+        <Language>English</Language>
+      </LanguageList>
+    </BibliographicData>';
+		$xml.='<Abstract><![CDATA['.$row['description'].']]></Abstract>';
+		$xml.='<DescriptorsData>';
+		$sql="select k.keyword from en.keyword k left join en.normalmetadata m on k.id=m.id where k.keytype='theme' and m.uuid=".$this->db->quote($uuid);
+		$rowk=$this->db->fetchAll($sql);
+		$xml.='<KeywordsList>';
+		foreach ($rowk as $k)
+		{
+			$xml.='<Keyword><![CDATA['.$k['keyword'].']]></Keyword>';
+		}
+		$xml.='        
+      </KeywordsList>';      
+		if ($row['timebegin'])
+		{
+			$xml.='<TimeperiodList>
+        <TimePeriod TimeSpan="Start">'.date('Y-m-d',strtotime($row['timebegin'])).'</TimePeriod>';
+			if ($row['timeend'] && (date('Y-m-d',strtotime($row['timebegin']))!=date('Y-m-d',strtotime($row['timeend'])))) $xml.='		
+	<TimePeriod TimeSpan="End">'.$row['timeend'].'</TimePeriod>';
+			$xml.='</TimeperiodList>';
+		}
+		$xml.='</DescriptorsData>';
+		$sql="select f.* from fund f left join mdfund mf on f.id=mf.fid where mf.uuid=".$this->db->quote($uuid).' order by mf.place asc';
+		$rowf=$this->db->fetchAll($sql);
+		$xml.='<FundingInfo>';
+		foreach ($rowf as $f)
+		{
+			$xml.='
+                     <FundingInfoList>
+                           <FundingStatement><GrantNumber>'.$f['fund_id'].'</GrantNumber><FundingOrganization>'.$f['fund_type_en'].'</FundingOrganization></FundingStatement>
+                     </FundingInfoList>';
+		}
+		$xml.='</FundingInfo>';
+		$sql="select r.* from reference r left join mdref mr on r.id=mr.refid where mr.reftype=1 and r.language<>'zh' and mr.uuid=".$this->db->quote($uuid).' order by mr.place asc';
+		$rowc=$this->db->fetchAll($sql);
+		$xml.='<CitationList>';
+		foreach ($rowc as $c)
+		{
+			$xml.='<Citation CitationType="Citing" CitationSeq="1">
+                           <CitationString>'.$c['reference'].'</CitationString>';
+			if ($c['doi'])
+			   $xml.='<CitationDOI>'.$c['doi'].'</CitationDOI>';
+			$xml.='</Citation>';
+		}
+		$xml.='</CitationList>    
+  </DataRecord>
+</DigitalContentData>';
+		$this->getResponse()->setHeader('Content-Type', 'text/xml')
+                           ->setBody($xml);
+	}
 }

application/default/views/scripts/account/account-resetpassword.phtml

@@ -0,0 +1,41 @@
+<?php
+	$this->headTitle($this->config->title->site);
+	$this->headTitle('用户登录');
+	$this->headTitle()->setSeparator(' - ');
+	$this->breadcrumb('<a href="/">首页</a>');
+	$this->breadcrumb('<a href="/account/login">用户登录</a>');
+	$this->breadcrumb()->setSeparator(' > ');
+?>
+<div class="row-fluid">
+	<?php if(!empty($this->error)) { ?>
+    	<?= $this->error ?>
+    <?php } ?>
+    <form method="post" class="form-horizontal">
+        <div class="control-group">
+            <label class="control-label" for="username">用户名</label>
+            <div class="controls">
+                <input id="username" type="text" value="" name="username" />
+            </div>
+        </div>
+        <div class="control-group">
+            <label class="control-label" for="password">密码</label>
+            <div class="controls">
+                <input id="password" type="password" value="" name="password" />
+            </div>
+        </div>
+        <div class="control-group">
+            <label class="control-label" for="confirm_password">确认密码</label>
+            <div class="controls">
+                <input id="confirm_password" type="password" value="" name="confirm_password" />
+            </div>
+        </div>
+        <div class="control-group">
+            <div class="controls">
+                <input type="hidden" name="submit" value="1" />
+                <input type="hidden" name="salt" value="<?= $this->salt ?>" />
+                <button type="submit" class="btn">提交</button>
+                <a href="/account/login">登录 </a>  <a href="/account/register">注册新用户</a>
+            </div>
+        </div>
+    </form>
+</div>

application/default/views/scripts/account/application-add.phtml

@@ -0,0 +1,43 @@
+<?php
+	$this->headTitle($this->config->title->site);
+	$this->headTitle('网站接入');
+	$this->headTitle()->setSeparator(' - ');
+?>
+  <div class="row">
+    <div class="span3">
+      <div class="well sidebar-nav">
+        <?= $this->partial('/account/left.phtml'); ?>
+      </div><!--/.well -->
+    </div><!--/span-->
+    <div class="span9">
+    	<h3>应用接入</h3>
+        <hr />
+        <?php if(!empty($this->msg)) { ?>
+			<?= $this->msg ?>
+        <?php }else{?>
+		<?php if(!empty($this->error)) { ?>
+        	<?= $this->error ?>
+        <?php } ?>
+        <form action="" method="post" class="form-horizontal">
+			<div class="control-group ">
+                <label class="control-label" for="name">名称</label>
+                <div class="controls">
+                <input type="text" id="name" name="name" value="<?php echo empty($this->info['name']) ? "":$this->info['name']; ?>" />
+                </div>
+            </div>
+            <div class="control-group ">
+                <label class="control-label" for="name">重定向地址</label>
+                <div class="controls">
+                <input type="text" id="uri" name="uri" value="<?php echo empty($this->info['uri']) ? "":$this->info['uri']; ?>" />
+                </div>
+            </div>
+            
+            <div class="form-actions">
+            	<input type="hidden" name="submit" value="submit" />
+            	<button type="submit" class="btn btn-primary">确定</button>
+            	<button type="button" class="btn">取消</button>
+            </div>
+        </form>
+        <?php }?>
+    </div><!--/span-->
+  </div><!--/row-->

application/default/views/scripts/account/application.phtml

@@ -0,0 +1,25 @@
+<?php
+	$this->headTitle($this->config->title->site);
+	$this->headTitle('我的账户');
+	$this->headTitle()->setSeparator(' - ');
+?>
+  <div class="row">
+    <div class="span3">
+      <div class="well sidebar-nav">
+        <?= $this->partial('account/left.phtml'); ?>
+      </div><!--/.well -->
+    </div><!--/span-->
+    <div class="span9">
+    	<a href="/account/application/ac/add" class="btn btn-info pull-right">应用接入</a>
+    	<h3>应用管理</h3>
+        <hr />
+        <?php if(!empty($this->msg)) { ?>
+			<?= $this->msg ?>
+        <?php }else{?>
+		<?php if(!empty($this->error)) { ?>
+       		<?= $this->error ?>
+        <?php } ?>
+        	
+        <?php }?>
+    </div><!--/span-->
+  </div><!--/row-->

application/default/views/scripts/account/callback.phtml

@@ -0,0 +1,46 @@
+<?php
+	$this->headTitle($this->config->title->site);
+	$this->headTitle('用户登录');
+	$this->headTitle()->setSeparator(' - ');
+	$this->breadcrumb('<a href="/">首页</a>');
+	$this->breadcrumb('<a href="/account/login">用户登录</a>');
+	$this->breadcrumb()->setSeparator(' > ');
+?>
+<style>
+.login_box {
+  max-width: 300px;
+  padding: 19px 29px 29px;
+  margin: 0 auto 20px;
+  background-color: #fff;
+  border: 1px solid #e5e5e5;
+  -webkit-border-radius: 5px;
+	 -moz-border-radius: 5px;
+		  border-radius: 5px;
+  -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.05);
+	 -moz-box-shadow: 0 1px 2px rgba(0,0,0,.05);
+		  box-shadow: 0 1px 2px rgba(0,0,0,.05);
+}
+</style>
+<div class="row-fluid">
+	<div class="span12">
+    	<?= empty($this->target_name) ? "":"您已经使用 <strong>".$this->target_name."</strong> 账号登录<hr />" ?>
+    </div>
+</div>
+<div class="row-fluid">
+    
+	
+</div>
+<script>
+$('#captcha_img').click(function(e) {
+    changecaptcha();
+});
+function changecaptcha(){
+	$.ajax({
+		url:"/account/captcha",
+		data:"<?= time() ?>",
+		success: function(src){
+			document.getElementById('captcha_img').src = src;
+		}
+	});
+}
+</script>

application/default/views/scripts/account/edit.phtml

@@ -53,13 +53,13 @@
             <div class="control-group ">
                 <label class="control-label">工作单位</label>
                 <div class="controls">
-                <input type="text" name="unit" value="<?php echo empty($this->info['unit']) ? "":$this->info['unit']; ?>" class="span8" />
+                <input type="text" name="unit" value="<?php echo empty($this->info['unit']) ? "":$this->info['unit']; ?>" class="input-block-level" />
                 </div>
             </div>
             <div class="control-group ">
                 <label class="control-label">联系地址</label>
                 <div class="controls">
-                <input type="text" name="address" value="<?php echo empty($this->info['address']) ? "":$this->info['address']; ?>" class="span8" />
+                <input type="text" name="address" value="<?php echo empty($this->info['address']) ? "":$this->info['address']; ?>" class="input-block-level" />
                 </div>
             </div>
             <div class="control-group ">
@@ -107,13 +107,13 @@
             <div class="control-group ">
                 <label class="control-label">项目名称</label>
                 <div class="controls">
-                <input type="text" name="project_title" value="<?php echo empty($this->info['project_title']) ? "":$this->info['project_title']; ?>" class="span8" />
+                <input type="text" name="project_title" value="<?php echo empty($this->info['project_title']) ? "":$this->info['project_title']; ?>" class="input-block-level" />
                 </div>
             </div>
             <div class="control-group ">
                 <label class="control-label">项目简介</label>
                 <div class="controls">
-                <textarea name="project" class="span8"><?php echo empty($this->info['project']) ? "":$this->info['project']; ?></textarea>
+                <textarea name="project" class="input-block-level"><?php echo empty($this->info['project']) ? "":$this->info['project']; ?></textarea>
                 </div>
             </div>
             <div class="form-actions">

application/default/views/scripts/account/fetchpwd.phtml

@@ -7,18 +7,49 @@
 	$this->breadcrumb('<a href="/account/fetchpwd">找回密码</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<?php if (!empty($this->messages)) : ?>
+<div class="row-fluid">
-<div id="message">
+	<?php if(!empty($this->error)) { ?>
-<?php 
+    	<?= $this->error ?>
-foreach ($this->messages as $info)echo $info;
+    <?php } ?>
- ?>
+    <form method="post" class="form-horizontal">
-</div>
+        <div class="control-group">
-<?php endif; ?>
+            <label class="control-label" for="email">E-mail</label>
-<?php if ($this->form) : ?>
+            <div class="controls">
-<div id="info">
+                <input id="email" type="text" value="" name="email" />
-<?php echo $this->form;?>
+                <span class="help-block">请输入注册时填写的Email地址</span>
-</div>
+            </div>
-<?php endif; ?>
+        </div>
-<div id="tool">
+        <div class="control-group">
-<a href="/account/login">登录 </a>  <a href="/account/register">注册新用户</a>
+            <label class="control-label" for="captcha">验证码</label>
+            <div class="controls">
+                <input id="captcha" type="text" value="" name="captcha" />
+                <img id="captcha_img" src="<?php echo $this->captcha ?>" style="cursor:pointer"  />
+                <a href="javascript:void(0);" onclick="changecaptcha()">看不清？</a>
+            </div>
+        </div>
+        <div class="control-group">
+        <div class="controls">
+            <input type="hidden" name="submit" value="1" />
+            <?php if(!empty($this->href)){?>
+            <input type="hidden" name="href" value="<?= $this->href ?>" />
+            <?php }?>
+            <button type="submit" class="btn">提交</button>
+            <a href="/account/login">登录 </a>  <a href="/account/register">注册新用户</a>
+        </div>
+    </div>
+    </form>
 </div>
+<script>
+$('#captcha_img').click(function(e) {
+    changecaptcha();
+});
+function changecaptcha(){
+	$.ajax({
+		url:"/account/captcha",
+		data:"<?= time() ?>",
+		success: function(src){
+			document.getElementById('captcha_img').src = src;
+		}
+	});
+}
+</script>

application/default/views/scripts/account/left.phtml

@@ -2,6 +2,7 @@
 	<li class="nav-header">应用</li>
 	<li id="Nav-account-dataorder"><a href="/data/order">数据篮</a></li>
     <!-- <li id="Nav-account-myfav"><a href="/account/myfav">我的收藏</a></li> -->
+    <!--<li id="Nav-account-application"><a href="/account/application">我的应用</a></li>-->
   	<li class="nav-header">账户</li>
 	<li id="Nav-account-index"><a href="/account">账户信息</a></li>
 	<li id="Nav-account-secure"><a href="/account/secure">安全性</a></li>

application/default/views/scripts/account/login.phtml

@@ -6,21 +6,6 @@
 	$this->breadcrumb('<a href="/account/login">用户登录</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<style>
-.login_box {
-  max-width: 300px;
-  padding: 19px 29px 29px;
-  margin: 0 auto 20px;
-  background-color: #fff;
-  border: 1px solid #e5e5e5;
-  -webkit-border-radius: 5px;
-	 -moz-border-radius: 5px;
-		  border-radius: 5px;
-  -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.05);
-	 -moz-box-shadow: 0 1px 2px rgba(0,0,0,.05);
-		  box-shadow: 0 1px 2px rgba(0,0,0,.05);
-}
-</style>
 <div class="row-fluid">
 <form class="form-horizontal" method="post">
 	<?php if(empty($this->error)) { ?>  
@@ -28,9 +13,7 @@
             请输入用户名和密码登录
         </div>
         <? }else{ ?>
-        <div class="alert alert-error alert-login">
+       		<?= $this->error ?>
-            <?= $this->error ?>
-        </div>
         <?php } ?>
     <div class="control-group">
         <label class="control-label" for="username">用户名</label>
@@ -56,6 +39,9 @@
         </div>
     </div>
 </form>
+<hr />
+<h5>其它账号登录</h5>
+<a href="/account/oauth2login/type/escience">中国科技网通行证</a>
 </div>
 <script>
 $('#captcha_img').click(function(e) {

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

@@ -19,6 +19,7 @@ h3.gs_rt{font-size:110%;}
 #file-list li li:hover {background-color: #dedede;}
 #file-list li li li:hover {background-color: #eeeeee;}
 </style>
+<?= $this->render('breadcrumbs.phtml'); ?>
 <?php $md=$this->metadata;if ($md):?>
 <h3><?php echo $this->escape($md->title);
 if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
@@ -33,6 +34,25 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
         </p>	
         </div>
         <div>	
+			<?php if ($this->mcitation) : ?>
+            <hr />
+            <h4><i class="icon-eye-open text-success"></i>本数据要求的多篇文献引用</h4>
+            <ol>
+            <?php foreach($this->mcitation as $ref) :
+		echo '<li>'.$ref->reference;
+		echo '<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a>';
+            if (empty($ref->link))
+            { 
+			if(!empty($ref->attid)) 
+				echo '<a href="/service/attach/id/'.$ref->attid.'"><i class="icon-download text-success"></i>下载</a>';
+	}else{ 
+		echo '<a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a>';
+	}
+	echo "</li>";
+            endforeach;
+            ?>
+            </ol>
+			<?php endif; ?>				
 			<?php if ($md->citation) : ?>
             <hr />
             <h4><i class="icon-quote-left muted"></i>本数据引用方式<a class="btn btn-danger pull-right" href="/archives/help/platform/archive-23.html" ><i class="icon-comment"></i>数据引用帮助</a></h4>
@@ -46,29 +66,63 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
 			echo substr($md->authors,1,-1).'. '.$md->title.'. '.$md->publisher.', '.(empty($md->ts_published)?$md->publish_year:date('Y',strtotime($md->ts_published))).'. doi:'.$md->doi;
 			echo ' ['.str_replace('"','',substr($md->author_en,1,-1)).'. '.$md->title_en.'. '.$md->publisher_en.', '.(empty($md->ts_published)?$md->publish_year:date('Y',strtotime($md->ts_published))).'. doi:'.$md->doi.']';
 			?> (下载引用：<a href="/service/ris/lang/cn/uuid/<?php echo $md->uuid; ?>">RIS格式</a> | <a href="/service/ris/lang/en/uuid/<?php echo $md->uuid; ?>">RIS英文格式</a> | <a href="/service/bibtex/lang/cn/uuid/<?php echo $md->uuid; ?>">Bibtex格式</a> | <a href="/service/bibtex/lang/en/uuid/<?php echo $md->uuid; ?>">Bibtex英文格式</a>)</p>
-        	<?php endif; endif; if ($this->ref) : ?>
+        	<?php endif;  if ($this->ref) : ?>
             <hr />
-            <h4><i class="icon-eye-open text-success"></i>建议参考文献</h4>
+            <h4><i class="icon-eye-open text-success"></i>相关文献（作者推荐）</h4>
             <ol>
             <?php foreach($this->ref as $ref) :
+            echo '<li>'.$ref->reference;
+	    echo '<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a>';
             if (empty($ref->link))
-                echo '<li>'.$ref->reference.'</li>';
+            { 
-            else
+			if(!empty($ref->attid)) 
-                echo '<li>'.$ref->reference.' <a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a></li>';
+				echo '<a href="/service/attach/id/'.$ref->attid.'"><i class="icon-download text-success"></i>下载</a>';
+	}else{ 
+		echo '<a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a>';
+	}
+	echo "</li>";
             endforeach;
             ?>
             </ol>
-			<?php endif; ?>	
+	<?php endif; if ($this->themeref) :?>	
-            <?php if ($this->userref) : ?>
+
             <hr />
-            <h4>数据用户发表文献</h4>
+            <h4><i class="icon-eye-open text-success"></i>专题文献</h4>
+            <ol>
+            <?php foreach($this->themeref as $ref) :
+            echo '<li>'.$ref->reference;
+	    echo '<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a>';
+            if (empty($ref->link))
+            { 
+			if(!empty($ref->attid)) 
+				echo ' | <a href="/service/attach/id/'.$ref->attid.'"><i class="icon-download text-success"></i>下载</a>';
+			}else{ 
+				echo ' | <a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a>';
+			}
+			echo "</li>";
+            endforeach;
+            ?>
+            </ol>
+            <?php endif; if ($this->userref) : ?>
+            <hr />
+            <h4><i class="icon-eye-open text-success"></i>数据施引文献</h4>
             <ol>
             <?php foreach($this->userref as $ref) :
+            echo '<li>'.$ref->reference;
+	    echo '<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a>';
             if (empty($ref->link))
-                echo '<li>'.$ref->reference.'</li>';
+            { 
-            else
+			if(!empty($ref->attid)) 
-                echo '<li>'.$ref->reference.' <a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a></li>';
+				echo '<a href="/service/attach/id/'.$ref->attid.'"><i class="icon-download text-success"></i>下载</a>';
+			}else{ 
+				echo '<a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a>';
+			}
+			echo "</li>";
             endforeach;
+	    if (count($this->userref)==15)
+	    {
+		echo '<a class="btn btn-success pull-right" href="/knowledge/user/uuid/'.$md->uuid.'" ><i class="icon-info-sign"></i>更多施引文献</a>';	
+	    }
             ?>
             </ol>
         	<?php endif; ?>
@@ -101,7 +155,7 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
                 <?php if(!empty($this->fund)) : ?>
                 <ul>
 				<?php foreach($this->fund as $k=>$v) : ?>
-                	<li><?= $v['fund_type'] ?>：<?= $v['title'] ?>(项目编号:<?= $v['fund_id']?>) [<?= $v['fund_type_en'] ?>(No. <?= $v['fund_id']?>)]</li>
+                	<li><?= $v['fund_type'] ?>：<a href="/data/fund/id/<?= $v['id'] ?>"><?= $v['title'] ?></a>(项目编号:<?= $v['fund_id']?>) [<?= $v['fund_type_en'] ?>(No. <?= $v['fund_id']?>)]</li>
                 <?php endforeach; ?>
                 </ul>
                 <?php elseif(!empty($md->suppinfo)) : ?>

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

@@ -0,0 +1,30 @@
+<?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'=>"/glacier",'title'=>$this->config->title->glacier);
+?>
+<?= $this->render('breadcrumbs.phtml'); ?>
+<div class="row">
+    <div class="span2">
+    <?= $this->partial('glacier/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="/glacier/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
+                <?php endforeach; ?>
+            </ol>	
+        </div>
+        <?php endif; ?>
+    </div>
+</div>

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

@@ -11,10 +11,10 @@ $this->breadcrumb('浏览');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
 <div class="row">
-    <div class="span3">
+    <div class="span2">
     <?= $this->partial('glacier/navi.phtml'); ?>
     </div>
-    <div class="span9">
+    <div class="span10">
 		<?php echo $this->page->getNavigation(); ?>
         <hr />
         <div id="mdlist">

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

@@ -1,43 +0,0 @@
-<?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->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('分类浏览：'.$this->codename);
-$this->breadcrumb()->setSeparator(' > ');
-?>
-<div class="row">
-    <div class="span3">
-    <?= $this->partial('glacier/navi.phtml'); ?>
-    </div>
-    <div class="span9">
-        <div id='links'>
-        <ul>
-        <?php foreach($this->category as $cg) : ?>
-        <li><a href='/glacier/category/code/<?php echo $cg['code']; ?>'><?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>
-        </div>
-        
-        <?php if (!empty($this->metadata)) : ?>
-        <div id='mdlist'>
-        <?php echo $this->page->getNavigation(); ?>
-        <hr />
-        <div id="mdlist">
-        <ol start="<?php echo $this->offset; ?>">
-            <?php foreach($this->metadata as $md) : ?>
-            <li><a href="/glacier/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>
-            <?php endforeach; ?>
-        </ol>	
-        </div>
-        <hr />
-        <?php echo $this->page->getNavigation(); ?>
-        </div>
-        <?php endif; ?>
-	</div>
-</div>

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

@@ -1,33 +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->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('珠穆朗玛峰北坡');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-
-<div id='sidebar'>
-<div id='leftnavi'>
-<?= $this->partial('glacier/navi.phtml'); ?>
-</div>
-</div>
-<div id='right'>
-<div>&nbsp;</div>
-<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="/glacier/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-	<?php endforeach; ?>
-</ol>	
-</div>
-<?php endif; ?>
-</div>

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

@@ -1,33 +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->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('冰湖编目数据');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-<div class="row">
-    <div class="span3">
-    <?= $this->partial('glacier/navi.phtml'); ?>
-    </div>
-    <div class="span9">
-        <div id="intro">
-        <p>为了对冰川编目结果进行验证并获得更多的冰川环境信息，项目开展了大量的野外考察。考察范围包括：祁连山、昆仑山－唐古拉山、喜马拉雅山、青藏高原腹地冰川考察、黄河源－念青唐古拉山中段北坡－喜马拉雅山中段。考察内容包括GPS测量、冰川厚度测量、冰川区地形摄影测量、冰川物质平衡测量、冰川区气象水文要素测量、冰湖水位和温度测量等。</p>
-        <img src="/images/glacier/field1.png" />
-        </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="/glacier/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-            <?php endforeach; ?>
-        </ol>	
-        </div>
-        <?php endif; ?>
-	</div>
-</div>

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

@@ -1,33 +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->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('冻土数据');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-<div class="row">
-    <div class="span3">
-    <?= $this->partial('glacier/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="/glacier/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-            <?php endforeach; ?>
-        </ol>	
-        </div>
-        <?php endif; ?>
-	</div>
-</div>

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

@@ -1,34 +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->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('基础数据');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-<div class="row">
-    <div class="span3">
-    <?= $this->partial('glacier/navi.phtml'); ?>
-    </div>
-    <div class="span9">
-    <div id="intro">
-        <p>基础数据是指用于开展冰川和冰湖编目的遥感影像、地形图和数字地形模型，由于地形图属国家保密数据，不在共享范围内。</p>
-        <p>地形图主要用来地第一次冰川编目数据进行校正，并辅助第二次冰川编目中冰川边界和山脊线的判断。冰川编目中使用和参考的地形图约1105幅，其中1:50,000地形图546幅（航摄制图512幅，陆地摄影测量成果15幅，平板仪测绘及其他地图19幅），1:100,000地形图572幅（航摄制图558幅，平板仪测绘及其他地图14幅），另外还参考了1975年左右的MSS遥感数据地形图7幅。</p>
-        <img src="/images/glacier/topographic.png" />
-        </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="/glacier/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-            <?php endforeach; ?>
-        </ol>	
-        </div>
-        <?php endif; ?>
-    </div>
-</div>

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

@@ -1,33 +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->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('冰川编目数据');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-<div class="row">
-    <div class="span3">
-    <?= $this->partial('glacier/navi.phtml'); ?>
-    </div>
-    <div class="span9">
-        <div id="intro">
-        <p>冰川编目数据：基于遥感影像解译获得的反应我国2005年前后冰川现状的冰川分布图及其基本属性。除了包括中国全境的冰川编目数据外，还包括祁连山、天山、贡嘎山、纳木错流域、长江源区、年楚河流域和珠穆朗玛峰北坡等典型地区的多年代冰川分布数据。
-        </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="/glacier/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-            <?php endforeach; ?>
-        </ol>	
-        </div>
-        <?php endif; ?>
-	</div>
-</div>

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

@@ -1,33 +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->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('贡嘎山');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-
-<div id='sidebar'>
-<div id='leftnavi'>
-<?= $this->partial('glacier/navi.phtml'); ?>
-</div>
-</div>
-<div id='right'>
-<div>&nbsp;</div>
-<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="/glacier/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-	<?php endforeach; ?>
-</ol>	
-</div>
-<?php endif; ?>
-</div>

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

@@ -1,33 +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->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('GPS测量数据');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-<div class="row">
-    <div class="span3">
-    <?= $this->partial('glacier/navi.phtml'); ?>
-    </div>
-    <div class="span9">
-        <div id="intro">
-        <p>采用高精度GPS设备在冰川表面或周边地区测量获得的数据，可用来获得冰川高程信息，也可与以前的观测数据相比较获得冰川流动和物质平衡变化信息。</p>
-        <img src="/images/glacier/gps.png" />
-        </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="/glacier/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-            <?php endforeach; ?>
-        </ol>	
-        </div>
-        <?php endif; ?>
-	</div>
-</div>

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

@@ -1,33 +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->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('水文数据');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-<div class="row">
-    <div class="span3">
-    <?= $this->partial('glacier/navi.phtml'); ?>
-    </div>
-    <div class="span9">
-        <div id="intro">
-        <p>在冰川下游观测获得的水文数据，观测要素包括径流、水质和水文化学等，也包括部分冰湖的观测数据。</p>
-        <img src="/images/glacier/hydro.png" />
-        </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="/glacier/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-            <?php endforeach; ?>
-        </ol>	
-        </div>
-        <?php endif; ?>
-	</div>
-</div>

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

@@ -3,73 +3,20 @@ $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->nav[] = array('link'=>"/glacier",'title'=>$this->config->title->glacier);
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb($this->config->title->glacier);
-$this->breadcrumb()->setSeparator(' > ');
 ?>
+<?= $this->render('breadcrumbs.phtml'); ?>
 <div class="row">
-    <div class="span3">
+    <div class="span2">
-    <?= $this->partial('glacier/navi.phtml'); ?>
+    	<?= $this->partial('glacier/navi.phtml'); ?>
     </div>
-    <div class="span9">
+
+    <div class="span10">
         <div id="intro">
-        <h1>“中国冰川资源及其变化调查”项目简介</h1>
+            <h1><?php if(!empty($this->info['title'])) echo $this->info['title']; ?></h1>
-        <p>
+            <table>
-        冰川是最敏感、最直接、最易于辩识、长纪录、高分辨的气候变化信息指示器和储存体，冰川变化信息是全球变化中的重要基础性资源。我国是中、低纬度山 地冰川面积最多的国家(占52%)，是两极冰盖之外最重要的冰川集结地，冰川变化信息的挖掘、调查、监测、编目是十分重要的基础性工作。
+                <tr><td><?php if(!empty($this->info['body'])) echo $this->info['body'];?></td></tr>
-        </p>
+            </table>
-        <p>
-        始于1978年的第一次冰川编目历时24年，查清了截止到第一次全国航空测量时(西部冰川区约为1960s-1980s)中国冰川资源的基本情况。第一次冰川清查工作在国际和国内产生了重大影响，被国际冰川学会主席誉为建立了一座“冰川和气候变化研究的金矿”。
-        本次冰川资源调查是在中国科技部和中国科学院的联合支持下开展的一次大规模冰川普查，其目标以第一次冰川编目为参考，以2005－2006年为现状 年，以高分辨率遥感数据与地理信息系统技术为基础，深入研究基于遥感的冰川制图方法，结合冰川野外考察考察，获取我国冰川的分布状况，对有观测历史的典型 冰川进行重点监测；并与第一次冰川编目数据进行比较，查明我国冰川资源变化情况；同时，以此调查数据为基础，综合定位监测与相关资料，评估冰川变化对水资 源的影响，为西部水资源开发利用提供决策依据 。
-        </p>
-        <h2>《中国冰川资源及其变化调查》主要研究内容</h2>
-        <ol>
-        <li>第一次冰川编目的数字化：重点开展第一次冰川编目时期冰川及冰湖分布的数字化，为冰川遥感监测提供基础数据。</li>
-        <li>现状年（2005－2006年）西北干旱区和其它典型区冰川(湖)分布遥感调查：重点开展现状年基于高分辨率遥感影像的冰川与冰湖分布调查，同时，开展研究区部分冰川表面高程和运动速度信息的提取。</li>
-        <li>遥感冰川制图地面验证、典型冰川厚度测量与冰川变化野外调查：重点开展代表性区域野外调查和典型冰川定位观测，验证遥感解译结果，获取典型监测冰川过程观测数据；开展代表性冰川厚度的雷达测量。</li>
-        <li>冰川变化对水资源的影响评估：以现有定位观测冰川和区域冰川变化遥感调查数据为基础，评估西北干旱区和其它典型区冰川变化特征及其对水资源的影响。</li>
-        <li>冰川资源及其变化调查信息共享平台建设：建立冰川资源管理及共享信息系统，为资源共享服务。</li>
-        </ol>
-        <h2>《西部冰川变化监测及其影响评估方法研究》主要研究内容</h2>
-        <ol>
-        <li>各类冰川参数的遥感提取方法研究：针对西部三类冰川特点，综合运用现有卫星遥感数据，建立冰川几何尺寸、特征要素、物理特征、表面高程等信息的提取算法，为大范围冰川调查提供适合各类冰川下垫面状况和气候条件的参数提取方法集，提高遥感获取冰川信息的自动化程度。</li>
-        <li>冰川储量估算与冰川参数遥感提取精度评估：研制或改进冰川厚度测量雷达，对不同类型典型冰川流域不同规模的代表性冰川进行冰川厚度测量，建立适 合不同规模冰川的储量计算公式；开展各典型监测冰川区遥感冰川制图的野外验证、控制点采集与冰川变化的调查，进行遥感提取参数的误差分析与方法验证研究。</li>
-        <li>流域冰川融水径流估算方法研究：以典型监测冰川长期观测资料为基础，并进行加强观测，同时收集流域出山口径流长期水文气象观测数据，建立适合不同资料条件的简单和复杂冰川融水径流模型，在对比分析基础上，提出适合西部流域尺度的冰川融水径流计算方案。</li>
-        <li>冰川变化对水资源影响的评估方法及其应用研究：分析典型冰川流域冰川变化的空间特征及其差异；以典型冰川融水径流过程和流域尺度冰川动力响应研 究为基础，研究不同融水径流计算方案、基于冰川动力响应和基于冰川几何尺度转换关系模型对于不同性质冰川流域融水径流年际变化的模拟能力；根据流域融水径 流模型集，剖析冰川变化对冰川径流临界转变的影响及其强度。</li>
-        </ol>
         </div>
-        <!--
-        <div id="heihe_ad">
-        <h2>已整理数据展示</h2>
-        <ul id="heihe_list">
-        <?php foreach($this->meatdata as $md) : ?>
-        <li>
-            <a href="/heihe/view/uuid/<?php echo $md['uuid']; ?>"><span><?php echo $md['title']; ?></span>
-            <img src="/service/thumb/id/<?php echo $md['id']; ?>" alt="Data Thumbnail" title="<?php echo mb_strlen($md['description'])>400?$this->escape(mb_substr($md['description'],0,400,'UTF-8').'...'):$this->escape($md['description']);?>" />
-            </a>
-        </li>
-        <?php endforeach; ?>
-        </ul>
-        <img class="next" src="/images/next.png" onclick="changetlist()" />
-        </div>
-        -->
     </div>
 </div>
-<script type="text/javascript" language="javascript">
-function changetlist(){
-	$.getJSON("/service/mdjson/source/heihe", function(data){
-		$('#heihe_list').html('');
-		if(data.length>0)
-		{
-			$.each(data, function(key, val) {
-				var a = '<a href="/data/'+val['uuid']+'"><span>'+val['title']+'</span>';
-				var img = '<img src="/service/thumb/id/'+val['id']+'" alt="Data Thumbnail" title="'+val['description']+'" />';
-				$('<li/>', {
-				//"class":'list_img',
-				"html": a+img+'</a>'
-				}).appendTo('#heihe_list');
-			});
-		}
-	});
-}
-</script>

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

@@ -1,35 +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->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('冰川冰湖编目数据');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-<div class="row">
-    <div class="span3">
-    <?= $this->partial('glacier/navi.phtml'); ?>
-    </div>
-    <div class="span9">
-        <div id="intro">
-        <p>冰川编目数据：基于遥感影像解译获得的反应我国2005年前后冰川现状的冰川分布图及其基本属性。除了包括中国全境的冰川编目数据外，还包括祁连山、天山、贡嘎山、纳木错流域、长江源区、年楚河流域和珠穆朗玛峰北坡等典型地区的多年代冰川分布数据。
-        </p>
-        <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="/glacier/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-            <?php endforeach; ?>
-        </ol>	
-        </div>
-        <?php endif; ?>
-	</div>
-</div>

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

@@ -1,34 +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->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('冰湖编目数据');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-<div class="row">
-    <div class="span3">
-    <?= $this->partial('glacier/navi.phtml'); ?>
-    </div>
-    <div class="span9">
-        <div id="intro">
-        <p>冰湖编目数据：
-        冰湖是指在冰川前端、表面或内部形成的湖泊。冰湖编目是指利用地形图和遥感数据等资料对位于冰川前端和表面的湖泊进行登记的调查行为。</p>
-        <img src="/images/glacier/lake.png" />
-        </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="/glacier/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-            <?php endforeach; ?>
-        </ol>	
-        </div>
-        <?php endif; ?>
-	</div>
-</div>

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

@@ -1,35 +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->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('雷达测厚数据');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-<div class="row">
-    <div class="span3">
-    <?= $this->partial('glacier/navi.phtml'); ?>
-    </div>
-    <div class="span9">
-        <div id="intro">
-        <p>
-        利用冰川测厚雷达获得的反应冰川厚度和冰下地形的野外测量数据，可为冰川厚度分布图和冰下地形图等提供重要的基础资料。同时，利用这些测量资料可以估算冰川的冰储量，为冰川变化响应气候变化提供定量科学依据，而且可以为各种水文模型提供重要的冰下地形参数。
-        </p>
-        <img src="/images/glacier/lidar.png" />
-        </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="/glacier/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-            <?php endforeach; ?>
-        </ol>	
-        </div>
-        <?php endif; ?>
-	</div>
-</div>

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

@@ -1,35 +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->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('物质平衡观测数据');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-<div class="row">
-    <div class="span3">
-    <?= $this->partial('glacier/navi.phtml'); ?>
-    </div>
-    <div class="span9">
-        <div id="intro">
-        <p>
-        冰川在一定时间内的物质变化即积累与消融之差。积累大于消融为正平衡，消融大于积累为负平衡。冰川物质平衡野外观测一般包括利用雪坑剖面观测冰川积累量和花杆观测冰川消融量。
-        </p>
-        <img src="/images/glacier/material.png" />
-        </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="/glacier/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-            <?php endforeach; ?>
-        </ol>	
-        </div>
-        <?php endif; ?>
-	</div>
-</div>

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

@@ -1,33 +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->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('气象数据');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-<div class="row">
-    <div class="span3">
-    <?= $this->partial('glacier/navi.phtml'); ?>
-    </div>
-    <div class="span9">
-        <div id="intro">
-        <p>在冰川区观测的气象数据，观测要素包括温度、风速、风向、降水等。受观测条件的限制，观测要素和观测时段不能保持完全一致。</p>
-        <img src="/images/glacier/metro.png" />
-        </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="/glacier/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-            <?php endforeach; ?>
-        </ol>	
-        </div>
-        <?php endif; ?>
-	</div>
-</div>

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

@@ -1,33 +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->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('冰川运动数据');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-<div class="row">
-    <div class="span3">
-    <?= $this->partial('glacier/navi.phtml'); ?>
-    </div>
-    <div class="span9">
-        <div id="intro">
-        <p>冰川运动观测一般分为冰川表面运动观测和冰川内部运动观测。前者一般采用GPS和花杆等测量方法，后者一般采用挖坑法、冰隧道法和钻孔法。
-        </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="/glacier/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-            <?php endforeach; ?>
-        </ol>	
-        </div>
-        <?php endif; ?>
-	</div>
-</div>

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

@@ -1,33 +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->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('纳木错流域');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-
-<div id='sidebar'>
-<div id='leftnavi'>
-<?= $this->partial('glacier/navi.phtml'); ?>
-</div>
-</div>
-<div id='right'>
-<div>&nbsp;</div>
-<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="/glacier/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-	<?php endforeach; ?>
-</ol>	
-</div>
-<?php endif; ?>
-</div>

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

@@ -70,13 +70,6 @@
           </a>
         </div>
     </div>
-    <div class="accordion-group heihe-accordion-title">
-        <div class="accordion-heading" id="Nav-glacier-category">
-          <a class="accordion-toggle" href="/glacier/category">
-			ISO19115分类
-          </a>
-        </div>
-    </div>
     <div class="accordion-group heihe-accordion-title">
         <div class="accordion-heading" id="Nav-glacier-thumb">
           <a class="accordion-toggle" href="/glacier/thumb">
@@ -108,10 +101,8 @@
 </div>
 <!--<li><a href="/glacier/document">项目文档</a></li>-->
 <!--<li><a href="/glacier/list">数据列表</a></li>-->
-<!-- <li>WebGIS地图浏览</li>
-<li>数据使用协议</li> -->
 <form  id="search" enctype="application/x-www-form-urlencoded" action="/glacier/search" method="post">
-<input type="text" name="q" id="q" value="<?php echo (empty($this->key))?'回车搜索标题和摘要':$this->key; ?>" onfocus="myfocus(this);" onblur="myblur(this);">
+<input type="text" name="q" id="q" value="<?php echo (empty($this->key))?'回车搜索标题和摘要':$this->key; ?>" onfocus="myfocus(this);" onblur="myblur(this);"  style="width:100%;">
 <input type="hidden" name="submit" value="submit">
 </form>
 <script>

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

@@ -1,33 +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->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('年楚河流域');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-
-<div id='sidebar'>
-<div id='leftnavi'>
-<?= $this->partial('glacier/navi.phtml'); ?>
-</div>
-</div>
-<div id='right'>
-<div>&nbsp;</div>
-<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="/glacier/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-	<?php endforeach; ?>
-</ol>	
-</div>
-<?php endif; ?>
-</div>

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

@@ -1,33 +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->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('近景摄影测量数据');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-<div class="row">
-    <div class="span3">
-    <?= $this->partial('glacier/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="/glacier/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-            <?php endforeach; ?>
-        </ol>	
-        </div>
-        <?php endif; ?>
-	</div>
-</div>

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

@@ -1,33 +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->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('冰雪物理过程数据');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-<div class="row">
-    <div class="span3">
-    <?= $this->partial('glacier/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="/glacier/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-            <?php endforeach; ?>
-        </ol>	
-        </div>
-        <?php endif; ?>
-	</div>
-</div>

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

@@ -1,33 +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->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('祁连山');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-
-<div id='sidebar'>
-<div id='leftnavi'>
-<?= $this->partial('glacier/navi.phtml'); ?>
-</div>
-</div>
-<div id='right'>
-<div>&nbsp;</div>
-<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="/glacier/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-	<?php endforeach; ?>
-</ol>	
-</div>
-<?php endif; ?>
-</div>

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

@@ -1,33 +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->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('第四纪数据');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-<div class="row">
-    <div class="span3">
-    <?= $this->partial('glacier/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="/glacier/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-            <?php endforeach; ?>
-        </ol>	
-        </div>
-        <?php endif; ?>
-	</div>
-</div>

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

@@ -1,33 +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->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('遥感影像');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-<div class="row">
-    <div class="span3">
-    <?= $this->partial('glacier/navi.phtml'); ?>
-    </div>
-    <div class="span9">
-        <div id="intro">
-        <img src="/images/glacier/landsat.png" class="pull-right" />
-        系统收集了可用于冰川编目的各种遥感数据，包括Landsat TM/ETM+、ASTER、SPOT、ALOS，其中Landsat TM/ETM+基本覆盖全部冰川区，其他遥感数据仅覆盖部分冰川区。
-        </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="/glacier/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-            <?php endforeach; ?>
-        </ol>	
-        </div>
-        <?php endif; ?>
-	</div>
-</div>

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

@@ -11,13 +11,15 @@ $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
 $this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
 $this->breadcrumb('快速搜索');
 $this->breadcrumb()->setSeparator(' > ');
+$this->nav[] = array('link'=>"/glacier/",'title'=>$this->config->title->glacier);
+$this->nav[] = array('link'=>"",'title'=>'快速搜索');
 ?>
+<?= $this->render('breadcrumbs.phtml'); ?>
 <div class='row'>
-<div class='span3'>
+<div class='span2'>
 <?= $this->partial('glacier/navi.phtml',array('key'=>$this->key)); ?>
 </div>
-<div class='span9'>
+<div class='span10'>
-<div><?= $this->breadcrumb() ?> </div>
 <?php if (!empty($this->metadata)) : ?>
 <?php echo $this->page->getNavigation(); ?>
 <hr />

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

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

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

@@ -1,40 +1,51 @@
 <?php
 $this->headTitle($this->config->title->site);
 $this->headTitle($this->config->title->data);
-$this->headTitle('全部浏览');
+$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="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('缩略图浏览');
 $this->breadcrumb()->setSeparator(' > ');
 $this->theme->AppendPlus($this,'colorbox');
+$this->theme->AppendPlus($this,'masonry');
+$this->nav[] = array('link'=>"/glacier/",'title'=>$this->config->title->glacier);
+$this->nav[] = array('link'=>"/glacier/thumb",'title'=>'缩略图浏览');
 ?>
+<?= $this->render('breadcrumbs.phtml') ?>
 <div class="row">
-    <div class="span3">
+    <div class="span2">
-    <?= $this->partial('glacier/navi.phtml'); ?>
+    	<?= $this->partial('glacier/navi.phtml'); ?>
     </div>
-    <div class="span9">
+    <div class="span10">
 		<?php echo $this->page->getNavigation(); ?>
         <hr />
-        <div id="mdlist">
+        <div>
+        <ul class="thumb water-thumb unstyled" id="container">
         <?php foreach($this->metadata as $md) : ?>
-         <div class="thumb">
+        <li class="items">
-         
+      		<h4><a href="/glacier/view/uuid/<?php echo $md['uuid'];?>"><?= $this->escape($md['title']);?></a></h4>
-         <div class="thumbtitle">
+            <a href="/service/bigthumb/uuid/<?= $md['uuid'] ?>" class="thumbnail colorbox">
-         <a href="/glacier/view/uuid/<?php echo $md['uuid'];?>"><?php echo $this->escape($md['title']); ?> </a>
+              <img src="/service/thumb/id/<?php echo $md['id'];?>" alt="">
-         </div>
+            </a>
-         <a class="colorbox" href="/service/bigthumb/id/<?php echo $md['id'];?>" title="<?php echo $this->escape($md['title']); ?>">
+            <div class="caption">
-         <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']);?>" />
+                <p>
-         </a>
+                    <?php echo mb_strlen($md['description'])>120?$this->escape(mb_substr($md['description'],0,120,'UTF-8').'...'):$this->escape($md['description']);?>
-         </div>     
+                </p>
+            </div>
+            <span class="pull-right"><a href="/data/<?php echo $md['uuid'];?>" class="btn"><i class="icon-zoom-in"></i>查看</a></span>
+      	</li>
         <?php endforeach; ?>
+        </ul>
         </div>
-        <hr style="clear:left;"/>
+        <hr class="clearfix" />
         <?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"});});
+$(document).ready(function(){
+	$(".colorbox").colorbox({rel:"colorbox",photo:"true",transition:"fade"});
+	$(".colorbox").colorbox({photo:"true"});
+});
+$('#container').masonry({
+	itemSelector : '.items',
+});
 </script>

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

@@ -1,33 +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->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('天山');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-
-<div id='sidebar'>
-<div id='leftnavi'>
-<?= $this->partial('glacier/navi.phtml'); ?>
-</div>
-</div>
-<div id='right'>
-<div>&nbsp;</div>
-<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="/glacier/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-	<?php endforeach; ?>
-</ol>	
-</div>
-<?php endif; ?>
-</div>

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

@@ -12,12 +12,14 @@ $this->breadcrumb()->setSeparator(' > ');
 $this->headScript()->appendFile('/js/timeline_var.js');
 $this->headScript()->appendFile('/js/timeline_js/timeline-api.js');
 $this->headScript()->appendFile('/js/glaciertime.js');
+$this->nav[] = array('link'=>"/glacier/",'title'=>$this->config->title->glacier);
+$this->nav[] = array('link'=>"/glacier/timeline",'title'=>'时间轴导航');
 ?>
 <div class="row">
-    <div class="span3">
+    <div class="span2">
     <?= $this->partial('glacier/navi.phtml'); ?>
     </div>
-    <div class="span9"> 
+    <div class="span10"> 
 		<div id="tl" class="timeline-default" style="height:600px;"> </div>
 	</div>
 </div>

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

@@ -15,15 +15,17 @@ $this->headScript()->appendFile('/js/timeline_var.js');
 $this->headScript()->appendFile('/js/timeline_js/timeline-api.js');
 $this->headScript()->appendFile('/js/timemap.2.0.1/lib/mxn/mxn.js?(googlev3)');
 $this->headScript()->appendFile('/js/timemap.2.0.1/timemap.pack.js');
+$this->nav[] = array('link'=>"/glacier/",'title'=>$this->config->title->glacier);
+$this->nav[] = array('link'=>"/glaicer/timemap",'title'=>'时空导航');
 ?>
 <style>
 img{max-width:none}
 </style>
 <div class="row">
-    <div class="span3">
+    <div class="span2">
     	<?= $this->partial('glacier/navi.phtml'); ?>
     </div>
-    <div class="span9">
+    <div class="span10">
     <div><?= $this->breadcrumb() ?> </div>     
     	<div id="timemap">
 			<div id="map" style="height:500px;width:40%;float:right;"></div>

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

@@ -1,33 +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->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('植被数据');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-<div class="row">
-    <div class="span3">
-    <?= $this->partial('glacier/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="/glacier/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-            <?php endforeach; ?>
-        </ol>	
-        </div>
-        <?php endif; ?>
-	</div>
-</div>

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

@@ -4,25 +4,27 @@
 	$this->headTitle($this->metadata->title);
 	$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="/glacier/">'.$this->config->title->glacier.'</a>');
-	$this->breadcrumb('查看元数据');
-	$this->breadcrumb()->setSeparator(' > ');
-	$this->headLink()->appendStylesheet('/css/water.css');
 	$this->theme->AppendPlus($this,'google_map_v3');
 	$this->theme->AppendPlus($this,'colorbox');
+	if(!empty($this->dataService)) {
+    	$this->theme->AppendModel($this,"dataservice");
+	}
+	$this->nav[] = array('link'=>"/glacier/",'title'=>$this->config->title->glacier);
+	$this->nav[] = array('link'=>"",'title'=>'查看元数据');
 ?>
 <style>
 h3.gs_rt{font-size:110%;}
+#file-list li:hover {background-color: #f5f5f5;}
+#file-list li li:hover {background-color: #dedede;}
+#file-list li li li:hover {background-color: #eeeeee;}
 </style>
+<?= $this->render('breadcrumbs.phtml'); ?>
 <?php $md=$this->metadata;if ($md):?>
 <div class="row">
-	<div class="span3">
+	<div class="span2">
     <?= $this->partial('glacier/navi.phtml'); ?>
     </div>
- <div class="span9">
+ <div class="span10">
-<div><?= $this->breadcrumb() ?> </div>
 	<h3><?php echo $this->escape($md->title);
 if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
 </h3>
@@ -37,21 +39,11 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
         </p>	
         </div>
         <div>
-			<?php if ($md->citation) : ?>
+			<?php if ($this->mcitation) : ?>
             <hr />
-            <h4><i class="icon-quote-left muted"></i>本数据引用方式<a class="btn btn-danger pull-right" href="/archives/help/dataplatformhelp/archive-23.html" ><i class="icon-comment"></i>数据引用帮助</a></h4>
+            <h4><i class="icon-eye-open text-success"></i>本数据要求的多篇文献引用</h4>
-			<p><?php  if (empty($md->datadoi) || !strpos($md->citation,$md->datadoi)) : ?><span class="label label-info">文章的引用</span>
-			<?php endif; echo $this->escape($md->citation);?></p>
-            <?php  if (!empty($md->datadoi) && !strpos($md->citation,$md->datadoi)) : ?>
-			<p><span class="label label-info">数据的引用</span><?php
-			echo substr($md->authors,1,-1).'. '.$md->title.'. '.$md->publisher.', '.$md->publish_year.'. doi:'.$md->doi;
-			echo ' ['.substr($md->author_en,1,-1).'. '.$md->title_en.'. '.$md->publisher_en.', '.$md->publish_year.'. doi:'.$md->doi.']';
-			?> (下载引用：<a href="/service/ris/lang/cn/uuid/<?php echo $md->uuid; ?>">RIS格式</a> | <a href="/service/ris/lang/en/uuid/<?php echo $md->uuid; ?>">RIS英文格式</a> | <a href="/service/bibtex/lang/cn/uuid/<?php echo $md->uuid; ?>">Bibtex格式</a> | <a href="/service/bibtex/lang/en/uuid/<?php echo $md->uuid; ?>">Bibtex英文格式</a>)</p>
-        	<?php endif; endif; if ($this->ref) : ?>
-            <hr />
-            <h4><i class="icon-eye-open text-success"></i>建议参考文献</h4>
             <ol>
-            <?php foreach($this->ref as $ref) :
+            <?php foreach($this->mcitation as $ref) :
             if (empty($ref->link))
                 echo '<li>'.$ref->reference.'</li>';
             else
@@ -59,17 +51,78 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
             endforeach;
             ?>
             </ol>
-			<?php endif; ?>	
+			<?php else: ?>	
-            <?php if ($this->userref) : ?>
+			
+			<?php if ($md->citation) : ?>
             <hr />
-            <h4>数据用户发表文献</h4>
+            <h4><i class="icon-quote-left muted"></i>本数据引用方式<a class="btn btn-danger pull-right" href="/archives/help/platform/archive-23.html" ><i class="icon-comment"></i>数据引用帮助</a></h4>
+			<p><?php  if (empty($md->datadoi) || !strpos($md->citation,$md->datadoi)) : ?><span class="label label-info">文章的引用</span>
+			<?php endif; echo $this->escape($md->citation);if (strpos($md->citation,$md->datadoi)) : ?>            
+			(下载引用：<a href="/service/ris/lang/cn/uuid/<?php echo $md->uuid; ?>">RIS格式</a> | <a href="/service/ris/lang/en/uuid/<?php echo $md->uuid; ?>">RIS英文格式</a> | <a href="/service/bibtex/lang/cn/uuid/<?php echo $md->uuid; ?>">Bibtex格式</a> | <a href="/service/bibtex/lang/en/uuid/<?php echo $md->uuid; ?>">Bibtex英文格式</a>)
+			<?php endif; ?>
+			</p>
+			<?php  if (!empty($md->datadoi) && !strpos($md->citation,$md->datadoi)) : ?>
+			<p><span class="label label-info">数据的引用</span><?php
+			echo substr($md->authors,1,-1).'. '.$md->title.'. '.$md->publisher.', '.(empty($md->ts_published)?$md->publish_year:date('Y',strtotime($md->ts_published))).'. doi:'.$md->doi;
+			echo ' ['.str_replace('"','',substr($md->author_en,1,-1)).'. '.$md->title_en.'. '.$md->publisher_en.', '.(empty($md->ts_published)?$md->publish_year:date('Y',strtotime($md->ts_published))).'. doi:'.$md->doi.']';
+			?> (下载引用：<a href="/service/ris/lang/cn/uuid/<?php echo $md->uuid; ?>">RIS格式</a> | <a href="/service/ris/lang/en/uuid/<?php echo $md->uuid; ?>">RIS英文格式</a> | <a href="/service/bibtex/lang/cn/uuid/<?php echo $md->uuid; ?>">Bibtex格式</a> | <a href="/service/bibtex/lang/en/uuid/<?php echo $md->uuid; ?>">Bibtex英文格式</a>)</p>
+        	<?php endif; endif; endif; if ($this->ref) : ?>
+            <hr />
+            <h4><i class="icon-eye-open text-success"></i>相关文献（作者推荐）</h4>
+            <ol>
+            <?php foreach($this->ref as $ref) :
+            echo '<li>'.$ref->reference;
+	    echo '<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a>';
+            if (empty($ref->link))
+            { 
+			if(!empty($ref->attid)) 
+				echo '<a href="/service/attach/id/'.$ref->attid.'"><i class="icon-download text-success"></i>下载</a>';
+	}else{ 
+		echo '<a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a>';
+	}
+	echo "</li>";
+            endforeach;
+            ?>
+            </ol>
+	<?php endif; if ($this->themeref) :?>	
+
+            <hr />
+            <h4><i class="icon-eye-open text-success"></i>专题文献</h4>
+            <ol>
+            <?php foreach($this->themeref as $ref) :
+            echo '<li>'.$ref->reference;
+	    echo '<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a>';
+            if (empty($ref->link))
+            { 
+			if(!empty($ref->attid)) 
+				echo ' | <a href="/service/attach/id/'.$ref->attid.'"><i class="icon-download text-success"></i>下载</a>';
+			}else{ 
+				echo ' | <a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a>';
+			}
+			echo "</li>";
+            endforeach;
+            ?>
+            </ol>
+            <?php endif; if ($this->userref) : ?>
+            <hr />
+            <h4><i class="icon-eye-open text-success"></i>数据施引文献</h4>
             <ol>
             <?php foreach($this->userref as $ref) :
+            echo '<li>'.$ref->reference;
+	    echo '<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a>';
             if (empty($ref->link))
-                echo '<li>'.$ref->reference.'</li>';
+            { 
-            else
+			if(!empty($ref->attid)) 
-                echo '<li>'.$ref->reference.' <a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a></li>';
+				echo '<a href="/service/attach/id/'.$ref->attid.'"><i class="icon-download text-success"></i>下载</a>';
+			}else{ 
+				echo '<a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a>';
+			}
+			echo "</li>";
             endforeach;
+	    if (count($this->userref)==15)
+	    {
+		echo '<a class="btn btn-success pull-right" href="/knowledge/user/uuid/'.$md->uuid.'" ><i class="icon-info-sign"></i>更多施引文献</a>';	
+	    }	    
             ?>
             </ol>
         	<?php endif; ?>
@@ -83,8 +136,8 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
 			?>
 			<?php else : ?>
 				<p>为尊重知识产权、保障数据作者的权益、扩展数据中心的服务、评估数据的应用潜力，请数据使用者在使用数据所产生的研究成果中（包括公开发表的论文、论著、数据产品和未公开发表的研究报告、数据产品等成果），明确注明数据来源和数据作者。对于转载（二次或多次发布）的数据，作者还须注明原始数据来源。</p>
-				<p>中文发表的成果参考以下规范注明：	数据来源于国家自然科学基金委员会"中国西部环境与生态科学数据中心"(http://westdc.westgis.ac.cn)</p>
+				<p>中文发表的成果参考以下规范注明：	数据来源于黑河计划数据管理中心、寒区旱区科学数据中心(http://westdc.westgis.ac.cn)</p>
-				<p>英文发表的成果依据以下规范注明： The data set is provided by Environmental and Ecological Science Data Center for West China,National Natural Science Foundation of China (http://westdc.westgis.ac.cn)</p>
+				<p>英文发表的成果依据以下规范注明： The data set is provided by Cold and Arid Regions Sciences Data Center at Lanzhou (http://westdc.westgis.ac.cn)</p>
 				</p>
 			<?php endif; ?>
             <?php if($this->data_archives){ ?>
@@ -102,7 +155,7 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
                 <?php if(!empty($this->fund)) : ?>
                 <ul>
 				<?php foreach($this->fund as $k=>$v) : ?>
-                	<li><?= $v['fund_type'] ?>：<?= $v['title'] ?>(项目编号:<?= $v['fund_id']?>) [<?= $v['fund_type_en'] ?>(No. <?= $v['fund_id']?>)]</li>
+                	<li><?= $v['fund_type'] ?>：<a href="/data/fund/id/<?= $v['id'] ?>"><?= $v['title'] ?></a>(项目编号:<?= $v['fund_id']?>) [<?= $v['fund_type_en'] ?>(No. <?= $v['fund_id']?>)]</li>
                 <?php endforeach; ?>
                 </ul>
                 <?php elseif(!empty($md->suppinfo)) : ?>
@@ -251,7 +304,7 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
         </div>
     </div>
     </div>
-    <div class="span3">
+    <div class="span4">
 			<ul class="well well-small inline unstyled">
 			<li><a href="/data/category"><i class="icon-th text-warning"></i>类别：</a></li>
 			<?php foreach($this->category as $cat): ?>
@@ -273,10 +326,10 @@ foreach($this->keys as $cg) :
 	if ($i==0) {
 		?>
 			<ul class="well well-small inline unstyled">
-			<li><a href="/data/tag/keytype/<?php echo $kt; ?>"><i class="icon-tags text-warning"></i><?php echo $kw[$kt]; ?></a></li>
+			<li><a href="/glaicer/tag/keytype/<?php echo $kt; ?>"><i class="icon-tags text-warning"></i><?php echo $kw[$kt]; ?></a></li>
 		<?
 		}
- 	echo '<li><a href="/data/tag/key/'.urlencode($cg['keyword']).'"><i class="icon-tag"></i>'.$cg['keyword'].'</a></li>';
+ 	echo '<li><a href="/glaicer/tag/key/'.urlencode($cg['keyword']).'"><i class="icon-tag"></i>'.$cg['keyword'].'</a></li>';
 endforeach;      
         ?></ul>
    <?php if ($md->doi) : ?>
@@ -285,7 +338,7 @@ endforeach;
     
     <div>
     <hr />
-    <h4>数据细节<a class="btn pull-right" href="javascript:void(0);" id="show-list" onclick="getFileList()" title=""><i class="icon-file"></i>文件列表</a></h4>
+    <h4>数据细节<a class="btn pull-right" href="javascript:void(0);" id="show-list" rel="<?= $md->uuid ?>"><i class="icon-file"></i>文件列表</a></h4>
     <ul class="inline unstyled well">
     <?php if ($md->fileformat) : ?>	
     <li><strong>格式：</strong><?php echo $md->fileformat; ?></li>
@@ -341,10 +394,21 @@ endforeach;
     	在线下载
     </a>
     <?php else: ?>
-    <a href="/data/order/uuid/<?php echo $md->uuid; ?>" class="btn btn-primary btn-large btn-block" title="免费！离线申请此数据（在线数据和离线数据都可申请）">
+    	<?php
-    	离线申请
+		 if(!empty($this->dataService)) { ?>
-    </a>
+         <?php  $this->theme->AppendPlus($this,'datepicker'); ?>
+        <a href="javascript:void(0);" class="btn btn-primary btn-large btn-block" title="此数据需要选择要下载的子集" onclick="westdc.dataservice.choiceData('<?= $md->uuid ?>',this);">
+        <?php }else{ ?>
+        <a href="/data/order/uuid/<?php echo $md->uuid; ?>" class="btn btn-primary btn-large btn-block" title="免费！离线申请此数据（在线数据和离线数据都可申请）">
+        <?php } ?>
+    	放入数据篮
+    	</a>
     <?php endif;endif; ?>
+    <!-- 
+    <a href="javascript:void(0);" onclick="method.like('<?php echo $md->uuid; ?>',this)" class="btn btn-block" title="喜欢此数据可以将它放到收藏夹中下次浏览">
+    	收藏此数据
+    </a>
+    -->
     </div>
     
     </div>
@@ -412,7 +476,7 @@ endforeach;
             <a class="jiathis_counter_style"></a>
         </div>
         <!-- JiaThis Button END -->
-        </div>
+        
     </div>
 </div>
 <script src="/js/metadata-view.js"></script>
@@ -444,6 +508,9 @@ $(function() {
 			googleSearch('<?php echo $ev;?>');
 		}
 	});
+	$('#show-list').click(function(e) {
+        method.filelist.get($(this).attr('rel'));
+    });
 });
 //ajax literature
 function literature(page){
@@ -460,10 +527,6 @@ function recommend(page){
 	recommend_get(page,'<?= $md->uuid; ?>');
 }
 
-function getFileList(){
-	getFileList_h('<?php echo $md->uuid;?>');
-}
-
 function ajaxpage(page){
 	ajaxpage_get(page,'<?= $md->uuid; ?>');
 }

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

@@ -1,33 +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->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/glacier/">'.$this->config->title->glacier.'</a>');
-$this->breadcrumb('长江源区');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-
-<div id='sidebar'>
-<div id='leftnavi'>
-<?= $this->partial('glacier/navi.phtml'); ?>
-</div>
-</div>
-<div id='right'>
-<div>&nbsp;</div>
-<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="/glacier/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
-	<?php endforeach; ?>
-</ol>	
-</div>
-<?php endif; ?>
-</div>

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

@@ -0,0 +1,30 @@
+<?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'=>"/haihe",'title'=>'海河流域观测数据集');
+?>
+<?= $this->render('breadcrumbs.phtml'); ?>
+<div class="row">
+    <div class="span2">
+    <?= $this->partial('haihe/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="/haihe/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a></li>
+                <?php endforeach; ?>
+            </ol>	
+        </div>
+        <?php endif; ?>
+    </div>
+</div>

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

@@ -0,0 +1,51 @@
+<?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()->setSeparator(' > ');
+$this->theme->AppendPlus($this,'colorbox');
+$this->nav[] = array('link'=>"/haihe",'title'=>'海河流域观测数据集');
+?>
+<?= $this->render('breadcrumbs.phtml'); ?>
+<div class="row">
+    <div class="span2">
+    	<?= $this->partial('haihe/navi.phtml'); ?>
+    </div>
+
+    <div class="span10">
+            <h3>数据相关文献</h3>
+            <?php if ($this->refs) : ?>
+            <?php echo $this->page->getNavigation(); ?>
+        <div id="mdlist">
+            <ol start="<?php echo $this->offset; ?>">
+                <?php foreach($this->refs as $md) : ?>
+                <li><?php echo $md['reference'];
+	    echo ' [<a href="/knowledge/paper/id/'.$md['id'].'"><i class="icon-info-sign text-success"></i>查看</a>';
+	    if (!empty($md['link'])) : 
+                echo ' <a href="'.$md['link'].'">下载</a>';
+		else :
+		  if (!empty($md['attid'])) echo ' <a href="/service/attach/id/'.$md['attid'].'"><i class="icon-download text-success"></i>下载</a>';
+                endif;		
+                 ?>
+                 <a href="javascript:;" onclick="showdata('<?php echo $md['id'];?>',0)"><i class="icon-external-link text-success"></i>相关数据</a>]
+                </li>
+                <?php endforeach; ?>
+            </ol>
+        </div>
+        <?php endif; ?>
+    </div>
+</div>
+<script>
+function showdata(id,page){
+	var url="/service/refdatalist/id/"+id;
+	$.ajax({
+		'type':"GET",
+		'url':url,
+		'data':'page='+page,
+		'dataType':'html',
+		'success':function(html){$.colorbox({'html':html,'innerHeight':230});}
+	});
+}
+</script>

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

@@ -0,0 +1,22 @@
+<?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'=>"/haihe",'title'=>'海河流域观测数据集');
+?>
+<?= $this->render('breadcrumbs.phtml'); ?>
+<div class="row">
+    <div class="span2">
+    	<?= $this->partial('haihe/navi.phtml'); ?>
+    </div>
+
+    <div class="span10">
+        <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>
+        </div>
+    </div>
+</div>

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

@@ -0,0 +1,38 @@
+<div id="side_accordion" class="accordion">
+	<div class="accordion-group heihe-accordion-title">
+        <div class="accordion-heading" id="Nav-haihe-index">
+          <a class="accordion-toggle" href="/haihe/">
+            介绍
+          </a>
+        </div>
+    </div>
+
+    <div class="accordion-group heihe-accordion-title">
+        <div class="accordion-heading" id="Nav-haihe-daxing">
+			<a class="accordion-toggle" href="/haihe/daxing">
+				大兴站
+			</a>
+        </div>
+    </div>
+    <div class="accordion-group heihe-accordion-title">
+        <div class="accordion-heading" id="Nav-haihe-miyun">
+			<a class="accordion-toggle" href="/haihe/miyun">
+				密云站
+			</a>
+        </div>
+    </div>
+    <div class="accordion-group heihe-accordion-title">
+        <div class="accordion-heading" id="Nav-haihe-guantao">
+			<a class="accordion-toggle" href="/haihe/guantao">
+				馆陶站
+			</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">
+				数据文献
+			</a>
+        </div>
+    </div>      
+</div>

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

@@ -0,0 +1,578 @@
+<?php
+	$this->headTitle($this->config->title->site);
+	$this->headTitle($this->config->title->data);
+	$this->headTitle($this->metadata->title);
+	$this->headTitle()->setSeparator(' - ');
+	$this->breadcrumb('<a href="/">首页</a>');
+	$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
+	$this->breadcrumb('查看元数据');
+	$this->breadcrumb()->setSeparator(' > ');
+	$this->theme->AppendPlus($this,'google_map_v3');
+	$this->theme->AppendPlus($this,'colorbox');
+	if(!empty($this->dataService)) {
+    	$this->theme->AppendModel($this,"dataservice");
+	}
+	$this->nav[] = array('link'=>"/haihe",'title'=>'海河流域观测数据集');
+?>
+<style>
+h3.gs_rt{font-size:110%;}
+#file-list li:hover {background-color: #f5f5f5;}
+#file-list li li:hover {background-color: #dedede;}
+#file-list li li li:hover {background-color: #eeeeee;}
+</style>
+<?= $this->render('breadcrumbs.phtml'); ?>
+<?php $md=$this->metadata;if ($md):?>
+<h3><?php echo $this->escape($md->title);
+if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
+</h3>
+<hr />
+<div class="row">
+	<div class="span8">
+    	<div>
+        <a class="colorbox pull-right" title="<?php echo $md->title; ?>" href="/service/bigthumb/uuid/<?php echo $md->uuid; ?>"><img src="/service/thumb/uuid/<?php echo $md->uuid;?>"/></a>
+        <p style="word-break:break-all;word-wrap:break-word;overflow:hidden;">
+           <?php echo str_replace(array("\r\n", "\n", "\r"),'</p><p>',$md->description);?>
+        </p>	
+        </div>
+        <div>
+			<?php if ($this->mcitation) : ?>
+            <hr />
+            <h4><i class="icon-eye-open text-success"></i>本数据要求的多篇文献引用</h4>
+            <ol>
+            <?php foreach($this->mcitation as $ref) :
+		echo '<li>'.$ref->reference;
+		echo '<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a>';
+            if (empty($ref->link))
+            { 
+			if(!empty($ref->attid)) 
+				echo '<a href="/service/attach/id/'.$ref->attid.'"><i class="icon-download text-success"></i>下载</a>';
+	}else{ 
+		echo '<a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a>';
+	}
+	echo "</li>";
+            endforeach;
+            ?>
+            </ol>
+			<?php endif; ?>				
+			<?php if ($md->citation) : ?>
+            <hr />
+            <h4><i class="icon-quote-left muted"></i>本数据引用方式<a class="btn btn-danger pull-right" href="/archives/help/platform/archive-23.html" ><i class="icon-comment"></i>数据引用帮助</a></h4>
+			<p><?php  if (empty($md->datadoi) || !strpos($md->citation,$md->datadoi)) : ?><span class="label label-info">文章的引用</span>
+			<?php endif; echo $this->escape($md->citation);if (strpos($md->citation,$md->datadoi)) : ?>            
+			(下载引用：<a href="/service/ris/lang/cn/uuid/<?php echo $md->uuid; ?>">RIS格式</a> | <a href="/service/ris/lang/en/uuid/<?php echo $md->uuid; ?>">RIS英文格式</a> | <a href="/service/bibtex/lang/cn/uuid/<?php echo $md->uuid; ?>">Bibtex格式</a> | <a href="/service/bibtex/lang/en/uuid/<?php echo $md->uuid; ?>">Bibtex英文格式</a>)
+			<?php endif; ?>
+			</p>
+			<?php  if (!empty($md->datadoi) && !strpos($md->citation,$md->datadoi)) : ?>
+			<p><span class="label label-info">数据的引用</span><?php
+			echo substr($md->authors,1,-1).'. '.$md->title.'. '.$md->publisher.', '.(empty($md->ts_published)?$md->publish_year:date('Y',strtotime($md->ts_published))).'. doi:'.$md->doi;
+			echo ' ['.str_replace('"','',substr($md->author_en,1,-1)).'. '.$md->title_en.'. '.$md->publisher_en.', '.(empty($md->ts_published)?$md->publish_year:date('Y',strtotime($md->ts_published))).'. doi:'.$md->doi.']';
+			?> (下载引用：<a href="/service/ris/lang/cn/uuid/<?php echo $md->uuid; ?>">RIS格式</a> | <a href="/service/ris/lang/en/uuid/<?php echo $md->uuid; ?>">RIS英文格式</a> | <a href="/service/bibtex/lang/cn/uuid/<?php echo $md->uuid; ?>">Bibtex格式</a> | <a href="/service/bibtex/lang/en/uuid/<?php echo $md->uuid; ?>">Bibtex英文格式</a>)</p>
+        	<?php endif;  endif; if ($this->ref) : ?>
+            <hr />
+            <h4><i class="icon-eye-open text-success"></i>相关文献（作者推荐）</h4>
+            <ol>
+            <?php foreach($this->ref as $ref) :
+            echo '<li>'.$ref->reference;
+	    echo '<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a>';
+            if (empty($ref->link))
+            { 
+			if(!empty($ref->attid)) 
+				echo '<a href="/service/attach/id/'.$ref->attid.'"><i class="icon-download text-success"></i>下载</a>';
+	}else{ 
+		echo '<a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a>';
+	}
+	echo "</li>";
+            endforeach;
+            ?>
+            </ol>
+	<?php endif; if ($this->themeref) :?>	
+
+            <hr />
+            <h4><i class="icon-eye-open text-success"></i>专题文献</h4>
+            <ol>
+            <?php foreach($this->themeref as $ref) :
+            echo '<li>'.$ref->reference;
+	    echo '<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a>';
+            if (empty($ref->link))
+            { 
+			if(!empty($ref->attid)) 
+				echo ' | <a href="/service/attach/id/'.$ref->attid.'"><i class="icon-download text-success"></i>下载</a>';
+			}else{ 
+				echo ' | <a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a>';
+			}
+			echo "</li>";
+            endforeach;
+            ?>
+            </ol>
+            <?php endif; if ($this->userref) : ?>
+            <hr />
+            <h4><i class="icon-eye-open text-success"></i>数据施引文献</h4>
+            <ol>
+            <?php foreach($this->userref as $ref) :
+            echo '<li>'.$ref->reference;
+	    echo '<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a>';
+            if (empty($ref->link))
+            { 
+			if(!empty($ref->attid)) 
+				echo '<a href="/service/attach/id/'.$ref->attid.'"><i class="icon-download text-success"></i>下载</a>';
+			}else{ 
+				echo '<a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a>';
+			}
+			echo "</li>";
+            endforeach;
+	    if (count($this->userref)==15)
+	    {
+		echo '<a class="btn btn-success pull-right" href="/knowledge/user/uuid/'.$md->uuid.'" ><i class="icon-info-sign"></i>更多施引文献</a>';	
+	    }
+            ?>
+            </ol>
+        	<?php endif; ?>
+            <hr />
+            <h4><i class="icon-legal text-warning"></i>数据使用声明</h4>
+            <?php
+			if ($this->uselimits) : 
+			foreach($this->uselimits as $uselimit) :
+			echo '<p>'.str_replace(array("\r\n", "\n", "\r"),'</p><p>',$this->escape($uselimit->uselimit)).'</p>';
+			endforeach;
+			?>
+			<?php else : ?>
+				<p>为尊重知识产权、保障数据作者的权益、扩展数据中心的服务、评估数据的应用潜力，请数据使用者在使用数据所产生的研究成果中（包括公开发表的论文、论著、数据产品和未公开发表的研究报告、数据产品等成果），明确注明数据来源和数据作者。对于转载（二次或多次发布）的数据，作者还须注明原始数据来源。</p>
+				<p>中文发表的成果参考以下规范注明：	数据来源于黑河计划数据管理中心、寒区旱区科学数据中心(http://westdc.westgis.ac.cn)</p>
+				<p>英文发表的成果依据以下规范注明： The data set is provided by Cold and Arid Regions Sciences Data Center at Lanzhou (http://westdc.westgis.ac.cn)</p>
+				</p>
+			<?php endif; ?>
+            <?php if($this->data_archives){ ?>
+                <h4>数据相关新闻</h4>
+                <ul>
+                <?php 
+                foreach($this->data_archives as $v){?>
+                <li><a href="<?= $v['url']['archive_url']?>"><?= $v['title']?></a></li>
+                <?php } ?>
+                </ul>
+                <hr />
+            <?php }?>
+            <?php if ($md->suppinfo || $this->fund) : ?>
+                <h4><i class="icon-money text-info"></i>资助项目</h4>
+                <?php if(!empty($this->fund)) : ?>
+                <ul>
+				<?php foreach($this->fund as $k=>$v) : ?>
+                	<li><?= $v['fund_type'] ?>：<a href="/data/fund/id/<?= $v['id'] ?>"><?= $v['title'] ?></a>(项目编号:<?= $v['fund_id']?>) [<?= $v['fund_type_en'] ?>(No. <?= $v['fund_id']?>)]</li>
+                <?php endforeach; ?>
+                </ul>
+                <?php elseif(!empty($md->suppinfo)) : ?>
+                <?php echo '<p>'.str_replace(array("\r\n", "\n", "\r"),'</p><p>',$this->escape($md->suppinfo)).'</p>';?>
+                <?php endif; ?>
+                <hr />
+            <?php endif; ?>
+			<?php if ($this->resources) : ?>
+                <h4><i class="icon-bolt text-warning"></i>相关资源</h4>
+                <ul class="unstyled inline"><?php foreach($this->resources as $link) : ?>
+                <li><a class="label" href="<?php echo $link->linkage; ?>" title="<?php echo $link->description; ?>">
+                <?php
+                 if (!empty($link->name))
+                   echo $link->name;
+                 elseif (!empty($link->description))
+                   echo $link->description;
+                 else
+                   echo $link->linkage;
+                    ?></a></li>
+                <?php endforeach; ?>
+                </ul>
+                <hr />
+            <?php endif; ?>
+        </div>
+        <div>
+        	<?php
+				$keywords = array();
+				foreach($this->keys as $cg){
+					if($cg['keytype']=="theme")
+					$keywords[]=$cg['keyword'];
+				}
+				$ev = join(" ",$keywords);
+			?>
+            <div class="tabbable"> <!-- Only required for left/right tabs -->
+                <ul class="nav nav-tabs">
+                	<li class="active"><a href="#related" data-toggle="tab" id="related_t">相关数据</a></li>
+                	<li><a href="#literature" data-toggle="tab" id="literature_t">相关文献</a></li>
+                    <li><a href="#gsearch" data-toggle="tab" id="gsearch_t">相关搜索</a></li>
+                    <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">
+                	<div id="related" class="tab-pane active">
+					</div>
+                    <div id="literature" class="tab-pane">
+                    	<div class="">
+                        	<ul class="nav nav-pills lit-nav">
+                            	<li><a href="javascript:;" class="literatures lit-nav-btn">西部计划知识库</a></li>
+                            	<li><a href="javascript:;" class="scholar lit-nav-btn">Google学术搜索</a></li>
+                        		<li><a href="javascript:;" class="cnkiSearch lit-nav-btn">CNKI学术搜索</a></li>
+                            </ul>
+                        </div>
+                        <div id="literature-list">
+                        </div>
+					</div>
+                    <div id="gsearch" class="tab-pane">
+                        <ul id="searchlist" class="unstyled well well-small"></ul>
+					</div>
+                    <div id="service" class="tab-pane">
+                    <?php if ($this->downhistory) : ?>
+                    <p>最近10条服务记录如下：</p>
+                    <ol start="1">
+                    <?php
+                        foreach($this->downhistory as $v){
+                            echo '<li>'.date("Y-m-d",strtotime($v->ts_created))." ".$v->unit." ".$v->realname;
+                            if (!empty($v->offlineproject))
+                                echo ' 用途：'.$v->offlineproject;
+                            elseif (!empty($v->onlineproject))
+                               echo ' 用途：'.$v->onlineproject;
+                            echo '</li>';
+                        }
+                    ?>
+                    </ol>
+                    <?php else : ?>
+                    暂时没有服务记录，欢迎您下载使用！
+                    <?php endif; ?>
+                    </div>
+                    <div id="recommend" class="tab-pane">
+                    
+                    </div>
+                </div>
+            </div>
+			<hr />
+			<div id="comments">
+			<?php if ($md->status>0 and $md->status<5) : ?>
+			<p class="strong">此数据还在评审过程中，我们真切地邀请您参加此数据的评审，以便我们能尽快发布此数据！<a class="btn btn-primary" href="/review/review/uuid/<?php echo $md->uuid; ?>">评审</a></p>
+			<?php else : ?>
+			<h4>数据评论</h4>
+			<div id="allcomments">
+			<div id="loading"><img src="/images/loading.gif" />评论加载中</div>
+			</div>
+			<?php
+			$auth = Zend_Auth::getInstance();
+			if($auth->hasIdentity())
+			{
+				$user = $auth->getIdentity();
+				$name = $user->realname;
+				$email = $user->email;
+			}else
+			{
+				$name = "";
+				$email = "";
+			}
+			?>
+            <form class="form-horizontal"  id="postcommentform">
+            <div class="control-group">
+            <label class="control-label">姓名</label>
+            <div class="controls">
+            <input type="text" name="author" value="<?php echo $name;?>" />
+            </div>
+            </div>
+            <div class="control-group">
+            <label class="control-label">Email</label>
+            <div class="controls">
+            <input type="text" name="email" value="<?php echo $email;?>" />
+            </div>
+            </div>
+            <div class="control-group">
+            <label class="control-label">Website</label>
+            <div class="controls">
+            <input type="text" name="url" value="" /> <span class="help-block">e.g. http://westdc.westgis.ac.cn/</span>
+            </div>
+            </div>
+            <div class="control-group">
+            <label class="control-label">内容</label>
+            <div class="controls">
+            <textarea name="content" class="span5"></textarea>
+            </div>
+            </div>
+            <div class="control-group">
+            <label class="control-label">验证码</label>
+            <div class="controls">
+            <img id="imgcode" style="margin-bottom:-10px;cursor:pointer;border:0px;" src="/service/imgcode/" onClick="this.src=this.src+'?'"><input type="text" name="vdcode" id="vdcode" maxlength="4" value="" />
+            </div>
+            </div>
+            <div class="control-group">
+            <div class="controls">
+            <input type="hidden" name="mdtitle" value="<?php echo $md->title;?>" />
+			<input type="hidden" name="uuid" value="<?php echo $md->uuid;?>" />
+			<a class="btn btn-primary" id="postcomment" href="javascript:;" onclick="postcomment();">提交</a><button type="reset" id="reset" class="btn">重置</button><span id="returninfo"></span>
+            </div>
+            </div>
+            </form>
+			<div id="infobox"></div>
+			<?php endif; ?>
+        </div>
+    </div>
+    </div>
+    <div class="span4">
+			<ul class="well well-small inline unstyled">
+			<li><a href="/data/category"><i class="icon-th text-warning"></i>类别：</a></li>
+			<?php foreach($this->category as $cat): ?>
+            <li><a href="/data/category/code/<?php echo $cat->code;?>"><i class="icon-th-large"></i><?php echo $this->escape($cat->name_zh);?></a></li>
+            <?php endforeach; ?>
+   </ul>
+        <?php
+        $kw=array('discipline'=>'学科','place'=>'地点','theme'=>'主题','temporal'=>'时间词','stratum'=>'地层');
+$kt='';
+$i=0;
+foreach($this->keys as $cg) :
+	if ($kt==$cg['keytype']) :		
+		$i+=1;
+	else :
+		if (!empty($kt)) echo '</ul>';
+		$kt=$cg['keytype'];
+		$i=0;
+	endif;
+	if ($i==0) {
+		?>
+			<ul class="well well-small inline unstyled">
+			<li><a href="/data/tag/keytype/<?php echo $kt; ?>"><i class="icon-tags text-warning"></i><?php echo $kw[$kt]; ?></a></li>
+		<?
+		}
+ 	echo '<li><a href="/data/tag/key/'.urlencode($cg['keyword']).'"><i class="icon-tag"></i>'.$cg['keyword'].'</a></li>';
+endforeach;      
+        ?></ul>
+   <?php if ($md->doi) : ?>
+   <ul class="well well-small inline unstyled"><li><span class="label label-success">数据DOI：</span><?php echo $md->doi; ?></li></ul>
+   <?php endif; ?>
+    <div>
+    <hr />
+    <h4>数据细节<a class="btn pull-right" href="javascript:void(0);" id="show-list" rel="<?= $md->uuid ?>"><i class="icon-file"></i>文件列表</a></h4>
+    <ul class="inline unstyled well">
+    <?php if ($md->fileformat) : ?>
+    <li><strong>格式：</strong><?php echo $md->fileformat; ?></li>
+    <?php endif; ?>
+        <li><strong>大小：</strong><?php echo $md->filesize; ?>MB</li>
+        <?php if ($this->downloaded>9) :?>
+        <li><strong>下载：</strong><?php echo $this->downloaded; ?>次</li>
+        <?php endif; ?>
+        <li><strong>浏览：</strong><?php echo $this->viewed; ?>次</li>
+    <!--
+    <?php if ($md->projection) : ?>	
+        <li id="projection" title="<?= $this->projection; ?>">数据投影：
+    <?php
+    $p=explode(" ",$this->projection);
+    $p=explode("=",$p[0]);
+    if (!empty($p[1]))
+      echo $p[1];
+    else
+    {
+     if (is_numeric($md->projection)) echo 'EPSG_CODE_';
+     echo $md->projection; 
+    }
+    ?></li>
+    <?php endif; ?>
+    -->
+        <?php if (!empty($md->timebegin)) : ?>
+        <li id="datatimes"><strong>数据时间范围：</strong><?php echo date('Y-m-d',strtotime($md->timebegin));if (!empty($md->timeend)) echo " 至 ".date('Y-m-d',strtotime($md->timeend)); ?></li>
+        <?php endif; ?>
+        <?php if (!empty($this->doc)) : ?>
+     <!--   <li id="datadoc"><a href="<?php $wikiTitle = $this->doc;
+            if(strpos($wikiTitle,'http://wiki.westgis.ac.cn/index.php/')!==false){
+            $title=str_replace('http://wiki.westgis.ac.cn/index.php/','',$wikiTitle);
+            echo "/data/wiki/$title";
+            }else{
+            echo $this->doc;
+            }?>">数据说明文档</a></li> -->
+        <?php endif; ?>
+        <?php if ($this->attachments) : ?>
+        <li id="attach"><span>相关文档：</span>
+        <?php foreach ($this->attachments as $k=>$a) : ?>
+        <a href="/service/attach/id/<?php echo $a->id; ?>" title="<?php echo $a->realname; ?>"><img src="/images/document.png"></a> 
+        <?php endforeach; ?>
+        <a href="/service/attach/zip/<?php echo $md->uuid; ?>"><img src="/images/zip_icon.gif" title="打包下载"/></a>
+        </li>
+        <?php endif; ?>
+        <li id="datatype"><strong>数据共享方式：</strong><?php if ($md->datatype) print "离线"; else print "在线（可直接下载）";?> </li>
+    </ul>
+    <div id="linkurl">
+    <?php if ($md->status>0 and $md->status<5) : ?>
+    <a href="/review/review/uuid/<?php echo $md->uuid; ?>" class="btn btn-primary btn-large btn-block" title="此数据正在评审中，我们邀请您对此数据进行评审，以便其能尽快发布！">数据评审</a> 
+    <?php else : if (!$md->datatype) : ?>
+    <a href="/data/todownload/?uuid=<?= $md->uuid?>"  class="btn btn-primary btn-large btn-block" title="直接下载">
+    	在线下载
+    </a>
+    <?php else: ?>
+    	<?php
+		 if(!empty($this->dataService)) { ?>
+         <?php  $this->theme->AppendPlus($this,'datepicker'); ?>
+        <a href="javascript:void(0);" class="btn btn-primary btn-large btn-block" title="此数据需要选择要下载的子集" onclick="westdc.dataservice.choiceData('<?= $md->uuid ?>',this);">
+        <?php }else{ ?>
+        <a href="/data/order/uuid/<?php echo $md->uuid; ?>" class="btn btn-primary btn-large btn-block" title="免费！离线申请此数据（在线数据和离线数据都可申请）">
+        <?php } ?>
+    	放入数据篮
+    	</a>
+    <?php endif;endif; ?>
+    <a href="javascript:void(0);" class="btn btn-block" title="喜欢此数据可以将它放到收藏夹中下次浏览">
+    	收藏此数据
+    </a>
+    </div>
+    </div>
+    <hr />
+    <h4>空间位置</h4>
+    <div id='watermap' style="width:100%;height:300px;"></div>
+    <hr />
+    <h4>联系信息</h4>
+    <div id="authors">
+    <ul class="unstyled">
+    <?php
+    $party_zh=array('resourceProvider'=>'资源提供者','custodian'=>'维护者','owner'=>'拥有者','user'=>'用户','distributor'=>'数据服务联系人','originator'=>'创建者','pointOfContact'=>'联系人','principalInvestigator'=>'数据调查与处理者','processor'=>'处理者','publisher'=>'元数据发布者','author'=>'元数据作者');
+    $r='';
+    $i=0;
+    foreach($this->authors as $k=>$author) :
+    if ($author->role!=$r)
+    {
+        $r=$author->role;
+        $i=0;
+        if ($k>0) echo '</li>'; 
+        echo '<li>'.$party_zh[$author->role].'：';	 
+    } 
+        if ($i>0) echo '，';
+        $i+=1;
+        if (!empty($author->email) && $r!='principalInvestigator')
+            echo '<a href="mailto:'.$author->email.'">';
+        echo '<strong title="'.$author->organisation.'">';
+        if (!empty($author->individual))
+            echo $author->individual;
+        else
+            echo $author->organisation;
+        echo '</strong>';
+        if (!empty($author->email)) echo '</a>';
+    if ($k+1==count($this->authors)) echo '</li>';
+    endforeach;
+    ?>	
+    </ul>
+    <hr />
+    <ul class="unstyled">
+        <li>元数据更新时间：<?php print date('Y-m-d',strtotime($md->ts_created)); ?></li>
+        <li><strong>下载元数据：</strong>
+        	<a href="/service/pdf/uuid/<?php echo $md->uuid; ?>"><img src="/images/pdf_icon.gif" alt="Adobe PDF格式" title="Adobe PDF格式"></a> 
+   <a href="/service/odt/uuid/<?php echo $md->uuid; ?>"><img src="/images/odt_icon.gif" alt="OpenOffice odt格式" title="OpenOffice odt格式"></a>
+   <a href="/service/doc/uuid/<?php echo $md->uuid; ?>"><img src="/images/doc_icon.gif" alt="Word doc格式" title="Word doc格式"></a>
+   <a href="/service/xml/uuid/<?php echo $md->uuid;?>"><img src="/images/xml_icon.gif" alt="查看XML源文件" title="查看XML源文件"></a> 
+        </li>
+        <!--<li><a href="/data/detail/id/<?php echo $md->id;?>">详细元数据</a></li>-->
+        <?php if($this->version->c>0):?>
+        <li id="dataversion">版本历史：<a href="javascript:void(0);" onclick="dataVersion('<?php echo $md->uuid;?>')" title=""><?= $this->version->c ?> 个 <img src="/images/list_extensions.gif" style="vertical-align:middle" /></a></li>
+        <?php endif;?>
+        </ul>
+    </div>
+    <!--
+    <hr />
+    <div class="row-fluit">
+    	<a href="javascript:void(0);" id="fav"  class="btn" title="收藏到网站收藏夹">
+    	<i class="icon-heart"></i> 喜欢
+    	</a>
+    	<a href="javascript:void(0);" class="btn" title="收藏到浏览器收藏夹">
+    	<i class="icon-bookmark"></i> 收藏
+    	</a>
+        <a href="/data/todownload/?uuid=<?= $md->uuid?>"  class="btn" title="扫描地址二维码">
+    	<i class="icon-qrcode"></i> 扫码转发
+    	</a>
+    </div>
+    -->
+    <hr />
+    <div class="row-fluit">
+    	<div class="pull-left">分享到</div>
+        <!-- JiaThis Button BEGIN -->
+        <div class="jiathis_style" style="margin-left:10px;">
+            <a class="jiathis_button_tsina"></a>
+            <a class="jiathis_button_qzone"></a>
+            <a class="jiathis_button_tqq"></a>
+            <a class="jiathis_button_renren"></a>
+            <a class="jiathis_button_douban"></a>
+            <a class="jiathis_button_tsohu"></a>
+            <a class="jiathis_button_t163"></a>
+            <a href="http://www.jiathis.com/share" class="jiathis jiathis_txt jtico jtico_jiathis" target="_blank"></a>
+            <a class="jiathis_counter_style"></a>
+        </div>
+        <!-- JiaThis Button END -->
+    </div>
+    </div>
+</div>
+<script src="/js/metadata-view.js"></script>
+<script type="text/javascript" charset="utf-8">
+$(function() {
+	google.maps.event.addDomListener(window, 'load', initialize);
+	$(".colorbox").colorbox({photo:"true"});
+	$('.googlesearch').click(function(){googleSearch('<?php echo $ev;?>');});
+	$('.bingsearch').click(function(){bingSearch('<?php echo $ev;?>');});
+	$('.cnkiSearch').click(function(){cnkiSearch('<?php echo $ev;?>');});
+	$('.scholar').click(function(){scholarSearch('<?php echo $ev;?>');});
+	$('#related_t').click(function(){related(1);});
+	$('#recommend_t').click(function(){recommend(0);});
+	$('#literature_t').click(function(){literature(1);$('.literatures').parent('li').addClass('active')});
+	$('.literatures').click(function(){literature(1);});
+	ajaxpage(0);
+	related(1);
+	$('.lit-nav-btn').each(function(index, element) {
+		$(this).click(function(){
+        	$('.lit-nav').children('li').each(function(index, element) {
+				$(this).removeClass('active');
+			});
+			$(this).parent('li').addClass('active');
+		});
+    });
+	$('#gsearch_t').click(function(){
+		if($('#searchlist').children('li').length<1)
+		{
+			googleSearch('<?php echo $ev;?>');
+		}
+	});
+	$('#show-list').click(function(e) {
+        method.filelist.get($(this).attr('rel'));
+    });
+});
+//ajax literature
+function literature(page){
+	literature_get(page,'<?= $md->uuid; ?>');
+}
+
+//ajax related
+function related(page){
+	related_get(page,'<?= $md->uuid; ?>');
+}
+
+//ajax recommend
+function recommend(page){
+	recommend_get(page,'<?= $md->uuid; ?>');
+}
+
+function ajaxpage(page){
+	ajaxpage_get(page,'<?= $md->uuid; ?>');
+}
+
+var map = null;
+var mapElementID = "watermap";
+var bounds = null;
+var rectangle = null;
+var zoomlevel = 1;
+var bound = {
+	lat:<?= ($md->south+$md->north)/2; ?>,
+	lng:<?= ($md->east+$md->west)/2; ?>,
+	zoom:<?php if ($md->north==$md->south) { ?> 10 <?php }else {?> 6 <?php }?>,
+	east:<?= $md->east; ?>,
+	west:<?= $md->west; ?>,
+	south:<?= $md->south; ?>,
+	north:<?= $md->north; ?>
+}
+
+function addfavorite(url,title){
+	var fav_url = url;
+	var fav_title = title;
+	if (document.all && window.external){
+		window.external.AddFavorite(fav_url,fav_title);
+	}else if (window.sidebar){
+		window.sidebar.addPanel(fav_title,fav_url,"");
+	}else{
+		alert("浏览器不支持，请手动CTRL+D加入收藏夹");
+	}
+} 
+</script>
+<?php else: ?>
+	<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>
+	

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

@@ -71,27 +71,61 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
 			?> (下载引用：<a href="/service/ris/lang/cn/uuid/<?php echo $md->uuid; ?>">RIS格式</a> | <a href="/service/ris/lang/en/uuid/<?php echo $md->uuid; ?>">RIS英文格式</a> | <a href="/service/bibtex/lang/cn/uuid/<?php echo $md->uuid; ?>">Bibtex格式</a> | <a href="/service/bibtex/lang/en/uuid/<?php echo $md->uuid; ?>">Bibtex英文格式</a>)</p>
         	<?php endif; endif; endif; if ($this->ref) : ?>
             <hr />
-            <h4><i class="icon-eye-open text-success"></i>建议参考文献</h4>
+            <h4><i class="icon-eye-open text-success"></i>相关文献（作者推荐）</h4>
             <ol>
             <?php foreach($this->ref as $ref) :
+            echo '<li>'.$ref->reference;
+	    echo '<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a>';
             if (empty($ref->link))
-                echo '<li>'.$ref->reference.'</li>';
+            { 
-            else
+			if(!empty($ref->attid)) 
-                echo '<li>'.$ref->reference.' <a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a></li>';
+				echo '<a href="/service/attach/id/'.$ref->attid.'"><i class="icon-download text-success"></i>下载</a>';
+	}else{ 
+		echo '<a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a>';
+	}
+	echo "</li>";
             endforeach;
             ?>
             </ol>
-			<?php endif; ?>	
+	<?php endif; if ($this->themeref) :?>	
-            <?php if ($this->userref) : ?>
+
             <hr />
-            <h4>数据用户发表文献</h4>
+            <h4><i class="icon-eye-open text-success"></i>专题文献</h4>
+            <ol>
+            <?php foreach($this->themeref as $ref) :
+            echo '<li>'.$ref->reference;
+	    echo '<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a>';
+            if (empty($ref->link))
+            { 
+			if(!empty($ref->attid)) 
+				echo ' | <a href="/service/attach/id/'.$ref->attid.'"><i class="icon-download text-success"></i>下载</a>';
+			}else{ 
+				echo ' | <a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a>';
+			}
+			echo "</li>";
+            endforeach;
+            ?>
+            </ol>
+            <?php endif; if ($this->userref) : ?>
+            <hr />
+            <h4><i class="icon-eye-open text-success"></i>数据施引文献</h4>
             <ol>
             <?php foreach($this->userref as $ref) :
+            echo '<li>'.$ref->reference;
+	    echo '<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a>';
             if (empty($ref->link))
-                echo '<li>'.$ref->reference.'</li>';
+            { 
-            else
+			if(!empty($ref->attid)) 
-                echo '<li>'.$ref->reference.' <a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a></li>';
+				echo '<a href="/service/attach/id/'.$ref->attid.'"><i class="icon-download text-success"></i>下载</a>';
+			}else{ 
+				echo '<a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a>';
+			}
+			echo "</li>";
             endforeach;
+	    if (count($this->userref)==15)
+	    {
+		echo '<a class="btn btn-success pull-right" href="/knowledge/user/uuid/'.$md->uuid.'" ><i class="icon-info-sign"></i>更多施引文献</a>';	
+	    }	    
             ?>
             </ol>
         	<?php endif; ?>
@@ -124,7 +158,7 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
                 <?php if(!empty($this->fund)) : ?>
                 <ul>
 				<?php foreach($this->fund as $k=>$v) : ?>
-                	<li><?= $v['fund_type'] ?>：<?= $v['title'] ?>(项目编号:<?= $v['fund_id']?>) [<?= $v['fund_type_en'] ?>(No. <?= $v['fund_id']?>)]</li>
+                	<li><?= $v['fund_type'] ?>：<a href="/heihe/fund/id/<?= $v['id'] ?>"><?= $v['title'] ?></a>(项目编号:<?= $v['fund_id']?>) [<?= $v['fund_type_en'] ?>(No. <?= $v['fund_id']?>)]</li>
                 <?php endforeach; ?>
                 </ul>
                 <?php elseif(!empty($md->suppinfo)) : ?>
@@ -445,7 +479,7 @@ endforeach;
             <a class="jiathis_counter_style"></a>
         </div>
         <!-- JiaThis Button END -->
-        </div>
+        
     </div>
 </div>
 <script src="/js/metadata-view.js"></script>
@@ -520,4 +554,4 @@ var bound = {
 	<p>没有找到对应的元数据。</p>
 <?php endif;?>
 </div>	
-<!--<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/hiwater/list.phtml

@@ -5,16 +5,16 @@ $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->heihe.'</a>');
+$this->breadcrumb('<a href="/hiwater/">'.$this->config->title->hiwater.'</a>');
 $this->breadcrumb('数据列表');
 $this->breadcrumb()->setSeparator(' > ');
 $this->theme->AppendPlus($this,'colorbox');
 ?>
 <div class="row">
-    <div class="span2">
+    <div class="span3">
     	<?= $this->partial('hiwater/navi.phtml'); ?>
     </div>
-    <div class="span10">
+    <div class="span9">
     <div><?= $this->breadcrumb() ?> </div>
         <div id="intro"></div>
         <?php if ($this->metadata) : ?>
@@ -22,12 +22,12 @@ $this->theme->AppendPlus($this,'colorbox');
         <ol class="md-list">
             <?php foreach($this->metadata as $md) : ?>
             <li>
-            <a href="/heihe/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a> 
+            <a href="/hiwater/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a> 
             <span class="pull-right">
             [<a class="colorbox" href="/service/bigthumb/uuid/<?php echo $md['uuid']; ?>" title="<?php echo $md['title']; ?>"><i class="icon-facetime-video"></i>缩略图幻灯片</a>]
-            [<a href="/service/pdf/review/1/uuid/<?php echo $md['uuid']; ?>"><i class="icon-file"></i>PDF版本下载</a>]
+            [<a href="/service/pdf/uuid/<?php echo $md['uuid']; ?>"><i class="icon-file"></i>PDF版本下载</a>]
-            [<a href="/service/odt/review/1/uuid/<?php echo $md['uuid']; ?>"><i class="icon-book"></i>ODT版本下载</a>]
+            [<a href="/service/odt/uuid/<?php echo $md['uuid']; ?>"><i class="icon-book"></i>ODT版本下载</a>]
-            [<a href="/service/doc/review/1/uuid/<?php echo $md['uuid']; ?>"><i class="icon-list-alt"></i>DOC版本下载</a>]
+            [<a href="/service/doc/uuid/<?php echo $md['uuid']; ?>"><i class="icon-list-alt"></i>DOC版本下载</a>]
             </span>
             </li>
             <?php endforeach; ?>

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

@@ -46,9 +46,16 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
             <ol>
             <?php foreach($this->mcitation as $ref) :
             if (empty($ref->link))
-                echo '<li>'.$ref->reference.'</li>';
+			{
+                echo '<li>'.$ref->reference;
+				echo '<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a>';
+				if(!empty($ref->attid)) {
+					echo ' <a href="/service/attach/id/'.$ref->attid.'"><i class="icon-download text-success"></i>下载</a>';
+				}
+				echo "</li>";
+			}
             else
-                echo '<li>'.$ref->reference.' <a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a></li>';
+                echo '<li>'.$ref->reference.'<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a> <a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a></li>';
             endforeach;
             ?>
             </ol>
@@ -69,27 +76,61 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
 			?> (下载引用：<a href="/service/ris/lang/cn/uuid/<?php echo $md->uuid; ?>">RIS格式</a> | <a href="/service/ris/lang/en/uuid/<?php echo $md->uuid; ?>">RIS英文格式</a> | <a href="/service/bibtex/lang/cn/uuid/<?php echo $md->uuid; ?>">Bibtex格式</a> | <a href="/service/bibtex/lang/en/uuid/<?php echo $md->uuid; ?>">Bibtex英文格式</a>)</p>
         	<?php endif; endif; endif; if ($this->ref) : ?>
             <hr />
-            <h4><i class="icon-eye-open text-success"></i>建议参考文献</h4>
+            <h4><i class="icon-eye-open text-success"></i>相关文献（作者推荐）</h4>
             <ol>
             <?php foreach($this->ref as $ref) :
+            echo '<li>'.$ref->reference;
+	    echo '<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a>';
             if (empty($ref->link))
-                echo '<li>'.$ref->reference.'</li>';
+            { 
-            else
+			if(!empty($ref->attid)) 
-                echo '<li>'.$ref->reference.' <a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a></li>';
+				echo '<a href="/service/attach/id/'.$ref->attid.'"><i class="icon-download text-success"></i>下载</a>';
+	}else{ 
+		echo '<a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a>';
+	}
+	echo "</li>";
             endforeach;
             ?>
             </ol>
-			<?php endif; ?>	
+	<?php endif; if ($this->themeref) :?>	
-            <?php if ($this->userref) : ?>
+
             <hr />
-            <h4>数据用户发表文献</h4>
+            <h4><i class="icon-eye-open text-success"></i>专题文献</h4>
+            <ol>
+            <?php foreach($this->themeref as $ref) :
+            echo '<li>'.$ref->reference;
+	    echo '<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a>';
+            if (empty($ref->link))
+            { 
+			if(!empty($ref->attid)) 
+				echo ' | <a href="/service/attach/id/'.$ref->attid.'"><i class="icon-download text-success"></i>下载</a>';
+			}else{ 
+				echo ' | <a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a>';
+			}
+			echo "</li>";
+            endforeach;
+            ?>
+            </ol>
+            <?php endif; if ($this->userref) : ?>
+            <hr />
+            <h4><i class="icon-eye-open text-success"></i>数据施引文献</h4>
             <ol>
             <?php foreach($this->userref as $ref) :
+            echo '<li>'.$ref->reference;
+	    echo '<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a>';
             if (empty($ref->link))
-                echo '<li>'.$ref->reference.'</li>';
+            { 
-            else
+			if(!empty($ref->attid)) 
-                echo '<li>'.$ref->reference.' <a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a></li>';
+				echo '<a href="/service/attach/id/'.$ref->attid.'"><i class="icon-download text-success"></i>下载</a>';
+			}else{ 
+				echo '<a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a>';
+			}
+			echo "</li>";
             endforeach;
+	    if (count($this->userref)==15)
+	    {
+		echo '<a class="btn btn-success pull-right" href="/knowledge/user/uuid/'.$md->uuid.'" ><i class="icon-info-sign"></i>更多施引文献</a>';	
+	    }	    
             ?>
             </ol>
         	<?php endif; ?>
@@ -122,7 +163,7 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
                 <?php if(!empty($this->fund)) : ?>
                 <ul>
 				<?php foreach($this->fund as $k=>$v) : ?>
-                	<li><?= $v['fund_type'] ?>：<?= $v['title'] ?>(项目编号:<?= $v['fund_id']?>) [<?= $v['fund_type_en'] ?>(No. <?= $v['fund_id']?>)]</li>
+                	<li><?= $v['fund_type'] ?>：<a href="/data/fund/id/<?= $v['id'] ?>"><?= $v['title'] ?></a>(项目编号:<?= $v['fund_id']?>) [<?= $v['fund_type_en'] ?>(No. <?= $v['fund_id']?>)]</li>
                 <?php endforeach; ?>
                 </ul>
                 <?php elseif(!empty($md->suppinfo)) : ?>

application/default/views/scripts/knowledge/author.phtml

@@ -5,7 +5,7 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/mdreview.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/knowledge">知识积累</a>');
-$this->breadcrumb('数据作者');
+$this->breadcrumb('作者推荐文献库');
 $this->breadcrumb()->setSeparator(' > ');
 $this->headScript()->appendFile('/js/jquery.colorbox-min.js');
 $this->headLink()->appendStylesheet('/css/colorbox.css');	
@@ -16,20 +16,23 @@ $this->headLink()->appendStylesheet('/css/colorbox.css');
     </div>
     <div class="span9">
     	<div id="content">
-        	<h2>数据作者文献库</h2>
+        	<h2>作者推荐文献库</h2>
             <div>
             <?php if (count($this->paginator)): ?> 
-            <ul>
+            <ol start="<?php echo ($this->paginator->getCurrentPageNumber() - 1) * $this->paginator->getItemCountPerPage()+1; ?>">
             <?php foreach ($this->paginator as $item): ?>
-            <li> <?php echo $item['reference']; ?> 
+            <li> <?php echo $item['reference'];
-            <?php if (!empty($item['link'])) : 
+	    echo ' <a href="/knowledge/paper/id/'.$item['id'].'"><i class="icon-info-sign text-success"></i>查看</a>';
+	    if (!empty($item['link'])) : 
                 echo ' <a href="'.$item['link'].'">下载</a>';
+		else :
+		  if (!empty($item['attid'])) echo ' <a href="/service/attach/id/'.$item['attid'].'"><i class="icon-download text-success"></i>下载</a>';
                 endif;		
             ?>
-             <a class="btn btn-mini btn-info" href="javascript:;" onclick="showdata('<?php echo $item['id'];?>',0)">相关数据</a>
+             <a href="javascript:;" onclick="showdata('<?php echo $item['id'];?>',0)"><i class="icon-external-link text-success"></i>相关数据</a>
             </li>
             <?php endforeach;	?>
-            </ul>
+            </ol>
             <div class="pagenavi"><?= $this->paginator; ?></div>
             <?php endif; ?>	
             </div>

application/default/views/scripts/knowledge/datacenter.phtml

@@ -17,16 +17,21 @@ $this->breadcrumb()->setSeparator(' > ');
         	<h2>数据中心文献库</h2>
             <div>
             <?php if (count($this->paginator)): ?> 
-            <ul>
+            <ol start="<?php echo ($this->paginator->getCurrentPageNumber() - 1) * $this->paginator->getItemCountPerPage()+1; ?>">
             <?php foreach ($this->paginator as $item): ?>
-            <li> <?php echo $item['reference']; ?> 
+            <li> <?php
-            <?php if (!empty($item['link'])) : 
+			if ($item['reftype']==1) echo '<span class="label label-info">数据中心施引文献</span>';
+			echo $item['reference'];
+	    echo ' <a href="/knowledge/paper/id/'.$item['id'].'"><i class="icon-info-sign text-success"></i>查看</a>';
+	    if (!empty($item['link'])) : 
                 echo ' <a href="'.$item['link'].'">下载</a>';
+		else :
+		  if (!empty($item['attid'])) echo ' <a href="/service/attach/id/'.$item['attid'].'"><i class="icon-download text-success"></i>下载</a>';
                 endif;		
             ?>
             </li>
             <?php endforeach;	?>
-            </ul>
+            </ol>
             <div class="pagenavi"><?= $this->paginator; ?></div>
             <?php endif; ?>	
             </div>

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

@@ -10,16 +10,6 @@ $this->breadcrumb()->setSeparator(' > ');
 <div class="row">
 	<div class="span3">
         <?= $this->partial('knowledge/navi.phtml'); ?>
-<div class="sidebar-nav bs-review-nav">        
-    <ul class="nav nav-list bs-review-sidenav">
-        <li> <a href="http://seekspace.resip.ac.cn/handle/2239/1" target="_blank"><i class="icon-share"></i>西部计划资源</a> </li>
-        <li> <a href="http://seekspace.resip.ac.cn/handle/2239/2" target="_blank"><i class="icon-share"></i>环境与生态科学期刊资源 </a> </li>
-        <li> <a href="http://seekspace.resip.ac.cn/handle/2239/12" target="_blank"><i class="icon-share"></i>环境与生态科学信息网关 </a> </li>
-        <li> <a href="http://seekspace.resip.ac.cn/handle/2239/13" target="_blank"><i class="icon-share"></i>环境与生态科学开放知识资源 </a> </li>
-        <li> <a href="http://seekspace.resip.ac.cn/handle/2239/2460" target="_blank"><i class="icon-share"></i>西部环境与生态科学文献库 </a> </li>
-        <li> <a href="http://seekspace.resip.ac.cn/handle/2239/23662" target="_blank"><i class="icon-share"></i>黑河流域研究 </a>  </li>
-    </ul>
-	</div>
 	</div>
 	<div class="span9">
  <div id="myCarousel" class="carousel slide">
@@ -27,10 +17,32 @@ $this->breadcrumb()->setSeparator(' > ');
     <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
     <li data-target="#myCarousel" data-slide-to="1"></li>
     <li data-target="#myCarousel" data-slide-to="2"></li>
+    <li data-target="#myCarousel" data-slide-to="3"></li>
     </ol>
     <!-- Carousel items -->
     <div class="carousel-inner">
-    <div class="active item hero-unit"><h2>西部计划文献库</h2>
+    <div class="active item hero-unit">
+    <h2>数据施引文献库</h2>
+    <p>数据施引文献库是数据用户在使用科学数据后公开发表在科技期刊上的文献，由用户自发通知数据中心、数据作者收集和数据中心集中手机三种方式进行收集整理。</p>
+    <p>从数据用户的文献库中，可以挖掘出更多的知识，了解用户是如何使用数据中心提供的科学数据。数据作者也可以从其中获取到数据相关的趋势性知识。
+    数据中心也欢迎用户提供更多的公开发表成果，我们将持续更新其内容，以满足数据的深层挖掘，实现学术信息进行搜索、发现、聚集和再组织。</p>
+    <p><a class="btn btn-primary" href="/knowledge/user">查看 &raquo;</a></p>
+    </div>
+    <div class="item hero-unit">
+    <h2>作者推荐文献库</h2>
+    <p>作者推荐文献库是对发布在数据中心的科学数据的作者所推荐的和其数据相关的科技文献，主要是由数据作者发表的、和其数据紧密相关的科学文献。</p>
+    <p>用户可以通过数据作者的文献库中挖掘出对应的数据信息，实现从文献到数据的一个知识挖掘。将数据中心所有的数据作者文献构建一个和数据紧密相关的知识库，可以供用户更好的了解和发现数据和知识。
+    支持用户对数据作者的学术信息进行搜索、发现、聚集和再组织。</p>
+    <p><a class="btn btn-primary" href="/knowledge/author">查看 &raquo;</a></p>
+    </div>
+    <div class="item hero-unit">
+    <h2>WATER文献库</h2>
+    <p>WATER文献库是对由WATER项目所相关的科技文献，包括WATER项目自身发表的文献以及WATER数据用户所发表的文献。</p>
+    <p>用户可以通过WATER文献库中挖掘出对应的数据信息，实现从文献到数据的一个知识挖掘。将数据中心所有的数据作者文献构建一个和数据紧密相关的知识库，可以供用户更好的了解和发现数据和知识。
+    支持用户对数据作者的学术信息进行搜索、发现、聚集和再组织。</p>
+    <p><a class="btn btn-primary" href="/knowledge/water">查看 &raquo;</a></p>
+    </div>
+    <div class="item hero-unit"><h2>西部计划文献库</h2>
     <div class="span3"><a href="http://seekspace.resip.ac.cn" target="_blank"> <img alt="中国（西部）环境与生态科学知识积累平台" src="/images/ssimg.jpg" /></a></div>
     <p>旨在发展和形成一个支持环境与生态科学领域开放学术信息的自助存档、交流和发现的领域知识平台。
     首先，实现对国家自然科学基金委组织实施的“中国西部环境与生态科学研究计划”历年来所支持的研究项目和课题所产生的有重要科研和学术价值的知识产出进行统一组织和管理，
@@ -38,20 +50,6 @@ $this->breadcrumb()->setSeparator(' > ');
     特别是对有重要学术影响的研究性数字知识库所涉及的环境与生态科学领域的学术信息进行搜索、发现、聚集和再组织。</p>
     <p><a class="btn btn-primary" href="/knowledge/westplan">查看 &raquo;</a> <a class="btn btn-info" href="http://seekspace.resip.ac.cn">访问seekspace &raquo;</a></p>
     </div>
-    <div class="item hero-unit">
-    <h2>数据作者文献库</h2>
-    <p>数据作者文献库是对发布在数据中心的科学数据中相关的参考文献，主要是由数据作者发表的、和其数据紧密相关的科学文献。</p>
-    <p>用户可以通过数据作者的文献库中挖掘出对应的数据信息，实现从文献到数据的一个知识挖掘。将数据中心所有的数据作者文献构建一个和数据紧密相关的知识库，可以供用户更好的了解和发现数据和知识。
-    支持用户对数据作者的学术信息进行搜索、发现、聚集和再组织。</p>
-    <p><a class="btn btn-primary" href="/knowledge/author">查看 &raquo;</a></p>
-    </div>
-    <div class="item hero-unit">
-    <h2>数据用户文献库</h2>
-    <p>数据用户文献库是数据用户在使用科学数据后公开发表在科技期刊上的文献，由用户自发通知数据中心、数据作者收集和数据中心集中手机三种方式进行收集整理。</p>
-    <p>从数据用户的文献库中，可以挖掘出更多的知识，了解用户是如何使用数据中心提供的科学数据。数据作者也可以从其中获取到数据相关的趋势性知识。
-    数据中心也欢迎用户提供更多的公开发表成果，我们将持续更新其内容，以满足数据的深层挖掘，实现学术信息进行搜索、发现、聚集和再组织。</p>
-    <p><a class="btn btn-primary" href="/knowledge/user">查看 &raquo;</a></p>
-    </div>
     </div>
     <!-- Carousel nav -->
     <a class="carousel-control left" href="#myCarousel" data-slide="prev">&lsaquo;</a>

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

@@ -1,25 +1,16 @@
 <div class="sidebar-nav bs-review-nav">
     <ul class="nav nav-list bs-review-sidenav">
         <li id="Nav-knowledge-index"><a href="/knowledge/"><i class="icon-chevron-right"></i>介绍</a></li>
-        <li id="Nav-knowledge-westplan"><a href="/knowledge/westplan"><i class="icon-chevron-right"></i>西部计划文献库</a></li>
+        <li id="Nav-knowledge-user"><a href="/knowledge/user"><i class="icon-chevron-right"></i>数据施引文献库</a></li>
-        <li id="Nav-knowledge-author"><a href="/knowledge/author"><i class="icon-chevron-right"></i>数据作者文献库</a></li>
+        <li id="Nav-knowledge-author"><a href="/knowledge/author"><i class="icon-chevron-right"></i>作者推荐文献库</a></li>
-        <li id="Nav-knowledge-user"><a href="/knowledge/user"><i class="icon-chevron-right"></i>数据用户文献库</a></li>
+        <li id="Nav-knowledge-water"><a href="/knowledge/water"><i class="icon-chevron-right"></i>WATER文献库</a></li>
         <li id="Nav-knowledge-datacenter"><a href="/knowledge/datacenter"><i class="icon-chevron-right"></i>数据中心文献库</a></li>
+        <li id="Nav-knowledge-westplan"><a href="/knowledge/westplan"><i class="icon-chevron-right"></i>西部计划文献库</a></li>
     </ul>
 </div>
 <form class="form-search"  id="search" enctype="application/x-www-form-urlencoded" action="/knowledge/search" method="get">
     <div class="input-append">
     <input class="span2" id="q" name="q" type="text"  value="<?php echo (empty($this->key))?'':$this->key; ?>" placeholder="搜索作者和标题">
     <button type="submit" class="btn">搜索</button>
-    <div class="form-actions">
-    <label class="radio">
-<input type="radio" name="searchsource" id="datasource" value="datasource" <?php echo ($this->source=='datasource')?'checked':''; ?>>
-数据文献库
-</label>
-<label class="radio">
-<input type="radio" name="searchsource" id="westsource" value="westsource" <?php echo ($this->source=='datasource')?'':'checked'; ?>>
-西部计划文献库
-</label>
-</div>
     </div>
 </form>

application/default/views/scripts/knowledge/paper.phtml

@@ -0,0 +1,105 @@
+<?php
+$this->headTitle($this->config->title->site);
+$this->headTitle('知识积累');
+$this->headTitle()->setSeparator(' - ');
+$this->headLink()->appendStylesheet('/css/mdreview.css');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/knowledge">知识积累</a>');
+$this->breadcrumb('文章查看');
+$this->breadcrumb()->setSeparator(' > ');
+$this->headScript()->appendFile('/js/jquery.colorbox-min.js');
+$this->headLink()->appendStylesheet('/css/colorbox.css');	
+?>
+<div class="row">
+	<div class="span3">
+		<?= $this->partial('knowledge/navi.phtml'); ?>
+	</div>
+	<div class="span9">
+	<div id="content">
+    	<?php if(!empty($this->paper['title'])){ ?>
+        	<h3><?php echo $this->paper['title']; ?></h3>
+        	<hr />
+        <?php } ?>
+        <?php if($this->author) : ?>
+        <h4>作者</h4>
+		<ul>
+			<?php foreach($this->author as $a) : ?>
+            <li><?php echo $a['lastname'];if (!empty($a['firstname'])) echo ', '.$a['firstname']; ?> 【<a href="/knowledge/search/author/<?php echo $a['id']; ?>/place/<?php echo $a['place']; ?>">所有文章</a>】</li>
+            <?php endforeach; ?>
+		</ul>
+        <hr />
+        <?php endif; ?>
+        
+		<?php if ($this->paper['abstract']){ ?>
+			<h4>摘要</h4>
+			<p><?php echo $this->paper['abstract']; ?></p>
+            <hr />
+        <?php } ?>
+        
+        <?php if(count($this->tag) > 0) { ?>
+            <h4>关键词</h4>
+            <ul>
+                <?php foreach($this->tag as $t) : ?>
+                <li><?php echo $t['tag']; ?></li>
+                <?php endforeach; ?>
+            </ul>
+            <hr />
+        <?php } ?>
+        
+        <?php if(!empty($this->paper['reference'])) { ?>
+        	<h4>引用方式</h4>
+            <blockquote>
+            	<?php echo $this->paper['reference']; ?> 	
+            </blockquote>
+            <hr />
+        <?php } ?>
+		
+        <div>
+        <?php
+			if (empty($this->paper['link']))
+			{ 
+				if(!empty($this->paper['attid'])) 
+				{
+					echo '<a href="/service/attach/id/'.$this->paper['attid'].'"><i class="icon-download text-success"></i>PDF下载</a>';
+				}
+			}else{
+				echo '<a href="'.$this->paper['link'].'"><i class="icon-download text-success"></i>PDF下载</a>';
+			}
+
+             if (!empty($this->paper['ris'])) : 
+                    echo ' <a href="/service/ris/id/'.$this->paper['id'].'"><i class="icon-download text-success"></i>RIS下载</a>';
+             endif;
+        ?>
+        <a href="javascript:;" onclick="showdata('<?php echo $this->paper['id'];?>',0)"><i class="icon-external-link text-success"></i>相关数据（共<span id="referenceDataCount">？</span>条）</a>
+                
+        </div>
+        
+        </div><!-- content -->
+    </div>
+</div>
+<script type="text/javascript" >
+$('#Nav-knowledge-user').addClass('active');
+</script>
+<script>
+function showdata(id,page){
+	var url="/service/refdatalist/id/"+id;
+	$.ajax({
+		'type':"GET",
+		'url':url,
+		'data':'page='+page,
+		'dataType':'html',
+		'success':function(html){$.colorbox({'html':html,'innerHeight':230});}
+	});
+}
+function displayDataCount()
+{
+	$.ajax({
+		'type':"GET",
+		'url':"/service/refdatacount/id/<?php echo $this->paper['id'];?>",
+		'data':'',
+		'dataType':'html',
+		'success':function(html){$('#referenceDataCount').html(html)}
+	});
+}
+displayDataCount();
+</script>

application/default/views/scripts/knowledge/search-data.phtml

@@ -19,17 +19,20 @@ $this->headLink()->appendStylesheet('/css/colorbox.css');
         	<h2>数据文献搜索</h2>
             <div>
             <?php if (count($this->paginator)): ?> 
-            <ul>
+            <ol start="<?php echo ($this->paginator->getCurrentPageNumber() - 1) * $this->paginator->getItemCountPerPage()+1; ?>">
             <?php foreach ($this->paginator as $item): ?>
-            <li> <?php echo $item['reference']; ?> 
+            <li> <?php echo $item['reference'];
-            <?php if (!empty($item['link'])) : 
+	    echo ' <a href="/knowledge/paper/id/'.$item['id'].'"><i class="icon-info-sign text-success"></i>查看</a>';
-                echo ' <a class="btn btn-mini btn-inverse" href="'.$item['link'].'">下载</a>';
+	    if (!empty($item['link'])) : 
+                echo ' <a href="'.$item['link'].'">下载</a>';
+		else :
+		  if (!empty($item['attid'])) echo ' <a href="/service/attach/id/'.$item['attid'].'"><i class="icon-download text-success"></i>下载</a>';
                 endif;		
             ?>
-             <a class="btn btn-mini btn-info" href="javascript:;" onclick="showdata('<?php echo $item['id'];?>',0)">相关数据</a>
+             <a href="javascript:;" onclick="showdata('<?php echo $item['id'];?>',0)"><i class="icon-external-link text-success"></i>相关数据</a>
             </li>
             <?php endforeach;	?>
-            </ul>
+            </ol>
             <div class="pagenavi"><?= $this->paginator; ?></div>
             <?php endif; ?>	
             </div>

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

@@ -43,7 +43,7 @@ $('#Nav-knowledge-westplan').addClass('active');
 </script>
 <script>
 function showdata(id,page){
-	var url="/service/tagdatalist/id/"+id;
+	var url="/service/refdatalist/id/"+id;
 	$.ajax({
 		'type':"GET",
 		'url':url,

application/default/views/scripts/knowledge/user.phtml

@@ -5,7 +5,7 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/mdreview.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/knowledge">知识积累</a>');
-$this->breadcrumb('数据用户');
+$this->breadcrumb('数据施引文献库');
 $this->breadcrumb()->setSeparator(' > ');
 $this->headScript()->appendFile('/js/jquery.colorbox-min.js');
 $this->headLink()->appendStylesheet('/css/colorbox.css');	
@@ -16,20 +16,27 @@ $this->headLink()->appendStylesheet('/css/colorbox.css');
     </div>
     <div class="span9">
     	<div id="content">
-        	<h2>数据用户文献库</h2>
+        	<h2>数据施引文献库</h2>
+		<?php if ($this->md) :
+		echo '<h3><a href="/data/'.$this->md['uuid'].'"><i class="icon-folder-open text-success"></i>'.$this->md['title'].'</a></h3>';
+		endif;
+		?>
             <div>
             <?php if (count($this->paginator)): ?> 
-            <ul>
+            <ol start="<?php echo ($this->paginator->getCurrentPageNumber() - 1) * $this->paginator->getItemCountPerPage()+1; ?>">
             <?php foreach ($this->paginator as $item): ?>
-            <li> <?php echo $item['reference']; ?> 
+            <li> <?php echo $item['reference'];
-            <?php if (!empty($item['link'])) : 
+	    echo ' <a href="/knowledge/paper/id/'.$item['id'].'"><i class="icon-info-sign text-success"></i>查看</a>';
+	    if (!empty($item['link'])) : 
                 echo ' <a href="'.$item['link'].'">下载</a>';
+		else :
+		  if (!empty($item['attid'])) echo ' <a href="/service/attach/id/'.$item['attid'].'"><i class="icon-download text-success"></i>下载</a>';
                 endif;		
             ?>
-             <a class="btn btn-mini btn-info" href="javascript:;" onclick="showdata('<?php echo $item['id'];?>',0)">相关数据</a>
+             <a href="javascript:;" onclick="showdata('<?php echo $item['id'];?>',0)"><i class="icon-external-link text-success"></i>相关数据</a>
             </li>
             <?php endforeach;	?>
-            </ul>
+            </ol>
             <div class="pagenavi"><?= $this->paginator; ?></div>
             <?php endif; ?>	
             </div>

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

@@ -0,0 +1,56 @@
+<?php
+$this->headTitle($this->config->title->site);
+$this->headTitle('知识积累');
+$this->headTitle()->setSeparator(' - ');
+$this->headLink()->appendStylesheet('/css/mdreview.css');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/knowledge">知识积累</a>');
+$this->breadcrumb('WATER文献库');
+$this->breadcrumb()->setSeparator(' > ');
+$this->headScript()->appendFile('/js/jquery.colorbox-min.js');
+$this->headLink()->appendStylesheet('/css/colorbox.css');	
+?>
+<div class="row">
+	<div class="span3">
+        <?= $this->partial('knowledge/navi.phtml'); ?>
+    </div>
+    <div class="span9">
+    	<div id="content">
+        	<h2>WATER文献库</h2>
+            <div>
+            <?php if (count($this->paginator)): ?> 
+            <ol start="<?php echo ($this->paginator->getCurrentPageNumber() - 1) * $this->paginator->getItemCountPerPage()+1; ?>">
+            <?php foreach ($this->paginator as $item): ?>
+            <li> <?php echo $item['reference'];
+	    echo ' <a href="/knowledge/paper/id/'.$item['id'].'"><i class="icon-info-sign text-success"></i>查看</a>';
+	    if (!empty($item['link'])) : 
+                echo ' <a href="'.$item['link'].'">下载</a>';
+		else :
+		  if (!empty($item['attid'])) echo ' <a href="/service/attach/id/'.$item['attid'].'"><i class="icon-download text-success"></i>下载</a>';
+                endif;		
+            ?>
+	<a href="javascript:;" onclick="showdata('<?php echo $item['id'];?>',0)"><i class="icon-external-link text-success"></i>相关数据</a>
+            </li>
+            <?php endforeach;	?>
+            </ol>
+            <div class="pagenavi"><?= $this->paginator; ?></div>
+            <?php endif; ?>	
+            </div>
+        </div>
+    </div>
+</div>
+<script type="text/javascript" >
+$('#Nav-knowledge-water').addClass('active');
+</script>
+<script>
+function showdata(id,page){
+	var url="/service/refdatalist/id/"+id;
+	$.ajax({
+		'type':"GET",
+		'url':url,
+		'data':'page='+page,
+		'dataType':'html',
+		'success':function(html){$.colorbox({'html':html,'innerHeight':230});}
+	});
+}
+</script>

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

@@ -23,10 +23,10 @@ h3.gs_rt{font-size:110%;}
 </style>
 	<?= $this->render('breadcrumbs.phtml'); ?>
 <?php $md=$this->metadata;if ($md):?>
-<h3><?php echo $this->escape($md->title);
+	<h3><?php echo $this->escape($md->title);
-if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
+	if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
-</h3>
+	</h3>
-<hr />
+	<hr />
 <div class="row">
 	<div class="span8">
     	<div>
@@ -36,39 +36,75 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
         </p>	
         </div>
         <div>
-			<?php if ($md->citation) : ?>
+	<?php if ($md->citation) : ?>
             <hr />
             <h4><i class="icon-quote-left muted"></i>本数据引用方式<a class="btn btn-danger pull-right" href="/archives/help/platform/archive-23.html" ><i class="icon-comment"></i>数据引用帮助</a></h4>
 			<p><?php  if (empty($md->datadoi) || !strpos($md->citation,$md->datadoi)) : ?><span class="label label-info">文章的引用</span>
 			<?php endif; echo $this->escape($md->citation);?></p>
-            <?php  if (!empty($md->datadoi) && !strpos($md->citation,$md->datadoi)) : ?>
+        <?php  if (!empty($md->datadoi) && !strpos($md->citation,$md->datadoi)) : ?>
-			<p><span class="label label-info">数据的引用</span><?php
+			<p><span class="label label-info">数据的引用</span>
+	<?php
 			echo substr($md->authors,1,-1).'. '.$md->title.'. '.$md->publisher.', '.$md->publish_year.'. doi:'.$md->doi;
 			echo ' ['.substr($md->author_en,1,-1).'. '.$md->title_en.'. '.$md->publisher_en.', '.(empty($md->ts_published)?$md->publish_year:date('Y',strtotime($md->ts_published))).'. doi:'.$md->doi.']';
 			?> (下载引用：<a href="/service/ris/lang/cn/uuid/<?php echo $md->uuid; ?>">RIS格式</a> | <a href="/service/ris/lang/en/uuid/<?php echo $md->uuid; ?>">RIS英文格式</a> | <a href="/service/bibtex/lang/cn/uuid/<?php echo $md->uuid; ?>">Bibtex格式</a> | <a href="/service/bibtex/lang/en/uuid/<?php echo $md->uuid; ?>">Bibtex英文格式</a>)</p>
-        	<?php endif; endif; if ($this->ref) : ?>
+        	<?php endif;
+	endif;  if ($this->ref) : ?>
             <hr />
-            <h4><i class="icon-eye-open text-success"></i>建议参考文献</h4>
+            <h4><i class="icon-eye-open text-success"></i>相关文献（作者推荐）</h4>
             <ol>
             <?php foreach($this->ref as $ref) :
+            echo '<li>'.$ref->reference;
+	    echo '<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a>';
             if (empty($ref->link))
-                echo '<li>'.$ref->reference.'</li>';
+            { 
-            else
+			if(!empty($ref->attid)) 
-                echo '<li>'.$ref->reference.' <a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a></li>';
+				echo '<a href="/service/attach/id/'.$ref->attid.'"><i class="icon-download text-success"></i>下载</a>';
+	}else{ 
+		echo '<a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a>';
+	}
+	echo "</li>";
             endforeach;
             ?>
             </ol>
-			<?php endif; ?>	
+	<?php endif; if ($this->themeref) :?>	
-            <?php if ($this->userref) : ?>
+
             <hr />
-            <h4>数据用户发表文献</h4>
+            <h4><i class="icon-eye-open text-success"></i>专题文献</h4>
+            <ol>
+            <?php foreach($this->themeref as $ref) :
+            echo '<li>'.$ref->reference;
+	    echo '<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a>';
+            if (empty($ref->link))
+            { 
+			if(!empty($ref->attid)) 
+				echo ' | <a href="/service/attach/id/'.$ref->attid.'"><i class="icon-download text-success"></i>下载</a>';
+			}else{ 
+				echo ' | <a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a>';
+			}
+			echo "</li>";
+            endforeach;
+            ?>
+            </ol>
+            <?php endif; if ($this->userref) : ?>
+            <hr />
+            <h4><i class="icon-eye-open text-success"></i>数据施引文献</h4>
             <ol>
             <?php foreach($this->userref as $ref) :
+            echo '<li>'.$ref->reference;
+	    echo '<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a>';
             if (empty($ref->link))
-                echo '<li>'.$ref->reference.'</li>';
+            { 
-            else
+			if(!empty($ref->attid)) 
-                echo '<li>'.$ref->reference.' <a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a></li>';
+				echo '<a href="/service/attach/id/'.$ref->attid.'"><i class="icon-download text-success"></i>下载</a>';
+			}else{ 
+				echo '<a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a>';
+			}
+			echo "</li>";
             endforeach;
+	    if (count($this->userref)==15)
+	    {
+		echo '<a class="btn btn-success pull-right" href="/knowledge/user/uuid/'.$md->uuid.'" ><i class="icon-info-sign"></i>更多施引文献</a>';	
+	    }	    
             ?>
             </ol>
         	<?php endif; ?>
@@ -101,7 +137,7 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
                 <?php if(!empty($this->fund)) : ?>
                 <ul>
 				<?php foreach($this->fund as $k=>$v) : ?>
-                	<li><?= $v['fund_type'] ?>：<?= $v['title'] ?>(项目编号:<?= $v['fund_id']?>) [<?= $v['fund_type_en'] ?>(No. <?= $v['fund_id']?>)]</li>
+                	<li><?= $v['fund_type'] ?>：<a href="/data/fund/id/<?= $v['id'] ?>"><?= $v['title'] ?></a>(项目编号:<?= $v['fund_id']?>) [<?= $v['fund_type_en'] ?>(No. <?= $v['fund_id']?>)]</li>
                 <?php endforeach; ?>
                 </ul>
                 <?php elseif(!empty($md->suppinfo)) : ?>

application/models/CustomControllerAclManager.php

@@ -1,4 +1,8 @@
 <?php
+
+use Users\Member;
+use Users\Account;
+use Helpers\View as view;
     class CustomControllerAclManager extends Zend_Controller_Plugin_Abstract
     {
         // default user role if not logged or (or invalid role found)
@@ -32,7 +36,7 @@
 			$this->acl->deny(null, 'author');
             // add an exception so guests can log in or register
             // in order to gain privilege
-			  $this->acl->allow('guest', 'account', array('login',
+			  $this->acl->allow('guest', 'account', array('login','oauth2login','callback',
 			  							'logout',
 										'captcha',
 			                          'fetchpwd',
@@ -72,31 +76,23 @@
 			 
 			if(!$this->auth->hasIdentity())
 			{
-				$mb = new member();
+				$member = new Member();
-				$mb->db=$this->db;
+				
-				if($mb->checkcookie())
+				if($member->checkcookie())
 				{
-					$auth = Zend_Auth::getInstance();
+					$data = array(
-					$authAdapter = new Zend_Auth_Adapter_DbTable($this->db);
+						'username' => $member->user,
-					$authAdapter->setTableName('users')
+						'password' => $member->srpwd
-										->setIdentityColumn('username')
+					);
-										->setCredentialColumn('password');
-					$authAdapter->setIdentity($mb->user)->setCredential($mb->srpwd);
-					$result = $auth->authenticate($authAdapter);
-					if ($result->isValid()) {  	
-						 $data = $authAdapter->getResultRowObject(null,'password');
-						 //头像
-						 include_once("Avatar.php");
-						 $avatar = new Avatar();
-						 $data->avatar = $avatar->Get($data->email,40);
 
-						 //组ID
+					$account = new Account();
-						 include_once("Users.php");
+					$status = $account->storeLogin($data,false);
-						 $usr = new Users($this->db);
-						 $data->gid = $usr->getGroup($data->id);
 					
-						 $auth->getStorage()->write($data);
+					if(isset($status['error']))
-						 $this->db->query("update users set ts_last_login=now() where username=?",array($mb->user));
+					{
+						$auth = Zend_Auth::getInstance();
+						$auth->clearIdentity();
+						Member::flushcookie();
 					}
 				}
 			}