Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

x_11_file_import_via_plugin #65

Open
flip wants to merge 65 commits from x_11_file_import_via_plugin into develop
pull from: x_11_file_import_via_plugin
merge into: Foodsoft:develop
Conversation 0 Commits 65 Files changed 463 +2 -2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit e0f63eebdc - Show all commits

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

@ -13,9 +13,9 @@
%li= link_to t('.reference_calculator'), home_reference_calculator_path
%li= link_to t('.logout'), logout_path
%li{class: ('disabled' if FoodsoftConfig[:homepage].blank?)}
= link_to FoodsoftConfig[:name], FoodsoftConfig[:homepage]
= link_to FoodsoftConfig[:name], FoodsoftConfig[:homepage], target: '_blank'
- if FoodsoftConfig[:help_url]
%li= link_to t('.help'), FoodsoftConfig[:help_url]
%li= link_to t('.help'), FoodsoftConfig[:help_url], target: '_blank'
%li= link_to t('.feedback.title'), new_feedback_path, title: t('.feedback.desc')
.clearfix