diff --git a/application/default/controllers/ReviewController.php b/application/default/controllers/ReviewController.php
index b6af7f2d..67557b69 100644
--- a/application/default/controllers/ReviewController.php
+++ b/application/default/controllers/ReviewController.php
@@ -29,239 +29,71 @@ class ReviewController extends Zend_Controller_Action
 	}
 	
 	function myreviewAction(){
-		
-		$keyword = $this->_request->getParam('q');
-		$search = $this->_request->getParam('search');
-		
-		try{
-			$auth = Zend_Auth::getInstance();
-			if($auth->hasIdentity())
-			{
-				$user = $auth->getIdentity();
-				$uid = $user->id;
-			}
-			else
-			{
-				$this->_redirect('/account/login/?href=/review/myreview');
-			}
-			
-			$sql = "select md.title,md.uuid,md.id,md.description,s.status from metadata md left join mdstatus s on md.uuid=s.uuid 
-			where md.uuid in (select uuid from mdexpertreview er where er.id=$uid 
-			union select uuid from mdreview r where r.userid=$uid)"; 
-			
-			if(!empty($keyword) && !empty($search))
-			{
-				if (preg_match("/[<|>|#|$|%|^|*|(|)|{|}|'|\"|;|:]/i",$keyword) || !is_numeric($search))
-				{
-					$this->messenger->addMessage('您的输入的搜索条件包含非法请求，请不要输入特殊符号');
-					$this->_redirect('/review/myreview');
-				}//非法请求过滤
-				$this->view->keyword = $keyword;
-				$sql.= " and md.title like '%$keyword%' ";
-								// e.g. (... or md.author like '%keyword%')
-			}
-			
-			$rs = $this->db->query($sql);
-			$rows = $rs->fetchAll();
-			
-			foreach($rows as $k=>$v)
-			{
-				$rows[$k]['status']=$this->rewritestatus($v['status']);
-			}
-			
-			$paginator = Zend_Paginator::factory($rows);
-			$paginator->setCurrentPageNumber($this->_getParam('page'));
-			$paginator->setItemCountPerPage($this->view->config->page->max);
-			$paginator->setView($this->view);
-			Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
-			$this->view->paginator=$paginator;
-		}catch(Exception $e){
-			$this->messenger->addMessage('查询失败，请稍后重试 :(');
-			$this->_redirect('/review/myreview');
-		}
-		
+		$auth = Zend_Auth::getInstance();
+		if($auth->hasIdentity())
+		{
+			$user = $auth->getIdentity();
+			$uid = $user->id;
+		}else{
+			$this->_redirect('/account/login/?href=/review/myreview');
+		}
+		$page=@(int)$this->_request->getParam('page');
+		if (empty($page)) $page=1;
+		$offset=$this->limit*($page-1);
+		$row=$this->db->fetchAll("select count(s.*) from mdstatus s left join normalmetadata m on s.uuid=m.uuid where m.uuid in (select uuid from mdexpertreview er where er.id=$uid union select uuid from mdreview r where r.userid=$uid)");
+		$sum=$row[0]['count'];
+    	$sql="select m.uuid,m.title,m.id,m.description,s.status,s.ts_accepted,s.ts_finished,g.id as gid,t.filename from mdstatus s left join normalmetadata m on s.uuid=m.uuid left join geonetworkmetadata g on g.uuid=m.uuid left join thumbnail t on t.id=m.id where m.uuid in (select uuid from mdexpertreview er where er.id=$uid union select uuid from mdreview r where r.userid=$uid) order by s.ts_created desc,m.title limit ? offset ?";
+		$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
+    	$this->view->page=new Pagination($sum,$page,$this->limit);	
+		foreach($this->view->metadata as $k=>$v)
+		{
+			$this->view->metadata[$k]['statustext']=$this->rewritestatus($v['status']);
+		}	
 	}//我参审的
 	
 	function draftAction(){
-		
-		$keyword = $this->_request->getParam('q');
-		$search = $this->_request->getParam('search');
-		
-		try{
-			
-			$wheresql = array();
-			$wheresql[]=" ms.status=0 ";
-			
-			if(!empty($keyword) && !empty($search))
-			{
-				if (preg_match("/[<|>|#|$|%|^|*|(|)|{|}|'|\"|;|:]/i",$keyword) || !is_numeric($search))
-				{
-					$this->messenger->addMessage('您的输入的搜索条件包含非法请求，请不要输入特殊符号');
-					$this->_redirect('/review/draft');
-				}//非法请求过滤
-				$this->view->keyword = $keyword;
-				$wheresql[] = " md.title like '%$keyword%' ";
-			}
-			
-			$wheresql = join(' and ',$wheresql);
-			
-			$sql = "select ms.uuid,ms.status,ms.ts_created,md.title,md.author from mdstatus ms
-					left join metadata md on md.uuid=ms.uuid
-					where $wheresql";
-			
-			$rs = $this->db->query($sql);
-			$rows = $rs->fetchAll();
-			
-			$paginator = Zend_Paginator::factory($rows);
-			$paginator->setCurrentPageNumber($this->_getParam('page'));
-			$paginator->setItemCountPerPage($this->view->config->page->max);
-			$paginator->setView($this->view);
-			Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
-			$this->view->paginator=$paginator;
-			
-		}catch(Exception $e){
-			$this->messenger->addMessage('查询失败，请稍后重试 :(');
-			$this->_redirect('/review/draft');
-		}
-		
+		$page=@(int)$this->_request->getParam('page');
+		if (empty($page)) $page=1;
+		$offset=$this->limit*($page-1);
+		$row=$this->db->fetchAll("select count(s.*) from mdstatus s left join metadata m on s.uuid=m.uuid where s.status in (0)");
+		$sum=$row[0]['count'];
+    	$sql="select m.uuid,m.title,m.id,m.description,s.status,s.ts_created,g.id as gid,t.filename from mdstatus s left join metadata m on s.uuid=m.uuid left join geonetworkmetadata g on g.uuid=m.uuid left join thumbnail t on t.id=m.id where s.status in (0) order by s.ts_created desc,m.title limit ? offset ?";
+		$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
+    	$this->view->page=new Pagination($sum,$page,$this->limit);			
 	}//最新收稿
 	
 	function acceptAction(){
-		
-		$keyword = $this->_request->getParam('q');
-		$search = $this->_request->getParam('search');
-		
-		try{
-			
-			$wheresql = array();
-			$wheresql[]=" ms.status=1 ";
-			
-			if(!empty($keyword) && !empty($search))
-			{
-				if (preg_match("/[<|>|#|$|%|^|*|(|)|{|}|'|\"|;|:]/i",$keyword) || !is_numeric($search))
-				{
-					$this->messenger->addMessage('您的输入的搜索条件包含非法请求，请不要输入特殊符号');
-					$this->_redirect('/review/draft');
-				}//非法请求过滤
-				$this->view->keyword = $keyword;
-				$wheresql[] = " md.title like '%$keyword%' ";
-			}
-			
-			$wheresql = join(' and ',$wheresql);
-			
-			$sql = "select ms.uuid,ms.status,ms.ts_created,md.title,md.author from mdstatus ms
-					left join metadata md on md.uuid=ms.uuid
-					where $wheresql";
-			
-			$rs = $this->db->query($sql);
-			$rows = $rs->fetchAll();
-			
-			$paginator = Zend_Paginator::factory($rows);
-			$paginator->setCurrentPageNumber($this->_getParam('page'));
-			$paginator->setItemCountPerPage($this->view->config->page->max);
-			$paginator->setView($this->view);
-			Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
-			$this->view->paginator=$paginator;
-			
-		}catch(Exception $e){
-			$this->messenger->addMessage('查询失败，请稍后重试 :(');
-			$this->_redirect('/review/draft');
-		}
-		
+		$page=@(int)$this->_request->getParam('page');
+		if (empty($page)) $page=1;
+		$offset=$this->limit*($page-1);
+		$row=$this->db->fetchAll("select count(s.*) from mdstatus s left join normalmetadata m on s.uuid=m.uuid where s.status in (1)");
+		$sum=$row[0]['count'];
+    	$sql="select m.uuid,m.title,m.id,m.description,s.status,s.ts_accepted,g.id as gid,t.filename from mdstatus s left join normalmetadata m on s.uuid=m.uuid left join geonetworkmetadata g on g.uuid=m.uuid left join thumbnail t on t.id=m.id where s.status in (1) order by s.ts_created desc,m.title limit ? offset ?";
+		$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
+    	$this->view->page=new Pagination($sum,$page,$this->limit);	
 	}//最新收稿
 	
 	function inreviewAction(){
-		
-		$keyword = $this->_request->getParam('q');
-		$search = $this->_request->getParam('search');
-		
-		try{
-			
-			$wheresql = array();
-			$wheresql[]=" ms.status in (2,3,4) ";
-			
-			if(!empty($keyword) && !empty($search))
-			{
-				if (preg_match("/[<|>|#|$|%|^|*|(|)|{|}|'|\"|;|:]/i",$keyword) || !is_numeric($search))
-				{
-					$this->messenger->addMessage('您的输入的搜索条件包含非法请求，请不要输入特殊符号');
-					$this->_redirect('/review/inreview');
-				}//非法请求过滤
-				$this->view->keyword = $keyword;
-				$wheresql[] = " md.title like '%$keyword%' ";
-			}
-			
-			$wheresql = join(' and ',$wheresql);
-			
-			$sql = "select ms.uuid,ms.status,ms.ts_created,md.title,md.author from mdstatus ms
-					left join metadata md on md.uuid=ms.uuid
-					where $wheresql";
-			
-			$rs = $this->db->query($sql);
-			$rows = $rs->fetchAll();
-			
-			foreach($rows as $k=>$v)
-			{
-				$rows[$k]['status']=$this->rewritestatus($v['status']);
-			}
-			
-			$paginator = Zend_Paginator::factory($rows);
-			$paginator->setCurrentPageNumber($this->_getParam('page'));
-			$paginator->setItemCountPerPage($this->view->config->page->max);
-			$paginator->setView($this->view);
-			Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
-			$this->view->paginator=$paginator;
-			
-		}catch(Exception $e){
-			$this->messenger->addMessage('查询失败，请稍后重试 :(');
-			$this->_redirect('/review/inreview');
-		}
-		
+		$page=@(int)$this->_request->getParam('page');
+		if (empty($page)) $page=1;
+		$offset=$this->limit*($page-1);
+		$row=$this->db->fetchAll("select count(s.*) from mdstatus s left join normalmetadata m on s.uuid=m.uuid where s.status in (2,3,4)");
+		$sum=$row[0]['count'];
+    	$sql="select m.uuid,m.title,m.id,m.description,s.status,s.ts_accepted,g.id as gid,t.filename from mdstatus s left join normalmetadata m on s.uuid=m.uuid left join geonetworkmetadata g on g.uuid=m.uuid left join thumbnail t on t.id=m.id where s.status in (2,3,4) order by s.ts_created desc,m.title limit ? offset ?";
+		$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
+    	$this->view->page=new Pagination($sum,$page,$this->limit);
 	}//在审阶段的元数据
 	
 	
 	function reviewedAction(){
-			
-		$keyword = $this->_request->getParam('q');
-		$search = $this->_request->getParam('search');
-		
-		try{
-			
-			$wheresql = array();
-			$wheresql[]=" ms.status=5 ";
-			
-			if(!empty($keyword) && !empty($search))
-			{
-				if (preg_match("/[<|>|#|$|%|^|*|(|)|{|}|'|\"|;|:]/i",$keyword) || !is_numeric($search))
-				{
-					$this->messenger->addMessage('您的输入的搜索条件包含非法请求，请不要输入特殊符号');
-					$this->_redirect('/review/reviewed');
-				}//非法请求过滤
-				$this->view->keyword = $keyword;
-				$wheresql[] = " md.title like '%$keyword%' ";
-			}
-			
-			$wheresql = join(' and ',$wheresql);
-			
-			$sql = "select ms.uuid,ms.status,ms.ts_created,ts_finished,md.title,md.author from mdstatus ms
-					left join metadata md on md.uuid=ms.uuid
-					where $wheresql";
-			
-			$rs = $this->db->query($sql);
-			$rows = $rs->fetchAll();
-			
-			$paginator = Zend_Paginator::factory($rows);
-			$paginator->setCurrentPageNumber($this->_getParam('page'));
-			$paginator->setItemCountPerPage($this->view->config->page->max);
-			$paginator->setView($this->view);
-			Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
-			$this->view->paginator=$paginator;
-			
-		}catch(Exception $e){
-			$this->messenger->addMessage('查询失败，请稍后重试 :(');
-			$this->_redirect('/review/reviewed');
-		}
-		
+		$page=@(int)$this->_request->getParam('page');
+		if (empty($page)) $page=1;
+		$offset=$this->limit*($page-1);
+		$row=$this->db->fetchAll("select count(s.*) from mdstatus s left join normalmetadata m on s.uuid=m.uuid where s.status in (5)");
+		$sum=$row[0]['count'];
+    	$sql="select m.uuid,m.title,m.id,m.description,s.status,s.ts_finished,g.id as gid,t.filename from mdstatus s left join normalmetadata m on s.uuid=m.uuid left join geonetworkmetadata g on g.uuid=m.uuid left join thumbnail t on t.id=m.id where s.status in (5) order by s.ts_created desc,m.title limit ? offset ?";
+		$this->view->metadata=$this->db->fetchAll($sql,array($this->limit,$offset));
+    	$this->view->page=new Pagination($sum,$page,$this->limit);
 	}//已完成评审的元数据
 	
 	
