gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #893 from nishanthvijayan/fix-tooltip-track

Browse source 
Proposal submitter should be asked to add track only if conf has track
This commit is contained in:
Henne Vogelsang 2016-03-30 17:30:36 +02:00
commit 483f1ccd85
4 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/views/proposal/_tooltip.html.haml
View file

@ -15,9 +15,10 @@
%li{'class'=>class_for_todo(progress_status['commercials'])}
%span{'class'=>icon_for_todo(progress_status['commercials'])}
= 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['track'])}
%span{'class'=>icon_for_todo(progress_status['track'])}
= link_to 'Add a track', edit_conference_program_proposal_path(event.program.conference.short_title, event)
- unless progress_status['track'].nil?
%li{'class'=>class_for_todo(progress_status['track'])}
%span{'class'=>icon_for_todo(progress_status['track'])}
= link_to 'Add a track', edit_conference_program_proposal_path(event.program.conference.short_title, event)
%li{'class'=>class_for_todo(progress_status['difficulty_level'])}
%span{'class'=>icon_for_todo(progress_status['difficulty_level'])}
= link_to 'Add a difficulty level', edit_conference_program_proposal_path(event.program.conference.short_title, event)

2
app/views/proposal/index.html.haml
View file

@ -76,7 +76,7 @@
- progress_percentage = event.calculate_progress
.progress
%div{class: "progress-bar #{event_progress_color(progress_percentage)}", style: "width:#{progress_percentage}%;"}
= event.progress_status.reject{ |_key, value| value }.length
= event.progress_status.reject{ |_key, value| value || value.nil? }.length
left
%td.col-md-3{style: "padding:20px 0px 20px 0px;"}