Skip to content

Commit eb7e5fe

Browse files
committed
render extra person profile tabs after about instead of at the end
1 parent bf96ee6 commit eb7e5fe

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

app/views/better_together/people/show.html.erb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@
5252
<%# Initialize the active tab state with accessible attributes %>
5353
<%= content_tag :div, id: 'profileTabs', class: 'nav nav-tabs card-header-tabs', role: 'tablist', aria_label: 'Profile Sections' do %>
5454
<%= link_to t('globals.tabs.about'), '#about', class: 'nav-link active', id: 'about-tab', data: { bs_toggle: 'tab', bs_target: '#about' }, role: 'tab', aria_controls: 'about', aria_selected: 'true', tabindex: '0' %>
55+
<%= render partial: 'better_together/people/extra_person_tabs', locals: { person: @person } %>
5556
<%= link_to BetterTogether::Platform.model_name.human.pluralize, '#platforms', class: 'nav-link', id: 'platforms-tab', data: { bs_toggle: 'tab', bs_target: '#platforms' }, role: 'tab', aria_controls: 'platforms', aria_selected: 'false', tabindex: '-1' if @person.person_platform_memberships.exists? %>
5657
<%= link_to BetterTogether::Community.model_name.human.pluralize, '#communities', class: 'nav-link', id: 'communities-tab', data: { bs_toggle: 'tab', bs_target: '#communities' }, role: 'tab', aria_controls: 'communities', aria_selected: 'false', tabindex: '-1' if @person.person_community_memberships.exists? %>
5758
<%= link_to BetterTogether::ResourcePermission.model_name.human.pluralize, '#permissions', class: 'nav-link', id: 'permissions-tab', data: { bs_toggle: 'tab', bs_target: '#permissions' }, role: 'tab', aria_controls: 'permissions', aria_selected: 'false', tabindex: '-1' if @person.resource_permissions.exists? && (current_person == @person || current_person.permitted_to?('manage_platform')) %>
58-
<%= render partial: 'better_together/people/extra_person_tabs', locals: { person: @person } %>
5959
<% end %>
6060
</div>
6161

@@ -65,7 +65,7 @@
6565
<section id="about" class="row collapse show" aria-labelledby="about-tab" aria-expanded="true">
6666
<div class="col-md-12">
6767
<!-- Name Section -->
68-
<h2 class="card-title text-center mb-3">
68+
<h2 class="card-title profile-name text-center mb-3">
6969
<%= @person.name %>
7070
</h2>
7171
<!-- Divider Line -->
@@ -82,6 +82,8 @@
8282
</div>
8383
</section>
8484

85+
<%= render partial: 'better_together/people/extra_person_tab_contents', locals: { person: @person } %>
86+
8587
<% if @person.person_platform_memberships.exists? %>
8688
<div id="platforms" class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 collapse" aria-labelledby="platforms-tab" aria-expanded="true">
8789
<%= render partial: 'better_together/person_platform_memberships/person_platform_membership', collection: @person.person_platform_memberships %>
@@ -96,20 +98,18 @@
9698

9799
<% if @person.role_resource_permissions.exists? %>
98100
<div id="permissions" class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 collapse" aria-labelledby="permissions-tab" aria-expanded="false">
99-
<% @person.role_resource_permissions.each do |role_resource_permission| %>
100-
<div class="col role-resource-permission-column">
101-
<div class="card shadow-sm border-0 my-3">
101+
<% @person.role_resource_permissions.order(role_id: :asc).each do |role_resource_permission| %>
102+
<div class="col mb-3 role-resource-permission-column">
103+
<div class="card shadow-sm border-0 my-3 h-100">
102104
<div class="card-body">
103-
<h5 class="card-title"><%= role_resource_permission.resource_permission.identifier %></h5>
105+
<h6 class="card-title"><%= role_resource_permission.resource_permission.identifier %></h6>
104106
<p class="card-text">Role: <%= role_resource_permission.role.name %></p>
105107
</div>
106108
</div>
107109
</div>
108110
<% end %>
109111
</div>
110112
<% end %>
111-
112-
<%= render partial: 'better_together/people/extra_person_tab_contents', locals: { person: @person } %>
113113
</div>
114114
</section>
115115
</div>

0 commit comments

Comments
 (0)