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

12_generate_custom_csv_file #58

Open
philipp wants to merge 59 commits from 12_generate_custom_csv_file into develop
pull from: 12_generate_custom_csv_file
merge into: Foodsoft:develop
Conversation 0 Commits 59 Files changed 426 +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('.reference_calculator'), home_reference_calculator_path
%li= link_to t('.logout'), logout_path %li= link_to t('.logout'), logout_path
%li{class: ('disabled' if FoodsoftConfig[:homepage].blank?)} %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] - 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') %li= link_to t('.feedback.title'), new_feedback_path, title: t('.feedback.desc')
.clearfix .clearfix