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

Merge branch '7.0'

Browse Source
This commit is contained in:
plt
2019-08-30 10:05:01 +08:00
parent 8d089b9309 d1b3bbc5af
commit 50da0104cd
11 changed files with 64 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
frontend/src/components/cur-dir-path/index.js
View File

@@ -1,5 +1,7 @@
import React, { Fragment } from 'react';
import PropTypes from 'prop-types';
import { Utils } from '../../utils/utils';
import SortOptionsDialog from '../../components/dialog/sort-options';
import DirPath from './dir-path';
import DirTool from './dir-tool';
@@ -19,7 +21,21 @@ const propTypes = {
class CurDirPath extends React.Component {
constructor(props) {
super(props);
this.state = {
isSortOptionsDialogOpen: false
};
}
toggleSortOptionsDialog = () => {
this.setState({
isSortOptionsDialogOpen: !this.state.isSortOptionsDialogOpen
});
}
render() {
const isDesktop = Utils.isDesktop();
return (
<Fragment>
<DirPath
@@ -32,6 +48,7 @@ class CurDirPath extends React.Component {
isViewFile={this.props.isViewFile}
fileTags={this.props.fileTags}
/>
{isDesktop &&
<DirTool
repoID={this.props.repoID}
repoName={this.props.repoName}
@@ -39,7 +56,17 @@ class CurDirPath extends React.Component {
currentPath={this.props.currentPath}
updateUsedRepoTags={this.props.updateUsedRepoTags}
onDeleteRepoTag={this.props.onDeleteRepoTag}
/>}
{!isDesktop && this.props.direntList.length > 0 &&
<span className="sf3-font sf3-font-sort action-icon" onClick={this.toggleSortOptionsDialog}></span>}
{this.state.isSortOptionsDialogOpen &&
<SortOptionsDialog
toggleDialog={this.toggleSortOptionsDialog}
sortBy={this.props.sortBy}
sortOrder={this.props.sortOrder}
sortItems={this.props.sortItems}
/>
}
</Fragment>
);
}

15
frontend/src/components/dirent-list-view/dirent-none-view.js
View File

@@ -5,7 +5,7 @@ import Loading from '../loading';
import ModalPortal from '../modal-portal';
import CreateFile from '../../components/dialog/create-file-dialog';
import '../../css/tip-for-new-md.css';
import '../../css/tip-for-new-file.css';
const propTypes = {
path: PropTypes.string.isRequired,
@@ -53,24 +53,19 @@ class DirentNodeView extends React.Component {
return (
<Fragment>
<div className="tip-for-new-file">
<p className="text-center">{gettext('This folder has no content at this time.')}</p>
<p className="text-center">{gettext('You can create files quickly')}{' +'}</p>
<div className="big-new-file-button-group">
<div className="d-flex justify-content-center">
<div className="tip-for-new-file text-center">
<p className="text-secondary">{gettext('This folder has no content at this time.')}</p>
<p className="text-secondary">{gettext('You can create files quickly')}{' +'}</p>
<button className="big-new-file-button" onClick={this.onCreateNewFile.bind(this, '.md')}>
{'+ Markdown'}</button>
<button className="big-new-file-button" onClick={this.onCreateNewFile.bind(this, '.pptx')}>
{'+ PPT'}</button>
</div>
<div className="d-flex justify-content-center">
<br />
<button className="big-new-file-button" onClick={this.onCreateNewFile.bind(this, '.docx')}>
{'+ Word'}</button>
<button className="big-new-file-button" onClick={this.onCreateNewFile.bind(this, '.xlsx')}>
{'+ Excel'}</button>
</div>
</div>
</div>
{this.state.isCreateFileDialogShow && (
<ModalPortal>
<CreateFile

6
frontend/src/components/toolbar/mutilple-dir-operation-toolbar.js → frontend/src/components/toolbar/multiple-dir-operation-toolbar.js
View File

@@ -35,7 +35,7 @@ const propTypes = {
updateDirent: PropTypes.func.isRequired,
};
class MutipleDirOperationToolbar extends React.Component {
class MultipleDirOperationToolbar extends React.Component {
constructor(props) {
super(props);
@@ -409,6 +409,6 @@ class MutipleDirOperationToolbar extends React.Component {
}
}
MutipleDirOperationToolbar.propTypes = propTypes;
MultipleDirOperationToolbar.propTypes = propTypes;
export default MutipleDirOperationToolbar;
export default MultipleDirOperationToolbar;

1
frontend/src/css/layout.css
View File

@@ -95,6 +95,7 @@
max-height: 40px;
background:#f9f9f9;
display: flex;
align-items: center;
flex-shrink: 0;
justify-content: space-between;
}

17
frontend/src/css/tip-for-new-md.css → frontend/src/css/tip-for-new-file.css
View File

@@ -1,23 +1,24 @@
.tip-for-new-file {
margin: 0 auto;
padding: 5em 8em;
padding: 2em 1em;
align-self: flex-start; /* for repo wiki mode */
}
@media (min-width: 768px) {
.tip-for-new-file {
padding: 5em 8em;
}
}
.big-new-file-button {
padding: .9em 2em 1em;
border-radius: 8px;
margin: 0 1.5em 1.5em 0;
margin: 0 0.75em 1.5em;
cursor: pointer;
width: 160px;
background: #fff;
border: 1px solid #d1d1d1;
}
.big-new-file-button:hover,
.big-new-file-button:focus {
border-color: #eb9205;
color: #eb8205;
}
.tip-for-new-file p {
color: #c4c4c4;
}
.big-new-file-button-group {
margin: 0 auto;
}

4
frontend/src/pages/lib-content-view/lib-content-container.js
View File

@@ -191,6 +191,10 @@ class LibContentContainer extends React.Component {
updateUsedRepoTags={this.props.updateUsedRepoTags}
fileTags={this.props.fileTags}
onDeleteRepoTag={this.props.onDeleteRepoTag}
direntList={this.props.direntList}
sortBy={this.props.sortBy}
sortOrder={this.props.sortOrder}
sortItems={this.props.sortItems}
/>
</div>
<div className={`cur-view-content lib-content-container ${this.props.currentMode === 'column' ? 'view-mode-container' : ''}`} onScroll={this.onItemsScroll}>

4
frontend/src/pages/lib-content-view/lib-content-toolbar.js
View File

@@ -5,7 +5,7 @@ import { gettext } from '../../utils/constants';
import CommonToolbar from '../../components/toolbar/common-toolbar';
import ViewModeToolbar from '../../components/toolbar/view-mode-toolbar';
import DirOperationToolBar from '../../components/toolbar/dir-operation-toolbar';
import MutipleDirOperationToolbar from '../../components/toolbar/mutilple-dir-operation-toolbar';
import MultipleDirOperationToolbar from '../../components/toolbar/multiple-dir-operation-toolbar';
import ViewFileToolbar from '../../components/toolbar/view-file-toolbar';
const propTypes = {
@@ -89,7 +89,7 @@ class LibContentToolbar extends React.Component {
<span className="sf2-icon-menu hidden-md-up d-md-none side-nav-toggle" title={gettext('Side Nav Menu')} onClick={this.props.onSideNavMenuClick}></span>
<div className="dir-operation">
{this.props.isDirentSelected ?
<MutipleDirOperationToolbar
<MultipleDirOperationToolbar
repoID={this.props.repoID}
path={this.props.path}
userPerm={this.props.userPerm}

2
frontend/src/pages/my-libs/my-libs.js
View File

@@ -159,7 +159,7 @@ class MyLibraries extends Component {
</div>
<div className="main-panel-center flex-row">
<div className="cur-view-container">
<div className="cur-view-path align-items-center">
<div className="cur-view-path">
<h3 className="sf-heading m-0">{gettext('My Libraries')}</h3>
{(!Utils.isDesktop() && this.state.repoList.length > 0) && <span className="sf3-font sf3-font-sort action-icon" onClick={this.toggleSortOptionsDialog}></span>}
</div>

4
frontend/src/pages/repo-wiki-mode/main-panel.js
View File

@@ -8,7 +8,7 @@ import RepoInfo from '../../models/repo-info';
import CommonToolbar from '../../components/toolbar/common-toolbar';
import ViewModeToolbar from '../../components/toolbar/view-mode-toolbar';
import DirOperationToolBar from '../../components/toolbar/dir-operation-toolbar';
import MutipleDirOperationToolbar from '../../components/toolbar/mutilple-dir-operation-toolbar';
import MultipleDirOperationToolbar from '../../components/toolbar/multiple-dir-operation-toolbar';
import CurDirPath from '../../components/cur-dir-path';
import WikiMarkdownViewer from '../../components/wiki-markdown-viewer';
import DirentListView from '../../components/dirent-list-view/dirent-list-view';
@@ -170,7 +170,7 @@ class MainPanel extends Component {
<span className="sf2-icon-menu hidden-md-up d-md-none side-nav-toggle" title={gettext('Side Nav Menu')} onClick={this.onSideNavMenuClick}></span>
<div className="dir-operation">
{this.props.isDirentSelected ?
<MutipleDirOperationToolbar
<MultipleDirOperationToolbar
repoID={repoID}
path={this.props.path}
selectedDirentList={this.props.selectedDirentList}

2
frontend/src/pages/shared-libs/shared-libs.js
View File

@@ -372,7 +372,7 @@ class SharedLibraries extends Component {
<Fragment>
<div className="main-panel-center">
<div className="cur-view-container">
<div className="cur-view-path align-items-center">
<div className="cur-view-path">
<h3 className="sf-heading m-0">{gettext('Shared with me')}</h3>
{(!Utils.isDesktop() && this.state.items.length > 0) && <span className="sf3-font sf3-font-sort action-icon" onClick={this.toggleSortOptionsDialog}></span>}
</div>

2
frontend/src/pages/shared-with-all/public-shared-view.js
View File

@@ -217,7 +217,7 @@ class PublicSharedView extends React.Component {
</div>
<div className="main-panel-center">
<div className="cur-view-container">
<div className="cur-view-path align-items-center">
<div className="cur-view-path">
<h3 className="sf-heading m-0">{gettext('Shared with all')}</h3>
{(!Utils.isDesktop() && this.state.repoList.length > 0) && <span className="sf3-font sf3-font-sort action-icon" onClick={this.toggleSortOptionsDialog}></span>}
</div>