haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-08 18:30:53 +00:00
Code Issues Releases Wiki Activity

Merge branch '7.0'

Browse Source
This commit is contained in:
plt
2019-06-25 17:35:19 +08:00
parent 837dfff28f b079bbe190
commit 7d1c1b271e
8 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/package-lock.json generated
View File

@@ -15921,9 +15921,9 @@
}
},
"seafile-js": {
"version": "0.2.94",
"resolved": "https://registry.npmjs.org/seafile-js/-/seafile-js-0.2.94.tgz",
"integrity": "sha512-X7mYw2w9j4F/jSsy4g5LeigyqBZkKhvCf1y9OcKjhw/u4ZCqgztejjIKXVZwm18VtePOo4fxg5HooXn9pQoNUg==",
"version": "0.2.95",
"resolved": "https://registry.npmjs.org/seafile-js/-/seafile-js-0.2.95.tgz",
"integrity": "sha512-IYO4uP5zkPtqUeGzcpuUlSk+/KqAEG65tzHLm0OJgJzzQ9jbC/UvhuRn3EETItia5BL8PilJ4WNcxX9iQqcnEw==",
"requires": {
"axios": "^0.18.0",
"form-data": "^2.3.2",

2
frontend/package.json
View File

@@ -37,7 +37,7 @@
"react-responsive": "^6.1.1",
"react-select": "^2.4.1",
"reactstrap": "^6.4.0",
"seafile-js": "^0.2.94",
"seafile-js": "^0.2.95",
"socket.io-client": "^2.2.0",
"sw-precache-webpack-plugin": "0.11.4",
"unified": "^7.0.0",

6
frontend/src/components/dialog/dismiss-group-dialog.js
View File

@@ -20,13 +20,13 @@ class DismissGroupDialog extends React.Component {
render() {
return(
<Modal isOpen={this.props.showDismissGroupDialog} toggle={this.props.toggleDismissGroupDialog}>
<ModalHeader>{gettext('Dismiss Group')}</ModalHeader>
<ModalHeader>{gettext('Delete Group')}</ModalHeader>
<ModalBody>
<span>{gettext('Really want to dismiss this group?')}</span>
<span>{gettext('Really want to delete this group?')}</span>
</ModalBody>
<ModalFooter>
<Button color="secondary" onClick={this.props.toggleDismissGroupDialog}>{gettext('Cancel')}</Button>
<Button color="primary" onClick={this.dismissGroup}>{gettext('Dismiss')}</Button>
<Button color="primary" onClick={this.dismissGroup}>{gettext('Delete')}</Button>
</ModalFooter>
</Modal>
);

4
frontend/src/components/dirent-detail/detail-comments-list.js
View File

@@ -101,7 +101,7 @@ class DetailCommentList extends React.Component {
className="add-comment-input" ref="commentTextarea" placeholder={gettext('Add a comment.')}
clos="100" rows="3" warp="virtual"
></textarea>
<Button className="submit-comment" color="success" size="sm" onClick={this.submitComment}>{gettext('Submit')}</Button>
<Button className="submit-comment" color="primary" size="sm" onClick={this.submitComment}>{gettext('Submit')}</Button>
</div>
</div>
);
@@ -189,7 +189,7 @@ class CommentItem extends React.Component {
<textarea className="edit-comment-input" value={this.state.newComment}
onChange={this.handleCommentChange} clos="100" rows="3" warp="virtual"
></textarea>
<Button className="comment-btn" color="success" size="sm" onClick={this.updateComment} id={item.id}>{gettext('Update')}</Button>{' '}
<Button className="comment-btn" color="primary" size="sm" onClick={this.updateComment} id={item.id}>{gettext('Update')}</Button>{' '}
<Button className="comment-btn" color="secondary" size="sm" onClick={this.toggleEditComment}> {gettext('Cancel')}</Button>
</div>
</li>

2
frontend/src/components/file-view/comment-panel.js
View File

@@ -130,7 +130,7 @@ class CommentPanel extends React.Component {
placeholder={gettext('Add a comment.')}
clos="100" rows="3" warp="virtual"></textarea>
<Button
className="submit-comment" color="success"
className="submit-comment" color="primary"
size="sm" onClick={this.submitComment} >
{gettext('Submit')}</Button>
</div>

4
frontend/src/components/review-list-view/review-comments.js
View File

@@ -155,7 +155,7 @@ class ReviewComments extends React.Component {
onChange={this.handleCommentChange}
clos="100" rows="3" warp="virtual"
></textarea>
<Button className="comment-btn" color="success" size="sm" onClick={this.submitComment}>{gettext('Submit')}</Button>
<Button className="comment-btn" color="primary" size="sm" onClick={this.submitComment}>{gettext('Submit')}</Button>
</div>
</div>
</div>
@@ -251,7 +251,7 @@ class CommentItem extends React.Component {
onChange={this.handleCommentChange}
clos="100" rows="3" warp="virtual"
></textarea>
<Button className="comment-btn" color="success" size="sm" onClick={this.updateComment} id={item.id}>
<Button className="comment-btn" color="primary" size="sm" onClick={this.updateComment} id={item.id}>
{gettext('Update')}</Button>{' '}
<Button className="comment-btn" color="secondary" size="sm" onClick={this.toggleEditComment}>
{gettext('Cancel')}</Button>

1
frontend/src/css/review-comments.css
View File

@@ -140,6 +140,7 @@
.seafile-comment-footer .seafile-add-comment .comment-btn,
.seafile-edit-comment .comment-btn {
height: 28px;
width: 60px;
}
.seafile-edit-comment {
margin-top: 10px;

2
frontend/src/pages/groups/group-view.js
View File

@@ -418,7 +418,7 @@ class GroupView extends React.Component {
{
this.state.isOwner &&
<ul className="sf-popover-list">
<li><a href="#" className="sf-popover-item" onClick={this.toggleDismissGroupDialog}>{gettext('Dismiss')}</a></li>
<li><a href="#" className="sf-popover-item" onClick={this.toggleDismissGroupDialog}>{gettext('Delete Group')}</a></li>
</ul>
}
</div>