ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2025-02-14 21:10:27 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/master' into AD-419-decouple-piece-registration-from-

Browse Source 
Conflicts:
	bitcoin/models.py
	web/settings_env/live.py
This commit is contained in:
diminator 2015-07-15 15:54:37 +02:00
parent 8953d0bfa7
commit 5f7b7db00f
2 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/components/ascribe_accordion_list/accordion_list_item.js
View File

@ -108,7 +108,8 @@ let AccordionListItem = React.createClass({
getCreateEditionsDialog() { getCreateEditionsDialog() {
if (this.props.content.num_editions < 1 && this.state.showCreateEditionsDialog) { if (this.props.content.num_editions < 1 && this.state.showCreateEditionsDialog) {
return ( return (
<div className="ascribe-accordion-list-item-table col-xs-12 col-sm-10 col-md-8 col-lg-8 col-sm-offset-1 col-md-offset-2 col-lg-offset-2"> <div
className="ascribe-accordion-list-item-table col-xs-12 col-sm-10 col-md-8 col-lg-8 col-sm-offset-1 col-md-offset-2 col-lg-offset-2">
<CreateEditionsForm <CreateEditionsForm
pieceId={this.props.content.id} pieceId={this.props.content.id}
handleSuccess={this.handleEditionCreationSuccess}/> handleSuccess={this.handleEditionCreationSuccess}/>
@ -121,9 +122,12 @@ let AccordionListItem = React.createClass({
// convert this to acl_view_licences later // convert this to acl_view_licences later
if (this.state.whitelabel.name === 'Creative Commons France') { if (this.state.whitelabel.name === 'Creative Commons France') {
return ( return (
<a href={this.props.content.license_type.url} target="_blank" className="pull-right"> <span>
<span>, </span>
<a href={this.props.content.license_type.url} target="_blank">
{getLangText('%s license', this.props.content.license_type.code)} {getLangText('%s license', this.props.content.license_type.code)}
</a> </a>
</span>
); );
} }
}, },
@ -158,11 +162,14 @@ let AccordionListItem = React.createClass({
</Link> </Link>
</div> </div>
</div> </div>
<div className="col-xs-8 col-sm-9 col-md-9 col-lg-9 col-md-offset-1 col-lg-offset-1 accordion-list-item-header"> <div
className="col-xs-8 col-sm-9 col-md-9 col-lg-9 col-md-offset-1 col-lg-offset-1 accordion-list-item-header">
<Link {...linkData}> <Link {...linkData}>
<h1 className="truncate">{this.props.content.title}</h1> <h1 className="truncate">{this.props.content.title}</h1>
</Link> </Link>
<h3>{getLangText('by %s', this.props.content.artist_name)}</h3> <h3>{getLangText('by %s', this.props.content.artist_name)}</h3>
<div> <div>
<span className="pull-left">{this.props.content.date_created.split('-')[0]}</span> <span className="pull-left">{this.props.content.date_created.split('-')[0]}</span>
@ -187,13 +194,15 @@ let AccordionListItem = React.createClass({
<button <button
disabled disabled
className="btn btn-default btn-xs pull-right"> className="btn btn-default btn-xs pull-right">
{getLangText('Submitted to prize')} <span className="glyphicon glyphicon-ok" aria-hidden="true"></span> {getLangText('Submitted to prize')} <span className="glyphicon glyphicon-ok"
aria-hidden="true"></span>
</button> </button>
</AclProxy> </AclProxy>
{this.getLicences()} {this.getLicences()}
</div> </div>
</div> </div>
<span style={{'clear': 'both'}}></span> <span style={{'clear': 'both'}}></span>
<div className="request-action-batch"> <div className="request-action-batch">
{this.getGlyphicon()} {this.getGlyphicon()}
</div> </div>

9
js/utils/lang_utils.js
View File

@ -28,12 +28,11 @@ export function getLangText(s, ...args) {
return formatText(languages['en-US'][s], args); return formatText(languages['en-US'][s], args);
} }
} catch(err) { } catch(err) {
if(!(s in languages[lang])) { //if(!(s in languages[lang])) {
console.warn('Language-string is not in constants file. Add: "' + s + '" to the "' + lang + '" language file. Defaulting to keyname'); console.warn('Language-string is not in constants file. Add: "' + s + '" to the "' + lang + '" language file. Defaulting to keyname');
return s; return s;
} else { //} else {
console.error(err); // console.error(err);
} //}
} }
} }