Many pages had this tag, but many other didn't, which made navigation inconsistent for people using screen readers. Note that there are slight changes in two pages: * The homepage now includes the banner and the content of the `shared/header` element inside the <main> tag * The budgets index now includes the banner inside the <main> tag I see both potential advantages and disadvantages of this approach, since banners aren't necessarily related to the main content of a page but on the other hand they aren't the same across pages and people using screen readers might accidentally skip them if they jump to the <main> tag. So I'm choosing the option that is easier to implement. Note we're adding a `public-content` class to the <main> element in the application layout. This might be redundat because the element could already be accessed through the `.public main` selector, but this is consistent with the `admin-content` class used in the admin section, and without it the <main> element would sometimes have an empty class attribute and we'd have to use `if content_for?(:main_class)` or `tag.main` which IMHO makes the code less consistent. The Capybara::DSL monkey-patch is only done on the `visit` method because it's the only reliable one. Other methods like `click_link` generate AJAX requests, so `expect(page).to have_css "main", count: 1` might be executed before the AJAX request is finished, meaning it wouldn't properly test anything.
27 lines
799 B
Plaintext
27 lines
799 B
Plaintext
<div class="activity row margin-top">
|
|
<div class="small-12 column">
|
|
|
|
<% if @user != current_user %>
|
|
<% if @user.email_on_direct_message? %>
|
|
<%= link_to t("users.show.send_private_message"),
|
|
new_user_direct_message_path(@user),
|
|
class: "button hollow float-right" %>
|
|
<% else %>
|
|
<div class="callout primary float-right">
|
|
<%= t("users.show.no_private_messages") %>
|
|
</div>
|
|
<% end %>
|
|
<% end %>
|
|
|
|
<h2 class="inline-block">
|
|
<%= render Shared::AvatarComponent.new(@user, size: 60) %>
|
|
<%= @user.name %>
|
|
<% if current_user&.administrator? %>
|
|
<small><%= @user.email %></small>
|
|
<% end %>
|
|
</h2>
|
|
|
|
<%= render Users::PublicActivityComponent.new(@user) %>
|
|
</div>
|
|
</div>
|