consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4806 from consul/budget_phases_hint

Browse Source 
Add and improve hint information related to phases duration
This commit is contained in:
Sebastia
2022-04-12 15:50:20 +02:00
committed by GitHub
parent d0f3bdf589 703e28e6cd
commit 810a516078
9 changed files with 41 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/stylesheets/admin/budgets/show.scss
View File

@@ -13,4 +13,10 @@
h4 {
@include header-font-size(h3);
}
.phases {
h3 {
margin-bottom: 0;
}
}
}

4
app/assets/stylesheets/layout.scss
View File

@@ -450,6 +450,10 @@ button,
.help-text {
line-height: rem-calc(20);
margin-top: 0;
strong {
font-style: normal;
}
}
.menu-and-content {

6
app/components/admin/budget_phases/form_component.html.erb
View File

@@ -12,15 +12,15 @@
</legend>
<p class="help-text" id="phase_duration_description">
<%= t("admin.budget_phases.edit.duration_description") %>
<%= sanitize(t("admin.budget_phases.edit.duration_description")) %>
</p>
<div class="date-field">
<%= f.date_field :starts_at, id: "start_date" %>
<%= f.date_field :starts_at, id: "start_date", hint: t("admin.budget_phases.edit.dates_help_text") %>
</div>
<div class="date-field">
<%= f.date_field :ends_at, id: "end_date" %>
<%= f.date_field :ends_at, id: "end_date", hint: t("admin.budget_phases.edit.dates_help_text") %>
</div>
</fieldset>

3
app/components/admin/budgets/show_component.html.erb
View File

@@ -11,8 +11,9 @@
<%= render Admin::Budgets::GroupsAndHeadingsComponent.new(budget) %>
</section>
<section aria-labelledby="phases_header">
<section class="phases" aria-labelledby="phases_header">
<h3 id="phases_header"><%= t("admin.budgets.edit.phases_caption") %></h3>
<span class="help-text"><%= t("admin.budgets.edit.phases_table_help_text") %></span>
<%= render Admin::BudgetPhases::PhasesComponent.new(budget) %>
</section>

8
app/views/admin/budget_phases/edit.html.erb
View File

@@ -1 +1,7 @@
<%= render Admin::BudgetsWizard::Phases::EditComponent.new(@phase) %>
<%= back_link_to admin_budget_path(@budget) %>
<h2><%= @budget.name %></h2>
<h3><%= "#{t("admin.budget_phases.edit.title")} - #{@phase.name}" %></h3>
<%= render "form" %>

8
config/locales/en/admin.yml
View File

@@ -113,6 +113,7 @@ en:
delete: Delete budget
phase: Phase
phases_caption: "Phases"
phases_table_help_text: "The configuration of these phases is used for information purposes only. Its function is to define the phases information displayed on the public page of the participatory budget."
duration: "Duration"
enabled: Enabled
actions: Actions
@@ -153,7 +154,7 @@ en:
headings:
multiple: "Headings are meant to divide the money of the participatory budget. Here you can add headings for this group and assign the amount of money that will be used for each heading."
single: "Headings are meant to divide the money of the participatory budget. Since this budget will only contain one heading, this is the place where you stablish the money that will be spent in this participaroty budget."
phases: "Participatory budgets have different phases. Here you can enable or disable phases and also customize each individual phase."
phases: "Participatory budgets have different phases. Here you can enable or disable phases and also customize each individual phase. The configuration of these phases is used for information purposes only and will be displayed on the public page of the participatory budget."
show:
add_group: "Add group"
add_heading: "Add heading"
@@ -213,10 +214,11 @@ en:
budget_phases:
edit:
title: "Edit phase"
dates_help_text: "For information purposes only"
description_help_text: This text will appear in the header when the phase is active
duration: "Phase's duration"
duration_description: "The period of time this phase will be active."
enabled_help_text: This phase will be public in the budget's phases timeline, as well as active for any other purpose
duration_description: "These fields are used for information purposes only and <strong>do not trigger an automatic update of the active phase.</strong> In order to update it, edit the budget and select the active phase."
enabled_help_text: This phase will be public in the budget's phases timeline.
image_description: "If an image is uploaded it will be displayed next to the description of this phase."
main_call_to_action: "Main call to action (optional)"
main_call_to_action_description: "This link will appear on main banner of this participatory budget when this phase is enabled and encourages your user to perform a specific action like creating a proposal, voting for existing ones, or learn more about the process."

8
config/locales/es/admin.yml
View File

@@ -113,6 +113,7 @@ es:
delete: Eliminar presupuesto
phase: Fase
phases_caption: "Fases"
phases_table_help_text: "La configuración de estas fases se utiliza únicamente con fines informativos. Su función es definir la información de las fases que se muestra en la página pública del presupuesto participativo."
duration: "Duración"
enabled: Habilitada
actions: Acciones
@@ -153,7 +154,7 @@ es:
headings:
multiple: "Las partidas sirven para dividir el dinero del presupuesto participativo. Aquí puedes ir añadiendo partidas para cada grupo y establecer la cantidad de dinero que se gastará en cada partida."
single: "Las partidas sirven para dividir el dinero del presupuesto participativo. Como este presupuesto solo tendrá una partida aquí podrás establecer la cantidad de dinero que se gastará en este presupuesto participativo."
phases: "Los presupuestos participativos tienen distintas fases. Aquí puedes habilitar o deshabilitar fases y también personalizar cada una de las fases."
phases: "Los presupuestos participativos tienen distintas fases. Aquí puedes habilitar o deshabilitar fases y también personalizar cada una de las fases. La configuración de estas fases se utiliza únicamente con fines informativos y se mostrará en la página pública del presupuesto participativo."
show:
add_group: "Añadir grupo"
add_heading: "Añadir partida"
@@ -212,10 +213,11 @@ es:
title: "Partidas de %{budget} / %{group}"
budget_phases:
edit:
dates_help_text: "Solo con fines informativos"
description_help_text: Este texto aparecerá en la cabecera cuando la fase esté activa
duration: "Duración de la fase"
duration_description: "El período de tiempo que esta fase estará activa."
enabled_help_text: Esta fase será pública en el calendario de fases del presupuesto y estará activa para otros propósitos
duration_description: "Estos campos se utilizan únicamente con fines informativos y <strong>no provocan una actualización automática de la fase activa.</strong> Para actualizarla, edita el presupuesto y selecciona la fase activa."
enabled_help_text: Esta fase será pública en el calendario de fases del presupuesto.
image_description: "Si se proporciona una imagen se mostrará junto a la descripción de esta fase."
main_call_to_action: "Enlace de acción principal (opcional)"
main_call_to_action_description: "Este enlace aparecerá en la cabecera de este presupuesto participativo cuando esta fase esté activa y permite al usuario ejecutar una acción específica como crear una nueva propuesta, votar las existentes, o leer más sobre el funcionamiento de los presupuestos participativos."

7
spec/system/admin/budget_phases_spec.rb
View File

@@ -7,6 +7,11 @@ describe "Admin budget phases" do
scenario "Update phase" do
visit edit_admin_budget_budget_phase_path(budget, budget.current_phase)
expect(page).to have_content "These fields are used for information purposes only and do not trigger "\
"an automatic update of the active phase. In order to update it, edit "\
"the budget and select the active phase."
expect(page).to have_content "For information purposes only"
fill_in "start_date", with: Date.current + 1.day
fill_in "end_date", with: Date.current + 12.days
fill_in_ckeditor "Description", with: "New description of the phase."
@@ -32,7 +37,7 @@ describe "Admin budget phases" do
within("tr", text: "Accepting projects") { click_link "Edit" }
end
expect(page).to have_css "h2", exact_text: "Edit phase - Accepting projects"
expect(page).to have_css "h3", exact_text: "Edit phase - Accepting projects"
fill_in "Name", with: "My phase custom name"
click_button "Save changes"

3
spec/system/admin/budgets_spec.rb
View File

@@ -235,6 +235,9 @@ describe "Admin budgets", :admin do
visit admin_budget_path(budget)
expect(page).to have_content "The configuration of these phases is used for information purposes "\
"only. Its function is to define the phases information displayed "\
"on the public page of the participatory budget."
expect(page).to have_table "Phases", with_cols: [
[
"Information",