diff --git a/application/default/views/scripts/review/accept.phtml b/application/default/views/scripts/review/accept.phtml
index 081cf0f2..6b4a0af4 100644
--- a/application/default/views/scripts/review/accept.phtml
+++ b/application/default/views/scripts/review/accept.phtml
@@ -1,57 +1,47 @@
 <?php
-$config = Zend_Registry::get('config');
-$this->headTitle($config->title->site);
-$this->headTitle($config->title->mdreview);
-$this->headTitle()->setSeparator(' - ');
-$this->headLink()->appendStylesheet('/css/mdreview.css');
-$this->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/review">元数据评审</a>');
-$this->breadcrumb()->setSeparator(' > ');
+$this->headTitle($this->config->title->site);
+$this->headTitle($this->config->title->review);
+$this->headTitle('接收元数据');
+$this->headTitle()->setSeparator(' - ');
+$this->headLink()->appendStylesheet('/css/mdreview.css');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/review">'.$this->config->title->review.'</a>');
+$this->breadcrumb('接收元数据');
+$this->breadcrumb()->setSeparator(' > ');
+$this->headScript()->appendFile('/js/pubfunc.js');
 ?>
-<div id='rightPanel'>
-
-<?php if ($this->msg or $this->messages) :?>
-<div class="box box-info">
-<?php if ($this->msg) : ?>
-   <?php echo $this->msg; ?>
-<?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
-<?php echo $msg; ?>
-<?php endforeach;endif; ?>
-<script language="javascript">
-setTimeout("document.getElementsByClassName('box-info').remove(0)",5000); 
-</script>
-</div>
-<?php endif; ?>
-
-<h3>最新收稿的元数据:</h3>
-
-<form action="/review/draft" method="GET">
-<input class="q" type="text" id="q" name="q" value="<?php echo $this->keyword;?>" />
-<input type="hidden" name="search" value="1" />
-<input type="submit" class="btn" value="搜索" /></form>
-
-<table class="stylized">
-	<thead>
-    	<tr>
-			<th>元数据标题</th>
-			<th>操作</th>
-		</tr>
-    </thead>
- 	<tbody>
-	<?php
-    if (count($this->paginator)): 
-        $autoindex=0;
-        foreach ($this->paginator as $item): 
-        $autoindex++;?>
-        <tr class="<?php if($autoindex%2 == 0) echo 'even'; else echo 'odd'; ?>">
-        <td> <img src="/images/westdc_20w.gif" /> <a href="<?php echo $item['uuid'];?>"><?php echo $item['title'];?></a></td>
-        <td>
-            <a href="/review/review/uuid/<?php echo $item['uuid'];?>">评审</a> <a href="/data/<?php echo $item['uuid'];?>">查看</a>
-        </td>
-        </tr>
-    <?php endforeach; endif; ?>
-	</tbody>
-</table>
-<div class="pagenavi"><?= $this->paginator; ?></div>
-
-</div>
\ No newline at end of file
+<div id='sidebar'>
+<div id='leftnavi'>
+<?= $this->partial('review/navi.phtml'); ?>
+</div>
+</div>
+<?php if (!empty($this->metadata)) : ?>
+<div id='mdlist'>
+<?php echo $this->page->getNavigation(); ?>
+<hr />
+<?php foreach($this->metadata as $md) : 
+   	$thumburl='/gndata/'.sprintf('%05d',floor(($md['gid']+0.1)/100)*100).'-'.sprintf('%05d',ceil(($md['gid']+0.1)/100)*100-1)."/".$md['gid'];
+    	$thumburl.='/public/'.str_replace('_s.','.',$md['filename']);	
+?>
+ <div class="thumbmd"> 
+ <div class="thumbtitle">
+ <a href="/data/<?php echo $md['uuid'];?>"><?php echo $this->escape($md['title']); ?> </a>【接收时间：<?php echo date('Y-m-d',strtotime($md['ts_accepted'])); ?>】
+ <?php if ($md['status']!=5) : ?>
+ <a href="/review/review/uuid/<?php echo $md['uuid'];?>"><img src="/images/review.png" alt="查看评审页" title="进行数据评审"></a>
+ <?php endif; ?>
+ </div>
+ 
+ <img class="thumbimg" 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']);?>"
+  onclick="fnCreate('<?php echo $thumburl; ?>')" />
+ 
+ </div>     
+<?php endforeach; ?>
+</div>
+<hr class="clear"/>
+<?php echo $this->page->getNavigation(); 
+else :
+?>
+<div>
+<p>当前没有对应元数据。</p>
+</div>
+<?php endif; ?>
\ No newline at end of file
diff --git a/application/default/views/scripts/review/draft.phtml b/application/default/views/scripts/review/draft.phtml
index f5b12c29..79f2b40d 100644
--- a/application/default/views/scripts/review/draft.phtml
+++ b/application/default/views/scripts/review/draft.phtml
@@ -1,57 +1,44 @@
 <?php
