1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 23:20:51 +00:00

Merge pull request #3374 from haiwen/update-history-ui

fix history page
This commit is contained in:
Daniel Pan
2019-04-26 15:42:22 +08:00
committed by GitHub
2 changed files with 18 additions and 18 deletions

View File

@@ -200,24 +200,23 @@ class FileHistory extends React.Component {
</div>
<div id="main" onScroll={this.onScrollHandler}>
<div className="old-history-main">
<div>
<Fragment>
<a href="javascript:window.history.back()" className="go-back" title="Back">
<span className="fas fa-chevron-left"></span>
</a>
<h2><span className="file-name">{fileName}</span>{' '}{gettext('History Versions')}</h2>
</div>
<div>
{this.state.isLoading && <Loading />}
{!this.state.isLoading &&
<table className="commit-list">
<thead>
<tr>
<th width="40%" >{gettext('Time')}</th>
<th width="30%" >{gettext('Modifier')}</th>
<th width="25%" >{gettext('Size')}</th>
<th width="5%" ></th>
</tr>
</thead>
</Fragment>
<Fragment>
<table className="commit-list">
<thead>
<tr>
<th width="40%" >{gettext('Time')}</th>
<th width="30%" >{gettext('Modifier')}</th>
<th width="25%" >{gettext('Size')}</th>
<th width="5%" ></th>
</tr>
</thead>
{!this.state.isLoading &&
<tbody>
{this.state.historyList.map((item, index) => {
return (
@@ -232,13 +231,13 @@ class FileHistory extends React.Component {
);
})}
</tbody>
</table>
}
{this.state.isReloadingData && <Loading />}
}
</table>
{(this.state.isReloadingData || this.state.isLoading) && <Loading />}
{this.state.nextCommit && !this.state.isLoading && !this.state.isReloadingData &&
<Button className="get-more-btn" onClick={this.reloadMore}>{gettext('More')}</Button>
}
</div>
</Fragment>
</div>
</div>
</Fragment>