aboutsummaryrefslogtreecommitdiffstats
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorjpl2016-11-09 10:05:48 +0100
committerjpl2016-11-09 10:05:48 +0100
commit96a6a299d66d241aa608c67fc8fb964666f51cbf (patch)
treedfc17243ac5b516844af8b3bb915cfaffa64345f /app/assets/javascripts
parent247d315d611efd754aedc13c046ad130915c5f6d (diff)
downloadchouette-core-96a6a299d66d241aa608c67fc8fb964666f51cbf.tar.bz2
improving stop_point integration, easy
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/es6_browserified/components/BSelect2.js19
1 files changed, 14 insertions, 5 deletions
diff --git a/app/assets/javascripts/es6_browserified/components/BSelect2.js b/app/assets/javascripts/es6_browserified/components/BSelect2.js
index 25d34bcc7..455c211a9 100644
--- a/app/assets/javascripts/es6_browserified/components/BSelect2.js
+++ b/app/assets/javascripts/es6_browserified/components/BSelect2.js
@@ -25,16 +25,25 @@ class BSelect3 extends React.Component{
render() {
if(this.state.edit)
return (
- <div>
+ <div className='input-group select2-bootstrap-append'>
<BSelect2 {...this.props} onSelect={ this.onChange.bind(this) }/>
- <span className='fa fa-undo' onClick={this.onToggleEdit.bind(this)}></span>
+ <span className='input-group-btn'>
+ <button type='button' className='btn btn-default' onClick={this.onToggleEdit.bind(this)}>
+ <span className='fa fa-undo'></span>
+ </button>
+ </span>
</div>
)
else
return (
- <div>
- <span>{this.props.value.text} </span>
- <span className='fa fa-pencil' onClick={this.onToggleEdit.bind(this)}></span>
+ <div className='input-group'>
+ <span className='form-control'>{this.props.value.text} </span>
+
+ <span className='input-group-btn'>
+ <button type='button' className='btn btn-default' onClick={this.onToggleEdit.bind(this)}>
+ <span className='fa fa-pencil'></span>
+ </button>
+ </span>
</div>
)
}