1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-17 15:53:28 +00:00

[12.0] fix wiki edit page style (#6078)

This commit is contained in:
Michael An
2024-05-15 14:57:18 +08:00
committed by GitHub
parent 8ccd0f37b7
commit ec11643e55
5 changed files with 11 additions and 31 deletions

View File

@@ -1,11 +1,10 @@
import React, { Component, Fragment } from 'react';
import PropTypes from 'prop-types';
import { gettext, repoID, siteRoot, username, isPro, isEditWiki } from '../../utils/constants';
import { gettext, repoID, siteRoot, username, isEditWiki } from '../../utils/constants';
import SeafileMarkdownViewer from '../../components/seafile-markdown-viewer';
import WikiDirListView from '../../components/wiki-dir-list-view/wiki-dir-list-view';
import Loading from '../../components/loading';
import { Utils } from '../../utils/utils';
import Search from '../../components/search/search';
// import Search from '../../components/search/search';
import Notification from '../../components/common/notification';
import Account from '../../components/common/account';
import SdocWikiPageViewer from '../../components/sdoc-wiki-page-viewer';
@@ -19,11 +18,9 @@ const propTypes = {
permission: PropTypes.string,
lastModified: PropTypes.string,
latestContributor: PropTypes.string,
direntList: PropTypes.array.isRequired,
onMenuClick: PropTypes.func.isRequired,
onSearchedClick: PropTypes.func.isRequired,
onMainNavBarClick: PropTypes.func.isRequired,
onDirentClick: PropTypes.func.isRequired,
onLinkClick: PropTypes.func.isRequired,
};
@@ -78,7 +75,7 @@ class MainPanel extends Component {
render() {
let { onSearchedClick } = this.props;
// let { onSearchedClick } = this.props;
const errMessage = (<div className="message err-tip">{gettext('Folder does not exist.')}</div>);
const isViewingFile = this.props.pathExist && !this.props.isDataLoading && this.props.isViewFile;
return (
@@ -91,9 +88,9 @@ class MainPanel extends Component {
<span className="sf2-icon-menu hidden-md-up d-md-none side-nav-toggle" title="Side Nav Menu" onClick={this.onMenuClick}></span>
</div>
<div className="common-toolbar">
{isPro && (
{/* {isPro && (
<Search isPublic={true} repoID={repoID} onSearchedClick={onSearchedClick} placeholder={gettext('Search files')}/>
)}
)} */}
</div>
</Fragment>
}
@@ -108,9 +105,9 @@ class MainPanel extends Component {
)}
</div>
<div className="common-toolbar">
{isPro && (
{/* {isPro && (
<Search isPublic={true} repoID={repoID} onSearchedClick={onSearchedClick} placeholder={gettext('Search files')}/>
)}
)} */}
<Notification />
<Account />
</div>
@@ -145,13 +142,6 @@ class MainPanel extends Component {
onLinkClick={this.props.onLinkClick}
/>
)}
{(!this.props.isDataLoading && !this.props.isViewFile) && (
<WikiDirListView
path={this.props.path}
direntList={this.props.direntList}
onDirentClick={this.props.onDirentClick}
/>
)}
</div>
</div>
</div>