-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #16769 from opf/53809-update-pageheaders-subheader…
…s-in-the-rails-global-index-pages [53809] Update PageHeaders & SubHeaders in the (rails) global index pages
- Loading branch information
Showing
22 changed files
with
171 additions
and
90 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,9 @@ | ||
<li class="<%= li_css_class %>"> | ||
<a href="<%= dynamic_path %>" | ||
id="<%= id %>" | ||
title="<%= title %>" | ||
arial-label="<%= aria_label %>" | ||
class="<%= link_css_class %>"> | ||
<%= icon %> | ||
<%= label %> | ||
</a> | ||
</li> | ||
<a href="<%= dynamic_path %>" | ||
id="<%= id %>" | ||
title="<%= title %>" | ||
arial-label="<%= aria_label %>" | ||
class="<%= link_css_class %>"> | ||
<%= icon %> | ||
<%= label %> | ||
</a> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 8 additions & 10 deletions
18
modules/calendar/app/components/calendar/add_button_component.html.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,8 @@ | ||
<li class="<%= li_css_class %>"> | ||
<a href="<%= dynamic_path %>" | ||
id="<%= id %>" | ||
title="<%= title %>" | ||
arial-label="<%= aria_label %>" | ||
class="<%= link_css_class %>"> | ||
<%= icon %> | ||
<%= label %> | ||
</a> | ||
</li> | ||
<a href="<%= dynamic_path %>" | ||
id="<%= id %>" | ||
title="<%= title %>" | ||
arial-label="<%= aria_label %>" | ||
class="<%= link_css_class %>"> | ||
<%= icon %> | ||
<%= label %> | ||
</a> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 16 additions & 3 deletions
19
modules/team_planner/app/views/team_planner/team_planner/index.html.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,20 @@ | ||
<% html_title(t('team_planner.label_team_planner_plural')) -%> | ||
<%= toolbar title: t(:'team_planner.label_team_planner_plural') do %> | ||
<%= render ::TeamPlanner::AddButtonComponent.new(current_project: @project) %> | ||
<% end %> | ||
<%= | ||
render Primer::OpenProject::PageHeader.new do |header| | ||
header.with_title { t('team_planner.label_team_planner_plural') } | ||
header.with_breadcrumbs([{ href: home_path, text: organization_name}, | ||
{ href: project_overview_path(@project.id), text: @project.name }, | ||
t('team_planner.label_team_planner_plural')]) | ||
end | ||
%> | ||
<%= | ||
render Primer::OpenProject::SubHeader.new do |subheader| | ||
subheader.with_action_component(data: { "test-selector": "add-team-planner-button"}) do | ||
render ::TeamPlanner::AddButtonComponent.new(current_project: @project) | ||
end | ||
end | ||
%> | ||
<%= render ::TeamPlanner::TableComponent.new(rows: @views, current_user: current_user) %> |
17 changes: 14 additions & 3 deletions
17
modules/team_planner/app/views/team_planner/team_planner/overview.html.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,18 @@ | ||
<% html_title(t('team_planner.label_team_planner_plural')) -%> | ||
<%= | ||
render Primer::OpenProject::PageHeader.new do |header| | ||
header.with_title { t('team_planner.label_team_planner_plural') } | ||
header.with_breadcrumbs([{ href: home_path, text: organization_name}, | ||
t('team_planner.label_team_planner_plural')]) | ||
end | ||
%> | ||
<%= toolbar title: t(:'team_planner.label_team_planner_plural') do %> | ||
<%= render ::TeamPlanner::AddButtonComponent.new %> | ||
<% end %> | ||
<%= | ||
render Primer::OpenProject::SubHeader.new do |subheader| | ||
subheader.with_action_component(data: { "test-selector": "add-team-planner-button"}) do | ||
render ::TeamPlanner::AddButtonComponent.new | ||
end | ||
end | ||
%> | ||
<%= render ::TeamPlanner::Overview::TableComponent.new(rows: @views, current_user: current_user) %> |
Oops, something went wrong.