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

fix history page

This commit is contained in:
Michael An
2019-04-26 15:33:11 +08:00
parent b4c8d7d839
commit ca55562bbc
2 changed files with 18 additions and 18 deletions

View File

@@ -68,6 +68,7 @@
width: 16px; width: 16px;
height: 16px; height: 16px;
border-radius: 2px; border-radius: 2px;
vertical-align: middle;
} }
.old-history-main .commit-list .username { .old-history-main .commit-list .username {

View File

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