diff --git a/js/components/ascribe_detail/edition.js b/js/components/ascribe_detail/edition.js index 9ad6504a..501b4c6b 100644 --- a/js/components/ascribe_detail/edition.js +++ b/js/components/ascribe_detail/edition.js @@ -25,7 +25,7 @@ import CollapsibleParagraph from './../ascribe_collapsible/collapsible_paragraph import Form from './../ascribe_forms/form'; import Property from './../ascribe_forms/property'; import EditionDetailProperty from './detail_property'; - +import LicenseDetail from './license_detail'; import EditionFurtherDetails from './further_details'; import ListRequestActions from './../ascribe_forms/list_form_request_actions'; @@ -101,7 +101,6 @@ let Edition = React.createClass({ }, refreshCollection() { - console.log('freshing'); PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search, this.state.orderBy, this.state.orderAsc, this.state.filterBy); EditionListActions.refreshEditionList({pieceId: this.props.edition.parent}); @@ -316,6 +315,7 @@ let EditionSummary = React.createClass({ + {this.getStatus()}
{this.getActions()} diff --git a/js/components/ascribe_detail/license_detail.js b/js/components/ascribe_detail/license_detail.js new file mode 100644 index 00000000..c3cc9f62 --- /dev/null +++ b/js/components/ascribe_detail/license_detail.js @@ -0,0 +1,31 @@ +'use strict'; + +import React from 'react'; + +import DetailProperty from './detail_property'; + +/** + * This is the component that implements display-specific functionality + */ +let LicenseDetail = React.createClass({ + propTypes: { + license: React.PropTypes.object + }, + render () { + if (this.props.license.code === 'default') { + return null; + } + return ( + + { this.props.license.code.toUpperCase() + ': ' + this.props.license.name} + + } + /> + ); + } +}); + +export default LicenseDetail; diff --git a/js/components/ascribe_detail/piece_container.js b/js/components/ascribe_detail/piece_container.js index f14cf743..c2eb1759 100644 --- a/js/components/ascribe_detail/piece_container.js +++ b/js/components/ascribe_detail/piece_container.js @@ -19,6 +19,7 @@ import CollapsibleParagraph from './../ascribe_collapsible/collapsible_paragraph import FurtherDetails from './further_details'; import DetailProperty from './detail_property'; +import LicenseDetail from './license_detail'; import HistoryIterator from './history_iterator'; import AclButtonList from './../ascribe_buttons/acl_button_list'; @@ -224,6 +225,7 @@ let PieceContainer = React.createClass({
+
} buttons={this.getActions()}> diff --git a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_order_widget.js b/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_order_widget.js index 38b92b6d..a44b8ca2 100644 --- a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_order_widget.js +++ b/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_order_widget.js @@ -3,7 +3,6 @@ import React from 'react'; import DropdownButton from 'react-bootstrap/lib/DropdownButton'; -import MenuItem from 'react-bootstrap/lib/MenuItem'; import { getLangText } from '../../utils/lang_utils.js'; @@ -62,20 +61,22 @@ let PieceListToolbarOrderWidget = React.createClass({ {this.props.orderParams.map((param) => { return ( - -
- - {getLangText(param.replace('_', ' '))} - - -1} /> -
-
+
+
  • +
    + + {getLangText(param.replace('_', ' '))} + + -1} /> +
    +
  • +
    ); })} diff --git a/js/components/header.js b/js/components/header.js index 68bacefb..a724751b 100644 --- a/js/components/header.js +++ b/js/components/header.js @@ -64,31 +64,33 @@ let Header = React.createClass({ }, getLogo(){ - let logo = ( + if (this.state.whitelabel && this.state.whitelabel.logo){ + return ; + } + return ( ascribe - ); - if (this.state.whitelabel && this.state.whitelabel.logo){ - logo = ; - } - return logo; + + ); }, getPoweredBy(){ - if (this.state.whitelabel && this.state.whitelabel.logo) { - return ( -
  • - - {getLangText('powered by')} - ascribe - - -
  • - ); - } - return null; + return ( + +
  • + + {getLangText('powered by')} + ascribe + + +
  • +
    + ); }, + onChange(state) { this.setState(state); diff --git a/js/components/whitelabel/wallet/components/cc/cc_register_piece.js b/js/components/whitelabel/wallet/components/cc/cc_register_piece.js index 129c1b0a..c9690477 100644 --- a/js/components/whitelabel/wallet/components/cc/cc_register_piece.js +++ b/js/components/whitelabel/wallet/components/cc/cc_register_piece.js @@ -46,12 +46,19 @@ let CCRegisterPiece = React.createClass({ label={getLangText('Copyright license%s', '...')} onChange={this.onLicenseChange} footer={ - - {getLangText('Learn more')} - + + + {getLangText('Learn more about ') + this.state.licenses[this.state.selectedLicense].code} + +  ( + + {getLangText('ascribe faq')} + ) + }>