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

wiki-list-improve (#2721)

Browse Source
This commit is contained in:
杨顺强
2018-12-26 16:27:15 +08:00
committed by Daniel Pan
parent 7836554816
commit 5a13fda71d
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/app.js
View File

@@ -42,7 +42,6 @@ const ShareAdminLibrariesWrapper = MainContentWrapper(ShareAdminLibraries);
const ShareAdminFoldersWrapper = MainContentWrapper(ShareAdminFolders); const ShareAdminFoldersWrapper = MainContentWrapper(ShareAdminFolders);
const ShareAdminShareLinksWrapper = MainContentWrapper(ShareAdminShareLinks); const ShareAdminShareLinksWrapper = MainContentWrapper(ShareAdminShareLinks);
const ShareAdminUploadLinksWrapper = MainContentWrapper(ShareAdminUploadLinks); const ShareAdminUploadLinksWrapper = MainContentWrapper(ShareAdminUploadLinks);
const WikisWrapper = MainContentWrapper(Wikis);
class App extends Component { class App extends Component {
@@ -217,7 +216,7 @@ class App extends Component {
onTabNavClick={this.tabItemClick} onTabNavClick={this.tabItemClick}
onGroupChanged={this.onGroupChanged} onGroupChanged={this.onGroupChanged}
/> />
<WikisWrapper path={siteRoot + 'wikis'} onShowSidePanel={this.onShowSidePanel} onSearchedClick={this.onSearchedClick}/> <Wikis path={siteRoot + 'wikis'} onShowSidePanel={this.onShowSidePanel} onSearchedClick={this.onSearchedClick}/>
<PublicSharedView path={siteRoot + 'org/'} onShowSidePanel={this.onShowSidePanel} onSearchedClick={this.onSearchedClick} onTabNavClick={this.tabItemClick}/> <PublicSharedView path={siteRoot + 'org/'} onShowSidePanel={this.onShowSidePanel} onSearchedClick={this.onSearchedClick} onTabNavClick={this.tabItemClick}/>
</Router> </Router>
</MainPanel> </MainPanel>

25
frontend/src/pages/wikis/wikis.js
View File

@@ -4,6 +4,7 @@ import { seafileAPI } from '../../utils/seafile-api';
import { gettext, loginUrl } from '../../utils/constants'; import { gettext, loginUrl } from '../../utils/constants';
import toaster from '../../components/toast'; import toaster from '../../components/toast';
import ModalPortal from '../../components/modal-portal'; import ModalPortal from '../../components/modal-portal';
import CommonToolbar from '../../components/toolbar/common-toolbar';
import NewWikiDialog from '../../components/dialog/new-wiki-dialog'; import NewWikiDialog from '../../components/dialog/new-wiki-dialog';
import WikiSelectDialog from '../../components/dialog/wiki-select-dialog'; import WikiSelectDialog from '../../components/dialog/wiki-select-dialog';
import WikiListView from '../../components/wiki-list-view/wiki-list-view'; import WikiListView from '../../components/wiki-list-view/wiki-list-view';
@@ -118,14 +119,11 @@ class Wikis extends Component {
render() { render() {
return ( return (
<Fragment> <Fragment>
<div className="main-panel-center"> <div className="main-panel-north">
<div className="cur-view-container" id="wikis"> <div className="cur-view-toolbar border-left-show">
<div className="cur-view-path"> <span className="sf2-icon-menu side-nav-toggle hidden-md-up d-md-none" title="Side Nav Menu" onClick={this.props.onShowSidePanel}></span>
<div className="path-container"> <div className="operation">
<h3 className="sf-heading">{gettext('Wikis')}</h3> <Dropdown tag="div" className="btn btn-secondary operation-item" isOpen={this.state.isShowAddWikiMenu} toggle={this.onMenuToggle}>
</div>
<div className="path-toolbar">
<Dropdown tag="div" className="btn btn-secondary operation-item" style={{marginTop: '-0.25rem'}} isOpen={this.state.isShowAddWikiMenu} toggle={this.onMenuToggle}>
<DropdownToggle <DropdownToggle
tag="i" tag="i"
className="fa fa-plus-square op-icon" className="fa fa-plus-square op-icon"
@@ -134,7 +132,7 @@ class Wikis extends Component {
aria-expanded={this.state.isShowAddWikiMenu} aria-expanded={this.state.isShowAddWikiMenu}
onClick={this.clickMenuToggle} onClick={this.clickMenuToggle}
> >
{' '}{gettext('Add Wiki')} {' '}<span className="btn-secondary">{gettext('Add Wiki')}</span>
</DropdownToggle> </DropdownToggle>
<DropdownMenu> <DropdownMenu>
<DropdownItem onClick={this.onCreateToggle}>{gettext('New Wiki')}</DropdownItem> <DropdownItem onClick={this.onCreateToggle}>{gettext('New Wiki')}</DropdownItem>
@@ -143,6 +141,15 @@ class Wikis extends Component {
</Dropdown> </Dropdown>
</div> </div>
</div> </div>
<CommonToolbar onSearchedClick={this.props.onSearchedClick} />
</div>
<div className="main-panel-center">
<div className="cur-view-container" id="wikis">
<div className="cur-view-path">
<div className="path-container">
<h3 className="sf-heading">{gettext('Wikis')}</h3>
</div>
</div>
<div className="cur-view-content"> <div className="cur-view-content">
{(this.state.loading || this.state.wikis.length !== 0) && {(this.state.loading || this.state.wikis.length !== 0) &&
<WikiListView <WikiListView