Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add pager classes for customization #30

Merged
merged 3 commits into from
Mar 13, 2019
Merged

Add pager classes for customization #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9df04a8
add classes for customization
nstriedinger Mar 12, 2019
2d80183
add class to current page link
nstriedinger Mar 12, 2019
c5b3566
add classes to results list
nstriedinger Mar 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/components/results/pagination.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class FederatedPagination extends React.Component {
let isCurrentPage = page === currentPage;
return (
<li className={cx("search-pager__item", (isCurrentPage ? 'is-active' : 'not-active'))} key={key}>
<a role="button" tabIndex="0" onClick={this.onPageChange.bind(this, page)} onKeyPress={this.buildHandleEnterKeyPress(this.onPageChange.bind(this, page))} title={isCurrentPage ? "Current page" : `Go to page ${page + 1}`} aria-current={isCurrentPage ? page + 1 : undefined}>
<a className={cx("search-pager__item-link")} role="button" tabIndex="0" onClick={this.onPageChange.bind(this, page)} onKeyPress={this.buildHandleEnterKeyPress(this.onPageChange.bind(this, page))} title={isCurrentPage ? "Current page" : `Go to page ${page + 1}`} aria-current={isCurrentPage ? page + 1 : undefined}>
<span className="element-invisible">Page</span>{page + 1}
</a>
</li>
Expand Down Expand Up @@ -63,33 +63,33 @@ class FederatedPagination extends React.Component {
<nav className="search-pager" aria-labelledby="pagination-heading">
<h4 id="pagination-heading" className="element-invisible">Pagination</h4>
<ul className="search-pager__items">
<li className={cx("search-pager__item", {"element-invisible": firstPageHidden})} key="start">
<a role="button" tabIndex={firstPageHidden ? "-1" : "0"} onClick={this.onPageChange.bind(this, 0)} onKeyPress={ this.buildHandleEnterKeyPress(this.onPageChange.bind(this, 0)) } title="Go to first page">
<li className={cx("search-pager__item search-pager__item--first", {"element-invisible": firstPageHidden})} key="start">
<a className={cx("search-pager__item-link")} role="button" tabIndex={firstPageHidden ? "-1" : "0"} onClick={this.onPageChange.bind(this, 0)} onKeyPress={ this.buildHandleEnterKeyPress(this.onPageChange.bind(this, 0)) } title="Go to first page">
<span className="element-invisible">First page</span>
<span aria-hidden={firstPageHidden ? "true" : "false"}>
<DoubleChevronLeft/>
</span>
</a>
</li>
<li className={cx("search-pager__item", {"element-invisible": prevPageHidden})} key="prev">
<a role="button" tabIndex={prevPageHidden ? "-1" : "0"} onClick={this.onPageChange.bind(this, currentPage - 1)} onKeyPress={ this.buildHandleEnterKeyPress(this.onPageChange.bind(this, currentPage - 1)) }title="Go to previous page" rel="next">
<li className={cx("search-pager__item search-pager__item--previous", {"element-invisible": prevPageHidden})} key="prev">
<a className={cx("search-pager__item-link")} role="button" tabIndex={prevPageHidden ? "-1" : "0"} onClick={this.onPageChange.bind(this, currentPage - 1)} onKeyPress={ this.buildHandleEnterKeyPress(this.onPageChange.bind(this, currentPage - 1)) }title="Go to previous page" rel="next">
<span className="element-invisible">Previous page</span>
<span aria-hidden={prevPageHidden ? "true" : "false"}>
<ChevronLeft/>
</span>
</a>
</li>
{pages.map((page, idx) => this.renderPage(page, currentPage, idx))}
<li className={cx("search-pager__item", {"element-invisible": nextPageHidden})} key="next">
<a role="button" tabIndex={nextPageHidden ? "-1" : "0"} onClick={this.onPageChange.bind(this, currentPage + 1, pageAmt)} onKeyPress={ this.buildHandleEnterKeyPress(this.onPageChange.bind(this, currentPage + 1, pageAmt)) } title="Go to next page" rel="next">
<li className={cx("search-pager__item search-pager__item--next", {"element-invisible": nextPageHidden})} key="next">
<a className={cx("search-pager__item-link")} role="button" tabIndex={nextPageHidden ? "-1" : "0"} onClick={this.onPageChange.bind(this, currentPage + 1, pageAmt)} onKeyPress={ this.buildHandleEnterKeyPress(this.onPageChange.bind(this, currentPage + 1, pageAmt)) } title="Go to next page" rel="next">
<span className="element-invisible">Next page</span>
<span aria-hidden={nextPageHidden ? "true" : "false"}>
<ChevronRight/>
</span>
</a>
</li>
<li className={cx("search-pager__item", {"element-invisible": lastPageHidden})} key="end">
<a role="button" tabIndex={lastPageHidden ? "-1" : "0"} onClick={this.onPageChange.bind(this, pageAmt - 1)} onKeyPress={ this.buildHandleEnterKeyPress(this.onPageChange.bind(this, pageAmt - 1)) } title="Go to last page">
<li className={cx("search-pager__item search-pager__item--last", {"element-invisible": lastPageHidden})} key="end">
<a className={cx("search-pager__item-link")} role="button" tabIndex={lastPageHidden ? "-1" : "0"} onClick={this.onPageChange.bind(this, pageAmt - 1)} onKeyPress={ this.buildHandleEnterKeyPress(this.onPageChange.bind(this, pageAmt - 1)) } title="Go to last page">
<span className="element-invisible">Last page</span>
<span aria-hidden={lastPageHidden ? "true" : "false"}>
<DoubleChevronRight/>
Expand Down
4 changes: 2 additions & 2 deletions src/components/results/result.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@ class FederatedResult extends React.Component {
<li onClick={() => this.props.onSelect(doc)}>
{doc.ss_federated_image &&
<div className="search-results__container--left">
<img src={doc.ss_federated_image} alt=""/>
<img className="search-results__image" src={doc.ss_federated_image} alt=""/>
</div>
}
<div className="search-results__container--right">
<span className="search-results__label">{doc.ss_federated_type}</span>
<h3 className="search-results__heading"><a href={this.getCanonicalLink(doc.sm_urls, doc.ss_url)} dangerouslySetInnerHTML={{__html: doc.ss_federated_title}} /></h3>
<h3 className="search-results__heading"><a className="search-results__heading-link" href={this.getCanonicalLink(doc.sm_urls, doc.ss_url)} dangerouslySetInnerHTML={{__html: doc.ss_federated_title}} /></h3>
<div className="search-results__meta">
<cite className="search-results__citation">{this.renderSitenameLinks(doc.sm_site_name, doc.sm_urls, doc.ss_site_name)}</cite>
{this.dateFormat(doc.ds_federated_date)}
Expand Down