Merge pull request #3331 from haiwen/file-history-page-rewirte

file history page rewrite

frontend/src/components/file-view/file-toolbar.js

@@ -100,7 +100,7 @@ class FileToolbar extends React.Component {
               icon="fa fa-history"
               text={gettext('History')}
               tag="a"
-              href={`${siteRoot}repo/file_revisions/${repoID}/?p=${encodeURIComponent(filePath)}&referer=${encodeURIComponent(location.href)}`}
+              href={`${siteRoot}repo/file_revisions/${repoID}/?p=${encodeURIComponent(filePath)}`}
             />
           )}
           {(canEditFile && !err) && 

frontend/src/components/logo.js

@@ -3,7 +3,8 @@ import PropTypes from 'prop-types';
 import { siteRoot, mediaUrl, logoPath, logoWidth, logoHeight, siteTitle } from '../utils/constants'; 
 
 const propTypes = {
-  onCloseSidePanel: PropTypes.func.isRequired,
+  onCloseSidePanel: PropTypes.func,
+  showCloseSidePanelIcon: PropTypes.bool,
 };
 
 class Logo extends React.Component {
@@ -18,13 +19,15 @@ class Logo extends React.Component {
         <a href={siteRoot} id="logo">
           <img src={mediaUrl + logoPath} height={logoHeight} width={logoWidth} title={siteTitle} alt="logo" />
         </a>
-        <a 
-          className="sf2-icon-x1 sf-popover-close side-panel-close action-icon d-md-none"
-          onClick={this.closeSide} 
-          title="Close" 
-          aria-label="Close" 
-        >
-        </a>
+        {this.props.showCloseSidePanelIcon &&
+          <a 
+            className="sf2-icon-x1 sf-popover-close side-panel-close action-icon d-md-none"
+            onClick={this.closeSide} 
+            title="Close" 
+            aria-label="Close" 
+          >
+          </a>
+        }
       </div>
     );
   }