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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve consistency of breadcrumbs #2643

Merged
merged 14 commits into from
Jan 15, 2024
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions app/views/account/activities/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@
{
title: "Settings",
url: account_path,
},
{
title: "Account access log",
},
}
]
})
%>
Expand Down
3 changes: 0 additions & 3 deletions app/views/account/applications/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
{
title: "Settings",
url: account_path,
},
{
title: "GOV.UK apps",
}
]
})
Expand Down
3 changes: 0 additions & 3 deletions app/views/account/emails/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
{
title: "Settings",
url: account_path,
},
{
title: "Change your email address",
}
]
})
Expand Down
3 changes: 0 additions & 3 deletions app/views/account/organisations/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
{
title: "Settings",
url: account_path,
},
{
title: organisation_page_title,
}
]
})
Expand Down
3 changes: 0 additions & 3 deletions app/views/account/passwords/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
{
title: "Settings",
url: account_path,
},
{
title: "Change your password",
}
]
})
Expand Down
5 changes: 1 addition & 4 deletions app/views/account/permissions/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@
{
title: "Settings",
url: account_path,
},
{
title: "Update permissions for #{@application.name}",
},
}
]
})
%>
Expand Down
5 changes: 1 addition & 4 deletions app/views/account/permissions/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@
{
title: "Settings",
url: account_path,
},
{
title: "My permissions for #{@application.name}",
},
}
]
})
%>
Expand Down
3 changes: 0 additions & 3 deletions app/views/account/roles/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
{
title: "Settings",
url: account_path,
},
{
title: role_page_title,
}
]
})
Expand Down
5 changes: 1 addition & 4 deletions app/views/account/signin_permissions/delete.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@
{
title: "GOV.UK apps",
url: account_applications_path,
},
{
title: "Remove access to #{@application.name}",
},
}
]
})
%>
Expand Down
15 changes: 0 additions & 15 deletions app/views/accounts/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,20 +1,5 @@
<% content_for :title, "Settings" %>

<% content_for :breadcrumbs,
render("govuk_publishing_components/components/breadcrumbs", {
collapse_on_mobile: true,
breadcrumbs: [
{
title: "Dashboard",
url: root_path,
},
{
title: "Settings",
}
]
})
%>

<%= render "govuk_publishing_components/components/cards", {
items: [
{
Expand Down
3 changes: 0 additions & 3 deletions app/views/api_users/applications/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
{
title: @api_user.name,
url: edit_api_user_path(@api_user),
},
{
title: "#{@api_user.name}'s applications",
}
]
})
Expand Down
5 changes: 1 addition & 4 deletions app/views/api_users/edit.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<% content_for :title_caption, "Manage API users" %>
<% content_for :title, "Edit #{@api_user.name}" %>
<% content_for :title, @api_user.name %>

