Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport 'Fix HTML titles in admin panel' to v0.27 #11333

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".title")) %>
<%= decidim_form_for(@form) do |f| %>
<div class="card">
<div class="card-divider">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("decidim.admin.titles.area_types")) %>
<div class="card" id="area-types">
<div class="card-divider">
<h2 class="card-title">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".title")) %>
<%= decidim_form_for(@form) do |f| %>
<div class="card">
<div class="card-divider">
Expand Down
1 change: 1 addition & 0 deletions decidim-admin/app/views/decidim/admin/areas/edit.html.erb
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".title")) %>
<%= decidim_form_for(@form) do |f| %>
<div class="card">
<div class="card-divider">
Expand Down
1 change: 1 addition & 0 deletions decidim-admin/app/views/decidim/admin/areas/index.html.erb
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("areas", scope: "decidim.admin.titles")) %>
<div class="card" id="areas">
<div class="card-divider">
<h2 class="card-title">
Expand Down
1 change: 1 addition & 0 deletions decidim-admin/app/views/decidim/admin/areas/new.html.erb
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".title")) %>
<%= decidim_form_for(@form, url: areas_path) do |f| %>
<div class="card">
<div class="card-divider">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("authorization_workflows", scope: "decidim.admin.titles")) %>
<div class="card">
<%= cell("decidim/verifications/revocations", @authorizations) %>
<div class="card-divider">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("title", scope: "decidim.admin.conflicts")) %>
<div class="card">
<div class="card-divider">
<h2 class="card-title">
Expand Down
@@ -1 +1,2 @@
<% add_decidim_page_title(t("help_sections", scope: "decidim.admin.menu")) %>
<%= render partial: "form", object: @form %>
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("impersonatable_users", scope: "decidim.admin.titles")) %>
<% if current_organization.available_authorizations.empty? %>
<div class="section">
<div class="callout warning">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("impersonate_new_managed_user", scope: "decidim.admin.impersonations.new")) %>
<h2 class="process-title-summary">
<% if creating_managed_user? %>
<%= t(".impersonate_new_managed_user") %>
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".title")) %>
<div class="card">
<div class="card-divider">
<h2 class="card-title">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".preview", template_name: t(template_manifest.public_name_key))) %>
<div class="card">
<div class="card-divider">
<h2 class="card-title"><%= t ".preview", template_name: t(template_manifest.public_name_key) %></h2>
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".title")) %>
<div class="card">
<div class="card-divider">
<h2 class="card-title">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".title")) %>
<%= decidim_form_for(@form, html: { class: "form new_newsletter" }, url: newsletter_template_newsletters_path(newsletter_template_id: params[:newsletter_template_id])) do |f| %>
<div class="card">
<div class="card-divider">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".preview")) %>
<div class="card">
<div class="card-divider">
<h2 class="card-title"><%= t ".preview" %></h2>
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("decidim.admin.titles.participants")) %>
<div class="card with-overflow" id='user-groups'>
<div class="card-divider">
<h2 class="card-title"><%= t "decidim.admin.titles.participants" %></h2>
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".title", name: user.name)) %>
<h2 class="process-title-summary">
<%= t(".title", name: user.name) %>
</h2>
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".title")) %>
<%= decidim_form_for(@form, html: { class: "form edit_organization" }, url: organization_path) do |f| %>
<div class="card">
<div class="card-divider">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("edit_organization_appearance", scope: "decidim.admin.titles")) %>
<%= decidim_form_for(@form, html: { class: "form edit_organization_appearance" }, url: organization_appearance_path, method: :put) do |f| %>
<%= render partial: "form", object: f %>
<div class="button--double form-general-submit">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("edit_external_domains", scope: "decidim.admin.titles")) %>
<%= decidim_form_for(@form, html: { class: "form edit_organization_external_domain_whitelist" }, url: organization_external_domain_whitelist_path, method: :patch) do |f| %>
<%= render partial: "form", object: f %>
<div class="button--double form-general-submit">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".title")) %>
<%= decidim_form_for(@form) do |f| %>
<div class="card">
<div class="card-divider">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("decidim.admin.titles.scope_types")) %>
<div class="card" id="scope-types">
<div class="card-divider">
<% if allowed_to? :creste, :scope_type %>
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".title")) %>
<%= decidim_form_for(@form) do |f| %>
<div class="card">
<div class="card-divider">
Expand Down
1 change: 1 addition & 0 deletions decidim-admin/app/views/decidim/admin/scopes/edit.html.erb
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".title")) %>
<%= decidim_form_for(@form) do |f| %>
<div class="card">
<div class="card-divider">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("decidim.admin.titles.scopes")) %>
<div class="card">
<div class="card-divider">
<h2 class="card-title">
Expand Down
1 change: 1 addition & 0 deletions decidim-admin/app/views/decidim/admin/scopes/new.html.erb
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".title")) %>
<%= decidim_form_for(@form, url: current_scopes_path) do |f| %>
<div class="card">
<div class="card-divider">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".title")) %>
<%= decidim_form_for(@form, html: { class: "form edit_static_page_topic" }) do |f| %>
<div class="card">
<div class="card-divider">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".title")) %>
<%= decidim_form_for(@form, html: { class: "form new_static_page_topic" }) do |f| %>
<div class="card">
<div class="card-divider">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title t(".title") %>
<%= decidim_form_for(@form, html: { class: "form edit_static_page" }) do |f| %>
<div class="card">
<div class="card-divider">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("pages", scope: "decidim.admin.titles")) %>
<% @topics.each do |topic| %>
<%= render partial: "topic", locals: { pages: topic.pages, topic: topic } %>
<% end %>
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".title")) %>
<%= decidim_form_for(@form, html: { class: "form new_static_page" }) do |f| %>
<div class="card">
<div class="card-divider">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("decidim.admin.titles.user_groups")) %>
<div class="card" id='user-groups'>
<div class="card-divider">
<h2 class="card-title">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".title")) %>
<div class="card" id='user-groups'>
<div class="card-divider">
<h2 class="card-title">
Expand Down
1 change: 1 addition & 0 deletions decidim-admin/app/views/decidim/admin/users/index.html.erb
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("decidim.admin.titles.users")) %>
<div class="card">
<div class="card-divider">
<h2 class="card-title">
Expand Down
1 change: 1 addition & 0 deletions decidim-admin/app/views/decidim/admin/users/new.html.erb
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".title")) %>
<%= decidim_form_for(@form, html: { class: "form new_user" }) do |f| %>
<div class="card">
<div class="card-divider">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".title" )) %>
<% content_for :sidebar_menu_nav do %>
<%= sidebar_menu(:admin_global_moderation_menu).render(title: t(".title" )) %>
<% end %>
Expand Down
5 changes: 4 additions & 1 deletion decidim-admin/config/locales/en.yml
Expand Up @@ -895,7 +895,7 @@ en:
update: Update
new:
create: Create scope type
title: New scope
title: New scope type
update:
error: There was a problem updating this scope type.
success: Scope type updated successfully
Expand Down Expand Up @@ -982,9 +982,12 @@ en:
areas: Areas
authorization_workflows: Verification methods
dashboard: Dashboard
edit_external_domains: External domain whitelist
edit_organization_appearance: Edit homepage appearance
impersonatable_users: Manageable participants
impersonations: Participants management
metrics: Metrics
pages: Pages
panel: Admin
participants: Participants
scope_types: Scope types
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("assemblies", scope: "decidim.admin.titles")) %>
<div class="card with-overflow" id="assemblies">
<div class="card-divider">
<h2 class="card-title">
Expand Down
@@ -1,3 +1,5 @@
<% add_decidim_page_title(t("assemblies.new.title", scope: "decidim.admin")) %>

