diff options
| author | jpl | 2017-04-03 17:44:36 +0200 |
|---|---|---|
| committer | jpl | 2017-04-03 17:44:36 +0200 |
| commit | bdf1a763e001aa5de6d237a50813b52927cd5fa7 (patch) | |
| tree | 0df0c1125c50fab762aa1dc601f63b962bb6b36c | |
| parent | 4ed8d66ec3025cb4e554554161a7af01307bd128 (diff) | |
| download | chouette-core-bdf1a763e001aa5de6d237a50813b52927cd5fa7.tar.bz2 | |
Fix disabled links on jp
3 files changed, 25 insertions, 10 deletions
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js index 04e3b8974..e0952e769 100644 --- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js +++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js @@ -75,28 +75,28 @@ class JourneyPattern extends Component{ </div> <ul className='dropdown-menu'> <li className={(this.props.value.deletable || this.props.status.policy['journey_patterns.edit'] == false) ? 'disabled' : ''}> - <a - href='#' + <button + type='button' onClick={this.props.onOpenEditModal} data-toggle='modal' data-target='#JourneyPatternModal' > Editer - </a> + </button> </li> <li className={this.props.value.object_id ? '' : 'disabled'}> {this.vehicleJourneyURL(this.props.value.object_id)} </li> <li className={'delete-action' + ((this.props.status.policy['journey_patterns.edit'] == false)? ' disabled' : '')}> - <a - href='#' + <button + type='button' onClick={(e) => { e.preventDefault() this.props.onDeleteJourneyPattern(this.props.index)} } > - <span className='fa fa-trash'></span>Supprimer - </a> + <span className='fa fa-trash'></span>Supprimer + </button> </li> </ul> </div> diff --git a/app/assets/stylesheets/components/_buttons.sass b/app/assets/stylesheets/components/_buttons.sass index 00551f7cb..f128512f5 100644 --- a/app/assets/stylesheets/components/_buttons.sass +++ b/app/assets/stylesheets/components/_buttons.sass @@ -113,12 +113,13 @@ table, .table border-radius: 0 box-shadow: 0 0 3px rgba($darkgrey, 0.25) - > li > a + > li > a, > li > button padding: 5px 15px > li.delete-action - > a + > a, > button + display: block position: relative margin-top: 11px diff --git a/app/assets/stylesheets/components/_dropdown.sass b/app/assets/stylesheets/components/_dropdown.sass index ee26aaeb5..eb2cc8f74 100644 --- a/app/assets/stylesheets/components/_dropdown.sass +++ b/app/assets/stylesheets/components/_dropdown.sass @@ -3,6 +3,20 @@ //-------------// .dropdown-menu - > .disabled > a + > li > button + display: block + width: 100% + text-align: left + border: none + background-color: transparent + color: #333 + + &:hover, &:focus + color: #262626 + background-color: whitesmoke + + > .disabled > a, > .disabled > button + cursor: not-allowed &, &:hover, &:focus color: rgba($darkgrey, 0.5) + background-color: transparent |
