diff --git a/module/doc/control.php b/module/doc/control.php
index 3db90c4e52..13d67617e9 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -70,7 +70,7 @@ class doc extends control
      * @access public
      * @return void
      */
-    public function browse($libID = 0, $browseType = 'byModule', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function browse($libID = 0, $browseType = 'all', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         $this->loadModel('search');
 
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index 22faacb2bd..dce2f34a8e 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -36,7 +36,8 @@ $lang->doc->whiteList      = '白名单';
 
 $lang->doc->moduleDoc      = '按模块浏览';
 $lang->doc->searchDoc      = '搜索';
-//$lang->doc->allDoc         = '所有文档';
+$lang->doc->allDoc         = '所有文档';
+$lang->doc->openedByMe     = '由我创建';
 
 /* 方法列表。*/
 $lang->doc->index          = '首页';
diff --git a/module/doc/model.php b/module/doc/model.php
index c2e94b40da..a1960724dc 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -135,7 +135,23 @@ class docModel extends model
      */
     public function getDocsByBrowseType($libID, $browseType, $queryID, $moduleID, $sort, $pager)
     {
-        if($browseType == "bymodule")
+        if($browseType == "all")
+        {
+            $docs = $this->getDocs($libID, 0, $sort, $pager);
+        }
+        elseif($browseType == "openedbyme")
+        {
+            $condition = $this->buildConditionSQL();
+            $docs = $this->dao->select('*')->from(TABLE_DOC)
+                ->where('deleted')->eq(0)
+                ->andWhere('lib')->in($libID)
+                ->andWhere('addedBy')->eq($this->app->user->account)
+                ->beginIF($condition)->andWhere("($condition)")->fi()
+                ->orderBy($sort)
+                ->page($pager)
+                ->fetchAll();
+        }
+        elseif($browseType == "bymodule")
         {
             $modules = 0;
             if($moduleID) $modules = $this->loadModel('tree')->getAllChildId($moduleID);
@@ -328,7 +344,7 @@ class docModel extends model
             ->join('users', ',')
             ->remove('comment,files,labels,uid')
             ->get();
-        if($doc->acl == 'private') $doc->users = $this->app->user->account;
+        if($doc->acl == 'private') $doc->users = $oldDoc->addedBy;
 
         $lib = $this->getLibByID($doc->lib);
         $doc = $this->loadModel('file')->processEditor($doc, $this->config->doc->editor->edit['id'], $this->post->uid);
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index 4064fa401b..ce71f1efd2 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -19,7 +19,9 @@ var type       = '<?php echo $type;?>';
 </script>
 <div id='featurebar'>
   <ul class='nav'>
-    <li id='bymoduleTab' onclick='browseByModule()'><a href='#'><?php echo $lang->doc->moduleDoc;?></a></li>
+    <li id='allTab'><?php echo html::a(inlink('browse', "libID=$libID&browseType=all&param=0&orderBy=$orderBy"), $lang->doc->allDoc)?></li>
+    <li id='bymoduleTab'><?php echo html::a(inlink('browse', "libID=$libID&browseType=byModule&param=0&orderBy=$orderBy"), $lang->doc->moduleDoc)?></li>
+    <li id='openedbymeTab'><?php echo html::a(inlink('browse', "libID=$libID&browseType=openedByMe&param=0&orderBy=$orderBy"), $lang->doc->openedByMe)?></li>
     <li id='bysearchTab'><a href='#'><i class='icon-search icon'></i>&nbsp;<?php echo $lang->doc->searchDoc;?></a></li>
   </ul>
   <div class='actions'>
@@ -52,6 +54,7 @@ var type       = '<?php echo $type;?>';
         <th>                <?php common::printOrderLink('title',     $orderBy, $vars, $lang->doc->title);?></th>
         <th class='w-100px'><?php common::printOrderLink('addedBy',   $orderBy, $vars, $lang->doc->addedBy);?></th>
         <th class='w-120px'><?php common::printOrderLink('addedDate', $orderBy, $vars, $lang->doc->addedDate);?></th>
+        <th class='w-120px'><?php common::printOrderLink('editedDate', $orderBy, $vars, $lang->doc->editedDate);?></th>
         <th class='w-100px {sorter:false}'><?php echo $lang->actions;?></th>
       </tr>
     </thead>
@@ -65,7 +68,8 @@ var type       = '<?php echo $type;?>';
         <td><?php if($canView) echo html::a($viewLink, sprintf('%03d', $doc->id)); else printf('%03d', $doc->id);?></td>
         <td class='text-left' title="<?php echo $doc->title?>"><nobr><?php echo html::a($viewLink, $doc->title);?></nobr></td>
         <td><?php isset($users[$doc->addedBy]) ? print($users[$doc->addedBy]) : print($doc->addedBy);?></td>
-        <td><?php echo date("m-d H:i", strtotime($doc->addedDate));?></td>
+        <td><?php echo substr($doc->addedDate, 5, 11);?></td>
+        <td><?php echo substr($doc->editedDate, 5, 11);?></td>
         <td>
           <?php 
           common::printIcon('doc', 'edit', "doc={$doc->id}", '', 'list');
@@ -79,7 +83,7 @@ var type       = '<?php echo $type;?>';
       </tr>
       <?php endforeach;?>
     </tbody>
-    <tfoot><tr><td colspan='5'><?php $pager->show();?></td></tr></tfoot>
+    <tfoot><tr><td colspan='6'><?php $pager->show();?></td></tr></tfoot>
   </table>
 </div>
 <?php include '../../common/view/footer.html.php';?>