Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</head>
<body>

<main class="main">
<main class="main" role="main">
<div class="layout-wrapper">
<div class="block md:hidden col-start-1 col-end-2">
<%= render partial: "layouts/decidim/admin/title_bar_responsive" %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ edit_link(

<%= render partial: "layouts/decidim/header/follow_space_menu_bar_button", locals: { participatory_space: current_participatory_space } %>

<main>
<main role="main">
<% if current_participatory_space.private_space? %>
<section class="participatory-space__block-reference alert">
<%= t("private_space", scope: "decidim.assemblies.show") %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ end
%>

<%# NOTE: this page does not use a regular layout %>
<main class="container">
<main class="container" role="main">
<h1 class="title-decorator my-12">
<span class="not-sr-only"><%= t(".program") %></span>
<span class="sr-only"><%= t(".program") %> (<%= translated_attribute current_participatory_space.title %>)</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ edit_link(
%>

<%# NOTE: this page does not use a regular layout %>
<main class="container">
<main class="container" role="main">

<section id="conference_speakers-grid">
<h1 class="title-decorator my-12">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ edit_link(
include the hero inside the two-column layout.
Therefore is mandatory to pass the "main_enabled: false" flag
to the layout_two_col for disabling the original main. %>
<main>
<main role="main">

<%= content_for :aside do %>
<div class="conference__nav-container">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ edit_link(
%>

<%# NOTE: this page does not use a regular layout %>
<main class="container">
<main class="container" role="main">
<h1 class="title-decorator my-12">
<span class="not-sr-only"><%= t("media", scope: "layouts.decidim.conferences_nav") %></span>
<span class="sr-only"><%= t("media", scope: "layouts.decidim.conferences_nav") %> (<%= translated_attribute current_participatory_space.title %>)</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ edit_link(
<%= append_stylesheet_pack_tag "decidim_conferences" %>

<%# NOTE: this page does not use a regular layout %>
<main class="container">
<main class="container" role="main">

<section>
<h1 class="title-decorator my-12">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
description: t(".page_description")
) %>

<main class="layout-1col cols-10">
<main class="layout-1col cols-10" role="main">

<header class="text-center py-10">
<header class="text-center py-10" role="banner">
<h1 class="title-decorator inline-block text-left mb-12">
<%= t ".title" %>
</h1>
Expand Down
2 changes: 1 addition & 1 deletion decidim-core/app/views/decidim/homepage/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
)
%>

<main class="home">
<main class="home" role="main">
<% Decidim::ContentBlock.published.for_scope(:homepage, organization: current_organization).each do |content_block| %>
<% next unless content_block.manifest %>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<% add_decidim_page_title(t("last_activity", scope: "decidim.last_activities.index")) %>

<%# NOTE: this page does not use a regular layout %>
<main class="container">
<main class="container" role="main">
<h1 class="title-decorator my-12"><%= t("last_activity", scope: "decidim.last_activities.index") %></h1>

<div class="profile__activity pb-16">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<main class="layout-1col cols-6">
<main class="layout-1col cols-6" role="main">
<div class="text-center py-12">
<h1 class="h1 decorator inline-block text-left"><%= t ".unsubscribe" %></h1>
</div>
Expand Down
2 changes: 1 addition & 1 deletion decidim-core/app/views/decidim/offline/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<% add_decidim_page_title(t("decidim.offline.name")) %>

<main id="offline-fallback-html" class="text-center my-8">
<main id="offline-fallback-html" class="text-center my-8" role="main">
<div class="flex justify-center">
<svg xmlns="http://www.w3.org/2000/svg" width="5rem" height="r5em" viewBox="0 0 25 25">
<path
Expand Down
2 changes: 1 addition & 1 deletion decidim-core/app/views/decidim/pages/_tabbed.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<%# NOTE: the structure of this file is the same as: decidim-core/app/views/layouts/decidim/shared/_layout_user_profile.html.erb %>
<%= render layout:"layouts/decidim/shared/layout_center", locals: { columns: 10 } do %>
<header class="text-center py-10">
<header class="text-center py-10" role="banner">
<h1 class="title-decorator inline-block text-left mb-12">
<%= title %>
</h1>
Expand Down
2 changes: 1 addition & 1 deletion decidim-core/app/views/decidim/profiles/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<% end %>

<%# NOTE: this page does not use a regular layout %>
<main>
<main role="main">
<%= cell "decidim/profile", profile_holder, context: { content_cell: @content_cell } %>
</main>
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<% end %>

<%# NOTE: this page does not use a regular layout %>
<main>
<main role="main">
<%= cell "decidim/profile", user, context: {
content_cell: "decidim/user_activity",
activities:,
Expand Down
4 changes: 2 additions & 2 deletions decidim-core/app/views/layouts/decidim/_wrapper.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ end
%>

<div class="layout-container">
<header <%= "class=with-admin-bar" if current_user && allowed_to?(:read, :admin_dashboard) %>>
<header <%= "class=with-admin-bar" if current_user && allowed_to?(:read, :admin_dashboard) %> role="banner">
<div id="header-container">
<%= render partial: "layouts/decidim/impersonation_warning" %>
<%= render partial: "layouts/decidim/omnipresent_banner" %>
Expand All @@ -37,7 +37,7 @@ end
<%= yield %>
</div>

<footer>
<footer role="contentinfo">
<% if current_user&.ephemeral? || content_for?(:focus_mode) %>
<%= render partial: "layouts/decidim/footer/focus_mode_main" %>
<% else %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ css_class = case columns
end
%>

<%= content_tag main_tag, class: "layout-1col #{css_class}" do %>
<%= content_tag main_tag, class: "layout-1col #{css_class}", role: (main_enabled ? "main" : nil) do %>
<%= yield %>
<% end %>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<%= yield :item_header %>
</div>
<div class="<%= layout_item_classes %>">
<main class="layout-item__main">
<main class="layout-item__main" role="main">
<% if params[:included_in] %>
<%= render partial: "layouts/decidim/shared/linked_resource" %>
<% end %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<%= yield :aside %>
</aside>
<% main_tag = main_enabled ? :main : :div %>
<%= content_tag main_tag, class: "layout-2col__main" do %>
<%= content_tag main_tag, class: "layout-2col__main", role: (main_enabled ? "main" : nil) do %>
<%= content_for :flash_messages %>
<%= yield %>
<% end %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
</ul>
</aside>

<main id="content">
<main id="content" role="main">
<% if content_for?(:heading) %>
<section class="design__heading__section">
<h1 class="design__heading__5xl">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</head>
<body class="text-black text-md form-defaults<%= yield (:body_class) %>">
<div class="layout-container">
<header>
<header role="banner">
<div id="elections-header-container">
<%= render partial: "layouts/decidim/election_votes_header" %>
</div>
Expand All @@ -22,7 +22,7 @@
<%= display_flash_messages %>
</div>
<% end %>
<main class="layout-1col cols-6">
<main class="layout-1col cols-6" role="main">
<div class="py-8 space-y-8 lg:py-12 lg:space-y-12">
<%= yield %>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<%= append_stylesheet_pack_tag "decidim_initiatives", media: "all" %>

<%= render "layouts/decidim/application" do %>
<%= render layout: "layouts/decidim/shared/layout_center" do %>
<main>
<%= render layout: "layouts/decidim/shared/layout_center", locals: { main_enabled: false } do %>
<main role="main">
<%= yield %>
</main>
<% if content_for? :expanded %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<%= render "layouts/decidim/application" do %>
<%= render partial: "decidim/initiatives/initiatives/initiative_hero" %>
<%= render layout:"layouts/decidim/shared/layout_two_col", locals: { reverse: true, main_enabled: false } do %>
<main>
<main role="main">
<%= yield %>
</main>
<% end %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<body class="meeting-polls__body">
<%= render partial: "layouts/decidim/timeout_modal" %>

<header class="meeting-polls__header">
<header class="meeting-polls__header" role="banner">
<div>
<strong class="text-secondary"><%= current_organization_name %></strong> / <strong><%= present(meeting).title(html_escape: true) %></strong>
</div>
Expand All @@ -30,7 +30,7 @@
</div>
</header>

<main class="meeting-polls__main">
<main class="meeting-polls__main" role="main">
<%= yield %>
</main>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
)
%>

<main class="participatory-space__container">
<main class="participatory-space__container" role="main">
<% active_content_blocks.each do |content_block| %>
<% next unless content_block.manifest %>
<%= cell content_block.manifest.cell, content_block %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<%= render partial: "layouts/decidim/header/follow_space_menu_bar_button", locals: { participatory_space: current_participatory_space } %>

<main>
<main role="main">
<%# NOTE: this elements goes outside of the .participatory-space__container block %>
<% if current_participatory_space.private_space? %>
<section class="participatory-space__block-reference alert">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<%= render partial: "layouts/decidim/system/sidebar" %>
</aside>

<main class="grow">
<main class="grow" role="main">
<div class="flex md:hidden items-center gap-2 bg-primary p-4 text-white font-bold text-lg">
<button id="aside-trigger" class="flex-none md:hidden" data-controller="dropdown" data-target="aside-system" data-disabled-md="true">
<%= icon "menu-line", class: "w-6 h-6 text-white fill-current" %>
Expand Down
Loading