diff --git a/app/assets/stylesheets/admin/budgets/form.scss b/app/assets/stylesheets/admin/budgets/form.scss new file mode 100644 index 000000000..a5ae94ea4 --- /dev/null +++ b/app/assets/stylesheets/admin/budgets/form.scss @@ -0,0 +1,20 @@ +.admin .budgets-form { + + > fieldset { + border-top: 4px solid $admin-border-color; + clear: both; + margin-top: $line-height * 1.5; + + legend { + color: $admin-text; + font-size: $small-font-size; + font-weight: bold; + padding-right: $line-height / 2; + text-transform: uppercase; + } + } + + .globalize-languages { + max-width: none; + } +} diff --git a/app/assets/stylesheets/admin/budgets/help.scss b/app/assets/stylesheets/admin/budgets/help.scss index 16f692830..e3bf1d6c0 100644 --- a/app/assets/stylesheets/admin/budgets/help.scss +++ b/app/assets/stylesheets/admin/budgets/help.scss @@ -7,6 +7,7 @@ @include has-fa-icon(quote-right, solid, after); background: $table-header; border-radius: rem-calc(6); + clear: both; color: $admin-text; margin-bottom: $line-height; padding: $padding; diff --git a/app/views/admin/budgets/_association.html.erb b/app/views/admin/budgets/_association.html.erb index 026a47ca6..143bebabe 100644 --- a/app/views/admin/budgets/_association.html.erb +++ b/app/views/admin/budgets/_association.html.erb @@ -2,10 +2,12 @@ <% if assignables.nil? || assignables.empty? %>

<%= t("admin.budgets.edit.empty_#{assignable_type}") %>

<% else %> -

<%= t("admin.budgets.edit.#{assignable_type}", count: 0) %>

