rebase fixes for commercials path

This commit is contained in:
Stella Rouzi 2016-01-22 11:00:01 +02:00 committed by Henne Vogelsang
parent a0d045e156
commit 813658fb19
3 changed files with 2 additions and 5 deletions

View file

@ -26,7 +26,7 @@
- if progress_status['commercials']
= link_to 'Edit the commercials', edit_conference_program_proposal_path(event.program.conference.short_title, event, anchor: 'commercials-content')
- else
= link_to 'Add a commercial', edit_conference_program_proposal_path(event.conference.short_title, event, anchor: 'commercials-content')
= link_to 'Add a commercial', edit_conference_program_proposal_path(event.program.conference.short_title, event, anchor: 'commercials-content')
%li{'class'=>class_for_todo(progress_status['difficulty_level'])}
%span{'class'=>icon_for_todo(progress_status['difficulty_level'])}
- if progress_status['difficulty_level']