diff --git a/js/components/ascribe_accordion_list/accordion_list.js b/js/components/ascribe_accordion_list/accordion_list.js index 471ba9d5..fe300702 100644 --- a/js/components/ascribe_accordion_list/accordion_list.js +++ b/js/components/ascribe_accordion_list/accordion_list.js @@ -21,7 +21,7 @@ let AccordionList = React.createClass({ ); } else if(this.props.count === 0) { return ( -
+

{getLangText('We could not find any works related to you...')}

{getLangText('To register one, click')} {getLangText('here')}!

diff --git a/js/components/piece_list.js b/js/components/piece_list.js index 71304a63..c7cab0f4 100644 --- a/js/components/piece_list.js +++ b/js/components/piece_list.js @@ -15,6 +15,8 @@ import AccordionListItemTableEditions from './ascribe_accordion_list/accordion_l import Pagination from './ascribe_pagination/pagination'; +import PieceListFilterDisplay from './piece_list_filter_display'; + import GlobalAction from './global_action'; import PieceListBulkModal from './ascribe_piece_list_bulk_modal/piece_list_bulk_modal'; import PieceListToolbar from './ascribe_piece_list_toolbar/piece_list_toolbar'; @@ -22,6 +24,8 @@ import PieceListToolbar from './ascribe_piece_list_toolbar/piece_list_toolbar'; import AppConstants from '../constants/application_constants'; import { mergeOptions } from '../utils/general_utils'; +import { getLangText } from '../utils/lang_utils'; + let PieceList = React.createClass({ propTypes: { @@ -149,9 +153,6 @@ let PieceList = React.createClass({ let loadingElement = (); let AccordionListItemType = this.props.accordionListItemType; - // - - return (
+ filter.split('acl_')[1]).join(', '); + + // there are acls, like acl_create_editions that still have underscores in them, + // therefore we need to replace all underscores with spaces + return filterText.replace(/_/g, ' '); + }, + + render() { + let { filterBy } = this.props; + + // do not show the FilterDisplay if there are no filters applied + if(filterBy && Object.keys(filterBy).length === 0) { + return null; + } else { + return ( +
+
+ {this.getFilterText()} +
+
+
+ ); + } + } +}); + +export default PieceListFilterDisplay; \ No newline at end of file diff --git a/sass/ascribe_accordion_list.scss b/sass/ascribe_accordion_list.scss index 6412a598..86a519b5 100644 --- a/sass/ascribe_accordion_list.scss +++ b/sass/ascribe_accordion_list.scss @@ -5,6 +5,10 @@ $ascribe-accordion-list-item-height: 8em; padding-right: 15px; } +.ascribe-accordion-list-placeholder { + margin-top: 1em; +} + .ascribe-accordion-list-item { background-color: white; border: 1px solid black; diff --git a/sass/main.scss b/sass/main.scss index 5f5c0f23..39ea78bd 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -487,3 +487,23 @@ hr { .ascribe-progress-bar-xs { height: 12px; } + + +.ascribe-piece-list-filter-display { + padding-left: 0; + padding-right: 0; + + > span { + font-size: 1.1em; + font-weight: 600; + color: #616161; + + padding-left: .3em; + } + + > hr { + margin-top: .15em; + margin-bottom: .1em; + border-color: #ccc; + } +} \ No newline at end of file