haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-02 07:27:04 +00:00
Code Issues Releases Wiki Activity

Sharing dialog improvements (#3449)

Browse Source
This commit is contained in:
zxj96
2019-05-13 18:36:58 +08:00
committed by Daniel Pan
parent 31d39b6fa4
commit 8d6dfab07a
3 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/src/components/dialog/generate-share-link.js
View File

@@ -296,7 +296,7 @@ class GenerateShareLink extends React.Component {
</Label> </Label>
</FormGroup> </FormGroup>
{this.state.isShowPasswordInput && {this.state.isShowPasswordInput &&
<FormGroup className="link-operation-content"> <FormGroup className="link-operation-content" check>
{/* todo translate */} {/* todo translate */}
<Label className="font-weight-bold">{gettext('Password')}</Label>{' '}<span className="tip">{passwordLengthTip}</span> <Label className="font-weight-bold">{gettext('Password')}</Label>{' '}<span className="tip">{passwordLengthTip}</span>
<InputGroup className="passwd"> <InputGroup className="passwd">
@@ -314,10 +314,16 @@ class GenerateShareLink extends React.Component {
<FormGroup check> <FormGroup check>
<Label check> <Label check>
<Input className="expire-checkbox" type="checkbox" onChange={this.onExpireChecked}/>{' '}{gettext('Add auto expiration')} <Input className="expire-checkbox" type="checkbox" onChange={this.onExpireChecked}/>{' '}{gettext('Add auto expiration')}
<Input className="expire-input" type="text" value={this.state.expireDays} onChange={this.onExpireDaysChanged} readOnly={!this.state.isExpireChecked}/><span>{gettext('days')}</span>
</Label> </Label>
</FormGroup> </FormGroup>
)} )}
{this.state.isExpireChecked &&
<FormGroup check>
<Label check>
<Input className="expire-input expire-input-border" type="text" value={this.state.expireDays} onChange={this.onExpireDaysChanged} readOnly={!this.state.isExpireChecked}/><span className="expir-span">{gettext('days')}</span>
</Label>
</FormGroup>
}
{!this.isExpireDaysNoLimit && ( {!this.isExpireDaysNoLimit && (
<FormGroup check> <FormGroup check>
<Label check> <Label check>
@@ -337,7 +343,7 @@ class GenerateShareLink extends React.Component {
)} )}
<FormGroup check> <FormGroup check>
<Label check> <Label check>
<Input type="checkbox" checked readOnly/>{' '}{gettext('Set permission')} <span>{' '}{gettext('Set permission')}</span>
</Label> </Label>
</FormGroup> </FormGroup>
<FormGroup check className="permission"> <FormGroup check className="permission">
@@ -346,7 +352,7 @@ class GenerateShareLink extends React.Component {
</Label> </Label>
</FormGroup> </FormGroup>
<FormGroup check className="permission"> <FormGroup check className="permission">
<Label check> <Label>
<Input type="radio" name="radio1" onChange={() => this.setPermission('preview')} />{' '}{gettext('Preview only')} <Input type="radio" name="radio1" onChange={() => this.setPermission('preview')} />{' '}{gettext('Preview only')}
</Label> </Label>
</FormGroup> </FormGroup>

5
frontend/src/components/dialog/generate-upload-link.js
View File

@@ -44,7 +44,7 @@ class GenerateUploadLink extends React.Component {
toaster.danger( toaster.danger(
<SessionExpiredTip />, <SessionExpiredTip />,
{id: 'session_expired', duration: 3600} {id: 'session_expired', duration: 3600}
) );
this.props.closeShareDialog(); this.props.closeShareDialog();
} }
}); });
@@ -153,9 +153,6 @@ class GenerateUploadLink extends React.Component {
} }
return ( return (
<Form className="generate-upload-link"> <Form className="generate-upload-link">
<FormGroup>
<FormText className="tip">{gettext('You can share the generated link to others and then they can upload files to this directory via the link.')}</FormText>
</FormGroup>
<FormGroup check> <FormGroup check>
<Label check> <Label check>
<Input type="checkbox" onChange={this.addPassword}/>{' '}{gettext('Add password protection')} <Input type="checkbox" onChange={this.addPassword}/>{' '}{gettext('Add password protection')}

26
frontend/src/css/share-link-dialog.css
View File

@@ -62,7 +62,7 @@
} }
.generate-share-link .permission { .generate-share-link .permission {
margin-left: 1.25rem; margin-left: 2.5rem;
} }
.generate-link-btn { .generate-link-btn {
@@ -81,6 +81,30 @@ input.expire-input {
margin: 0 0.25rem 0 1.25rem; margin: 0 0.25rem 0 1.25rem;
} }
.expire-input-border {
border-bottom-right-radius: 0;
border-top-right-radius: 0;
height: 2.375rem!important;
padding: 0.375rem 0.75rem!important;
}
.share-dialog-main .permission-editor .permission-editor__menu { .share-dialog-main .permission-editor .permission-editor__menu {
width: 240px; width: 240px;
} }
.expir-span {
border: 1px solid rgba(0, 40, 100, 0.12);
border-left: none;
font-size: 0.9375rem;
margin-left: -5px;
padding: 0px 8px;
height: 2.375rem;
display: inline-block;
text-align: center;
position: absolute;
top: 4px;
min-width: 2.375rem;
line-height: 2.25;
border-bottom-right-radius: 3px;
border-top-right-radius: 3px;
}