From 9d1e3969e87aba7f44bbbeb84a8ccce4ffab6d55 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Tue, 10 Dec 2019 17:08:58 +0800
Subject: [PATCH]  * adjust for task #6709.

---
 module/repo/control.php                | 2 +-
 module/repo/css/common.css             | 2 ++
 module/repo/js/view.js                 | 4 +++-
 module/repo/view/ajaxsidelogs.html.php | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/module/repo/control.php b/module/repo/control.php
index 5c6b635c87..7192ea3ede 100644
--- a/module/repo/control.php
+++ b/module/repo/control.php
@@ -133,7 +133,7 @@ class repo extends control
 
         $this->scm->setEngine($repo);
         $info = $this->scm->info($entry, $revision);
-        if($info->kind == 'dir') $this->locate($this->repo->createLink('log', "repoID=$repoID&entry=&revision=$revision", "entry=" . $this->repo->encodePath($info->path)));
+        if($info->kind == 'dir') $this->locate($this->repo->createLink('browse', "repoID=$repoID&path=&revision=$revision", "path=" . $this->repo->encodePath($info->path)));
         $content  = $this->scm->cat($entry, $revision);
         $entry    = urldecode($entry);
         $pathInfo = pathinfo($entry); 
diff --git a/module/repo/css/common.css b/module/repo/css/common.css
index 1040249fa2..95d97fd170 100644
--- a/module/repo/css/common.css
+++ b/module/repo/css/common.css
@@ -177,3 +177,5 @@ h3 {font-size:16px;}
 
 #sidebar>.sidebar-toggle{left:5px; right:auto;}
 #sidebar>.sidebar-toggle>.icon{right:-4px; left:auto;}
+
+#logForm .fixed-footer a.allLogs{color:#fff !important;}
diff --git a/module/repo/js/view.js b/module/repo/js/view.js
index ea5bc7c83e..ae6b0bea3e 100644
--- a/module/repo/js/view.js
+++ b/module/repo/js/view.js
@@ -1,6 +1,8 @@
 $(document).ready(function()
 {
     var $pre = $('.repoCode .content pre');
+    var rowTip = '';
+    if($('#rowTip').length > 0) rowTip = $('#rowTip').html();
 
     if($pre.length)
     {
@@ -11,7 +13,7 @@ $(document).ready(function()
         for(var i = 0 ; i < arr.length ; i++)
         {
             line = i + 1;
-            code += "<tr data-line='" + line +"'><th id='L" + line + "'><div class='comment-btn view'><span class='icon-wrapper'><i class='icon-plus'></i></span></div>" + line + "</th><td>" + (arr[i] || '&nbsp;') + "</td></tr>";
+            code += "<tr data-line='" + line +"'><th id='L" + line + "'><div class='comment-btn view'><span class='icon-wrapper'><i class='icon-plus'></i></span></div>" + line + "</th><td>" + (arr[i] || '&nbsp;') + rowTip +  "</td></tr>";
         }
         $pre.html("<table><tbody>" + code + "</tbody></table>");
     }
diff --git a/module/repo/view/ajaxsidelogs.html.php b/module/repo/view/ajaxsidelogs.html.php
index 316ce92eba..a2102967f0 100644
--- a/module/repo/view/ajaxsidelogs.html.php
+++ b/module/repo/view/ajaxsidelogs.html.php
@@ -51,7 +51,7 @@ if(isset($entry)) $pathInfo .= '&type=file';
   </table>
   <div class='table-footer'>
     <?php if(common::hasPriv('repo', 'diff')) echo html::submitButton($lang->repo->diff, '', count($revisions) < 2 ? 'disabled btn btn-primary' : 'btn btn-primary')?>
-    <?php echo html::a($this->repo->createLink('log', "repoID=$repoID&entry=&revision=HEAD&type=$logType", "entry=" . $this->repo->encodePath($path)), $lang->repo->allLog);?>
+    <?php echo html::a($this->repo->createLink('log', "repoID=$repoID&entry=&revision=HEAD&type=$logType", "entry=" . $this->repo->encodePath($path)), $lang->repo->allLog, '', "class='allLogs'");?>
     <div class='pull-right'>
       <div class='btn-group'>
         <?php