-$config = Zend_Registry::get('config');
-$this->headTitle($config->title->site);
-$this->headTitle($config->title->mdreview);
-$this->headTitle()->setSeparator(' - ');
-$this->headLink()->appendStylesheet('/css/mdreview.css');
-$this->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/review">元数据评审</a>');
-$this->breadcrumb()->setSeparator(' > ');
+$this->headTitle($this->config->title->site);
+$this->headTitle($this->config->title->review);
+$this->headTitle('投稿元数据');
+$this->headTitle()->setSeparator(' - ');
+$this->headLink()->appendStylesheet('/css/mdreview.css');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/review">'.$this->config->title->review.'</a>');
+$this->breadcrumb('投稿元数据');
+$this->breadcrumb()->setSeparator(' > ');
+$this->headScript()->appendFile('/js/pubfunc.js');
 ?>
-<div id='rightPanel'>
-
-<?php if ($this->msg or $this->messages) :?>
-<div class="box box-info">
-<?php if ($this->msg) : ?>
-   <?php echo $this->msg; ?>
-<?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
-<?php echo $msg; ?>
-<?php endforeach;endif; ?>
-<script language="javascript">
-setTimeout("document.getElementsByClassName('box-info').remove(0)",5000); 
-</script>
-</div>
-<?php endif; ?>
-
-<h3>最新收稿的元数据:</h3>
-
-<form action="/review/draft" method="GET">
-<input class="q" type="text" id="q" name="q" value="<?php echo $this->keyword;?>" />
-<input type="hidden" name="search" value="1" />
-<input type="submit" class="btn" value="搜索" /></form>
-
-<table class="stylized">
-	<thead>
-    	<tr>
-			<th>元数据标题</th>
-			<th>收稿时间</th>
-		</tr>
-    </thead>
- 	<tbody>
-	<?php
-    if (count($this->paginator)): 
-        $autoindex=0;
-        foreach ($this->paginator as $item): 
-        $autoindex++;?>
-        <tr class="<?php if($autoindex%2 == 0) echo 'even'; else echo 'odd'; ?>">
-        <td> <img src="/images/westdc_20w.gif" /> <a href="/data/<?php echo $item['uuid'];?>"><?php echo $item['title'];?></a></td>
-        <td>
-            <?php echo date("Y-m-d H:i",strtotime($item['ts_created']));?>
-        </td>
-        </tr>
-    <?php endforeach; endif; ?>
-	</tbody>
-</table>
-<div class="pagenavi"><?= $this->paginator; ?></div>
-
-</div>
\ No newline at end of file
+<div id='sidebar'>
+<div id='leftnavi'>
+<?= $this->partial('review/navi.phtml'); ?>
+</div>
+</div>
+<?php if (!empty($this->metadata)) : ?>
+<div id='mdlist'>
+<?php echo $this->page->getNavigation(); ?>
+<hr />
+<?php foreach($this->metadata as $md) : 
+   	$thumburl='/gndata/'.sprintf('%05d',floor(($md['gid']+0.1)/100)*100).'-'.sprintf('%05d',ceil(($md['gid']+0.1)/100)*100-1)."/".$md['gid'];
+    	$thumburl.='/public/'.str_replace('_s.','.',$md['filename']);	
+?>
+ <div class="thumbmd"> 
+ <div class="thumbtitle">
+ <?php echo $this->escape($md['title']); ?>【投稿时间：<?php echo date('Y-m-d',strtotime($md['ts_created'])); ?>】
+ </div>
+ 
+ <img class="thumbimg" 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']);?>"
+  onclick="fnCreate('<?php echo $thumburl; ?>')" />
+ 
+ </div>     
+<?php endforeach; ?>
+</div>
+<hr class="clear"/>
+<?php echo $this->page->getNavigation(); 
+else :
+?>
+<div>
+<p>当前没有对应元数据。</p>
+</div>
+<?php endif; ?>
\ No newline at end of file
diff --git a/application/default/views/scripts/review/inreview.phtml b/application/default/views/scripts/review/inreview.phtml
index f1fb42ed..1e04e283 100644
--- a/application/default/views/scripts/review/inreview.phtml
+++ b/application/default/views/scripts/review/inreview.phtml
@@ -1,59 +1,47 @@
 <?php
