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

Merge pull request #375 from differentreality/typo

Browse source 
typo
This commit is contained in:
Artem Chernikov 2014-07-27 16:55:27 +02:00
commit 6e8d34f666
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/sponsors_controller.rb
View file

@ -10,7 +10,7 @@ module Admin
else else
redirect_to(admin_conference_sponsors_path( redirect_to(admin_conference_sponsors_path(
conference_id: @conference.short_title), conference_id: @conference.short_title),
alert: 'Sponsorships updation failed') alert: 'Sponsorships update failed.')
end end
end end
end end

4
app/views/admin/conference/show.html.haml
View file

@ -26,8 +26,8 @@
.icon .icon
%i.glyphicon.glyphicon-user %i.glyphicon.glyphicon-user
.text .text
%label.text-muted programm: #{@program_length} min %label.text-muted program: #{@program_length} min
%label.text-muted new programm: #{@new_program_length} min %label.text-muted new program: #{@new_program_length} min
.row .row
= render partial: 'targets', locals: { targets: @program_minutes_targets, name: 'program_hours' } = render partial: 'targets', locals: { targets: @program_minutes_targets, name: 'program_hours' }
.row .row