<% content_for :breadcrumbs,
render("govuk_publishing_components/components/breadcrumbs", {
Expand All @@ -12,9 +12,6 @@
{
title: "API users",
url: api_users_path,
},
{
title: "Edit #{@api_user.name}",
}
]
})
Expand Down
3 changes: 0 additions & 3 deletions app/views/api_users/manage_tokens.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
{
title: @api_user.name,
url: edit_api_user_path(@api_user),
},
{
title: "Manage tokens",
}
]
})
Expand Down
3 changes: 0 additions & 3 deletions app/views/api_users/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
{
title: "API users",
url: api_users_path,
},
{
title: "New API user",
}
]
})
Expand Down
5 changes: 1 addition & 4 deletions app/views/api_users/permissions/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,8 @@
url: edit_api_user_path(@api_user),
},
{
title: "#{@api_user.name}'s applications",
title: "Applications",
url: api_user_applications_path(@api_user),
},
{
title: "Update #{@api_user.name}'s permissions for #{@application.name}",
}
]
})
Expand Down
5 changes: 1 addition & 4 deletions app/views/authorisations/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
collapse_on_mobile: true,
breadcrumbs: [
{
title: "Home",
title: "Dashboard",
url: root_path,
},
{
Expand All @@ -18,9 +18,6 @@
{
title: "Manage tokens",
url: manage_tokens_api_user_path(@api_user),
},
{
title: "Revoke access token",
}
]
})
Expand Down
5 changes: 1 addition & 4 deletions app/views/authorisations/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
collapse_on_mobile: true,
breadcrumbs: [
{
title: "Home",
title: "Dashboard",
url: root_path,
},
{
Expand All @@ -20,9 +20,6 @@
{
title: "Manage tokens",
url: manage_tokens_api_user_path(@api_user),
},
{
title: "Create new access token",
}
]
})
Expand Down
5 changes: 1 addition & 4 deletions app/views/batch_invitation_permissions/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,12 @@
collapse_on_mobile: true,
breadcrumbs: [
{
title: "Home",
title: "Dashboard",
url: root_path,
},
{
title: "Users",
url: users_path,
},
{
title: "Manage permissions for new users",
}
]
})
Expand Down
5 changes: 1 addition & 4 deletions app/views/batch_invitations/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,12 @@
collapse_on_mobile: true,
breadcrumbs: [
{
title: "Home",
title: "Dashboard",
url: root_path,
},
{
title: "Users",
url: users_path,
},
{
title: "Upload a batch of users",
}
]
})
Expand Down
5 changes: 1 addition & 4 deletions app/views/batch_invitations/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
collapse_on_mobile: true,
breadcrumbs: [
{
title: "Home",
title: "Dashboard",
url: root_path,
},
{
Expand All @@ -14,9 +14,6 @@
{
title: "Upload a batch of users",
url: new_batch_invitation_path,
},
{
title: "Creating a batch of users",
}
]
})
Expand Down
5 changes: 1 addition & 4 deletions app/views/devise/invitations/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,12 @@
collapse_on_mobile: true,
breadcrumbs: [
{
title: "Home",
title: "Dashboard",
url: root_path,
},
{
title: "Users",
url: users_path,
},
{
title: "Create new user",
}
]
})
Expand Down
3 changes: 0 additions & 3 deletions app/views/devise/two_step_verification/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
{
title: "Settings",
url: account_path,
},
{
title: two_step_verification_page_title,
}
]
})
Expand Down
18 changes: 16 additions & 2 deletions app/views/doorkeeper_applications/edit.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
<% content_for :title, "Edit ‘#{@application.name}’" %>
<% content_for :back_link, doorkeeper_applications_path %>
<% content_for :title, "Edit #{@application.name}" %>
<% content_for :breadcrumbs,
render("govuk_publishing_components/components/breadcrumbs", {
collapse_on_mobile: true,
breadcrumbs: [
{
title: "Dashboard",
url: root_path,
},
{
title: "Applications",
url: doorkeeper_applications_path,
}
]
})
%>

<%= link_to "Users with access",
users_with_access_doorkeeper_application_path(@application),
Expand Down
7 changes: 2 additions & 5 deletions app/views/doorkeeper_applications/users_with_access.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
collapse_on_mobile: true,
breadcrumbs: [
{
title: "Home",
title: "Dashboard",
url: root_path,
},
{
Expand All @@ -14,10 +14,7 @@
{
title: @application.name,
url: edit_doorkeeper_application_path(@application),
},
{
title: "Users with access",
},
}
]
})
%>
Expand Down
7 changes: 2 additions & 5 deletions app/views/organisations/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,13 @@
collapse_on_mobile: true,
breadcrumbs: [
{
title: "Home",
title: "Dashboard",
url: root_path,
},
{
title: "Organisations",
url: organisations_path,
},
{
title: "Require 2-step verification",
},
}
]
})
%>
Expand Down
9 changes: 3 additions & 6 deletions app/views/supported_permissions/edit.html.erb
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<% content_for :title, "Edit #{@supported_permission.name_was} permission for #{@application.name}" %>
<% content_for :title, "Edit #{@supported_permission.name_was} permission for #{@application.name}" %>

<% content_for :breadcrumbs,
render("govuk_publishing_components/components/breadcrumbs", {
collapse_on_mobile: true,
breadcrumbs: [
{
title: "Home",
title: "Dashboard",
url: root_path,
},
{
Expand All @@ -19,10 +19,7 @@
{
title: "Permissions",
url: doorkeeper_application_supported_permissions_path(@application),
},
{
title: "Edit “#{@supported_permission.name_was}” permission",
},
}
]
})
%>
Expand Down
Loading
Loading