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

fixes done

Browse source
This commit is contained in:
Gopesh Tulsyan 2014-05-16 21:01:03 +05:30
parent d498178513
commit 2d01bcad17
2 changed files with 49 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/home/_conference_details.html.haml
View file

@ -20,7 +20,7 @@
= simple_format(conference.venue.description, class: 'lead') = simple_format(conference.venue.description, class: 'lead')
.col-md-2 .col-md-2
.btn-group-vertical .btn-group-vertical
- if @conference && controller.class.name != "ConferenceController" - if !@conference || @conference != conference
= link_to "View Conference", conference_path(conference.short_title), :class =>"btn btn-default" = link_to "View Conference", conference_path(conference.short_title), :class =>"btn btn-default"
- if conference.registration_open? - if conference.registration_open?
- if conference.user_registered?(current_user) - if conference.user_registered?(current_user)

4
app/views/layouts/_navigation.html.haml
View file

@ -7,14 +7,12 @@
%span.icon-bar %span.icon-bar
%span.icon-bar %span.icon-bar
%span.icon-bar %span.icon-bar
- if @conference && controller.class.name == "ConferenceController" - if @conference
= link_to @conference.title, "#", :class => 'navbar-brand' = link_to @conference.title, "#", :class => 'navbar-brand'
- else - else
= link_to CONFIG['name'], root_path, :class => 'navbar-brand', :title => "Open Source Event Manager" = link_to CONFIG['name'], root_path, :class => 'navbar-brand', :title => "Open Source Event Manager"
.collapse.navbar-collapse .collapse.navbar-collapse
- if content_for?(:splash_header)
= yield(:splash_header) = yield(:splash_header)
- else
- if @conference && !@conference.short_title.nil? - if @conference && !@conference.short_title.nil?
%p.navbar-text %p.navbar-text
= @conference.short_title = @conference.short_title