-$config = Zend_Registry::get('config');
-$this->headTitle($config->title->site);
-$this->headTitle($config->title->mdreview);
-$this->headTitle()->setSeparator(' - ');
-$this->headLink()->appendStylesheet('/css/mdreview.css');
-$this->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/review">元数据评审</a>');
-$this->breadcrumb()->setSeparator(' > ');
+$this->headTitle($this->config->title->site);
+$this->headTitle($this->config->title->review);
+$this->headTitle('在审元数据');
+$this->headTitle()->setSeparator(' - ');
+$this->headLink()->appendStylesheet('/css/mdreview.css');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/review">'.$this->config->title->review.'</a>');
+$this->breadcrumb('在审元数据');
+$this->breadcrumb()->setSeparator(' > ');
+$this->headScript()->appendFile('/js/pubfunc.js');
 ?>
-<div id='rightPanel'>
-
-<?php if ($this->msg or $this->messages) :?>
-<div class="box box-info">
-<?php if ($this->msg) : ?>
-   <?php echo $this->msg; ?>
-<?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
-<?php echo $msg; ?>
-<?php endforeach;endif; ?>
-<script language="javascript">
-setTimeout("document.getElementsByClassName('box-info').remove(0)",5000); 
-</script>
-</div>
-<?php endif; ?>
-
-<h3>目前在审的元数据:</h3>
-
-<form action="/review/inreview" method="GET">
-<input class="q" type="text" id="q" name="q" value="<?php echo $this->keyword;?>" />
-<input type="hidden" name="search" value="1" />
-<input type="submit" class="btn" value="搜索" /></form>
-
-<table class="stylized">
-	<thead>
-    	<tr>
-			<th>元数据标题</th>
-			<th>收稿时间</th>
-            <th>状态</th>
-		</tr>
-    </thead>
- 	<tbody id="datas">
-	<?php
-    if (count($this->paginator)): 
-        foreach ($this->paginator as $item): 
-        ?>
-        <tr>
-        <td> <img src="/images/westdc_20w.gif" /> <a href="/review/review/uuid/<?php echo $item['uuid'];?>"><?php echo $item['title'];?></a></td>
-        <td>
-            <?php echo date("Y-m-d",strtotime($item['ts_created']));?>
-        </td>
-        <td>
-            <?php echo $item['status'];?>
-        </td>
-        </tr>
-    <?php endforeach; endif; ?>
-	</tbody>
-</table>
-<div class="pagenavi"><?= $this->paginator; ?></div>
-</div>
\ No newline at end of file
+<div id='sidebar'>
+<div id='leftnavi'>
+<?= $this->partial('review/navi.phtml'); ?>
+</div>
+</div>
+<?php if (!empty($this->metadata)) : ?>
+<div id='mdlist'>
+<?php echo $this->page->getNavigation(); ?>
+<hr />
+<?php foreach($this->metadata as $md) : 
+   	$thumburl='/gndata/'.sprintf('%05d',floor(($md['gid']+0.1)/100)*100).'-'.sprintf('%05d',ceil(($md['gid']+0.1)/100)*100-1)."/".$md['gid'];
+    	$thumburl.='/public/'.str_replace('_s.','.',$md['filename']);	
+?>
+ <div class="thumbmd"> 
+ <div class="thumbtitle">
+ <a href="/data/<?php echo $md['uuid'];?>"><?php echo $this->escape($md['title']); ?> </a> 【接收时间：<?php echo date('Y-m-d',strtotime($md['ts_accepted'])); ?>】
+ <?php if ($md['status']!=5) : ?>
+ <a href="/review/review/uuid/<?php echo $md['uuid'];?>"><img src="/images/review.png" alt="查看评审页" title="进行数据评审"></a>
+ <?php endif; ?>
+ </div>
+ 
+ <img class="thumbimg" 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']);?>"
+  onclick="fnCreate('<?php echo $thumburl; ?>')" />
+ 
+ </div>     
+<?php endforeach; ?>
+</div>
+<hr class="clear"/>
+<?php echo $this->page->getNavigation(); 
+else :
+?>
+<div>
+<p>当前没有对应元数据。</p>
+</div>
+<?php endif; ?>
\ No newline at end of file
diff --git a/application/default/views/scripts/review/myreview.phtml b/application/default/views/scripts/review/myreview.phtml
index e6da9caa..15dbb70d 100644
--- a/application/default/views/scripts/review/myreview.phtml
+++ b/application/default/views/scripts/review/myreview.phtml
@@ -1,61 +1,50 @@
-<?php
-$this->headTitle($this->config->title->site);
-$this->headTitle($this->config->title->mdreview);
-$this->headTitle()->setSeparator(' - ');
-$this->headLink()->appendStylesheet('/css/mdreview.css');
-$this->headScript()->appendFile('/js/jquery-1.6.4.min.js');
-$this->headScript()->appendFile('/js/jquery.masonry.min.js');
-$this->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/review">元数据评审</a>');
-$this->breadcrumb('我参审的元数据');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-<div id='myreview'>
-
-<?php if ($this->msg or $this->messages) :?>
-<div class="box box-info">
-<?php if ($this->msg) : ?>
-   <?php echo $this->msg; ?>
-<?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
-<?php echo $msg; ?>
-<?php endforeach;endif; ?>
-<script language="javascript">
-setTimeout("document.getElementsByClassName('box-info').remove(0)",5000); 
-</script>
-</div>
-<?php endif; ?>
-
-<h3>我参审的元数据:</h3>
-
-<form action="/review/myreview" method="GET">
-<input class="q" type="text" id="q" name="q" value="<?php echo $this->keyword;?>" />
-<input type="hidden" name="search" value="1" />
-<input type="submit" class="btn" value="搜索" /></form>
-
-<div class="wapper">
-	<?php if (count($this->paginator)): ?>
-        <ul id="container" style="width:100%">
-        <?php foreach ($this->paginator as $item): ?> 
-		<li class="items">
-         <img class="thumb" src="/service/thumb/id/<?php echo $item['id'];?>" width="180" />
-         <a href="/data/<?php echo $item['uuid'];?>"><?php echo $item['title'];?></a>
-         <br />状态：<?php echo $item['status'];?>
-		 <br /><a href="/review/review/uuid/<?php echo $item['uuid'];?>"><img src="/images/review.png" alt="查看评审页" title="进行数据评审"></a>
-		</li>
-    	<?php endforeach;?>
-    	</ul>
-    <?php endif; ?>
-</div>
-<div class="pagenavi"><?= $this->paginator; ?></div>
-
-</div>
-<script>
-var $tumblelog = $('#container');
-$tumblelog.imagesLoaded(function(){
-  $tumblelog.masonry({
-	itemSelector: '.items',
-    columnWidth: 240
-  });
-});
-$(".items").mouseover(function(){$(this).addClass("hover")}).mouseout(function(){$(this).removeClass("hover")})
-</script>
\ No newline at end of file
+<?php
+$this->headTitle($this->config->title->site);
+$this->headTitle($this->config->title->review);
+$this->headTitle('我参审的元数据');
+$this->headTitle()->setSeparator(' - ');
+$this->headLink()->appendStylesheet('/css/mdreview.css');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/review">'.$this->config->title->review.'</a>');
+$this->breadcrumb('我参审的元数据');
+$this->breadcrumb()->setSeparator(' > ');
+$this->headScript()->appendFile('/js/pubfunc.js');
+?>
+<div id='sidebar'>
+<div id='leftnavi'>
+<?= $this->partial('review/navi.phtml'); ?>
+</div>
+</div>
+<?php if (!empty($this->metadata)) : ?>
+<div id='mdlist'>
+<?php echo $this->page->getNavigation(); ?>
+<hr />
+<?php foreach($this->metadata as $md) : 
+   	$thumburl='/gndata/'.sprintf('%05d',floor(($md['gid']+0.1)/100)*100).'-'.sprintf('%05d',ceil(($md['gid']+0.1)/100)*100-1)."/".$md['gid'];
+    	$thumburl.='/public/'.str_replace('_s.','.',$md['filename']);	
+?>
+ <div class="thumbmd"> 
+ <div class="thumbtitle">
+ <a href="/data/<?php echo $md['uuid'];?>"><?php echo $this->escape($md['title']); ?> </a>【状态：<?php echo $md['statustext']; ?>】
+ <?php if ($md['status']!=5) : ?>
+ <a href="/review/review/uuid/<?php echo $md['uuid'];?>"><img src="/images/review.png" alt="查看评审页" title="进行数据评审"></a>
+ <?php else : ?>
+ 【接收时间：<?php echo date('Y-m-d',strtotime($md['ts_accepted'])); ?>
+ 审结时间：<?php echo date('Y-m-d',strtotime($md['ts_finished'])); ?>】
+ <?php endif; ?>
+ </div>
+ 
+ <img class="thumbimg" 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']);?>"
+  onclick="fnCreate('<?php echo $thumburl; ?>')" />
+ 
+ </div>     
+<?php endforeach; ?>
+</div>
+<hr class="clear"/>
+<?php echo $this->page->getNavigation(); 
+else :
+?>
+<div>
+<p>当前没有对应元数据。</p>
+</div>
+<?php endif; ?>
\ No newline at end of file
diff --git a/application/default/views/scripts/review/reviewed.phtml b/application/default/views/scripts/review/reviewed.phtml
index 142690f3..afcd2e39 100644
--- a/application/default/views/scripts/review/reviewed.phtml
+++ b/application/default/views/scripts/review/reviewed.phtml
@@ -1,58 +1,47 @@
 <?php
