diff --git a/application/default/controllers/AuthorController.php b/application/default/controllers/AuthorController.php
index 83480790..1f4dde7d 100644
--- a/application/default/controllers/AuthorController.php
+++ b/application/default/controllers/AuthorController.php
@@ -1406,6 +1406,89 @@ class AuthorController extends Zend_Controller_Action
 		}
    }
 
-   
+   function versionAction()
+   {
+	   $ac = $this->_request->getParam('ac');
+	   $uuid = $this->_request->getParam('uuid');
+	   
+	   $auth = Zend_Auth::getInstance();
+		if($auth->hasIdentity())
+		{
+			$user = $auth->getIdentity();
+			$u_id = $user->id;
+		}
+	   
+	   if (!empty($uuid) && empty($ac))
+	   {
+	   	//view the versions of the data
+			$sql = "SELECT md.title,md.uuid,v.ts_created,v.changelog,v.userid,v.id FROM mdversion v
+					LEFT JOIN metadata md ON md.uuid=v.uuid
+					LEFT JOIN mdauthor a ON md.uuid=a.uuid
+					WHERE md.title IS NOT NULL AND a.userid=? and v.uuid=?
+					order by v.ts_created desc
+					";
+			$sth = $this->db->prepare($sql);
+			$sth->execute(array($u_id,$uuid));
+			$rows = $sth->fetchAll();
+			@$this->view->mdtitle=$rows[0]['title'];
+			
+			$paginator = Zend_Paginator::factory($rows);
+			$paginator->setCurrentPageNumber($this->_getParam('page'));
+			$paginator->setItemCountPerPage(15);
+			$paginator->setView($this->view);
+			Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
+			$this->view->paginator=$paginator;	   	
+	   }
+	   else if((empty($ac) && empty($uuid))|| $ac=='list')
+	   {
+			$sql = "SELECT md.title,md.uuid,v.ts_created,v.changelog,v.userid,v.id FROM mdversion v
+					LEFT JOIN metadata md ON md.uuid=v.uuid
+					LEFT JOIN mdauthor a ON md.uuid=a.uuid
+					WHERE md.title IS NOT NULL AND a.userid=?
+					order by v.ts_created desc
+					";
+			$sth = $this->db->prepare($sql);
+			$sth->execute(array($u_id));
+			$rows = $sth->fetchAll();
+			
+			
+			$paginator = Zend_Paginator::factory($rows);
+			$paginator->setCurrentPageNumber($this->_getParam('page'));
+			$paginator->setItemCountPerPage(15);
+			$paginator->setView($this->view);
+			Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
+			$this->view->paginator=$paginator;			
+	   }
+	   else if($ac=="bydata")
+	   {
+	   	$keywords = $this->_request->getParam('q');
+			if(!empty($keywords))
+				$this->view->q = $keywords;
+			$sql = "SELECT md.title,md.uuid,count(v.id) as c FROM mdversion v
+					LEFT JOIN metadata md ON md.uuid=v.uuid
+					LEFT JOIN mdauthor a ON md.uuid=a.uuid
+					WHERE md.title IS NOT NULL AND a.userid=?";
+			if(!empty($keywords))
+			{
+				$search=new Search($keywords);
+				$where=$search->sql_expr(array("md.title","md.description"));
+				$sql.=' and '.$where;
+			}
+			$sql.=" group by md.uuid,md.title";
+
+			$sth = $this->db->prepare($sql);
+			$sth->execute(array($u_id));
+			$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;
+		   
+			$this->_helper->viewRenderer('version-bydata');
+	   }
+   }// versionAction() 数据版本管理   
 }
 
