diff --git a/frontend/src/components/cur-dir-path/index.js b/frontend/src/components/cur-dir-path/index.js
index b672dd8796..d43cb8d958 100644
--- a/frontend/src/components/cur-dir-path/index.js
+++ b/frontend/src/components/cur-dir-path/index.js
@@ -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 (
+ {isDesktop &&
}
+ {!isDesktop && this.props.direntList.length > 0 &&
+ }
+ {this.state.isSortOptionsDialogOpen &&
+
+ }
);
}
diff --git a/frontend/src/components/toolbar/mutilple-dir-operation-toolbar.js b/frontend/src/components/toolbar/multiple-dir-operation-toolbar.js
similarity index 98%
rename from frontend/src/components/toolbar/mutilple-dir-operation-toolbar.js
rename to frontend/src/components/toolbar/multiple-dir-operation-toolbar.js
index aef8a6204a..8a593ca871 100644
--- a/frontend/src/components/toolbar/mutilple-dir-operation-toolbar.js
+++ b/frontend/src/components/toolbar/multiple-dir-operation-toolbar.js
@@ -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;
diff --git a/frontend/src/css/layout.css b/frontend/src/css/layout.css
index 846842c923..980838dba1 100644
--- a/frontend/src/css/layout.css
+++ b/frontend/src/css/layout.css
@@ -95,6 +95,7 @@
max-height: 40px;
background:#f9f9f9;
display: flex;
+ align-items: center;
flex-shrink: 0;
justify-content: space-between;
}
diff --git a/frontend/src/pages/lib-content-view/lib-content-container.js b/frontend/src/pages/lib-content-view/lib-content-container.js
index 470c1c289d..0bdc28c55d 100644
--- a/frontend/src/pages/lib-content-view/lib-content-container.js
+++ b/frontend/src/pages/lib-content-view/lib-content-container.js
@@ -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}
/>
diff --git a/frontend/src/pages/lib-content-view/lib-content-toolbar.js b/frontend/src/pages/lib-content-view/lib-content-toolbar.js
index c8705bff16..bd1eacd34a 100644
--- a/frontend/src/pages/lib-content-view/lib-content-toolbar.js
+++ b/frontend/src/pages/lib-content-view/lib-content-toolbar.js
@@ -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 {
{this.props.isDirentSelected ?
-
-
+
{gettext('My Libraries')}
{(!Utils.isDesktop() && this.state.repoList.length > 0) && }
diff --git a/frontend/src/pages/repo-wiki-mode/main-panel.js b/frontend/src/pages/repo-wiki-mode/main-panel.js
index 2b2281e4a7..3929b27005 100644
--- a/frontend/src/pages/repo-wiki-mode/main-panel.js
+++ b/frontend/src/pages/repo-wiki-mode/main-panel.js
@@ -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 {
{this.props.isDirentSelected ?
-
-
+
{gettext('Shared with me')}
{(!Utils.isDesktop() && this.state.items.length > 0) && }
diff --git a/frontend/src/pages/shared-with-all/public-shared-view.js b/frontend/src/pages/shared-with-all/public-shared-view.js
index 5a07910a3b..72b0e69d95 100644
--- a/frontend/src/pages/shared-with-all/public-shared-view.js
+++ b/frontend/src/pages/shared-with-all/public-shared-view.js
@@ -217,7 +217,7 @@ class PublicSharedView extends React.Component {
-
+
{gettext('Shared with all')}
{(!Utils.isDesktop() && this.state.repoList.length > 0) && }