<h2 class="assembly-title-summary">
<%= t "assemblies.new.title", scope: "decidim.admin" %>
</h2>
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("decidim.assemblies.admin.assemblies_settings.form.title")) %>
<%= decidim_form_for(@form, html: { class: "form edit_assemblies_settings" }, url: assemblies_settings_path, method: :put) do |f| %>
<%= render partial: "form", object: f %>
<div class="button--double form-general-submit">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("decidim.assemblies.admin.assemblies_types.form.title")) %>
<%= decidim_form_for(@form, html: { class: "form edit_assembly_type" }) do |f| %>
<%= render partial: "form", object: f %>
<div class="button--double form-general-submit">
Expand Down
@@ -1,3 +1,5 @@
<% add_decidim_page_title(t("decidim.admin.titles.assemblies_types")) %>

<div class="card" id="assembly-types">
<div class="card-divider">
<h2 class="card-title">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("assemblies_types.new.title", scope: "decidim.admin")) %>
<%= decidim_form_for(@form, html: { class: "form new_assembly_type" }) do |f| %>
<%= render partial: "form", object: f, locals: { title: t("assemblies_types.new.title", scope: "decidim.admin") } %>

Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(translated_attribute(current_participatory_space.title)) %>
<% content_for :sidebar_menu_nav do %>
<%= sidebar_menu(:admin_assembly_menu).render do
public_page_link decidim_assemblies.assembly_path(current_participatory_space)
Expand Down
2 changes: 1 addition & 1 deletion decidim-assemblies/config/locales/en.yml
Expand Up @@ -300,7 +300,7 @@ en:
title: Settings for assemblies
assemblies_types:
form:
title: Title
title: Edit assembly type
assembly_copies:
form:
slug_help: 'URL slugs are used to generate the URLs that point to this assembly. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("conference_copies.new.title", scope: "decidim.admin")) %>
<%= decidim_form_for(@form, url: conference_copies_path(current_conference), method: :post, html: { class: "form copy_conference" }) do |f| %>
<%= render partial: "form", object: f, locals: { title: t("conference_copies.new.title", scope: "decidim.admin"), select: t("conference_copies.new.select", scope: "decidim.admin") } %>

Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".invites")) %>
<div class="filters row">
<div class="column medium-3">
<span class="dropdown-menu-inverted_label"><%= t(".filter_by") %> :</span>
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".new_invite")) %>
<h2 class="process-title-summary">
<%= t(".new_invite") %>
</h2>
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".registrations")) %>
<div class="card" id="conference-registrations">
<div class="card-divider">
<h2 class="card-title">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("conference_speakers.edit.title", scope: "decidim.admin")) %>
<%= decidim_form_for(@form, url: conference_speaker_path(conference_speaker.conference, conference_speaker), html: { class: "form edit_conference_speaker" }) do |f| %>
<%= render partial: "form", object: f, locals: { title: t("conference_speakers.edit.title", scope: "decidim.admin") } %>

Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("conference_speakers.index.conference_speakers_title", scope: "decidim.admin")) %>
<div class="filters row">
<div class="column medium-4">
<%= form_tag "", method: :get do %>
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("conference_speakers.new.title", scope: "decidim.admin")) %>
<%= decidim_form_for(@form, html: { class: "form new_conference_speaker" }) do |f| %>
<%= render partial: "form", object: f, locals: { title: t("conference_speakers.new.title", scope: "decidim.admin") } %>

Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("conference_user_roles.edit.title", scope: "decidim.admin")) %>
<%= decidim_form_for(@form, url: conference_user_role_path(@user_role.conference, @user_role), html: { class: "form edit_conference_user_roles" }) do |f| %>
<%= render partial: "form", object: f, locals: { title: t("conference_user_roles.edit.title", scope: "decidim.admin") } %>

Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("conference_user_roles.index.conference_admins_title", scope: "decidim.admin")) %>
<div class='card' id="conference_admins">
<div class="card-divider">
<h2 class="card-title">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("conference_user_roles.new.title", scope: "decidim.admin")) %>
<%= decidim_form_for(@form, html: { class: "form new_conference_user_role" }) do |f| %>
<%= render partial: "form", object: f, locals: { title: t("conference_user_roles.new.title", scope: "decidim.admin") } %>

Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(translated_attribute(current_conference.title)) %>
<%= decidim_form_for(@form, html: { class: "form edit_conference conference_form_admin" }) do |f| %>
<%= render partial: "form", object: f %>
<div class="button--double form-general-submit">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("decidim.admin.titles.conferences")) %>
<div class="card with-overflow" id="conferences">
<div class="card-divider">
<h2 class="card-title">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("conferences.new.title", scope: "decidim.admin")) %>
<h2 class="conference-title-summary">
<%= t "conferences.new.title", scope: "decidim.admin" %>
</h2>
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("diplomas.edit.title", scope: "decidim.conferences.admin")) %>
<%= decidim_form_for(@form, url: conference_diploma_path, html: { class: "form edit_conference_diploma" }) do |f| %>
<%= render partial: "form", object: f, locals: { title: t("diplomas.edit.title", scope: "decidim.conferences.admin") } %>

Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("media_links.edit.title", scope: "decidim.admin")) %>
<%= decidim_form_for(@form, url: conference_media_link_path(@media_link.conference, @media_link), html: { class: "form edit_media_link" }) do |f| %>
<%= render partial: "form", object: f, locals: { title: t("media_links.edit.title", scope: "decidim.admin") } %>

Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("media_links.index.media_links_title", scope: "decidim.admin")) %>
<div class='card' id="media_links">
<div class="card-divider">
<h2 class="card-title">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("media_links.new.title", scope: "decidim.admin")) %>
<%= decidim_form_for(@form, html: { class: "form new_media_link" }) do |f| %>
<%= render partial: "form", object: f, locals: { title: t("media_links.new.title", scope: "decidim.admin") } %>

Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("partners.edit.title", scope: "decidim.admin")) %>
<%= decidim_form_for(@form, url: conference_partner_path(@partner.conference, @partner), html: { class: "form edit_partner" }) do |f| %>
<%= render partial: "form", object: f, locals: { title: t("partners.edit.title", scope: "decidim.admin") } %>

Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".title")) %>
<div class='card' id="partners">
<div class="card-divider">
<h2 class="card-title">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("partners.new.title", scope: "decidim.admin")) %>
<%= decidim_form_for(@form, html: { class: "form new_partner" }) do |f| %>
<%= render partial: "form", object: f, locals: { title: t("partners.new.title", scope: "decidim.admin") } %>

Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("registration_types.edit.title", scope: "decidim.admin")) %>
<%= decidim_form_for(@form, url: conference_registration_type_path(@registration_type.conference, @registration_type), html: { class: "form edit_registration_type" }) do |f| %>
<%= render partial: "form", object: f, locals: { title: t("registration_types.edit.title", scope: "decidim.admin") } %>

Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t(".title")) %>
<div class='card' id="registration_types">
<div class="card-divider">
<h2 class="card-title">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("registration_types.new.title", scope: "decidim.admin")) %>
<%= decidim_form_for(@form, html: { class: "form new_registration_type" }) do |f| %>
<%= render partial: "form", object: f, locals: { title: t("registration_types.new.title", scope: "decidim.admin") } %>

Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(translated_attribute(current_consultation.title)) %>
<%= decidim_form_for @form,
method: :patch,
url: consultation_path(current_consultation),
Expand Down
@@ -1,3 +1,5 @@
<% add_decidim_page_title(t("consultations", scope: "decidim.admin.titles")) %>

<div class="card with-overflow" id="consultations">
<div class="card-divider">
<h2 class="card-title">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("consultations.new.title", scope: "decidim.admin")) %>
<h2 class="consultation-title-summary">
<%= t "consultations.new.title", scope: "decidim.admin" %>
</h2>
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(translated_attribute(current_question.title)) %>
<%= decidim_form_for @form,
url: question_path(current_question),
method: :patch,
Expand Down
@@ -1,3 +1,5 @@
<% add_decidim_page_title(t("questions", scope: "decidim.admin.titles")) %>

<div class="card" id="questions">
<div class="card-divider">
<h2 class="card-title">
Expand Down
@@ -1,3 +1,4 @@
<% add_decidim_page_title(t("questions.new.title", scope: "decidim.admin")) %>
<h2 class="questions-title-summary">
<%= t "questions.new.title", scope: "decidim.admin" %>
</h2>
Expand Down