From 61bd34fdc5ae2ca55373c84f03b1ed71a28ba2cb Mon Sep 17 00:00:00 2001 From: cryptogopher Date: Fri, 27 Dec 2019 23:54:27 +0100 Subject: [PATCH] Moved sidebar rendering to layout --- app/views/body_trackers/index.html.erb | 4 ---- app/views/ingredients/index.html.erb | 4 ---- app/views/ingredients/nutrients.html.erb | 4 ---- app/views/layouts/_body_tracking.html.erb | 4 ++++ app/views/measurements/index.html.erb | 4 ---- app/views/measurements/readouts.html.erb | 4 ---- app/views/quantities/index.html.erb | 4 ---- app/views/sources/index.html.erb | 4 ---- app/views/units/index.html.erb | 4 ---- 9 files changed, 4 insertions(+), 32 deletions(-) diff --git a/app/views/body_trackers/index.html.erb b/app/views/body_trackers/index.html.erb index e2860e3..dcec405 100644 --- a/app/views/body_trackers/index.html.erb +++ b/app/views/body_trackers/index.html.erb @@ -1,5 +1 @@

<%= t ".heading" %>

- -<% content_for :sidebar do %> - <%= render partial: 'body_trackers/sidebar' %> -<% end %> diff --git a/app/views/ingredients/index.html.erb b/app/views/ingredients/index.html.erb index a78dd23..d932a9d 100644 --- a/app/views/ingredients/index.html.erb +++ b/app/views/ingredients/index.html.erb @@ -1,7 +1,3 @@ -<% content_for :sidebar do %> - <%= render partial: 'body_trackers/sidebar' %> -<% end %> -
<%= link_to t(".heading_nutrient_view"), nutrients_project_ingredients_path(@project), class: 'icon icon-stats' %> diff --git a/app/views/ingredients/nutrients.html.erb b/app/views/ingredients/nutrients.html.erb index a7596dc..e109571 100644 --- a/app/views/ingredients/nutrients.html.erb +++ b/app/views/ingredients/nutrients.html.erb @@ -1,7 +1,3 @@ -<% content_for :sidebar do %> - <%= render partial: 'body_trackers/sidebar' %> -<% end %> -
<%= link_to t(".heading_ingredient_list"), project_ingredients_path(@project), class: 'icon icon-list' %> diff --git a/app/views/layouts/_body_tracking.html.erb b/app/views/layouts/_body_tracking.html.erb index 3537b53..f5f75f5 100644 --- a/app/views/layouts/_body_tracking.html.erb +++ b/app/views/layouts/_body_tracking.html.erb @@ -1,3 +1,7 @@ <% content_for :header_tags do %> <%= stylesheet_link_tag 'body_tracking', plugin: 'body_tracking' %> <% end %> + +<% content_for :sidebar do %> + <%= render partial: 'body_trackers/sidebar' %> +<% end %> diff --git a/app/views/measurements/index.html.erb b/app/views/measurements/index.html.erb index 26cdcdc..195e06c 100644 --- a/app/views/measurements/index.html.erb +++ b/app/views/measurements/index.html.erb @@ -1,7 +1,3 @@ -<% content_for :sidebar do %> - <%= render partial: 'body_trackers/sidebar' %> -<% end %> -
<%= render partial: 'measurements/contextual' %>
diff --git a/app/views/measurements/readouts.html.erb b/app/views/measurements/readouts.html.erb index 39d2844..1ad7fab 100644 --- a/app/views/measurements/readouts.html.erb +++ b/app/views/measurements/readouts.html.erb @@ -1,7 +1,3 @@ -<% content_for :sidebar do %> - <%= render partial: 'body_trackers/sidebar' %> -<% end %> -
<%= render partial: 'measurements/contextual' %>
diff --git a/app/views/quantities/index.html.erb b/app/views/quantities/index.html.erb index c3c821a..54d1486 100644 --- a/app/views/quantities/index.html.erb +++ b/app/views/quantities/index.html.erb @@ -1,7 +1,3 @@ -<% content_for :sidebar do %> - <%= render partial: 'body_trackers/sidebar' %> -<% end %> -
<% if User.current.allowed_to?(:manage_common, @project) %> <%= link_to t(".link_new_quantity"), '#', class: 'icon icon-add', diff --git a/app/views/sources/index.html.erb b/app/views/sources/index.html.erb index 60c5609..55b8ca9 100644 --- a/app/views/sources/index.html.erb +++ b/app/views/sources/index.html.erb @@ -1,7 +1,3 @@ -<% content_for :sidebar do %> - <%= render partial: 'body_trackers/sidebar' %> -<% end %> -
<% if User.current.allowed_to?(:manage_common, @project) %> <%= link_to t(".link_new_source"), '#', class: 'icon icon-add', diff --git a/app/views/units/index.html.erb b/app/views/units/index.html.erb index 7878c26..c92e9e0 100644 --- a/app/views/units/index.html.erb +++ b/app/views/units/index.html.erb @@ -1,7 +1,3 @@ -<% content_for :sidebar do %> - <%= render partial: 'body_trackers/sidebar' %> -<% end %> -
<% if User.current.allowed_to?(:manage_common, @project) %> <%= link_to t(".link_new_unit"), '#', class: 'icon icon-add',