ascribe
/
onion
mirror of https://github.com/ascribe/onion.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Rebase remerge

This commit is contained in:
Brett Sun 2016-02-04 13:30:16 +01:00
parent cb59d042b5
commit 5cfbe5cc39
5 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/components/ascribe_piece_list_toolbar/piece_list_toolbar_filter_widget.js
View File

@ -84,6 +84,7 @@ let PieceListToolbarFilterWidget = React.createClass({
if (this.props.filterParams && this.props.filterParams.length) {
return (
<DropdownButton
id="ascribe-piece-list-toolbar-filter-widget-dropdown"
pullRight={true}
title={filterIcon}
className="ascribe-piece-list-toolbar-filter-widget">

7
js/components/ascribe_piece_list_toolbar/piece_list_toolbar_order_widget.js
View File

@ -45,7 +45,7 @@ let PieceListToolbarOrderWidget = React.createClass({
},
render() {
let filterIcon = (
let orderIcon = (
<span>
<span className="ascribe-icon icon-ascribe-sort" aria-hidden="true"></span>
<span style={this.isOrderActive()}>&middot;</span>
@ -55,9 +55,10 @@ let PieceListToolbarOrderWidget = React.createClass({
if (this.props.orderParams && this.props.orderParams.length) {
return (
<DropdownButton
id="ascribe-piece-list-toolbar-order-widget-dropdown"
pullRight={true}
title={filterIcon}
className="ascribe-piece-list-toolbar-filter-widget">
className="ascribe-piece-list-toolbar-filter-widget"
title={orderIcon}>
<li style={{'textAlign': 'center'}}>
<em>{getLangText('Sort by')}:</em>
</li>

1
js/components/header.js
View File

@ -173,6 +173,7 @@ let Header = React.createClass({
account = (
<DropdownButton
ref='dropdownbutton'
id="nav-route-user-dropdown"
eventKey="1"
title={currentUser.username}>
<LinkContainer

1
js/components/header_notification.js
View File

@ -126,6 +126,7 @@ let HeaderNotifications = React.createClass({
<Nav navbar right>
<DropdownButton
ref='dropdownbutton'
id="header-notification-dropdown"
eventKey="1"
title={
<span>

1
js/components/nav_routes_links_link.js
View File

@ -30,6 +30,7 @@ let NavRoutesLinksLink = React.createClass({
return (
<DropdownButton
disabled={disabled}
id={`nav-route-${headerTitle.toLowerCase()}-dropdown`}
title={headerTitle}>
{children}
</DropdownButton>