- <% field = "#{assignable_type.chomp("s")}_ids" %> - <%= form.collection_check_boxes field, assignables, :id, :name do |box| %> - <%= box.label { box.check_box + box.text } %> - <% end %> +
+ <%= t("admin.budgets.edit.#{assignable_type}", count: 0) %> + <% field = "#{assignable_type.chomp("s")}_ids" %> + <%= form.collection_check_boxes field, assignables, :id, :name do |box| %> + <%= box.label { box.check_box + box.text } %> + <% end %> +
<% end %> diff --git a/app/views/admin/budgets/_form.html.erb b/app/views/admin/budgets/_form.html.erb index 628f4a96e..4702a7ae2 100644 --- a/app/views/admin/budgets/_form.html.erb +++ b/app/views/admin/budgets/_form.html.erb @@ -1,21 +1,16 @@ -<%= render "shared/globalize_locales", resource: @budget %> +<%= translatable_form_for [:admin, @budget], html: { class: "budgets-form" } do |f| %> +
+ <%= t("admin.budgets.edit.info.budget_settings") %> + <%= render "shared/globalize_locales", resource: @budget %> + <%= render "shared/errors", resource: @budget %> -<%= translatable_form_for [:admin, @budget] do |f| %> - - <%= render "shared/errors", resource: @budget %> - -
<%= f.translatable_fields do |translations_form| %> -
- <%= translations_form.text_field :name, maxlength: Budget.title_max_length %> +
+ <%= translations_form.text_field :name, + maxlength: Budget.title_max_length, + hint: t("admin.budgets.edit.name_description") %>
<% end %> -
- -
-
- <%= f.select :phase, budget_phases_select_options %> -
<%= f.select :voting_style, budget_voting_styles_select_options %> @@ -24,102 +19,103 @@
<%= f.select :currency_symbol, budget_currency_symbol_select_options %>
-
+
+ +
+ <%= t("admin.budgets.edit.info.staff_settings") %> -
<% %w[administrators valuators].each do |staff| %> -
+
<%= link_to t("admin.budgets.edit.#{staff}", count: @budget.send(staff).count), "#", class: "button expanded hollow js-budget-show-#{staff}-list js-budget-show-users-list", data: { toggle: "#{staff}_list", texts: t("admin.budgets.edit.#{staff}") } %>
<% end %> -
-
<%= render "/admin/budgets/association", assignable_type: "administrators", assignables: @admins, form: f %> <%= render "/admin/budgets/association", assignable_type: "valuators", assignables: @valuators, form: f %> -
+
- <%= render Admin::Budgets::HelpComponent.new("budget_phases") %> - - <% if @budget.phases.present? %> -
-
- - - - - - - - - - - <% @budget.phases.order(:id).each do |phase| %> - - - - - - - <% end %> -
<%= t("admin.budgets.edit.phase") %><%= t("admin.budgets.edit.dates") %><%= t("admin.budgets.edit.enabled") %><%= t("admin.budgets.edit.actions") %>
- <%= t("budgets.phase.#{phase.kind}") %> - <% if @budget.current_phase == phase %> - <%= t("admin.budgets.edit.active") %> - <% end %> - - <% if phase.starts_at.present? || phase.ends_at.present? %> - <%= l(phase.starts_at.to_date) if phase.starts_at.present? %> - - - <%= l(phase.ends_at.to_date) if phase.ends_at.present? %> - <% else %> - <%= t("admin.budgets.edit.blank_dates") %> - <% end %> - - "> - - <%= render Admin::TableActionsComponent.new(phase, - actions: [:edit], - edit_text: t("admin.budgets.edit.edit_phase") - ) %> -
-
+
+ <%= t("admin.budgets.edit.info.phases_settings") %> +
+ <%= f.select :phase, budget_phases_select_options %>
+ + <%= render Admin::Budgets::HelpComponent.new("budget_phases") %> + + <% if @budget.phases.present? %> + + + + + + + + + + + <% @budget.phases.order(:id).each do |phase| %> + + + + + + + <% end %> +
<%= t("admin.budgets.edit.phase") %><%= t("admin.budgets.edit.dates") %><%= t("admin.budgets.edit.enabled") %><%= t("admin.budgets.edit.actions") %>
+ <%= t("budgets.phase.#{phase.kind}") %> + <% if @budget.current_phase == phase %> + <%= t("admin.budgets.edit.active") %> + <% end %> + + <% if phase.starts_at.present? || phase.ends_at.present? %> + <%= l(phase.starts_at.to_date) if phase.starts_at.present? %> + - + <%= l(phase.ends_at.to_date) if phase.ends_at.present? %> + <% else %> + <%= t("admin.budgets.edit.blank_dates") %> + <% end %> + + "> + + <%= render Admin::TableActionsComponent.new(phase, + actions: [:edit], + edit_text: t("admin.budgets.edit.edit_phase") + ) %> +
+ <% end %> +
+ + <% if @budget.persisted? %> + <%= render "admin/shared/show_results_fields", form: f %> <% end %> -
-
- <%= render "admin/shared/show_results_fields", form: f %> +
+
+ <%= f.submit nil, class: "button success" %>
-
-
- <%= f.submit nil, class: "button success" %> -
+
+ <% if display_calculate_winners_button?(@budget) %> + <%= link_to calculate_winner_button_text(@budget), + calculate_winners_admin_budget_path(@budget), + method: :put, + class: "button hollow" %> + <% end %> -
- <% if display_calculate_winners_button?(@budget) %> - <%= link_to calculate_winner_button_text(@budget), - calculate_winners_admin_budget_path(@budget), - method: :put, - class: "button hollow" %> - <% end %> - - <% if @budget.has_winning_investments? %> - <%= link_to t("budgets.show.see_results"), - budget_results_path(@budget), - class: "button hollow margin-left" %> - <% end %> - <% if @budget.persisted? %> - <%= link_to t("admin.budgets.edit.delete"), - admin_budget_path(@budget), - method: :delete, - class: "delete float-right margin-left" %> - <% end %> -
+ <% if @budget.has_winning_investments? %> + <%= link_to t("budgets.show.see_results"), + budget_results_path(@budget), + class: "button hollow margin-left" %> + <% end %> + <% if @budget.persisted? %> + <%= link_to t("admin.budgets.edit.delete"), + admin_budget_path(@budget), + method: :delete, + class: "delete float-right margin-left" %> + <% end %>
<% end %> diff --git a/app/views/admin/budgets/edit.html.erb b/app/views/admin/budgets/edit.html.erb index 2ccbba53a..455546803 100644 --- a/app/views/admin/budgets/edit.html.erb +++ b/app/views/admin/budgets/edit.html.erb @@ -1,9 +1,5 @@ <%= back_link_to admin_budgets_path %> -
-
-