-$this->headTitle($this->config->title->site);
-$this->headTitle($this->config->title->review);
-$this->headTitle()->setSeparator(' - ');
-$this->headLink()->appendStylesheet('/css/mdreview.css');
-$this->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/review">元数据评审</a>');
-$this->breadcrumb()->setSeparator(' > ');
+$this->headTitle($this->config->title->site);
+$this->headTitle($this->config->title->review);
+$this->headTitle('审结元数据');
+$this->headTitle()->setSeparator(' - ');
+$this->headLink()->appendStylesheet('/css/mdreview.css');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/review">'.$this->config->title->review.'</a>');
+$this->breadcrumb('审结元数据');
+$this->breadcrumb()->setSeparator(' > ');
+$this->headScript()->appendFile('/js/pubfunc.js');
 ?>
-<div id='rightPanel'>
-
-<?php if ($this->msg or $this->messages) :?>
-<div class="box box-info">
-<?php if ($this->msg) : ?>
-   <?php echo $this->msg; ?>
-<?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
-<?php echo $msg; ?>
-<?php endforeach;endif; ?>
-<script language="javascript">
-setTimeout("document.getElementsByClassName('box-info').remove(0)",5000); 
-</script>
-</div>
-<?php endif; ?>
-
-<h3>已经通过审核的元数据:</h3>
-
-<form action="/review/reviewed" method="GET">
-<input class="q" type="text" id="q" name="q" value="<?php echo $this->keyword;?>" />
-<input type="hidden" name="search" value="1" />
-<input type="submit" class="btn" value="搜索" /></form>
-
-<table class="stylized">
-	<thead>
-    	<tr>
-			<th>元数据标题</th>
-            <th>评审结束时间</th>
-            <th>操作</th>
-		</tr>
-    </thead>
- 	<tbody>
-	<?php
-    if (count($this->paginator)): 
-        $autoindex=0;
-        foreach ($this->paginator as $item): 
-        $autoindex++;?>
-        <tr class="<?php if($autoindex%2 == 0) echo 'even'; else echo 'odd'; ?>">
-        <td> <img src="/images/westdc_20w.gif" /> <a href="/data/<?php echo $item['uuid'];?>"><?php echo $item['title'];?></a></td>
-        <td>
-            <?php echo date("Y-m-d",strtotime($item['ts_finished']));?>
-        </td>
-        <td><a href="/review/review/uuid/<?php echo $item['uuid'];?>">查看评审页</a></td>
-        </tr>
-    <?php endforeach; endif; ?>
-	</tbody>
-</table>
-<div class="pagenavi"><?= $this->paginator; ?></div>
-
-</div>
\ No newline at end of file
+<div id='sidebar'>
+<div id='leftnavi'>
+<?= $this->partial('review/navi.phtml'); ?>
+</div>
+</div>
+<?php if (!empty($this->metadata)) : ?>
+<div id='mdlist'>
+<?php echo $this->page->getNavigation(); ?>
+<hr />
+<?php foreach($this->metadata as $md) : 
+   	$thumburl='/gndata/'.sprintf('%05d',floor(($md['gid']+0.1)/100)*100).'-'.sprintf('%05d',ceil(($md['gid']+0.1)/100)*100-1)."/".$md['gid'];
+    	$thumburl.='/public/'.str_replace('_s.','.',$md['filename']);	
+?>
+ <div class="thumbmd"> 
+ <div class="thumbtitle">
+ <a href="/data/<?php echo $md['uuid'];?>"><?php echo $this->escape($md['title']); ?> </a>【接收时间：<?php echo date('Y-m-d',strtotime($md['ts_finished'])); ?>】
+ <?php if ($md['status']!=5) : ?>
+ <a href="/review/review/uuid/<?php echo $md['uuid'];?>"><img src="/images/review.png" alt="查看评审页" title="进行数据评审"></a>
+ <?php endif; ?>
+ </div>
+ 
+ <img class="thumbimg" 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']);?>"
+  onclick="fnCreate('<?php echo $thumburl; ?>')" />
+ 
+ </div>     
+<?php endforeach; ?>
+</div>
+<hr class="clear"/>
+<?php echo $this->page->getNavigation(); 
+else :
+?>
+<div>
+<p>当前没有对应元数据。</p>
+</div>
+<?php endif; ?>
\ No newline at end of file