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

[search] redesigned 'show more' for search in wiki (#4383)

Browse Source 
* [search] redesigned 'show more' for search in wiki

* [search] modification

* [search] added wiki-search.js

* [wiki] search: modified placeholder text; removed 'arrow'
This commit is contained in:
llj
2019-12-31 16:58:45 +08:00
committed by Daniel Pan
parent fbac92ec68
commit 1c76000843
5 changed files with 348 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
frontend/src/pages/wiki/main-panel.js
View File

@@ -6,7 +6,9 @@ import WikiMarkdownViewer from '../../components/wiki-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/wiki-search';
import Notification from '../../components/common/notification';
import Account from '../../components/common/account';
const propTypes = {
path: PropTypes.string.isRequired,
@@ -89,10 +91,9 @@ class MainPanel extends Component {
</div>
<div className="common-toolbar">
<Search
isPublic={true}
repoID={repoID}
onSearchedClick={this.props.onSearchedClick}
placeholder={gettext('Search files in this library')}
placeholder={gettext('Search')}
/>
</div>
</Fragment>
@@ -107,11 +108,15 @@ class MainPanel extends Component {
<span className="fa fa-pencil-alt mobile-toolbar-icon" title={gettext('Edit')} onClick={this.onEditClick} style={{'font-size': '1.1rem'}}></span>
)}
</div>
<CommonToolbar
repoID={repoID}
onSearchedClick={this.props.onSearchedClick}
searchPlaceholder={gettext('Search files in this library')}
/>
<div className="common-toolbar">
<Search
repoID={repoID}
onSearchedClick={this.props.onSearchedClick}
placeholder={gettext('Search')}
/>
<Notification />
<Account />
</div>
</Fragment>
)}
</div>