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

[user setting] modification (#3445)

Browse Source
This commit is contained in:
llj
2019-05-13 12:17:40 +08:00
committed by Daniel Pan
parent 30d7542670
commit 7ad7705b26
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/user-settings/delete-account.js
View File

@@ -35,7 +35,7 @@ class DeleteAccount extends React.Component {
<div className="setting-item" id="del-account"> <div className="setting-item" id="del-account">
<h3 className="setting-item-heading">{gettext('Delete Account')}</h3> <h3 className="setting-item-heading">{gettext('Delete Account')}</h3>
<p className="mb-2">{gettext('This operation will not be reverted. Please think twice!')}</p> <p className="mb-2">{gettext('This operation will not be reverted. Please think twice!')}</p>
<button className="btn btn-secondary" onClick={this.confirmDelete}>{gettext('Delete')}</button> <button className="btn btn-outline-primary" onClick={this.confirmDelete}>{gettext('Delete')}</button>
</div> </div>
{this.state.isConfirmDialogOpen && ( {this.state.isConfirmDialogOpen && (
<ModalPortal> <ModalPortal>

1
frontend/src/components/user-settings/language-setting.js
View File

@@ -1,6 +1,5 @@
import React from 'react'; import React from 'react';
import Select from 'react-select'; import Select from 'react-select';
import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap';
import { gettext, siteRoot } from '../../utils/constants'; import { gettext, siteRoot } from '../../utils/constants';
const { const {

4
frontend/src/components/user-settings/social-login.js
View File

@@ -39,8 +39,8 @@ class SocialLogin extends React.Component {
<h3 className="setting-item-heading">{gettext('Social Login')}</h3> <h3 className="setting-item-heading">{gettext('Social Login')}</h3>
<p className="mb-2">{langCode == 'zh-cn' ? '企业微信': 'WeChat Work'}</p> <p className="mb-2">{langCode == 'zh-cn' ? '企业微信': 'WeChat Work'}</p>
{socialConnected ? {socialConnected ?
<a href="#" className="btn btn-secondary" onClick={this.confirmDisconnect}>{gettext('Disconnect')}</a> : <a href="#" className="btn btn-outline-primary" onClick={this.confirmDisconnect}>{gettext('Disconnect')}</a> :
<a href={`${siteRoot}social/login/weixin-work/?next=${encodeURIComponent(socialNextPage)}`} className="btn btn-secondary">{gettext('Connect')}</a> <a href={`${siteRoot}social/login/weixin-work/?next=${encodeURIComponent(socialNextPage)}`} className="btn btn-outline-primary">{gettext('Connect')}</a>
} }
</div> </div>
{this.state.isConfirmDialogOpen && ( {this.state.isConfirmDialogOpen && (

4
frontend/src/components/user-settings/user-basic-info-form.js
View File

@@ -79,7 +79,7 @@ class UserBasicInfoForm extends React.Component {
<div className="col-sm-5"> <div className="col-sm-5">
<input className="form-control" id="user-name" type="text" name="username" value={loginID} disabled={true} readOnly={true} /> <input className="form-control" id="user-name" type="text" name="username" value={loginID} disabled={true} readOnly={true} />
</div> </div>
<p className="col-sm-5 m-0">{gettext('You can use this field at login.')}</p> <p className="col-sm-5 m-0 input-tip">{gettext('You can use this field at login.')}</p>
</div> </div>
)} )}
@@ -89,7 +89,7 @@ class UserBasicInfoForm extends React.Component {
<div className="col-sm-5"> <div className="col-sm-5">
<input className="form-control" id="contact-email" type="text" name="contact_email" value={contactEmail} disabled={!enableUserSetContactEmail} readOnly={!enableUserSetContactEmail} onChange={this.handleContactEmailInputChange} /> <input className="form-control" id="contact-email" type="text" name="contact_email" value={contactEmail} disabled={!enableUserSetContactEmail} readOnly={!enableUserSetContactEmail} onChange={this.handleContactEmailInputChange} />
</div> </div>
<p className="col-sm-5 m-0">{gettext('Your notifications will be sent to this email.')}</p> <p className="col-sm-5 m-0 input-tip">{gettext('Your notifications will be sent to this email.')}</p>
</div> </div>
)} )}

8
frontend/src/css/user-settings.css
View File

@@ -30,7 +30,7 @@ body {
margin:0; margin:0;
} }
.content { .content {
padding: 0rem 1rem; padding: 0rem 1rem 8rem;
overflow: auto; overflow: auto;
} }
.setting-item { .setting-item {
@@ -64,7 +64,7 @@ body {
flex: auto; flex: auto;
margin: 0; margin: 0;
padding-left: 1em; padding-left: 1em;
border-left: 1px solid transparent; border-left: 2px solid transparent;
color: #333; color: #333;
} }
.user-setting-nav .nav-item.active .nav-link { .user-setting-nav .nav-item.active .nav-link {
@@ -77,3 +77,7 @@ body {
.eye-icon { .eye-icon {
color: #666; color: #666;
} }
.input-tip {
padding-top: calc(0.375rem + 1px);
color: #666;
}