diff --git a/app/views/admin/spending_proposals/edit.html.erb b/app/views/admin/spending_proposals/edit.html.erb index a2e45dd04..e695c3a97 100644 --- a/app/views/admin/spending_proposals/edit.html.erb +++ b/app/views/admin/spending_proposals/edit.html.erb @@ -36,4 +36,4 @@ <% end %>
-<%= render 'written_by_valuators' %> \ No newline at end of file +<%= render 'valuation/spending_proposals/written_by_valuators' %> \ No newline at end of file diff --git a/app/views/admin/spending_proposals/show.html.erb b/app/views/admin/spending_proposals/show.html.erb index 7c8e943af..bb0288fae 100644 --- a/app/views/admin/spending_proposals/show.html.erb +++ b/app/views/admin/spending_proposals/show.html.erb @@ -30,4 +30,4 @@
-<%= render 'written_by_valuators' %> \ No newline at end of file +<%= render 'valuation/spending_proposals/written_by_valuators' %> \ No newline at end of file diff --git a/app/views/admin/spending_proposals/_written_by_valuators.html.erb b/app/views/valuation/spending_proposals/_written_by_valuators.html.erb similarity index 100% rename from app/views/admin/spending_proposals/_written_by_valuators.html.erb rename to app/views/valuation/spending_proposals/_written_by_valuators.html.erb diff --git a/app/views/valuation/spending_proposals/show.html.erb b/app/views/valuation/spending_proposals/show.html.erb index 7abb62452..b5b71fcdf 100644 --- a/app/views/valuation/spending_proposals/show.html.erb +++ b/app/views/valuation/spending_proposals/show.html.erb @@ -57,57 +57,4 @@ <%= link_to t("valuation.spending_proposals.show.edit_dossier"), edit_valuation_spending_proposal_path(@spending_proposal) %>

-

- - <%= t("valuation.spending_proposals.show.price") %> - (<%= t("valuation.spending_proposals.show.currency") %>): - - - <% if @spending_proposal.price.present? %> - <%= @spending_proposal.price %> - <% else %> - <% t("valuation.spending_proposals.show.undefined") %> - <% end %> -

- -

- - <%= t("valuation.spending_proposals.show.price_first_year") %> - (<%= t("valuation.spending_proposals.show.currency") %>): - - - <% if @spending_proposal.price_first_year.present? %> - <%= @spending_proposal.price_first_year %> - <% else %> - <%= t("valuation.spending_proposals.show.undefined") %> - <% end %> -

- -<%= explanation_field @spending_proposal.price_explanation %> - -

- <%= t("valuation.spending_proposals.show.time_scope") %>: - <% if @spending_proposal.time_scope.present? %> - <%= @spending_proposal.time_scope %> - <% else %> - <%= t("valuation.spending_proposals.show.undefined") %> - <% end %> -

- -

- <%= t("valuation.spending_proposals.show.feasibility") %>: - <%= t("valuation.spending_proposals.show.#{@spending_proposal.feasibility}") %> -

- -<%= explanation_field @spending_proposal.feasible_explanation %> - -<% if @spending_proposal.valuation_finished %> -

- <%= t("valuation.spending_proposals.show.valuation_finished") %> -

-<% end %> - -<% if @spending_proposal.internal_comments.present? %> -

<%= t("valuation.spending_proposals.show.internal_comments") %>

- <%= explanation_field @spending_proposal.internal_comments %> -<% end %> +<%= render 'written_by_valuators' %> \ No newline at end of file