mirror of
https://github.com/ascribe/onion.git
synced 2024-12-23 01:39:36 +01:00
Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-551-work-on-burn-down-list
This commit is contained in:
commit
ca72168da2
@ -82,7 +82,9 @@ let AccordionListItem = React.createClass({
|
||||
</Link>
|
||||
<h3>{getLangText('by %s', this.props.content.artist_name)}</h3>
|
||||
<div>
|
||||
<span>{this.props.content.date_created.split('-')[0]}, </span>
|
||||
<span>{this.props.content.date_created.split('-')[0]}</span>
|
||||
</div>
|
||||
<div>
|
||||
<AccordionListItemEditionWidget
|
||||
piece={this.props.content}/>
|
||||
{/* <a href={this.props.content.license_type.url} target="_blank" className="pull-right">
|
||||
|
@ -78,7 +78,7 @@ let AccordionListItemEditionWidget = React.createClass({
|
||||
<span
|
||||
onClick={this.toggleTable}
|
||||
className="ascribe-accordion-list-item-edition-widget">
|
||||
Create editions
|
||||
+ Editions
|
||||
</span>
|
||||
);
|
||||
} else if(numEditions === 1) {
|
||||
@ -91,7 +91,8 @@ let AccordionListItemEditionWidget = React.createClass({
|
||||
{editionMapping + ' ' + getLangText('Edition')} {this.getGlyphicon()}
|
||||
</span>
|
||||
);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
return (
|
||||
<span
|
||||
onClick={this.toggleTable}
|
||||
|
@ -275,7 +275,7 @@ let EditionPersonalNote = React.createClass({
|
||||
label={getLangText('Personal note (private)')}
|
||||
editable={true}>
|
||||
<InputTextAreaToggable
|
||||
rows={3}
|
||||
rows={1}
|
||||
editable={true}
|
||||
defaultValue={this.props.edition.note_from_user}
|
||||
placeholder={getLangText('Enter a personal note%s', '...')}
|
||||
@ -314,7 +314,7 @@ let EditionPublicEditionNote = React.createClass({
|
||||
label={getLangText('Edition note (public)')}
|
||||
editable={isEditable}>
|
||||
<InputTextAreaToggable
|
||||
rows={3}
|
||||
rows={1}
|
||||
editable={isEditable}
|
||||
defaultValue={this.props.edition.public_note}
|
||||
placeholder={getLangText('Enter a public note for this edition%', '...')}
|
||||
|
@ -35,6 +35,7 @@ let Form = React.createClass({
|
||||
this.refs[ref].reset();
|
||||
}
|
||||
}
|
||||
this.setState(this.getInitialState());
|
||||
},
|
||||
submit(event){
|
||||
if (event) {
|
||||
|
@ -276,7 +276,7 @@ var ReactS3FineUploader = React.createClass({
|
||||
body: JSON.stringify({
|
||||
'filename': file.name,
|
||||
'key': file.key,
|
||||
'bitcoin_id': this.props.createBlobRoutine.pieceId
|
||||
'piece_id': this.props.createBlobRoutine.pieceId
|
||||
})
|
||||
})
|
||||
.then((res) => {
|
||||
|
@ -94,7 +94,7 @@ let RegisterPiece = React.createClass( {
|
||||
this.state.orderBy,
|
||||
this.state.orderAsc);
|
||||
|
||||
this.transitionTo('piece', {editionId: response.piece.id});
|
||||
this.transitionTo('piece', {pieceId: response.piece.id});
|
||||
},
|
||||
|
||||
getFormData(){
|
||||
|
@ -8,7 +8,7 @@ $ascribe-accordion-list-font: 'Source Sans Pro';
|
||||
|
||||
padding-left:0;
|
||||
padding-right:0;
|
||||
margin-top: 3em;
|
||||
margin-top: 1.5em;
|
||||
&::first-child {
|
||||
margin-top:0;
|
||||
}
|
||||
@ -44,13 +44,14 @@ $ascribe-accordion-list-font: 'Source Sans Pro';
|
||||
}
|
||||
}
|
||||
h1 {
|
||||
margin-top: .3em;
|
||||
font-size: 2.25em;
|
||||
margin: .1em 0 .1em 0;
|
||||
font-size: 2.2em;
|
||||
cursor: pointer;
|
||||
}
|
||||
h3 {
|
||||
font-size: 1.1em;
|
||||
margin: .2em 0 0 0;
|
||||
font-size: 1.3em;
|
||||
margin: .2em 0 .3em 0;
|
||||
cursor: pointer;
|
||||
}
|
||||
a {
|
||||
color: #666;
|
||||
@ -92,6 +93,7 @@ $ascribe-accordion-list-font: 'Source Sans Pro';
|
||||
}
|
||||
}
|
||||
border-left: 3px solid rgba(0,0,0,0);
|
||||
border-top: 1px solid rgba(0,0,0,.1);
|
||||
border-bottom: 1px solid rgba(0,0,0,.05);
|
||||
}
|
||||
tbody {
|
||||
@ -147,9 +149,12 @@ span.ascribe-accordion-list-table-toggle {
|
||||
|
||||
.ascribe-accordion-list-item-edition-widget {
|
||||
cursor: pointer;
|
||||
//margin-left: 0.3em;
|
||||
|
||||
&:hover {
|
||||
color: $ascribe-color-full;
|
||||
color: $ascribe-color-dark;
|
||||
}
|
||||
.glyphicon {
|
||||
top: 1px !important;
|
||||
font-size: 0.8em;
|
||||
}
|
||||
}
|
@ -11,8 +11,8 @@
|
||||
.ascribe-edition-collapsible-wrapper > div:first-child {
|
||||
width: 100%;
|
||||
cursor: pointer;
|
||||
background-color: #F5F5F5;
|
||||
padding: 10px;
|
||||
background-color: rgba(0,0,0,0);
|
||||
padding: 0 10px 10px 0;
|
||||
margin-top: 20px;
|
||||
}
|
||||
.ascribe-edition-collapsible-wrapper > div > span {
|
||||
|
Loading…
Reference in New Issue
Block a user