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

Merge branch 'master' into organization-link

Browse source
This commit is contained in:
James Mason 2017-11-07 14:32:35 -08:00 • committed by GitHub
commit 1c623b1c8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 41 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,10 +13,8 @@
%span.icon-bar
%span.icon-bar
%span.icon-bar
- if conference.nil? || conference.new_record?
= link_to (ENV['OSEM_NAME'] || 'OSEM'), root_path, class: 'navbar-brand', title: 'Open Source Event Manager'
- else
= link_to conference.organization.name, organizations_path, class: 'navbar-brand', title: 'Open Source Event Manager'
= nav_root_link_for conference
.collapse.navbar-collapse#main-nav
- if content_for :splash_nav
%ul.nav.navbar-nav#splash-nav