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

remove Organization suffix from navbar-brand in navigation

Browse source
This commit is contained in:
shlok007 2017-08-09 23:34:58 +05:30 • committed by Shlok Srivastava
parent 28b55a9d72
commit 83abc9f71f
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,7 @@
- if conference.nil? || conference.new_record? - if conference.nil? || conference.new_record?
= link_to (ENV['OSEM_NAME'] || 'OSEM'), root_path, class: 'navbar-brand', title: 'Open Source Event Manager' = link_to (ENV['OSEM_NAME'] || 'OSEM'), root_path, class: 'navbar-brand', title: 'Open Source Event Manager'
- else - else
= link_to "#{conference.organization.name} Organization", organizations_path, class: 'navbar-brand', title: 'Open Source Event Manager' = link_to conference.organization.name, organizations_path, class: 'navbar-brand', title: 'Open Source Event Manager'
.collapse.navbar-collapse .collapse.navbar-collapse
- if content_for :splash_nav - if content_for :splash_nav
%ul.nav.navbar-nav#splash-nav %ul.nav.navbar-nav#splash-nav

2
spec/features/conference_spec.rb
View file

@ -77,7 +77,7 @@ feature Conference do
sign_in user sign_in user
visit admin_conference_path(conference.short_title) visit admin_conference_path(conference.short_title)
expect(find('.navbar-brand').text).to eq "#{conference.organization.name} Organization" expect(find('.navbar-brand').text).to eq(conference.organization.name)
end end
it_behaves_like 'add and update conference' it_behaves_like 'add and update conference'