<%= t("admin.budgets.edit.title") %>

-
-
+

<%= t("admin.budgets.edit.title") %>

<%= render "/admin/budgets/form" %> diff --git a/app/views/admin/shared/_show_results_fields.html.erb b/app/views/admin/shared/_show_results_fields.html.erb index 54cd2b70c..3b0d83530 100644 --- a/app/views/admin/shared/_show_results_fields.html.erb +++ b/app/views/admin/shared/_show_results_fields.html.erb @@ -1,7 +1,11 @@ -
+
<%= t("admin.shared.show_results_and_stats") %> + +

+ <%= t("admin.shared.results_and_stats_reminder") %> +

+ <%= form.check_box :results_enabled %> <%= form.check_box :stats_enabled %> <%= form.check_box :advanced_stats_enabled %> -

<%= t("admin.shared.results_and_stats_reminder") %>

diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 332cd31b6..513ed25cf 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -102,6 +102,11 @@ en: other: "%{count} valuators selected" empty_administrators: "There are no administrators" empty_valuators: "There are no valuators" + name_description: "This is the name of the participatory budget used on the header and cards whenever it is active" + info: + budget_settings: "General participatory budget settings" + phases_settings: "Phases settings" + staff_settings: "Administrators and Valuators assigned to the budget" destroy: success_notice: Budget deleted successfully unable_notice: You cannot delete a budget that has associated investments diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 58d5c4ada..de520b625 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -102,6 +102,11 @@ es: other: "%{count} evaluadores seleccionados" empty_administrators: "No hay administradores" empty_valuators: "No hay evaluadores" + name_description: "Este es el nombre del presupuesto participativo usado en la cabecera y tarjetas cuando éste está activo" + info: + budget_settings: "Configuración genérica del presupuesto participativo" + phases_settings: "Configuración de las fases" + staff_settings: "Administradores y Evaluadores asigandos al presupuesto" destroy: success_notice: Presupuesto eliminado correctamente unable_notice: No se puede eliminar un presupuesto con proyectos asociados diff --git a/spec/system/admin/budgets_spec.rb b/spec/system/admin/budgets_spec.rb index b7a9d90fe..ad0bfe854 100644 --- a/spec/system/admin/budgets_spec.rb +++ b/spec/system/admin/budgets_spec.rb @@ -144,6 +144,15 @@ describe "Admin budgets", :admin do expect(page).to have_css(".is-invalid-label", text: "Name") expect(page).to have_css("small.form-error", text: "has already been taken") end + + scenario "Do not show results and stats settings on new budget", :js do + visit new_admin_budget_path + + expect(page).not_to have_content "Show results and stats" + expect(page).not_to have_field "Show results" + expect(page).not_to have_field "Show stats" + expect(page).not_to have_field "Show advanced stats" + end end context "Destroy" do @@ -216,6 +225,16 @@ describe "Admin budgets", :admin do end end + scenario "Show results and stats settings", :js do + visit edit_admin_budget_path(budget) + + within_fieldset "Show results and stats" do + expect(page).to have_field "Show results" + expect(page).to have_field "Show stats" + expect(page).to have_field "Show advanced stats" + end + end + scenario "Changing name for current locale will update the slug if budget is in draft phase", :js do budget.update!(phase: "drafting") old_slug = budget.slug