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

adjust search placeholder

Browse Source
This commit is contained in:
shanshuirenjia 2018-12-13 15:48:42 +08:00
parent 69201e4928
commit a74ada65d4
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/components/toolbar/common-toolbar.js
View File

@ -13,12 +13,13 @@ const propTypes = {
class CommonToolbar extends React.Component { class CommonToolbar extends React.Component {
render() { render() {
let searchPlaceholder = this.props.searchPlaceholder || 'Search Files'
return ( return (
<div className="common-toolbar"> <div className="common-toolbar">
{isPro && ( {isPro && (
<Search <Search
repoID={this.props.repoID} repoID={this.props.repoID}
placeholder={gettext(this.props.searchPlaceholder)} placeholder={gettext(searchPlaceholder)}
onSearchedClick={this.props.onSearchedClick} onSearchedClick={this.props.onSearchedClick}
/> />
)} )}

3
frontend/src/components/toolbar/general-toolbar.js
View File

@ -13,7 +13,6 @@ class GeneralToolbar extends React.Component {
render() { render() {
// todo get repoID? // todo get repoID?
let { onShowSidePanel, onSearchedClick } = this.props; let { onShowSidePanel, onSearchedClick } = this.props;
let placeHolder = this.props.searchPlaceholder || 'Search files in this library';
return ( return (
<div className="main-panel-north"> <div className="main-panel-north">
<div className="cur-view-toolbar"> <div className="cur-view-toolbar">
@ -25,7 +24,7 @@ class GeneralToolbar extends React.Component {
</div> </div>
<CommonToolbar <CommonToolbar
repoID={'todo'} repoID={'todo'}
searchPlaceholder={placeHolder} searchPlaceholder={this.props.searchPlaceholder}
onSearchedClick={onSearchedClick} onSearchedClick={onSearchedClick}
/> />
</div> </div>

3
frontend/src/components/toolbar/groups-toolbar.js
View File

@ -19,7 +19,6 @@ class GroupsToolbar extends React.Component {
render() { render() {
let { onShowSidePanel, onSearchedClick } = this.props; let { onShowSidePanel, onSearchedClick } = this.props;
let placeHolder = this.props.searchPlaceholder || 'Search files in this library';
return ( return (
<div className="main-panel-north"> <div className="main-panel-north">
<div className="cur-view-toolbar"> <div className="cur-view-toolbar">
@ -32,7 +31,7 @@ class GroupsToolbar extends React.Component {
className="sf2-icon-menu side-nav-toggle hidden-md-up d-md-none"> className="sf2-icon-menu side-nav-toggle hidden-md-up d-md-none">
</span> </span>
</div> </div>
<CommonToolbar searchPlaceholder={placeHolder} onSearchedClick={onSearchedClick}/> <CommonToolbar searchPlaceholder={this.props.searchPlaceholder} onSearchedClick={onSearchedClick}/>
</div> </div>
); );
} }

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

@ -26,6 +26,7 @@
.search-input { .search-input {
height: 1.875rem; height: 1.875rem;
width: 15rem;
} }
.search-result-container { .search-result-container {