diff --git a/application/default/views/scripts/author/version-bydata.phtml b/application/default/views/scripts/author/version-bydata.phtml
new file mode 100644
index 00000000..733fa6c3
--- /dev/null
+++ b/application/default/views/scripts/author/version-bydata.phtml
@@ -0,0 +1,53 @@
+<?php
+$this->headTitle($this->config->title->site);
+$this->headTitle($this->config->title->author);
+$this->headTitle()->setSeparator(' - ');
+$this->headScript()->appendFile('/js/jquery-1.7.min.js');
+$this->headLink()->appendStylesheet('/css/author.css');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/author">数据作者</a>');
+$this->breadcrumb('数据版本管理');
+$this->breadcrumb()->setSeparator(' > ');
+?>
+<!-- 左侧导航 -->
+<div id='sidebar'>
+    <div id='leftnavi'>
+    <?= $this->partial('author/navi.phtml'); ?>
+    </div>
+</div>
+<!-- //左侧导航 -->
+
+<!-- 页面内容 -->
+<div id="wapper">
+	<div id="tabs-controller">
+		<ul>
+			<li class="box-shadow"><a class="text-shadow" href="/author/version/">所有版本概况</a></li>
+         <li class="box-shadow active"><a class="text-shadow" href="/author/version/ac/bydata">逐数据浏览</a></li>
+		</ul>
+	</div> 
+	<p>请输入元数据标题关键字进行搜索</p>
+	<form id="datasearch" class="search_form" action="/author/version/ac/bydata">
+    	<input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />
+        <button type="submit" class="btn" id="search_btn">搜索</button>
+    </form>
+    <div id="datalist">
+    	<?php
+		if (count($this->paginator)): 
+		echo "<ul>";
+			$autoindex=0;
+			foreach ($this->paginator as $item): 
+			$autoindex++;?>
+			<li>
+            	<p><a href="/data/<?php echo $item['uuid'];?>" target="_blank"><?php echo $item['title'];?></a></p>
+               <p>数据库中共有版本数：<?php echo $item['c'];?> (<a href="/author/version/uuid/<?php echo $item['uuid'];?>">查看详细</a>)</p>
+            </li>
+		<?php endforeach; 
+		echo "</ul>";
+		endif; ?>
+        <div class="pagenavi"><?= $this->paginator; ?></div>
+    </div>
+</div>
+<!-- //页面内容 -->
+<script>
+$('#wapper').width($('body').width()-300);
+</script>
\ No newline at end of file
diff --git a/application/default/views/scripts/author/version.phtml b/application/default/views/scripts/author/version.phtml
new file mode 100644
index 00000000..805dbd14
--- /dev/null
+++ b/application/default/views/scripts/author/version.phtml
@@ -0,0 +1,63 @@
+<?php
+$this->headTitle($this->config->title->site);
+$this->headTitle($this->config->title->author);
+$this->headTitle()->setSeparator(' - ');
+$this->headScript()->appendFile('/js/jquery-1.7.min.js');
+$this->headLink()->appendStylesheet('/css/author.css');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/author">数据作者</a>');
+$this->breadcrumb('数据版本管理');
+$this->breadcrumb()->setSeparator(' > ');
+?>
+<!-- 左侧导航 -->
+<div id='sidebar'>
+    <div id='leftnavi'>
+    <?= $this->partial('author/navi.phtml'); ?>
+    </div>
+</div>
+<!-- //左侧导航 -->
+
+<!-- 页面内容 -->
+<div id="wapper">
+	<div id="tabs-controller">
+		<ul>
+			<li class="box-shadow active"><a class="text-shadow" href="/author/version">所有版本概况</a></li>
+			<li class="box-shadow"><a class="text-shadow" href="/author/version/ac/bydata">逐数据浏览</a></li>
+		</ul>
+	</div> 
+    <div id="datalist">
+		<?php
+		if (count($this->paginator)): 
+		if ($this->mdtitle) echo "<h2>元数据：".$this->mdtitle."</h2>";
+		echo "<ul>";
+			$autoindex=0;
+			foreach ($this->paginator as $item): 
+			$autoindex++;?>
+			<li>
+				<p><a href="/data/<?php echo $item['uuid'];?>" target="_blank"><?php echo $item['title'];?></a> 
+				【<a href="/author/version/uuid/<?php echo $item['uuid']; ?>">查看此数据所有版本</a>】</p>
+                <p>版本创建时间: <?php echo date("Y-m-d H:i",strtotime($item['ts_created']));?> 
+                <?php if ($item['userid']) :
+                  echo "发布人： ".$item['username'];
+                  else :
+                 ?>
+                <a href="/author/version/ac/delete/id/<?php echo $item['id'];?>" class="more">删除</a>
+                <?php endif; ?>
+                <a href="/author/version/ac/restore/id/<?php echo $item['id'];?>" class="more">恢复到geonetwork</a>
+                <a href="/author/version/ac/diff/id/<?php echo $item['id'];?>" class="more">与前一版对比</a>
+                <a href="/author/version/ac/commit/id/<?php echo $item['id'];?>" class="more">提交评审发布</a>
+                </p>
+                <?php if ($item['changelog']) : ?>                
+                <p><?php echo $item['changelog']; ?></p>
+                <?php endif; ?>
+			</li>
+		<?php endforeach; 
+		echo "</ul>";
+		endif; ?>
+        <div class="pagenavi"><?= $this->paginator; ?></div>
+    </div>
+</div>
+<!-- //页面内容 -->
+<script>
+$('#wapper').width($('body').width()-300);
+</script>
\ No newline at end of file