diff --git a/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal_selected_editions_widget.js b/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal_selected_editions_widget.js index 17e72072..e169adaa 100644 --- a/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal_selected_editions_widget.js +++ b/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal_selected_editions_widget.js @@ -1,7 +1,7 @@ 'use strict'; import React from 'react'; -import { getLangText } from '../../utils/lang_utils.js' +import { getLangText } from '../../utils/lang_utils.js'; let PieceListBulkModalSelectedEditionsWidget = React.createClass({ propTypes: { diff --git a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js b/js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js index 3f9d04ab..85c3c2b9 100644 --- a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js +++ b/js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js @@ -2,6 +2,8 @@ import React from 'react'; +import PieceListToolbarFilterWidget from './piece_list_toolbar_filter_widget'; + import Input from 'react-bootstrap/lib/Input'; import Glyphicon from 'react-bootstrap/lib/Glyphicon'; import { getLangText } from '../../utils/lang_utils'; @@ -41,6 +43,9 @@ let PieceListToolbar = React.createClass({ onChange={this.searchFor} addonAfter={searchIcon} /> + + + diff --git a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_filter_widget.js b/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_filter_widget.js index d624dc68..389f201c 100644 --- a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_filter_widget.js +++ b/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_filter_widget.js @@ -5,25 +5,28 @@ import React from 'react'; import Glyphicon from 'react-bootstrap/lib/Glyphicon'; import DropdownButton from 'react-bootstrap/lib/DropdownButton'; import MenuItem from 'react-bootstrap/lib/MenuItem'; -import { getLangText } from '../../utils/lang_utils.js' +import { getLangText } from '../../utils/lang_utils.js'; let PieceListToolbarFilterWidgetFilter = React.createClass({ + render() { let filterIcon = ; return ( - +
  • {getLangText('Show Pieces that')}:
  • - -
    - {getLangText('I can transfer')} + +
    +
    - -
    - {getLangText('I can consign')} + +
    +
    diff --git a/sass/ascribe_piece_list_toolbar.scss b/sass/ascribe_piece_list_toolbar.scss index 2fa612aa..cb133b4e 100644 --- a/sass/ascribe_piece_list_toolbar.scss +++ b/sass/ascribe_piece_list_toolbar.scss @@ -6,4 +6,21 @@ .search-bar { max-width: 160px; + input { + height: 33px; + } +} + +.ascribe-piece-list-toolbar-filter-widget { + margin-right: 1em; + .checkbox-line { + label { + font-weight: normal; + } + input { + position: relative; + top: 2px; + margin-left: 10px; + } + } } \ No newline at end of file