Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Enforce underline effect on all in-text links

Henriette Darge1f10fab39a8f
diff --git a/app/components/work_packages/activities_tab/journals/revision_component.html.erb b/app/components/work_packages/activities_tab/journals/revision_component.html.erb
index 54d7cc44372..ad622092be3 100644
--- a/app/components/work_packages/activities_tab/journals/revision_component.html.erb
+++ b/app/components/work_packages/activities_tab/journals/revision_component.html.erb
@@ -37,7 +37,7 @@
Primer::Beta::Link.new(
href: revision_url,
scheme: :secondary,
- underline: false,
+ underline: true,
font_size: :small,
target: "_blank"
)
@@ -64,7 +64,7 @@
Primer::Beta::Link.new(
href: revision_url,
scheme: :secondary,
- underline: false,
+ underline: true,
font_size: :small,
target: "_blank"
)
diff --git a/app/components/work_packages/date_picker/banner_component.rb b/app/components/work_packages/date_picker/banner_component.rb
index dd264a7a04e..8ece0b374a1 100644
--- a/app/components/work_packages/date_picker/banner_component.rb
+++ b/app/components/work_packages/date_picker/banner_component.rb
@@ -102,7 +102,7 @@ module WorkPackages
I18n.t("work_packages.datepicker_modal.banner.description.automatic_mobile")
end
- "#{text} #{render(Primer::Beta::Link.new(tag: :a, href: link, target: '_blank')) do
+ "#{text} #{render(Primer::Beta::Link.new(tag: :a, href: link, target: '_blank', underline: true)) do
I18n.t('work_packages.datepicker_modal.show_relations')
end}".html_safe
end
diff --git a/app/components/work_packages/progress/status_based/modal_body_component.html.erb b/app/components/work_packages/progress/status_based/modal_body_component.html.erb
index 6dce5a1b032..216aa755e12 100644
--- a/app/components/work_packages/progress/status_based/modal_body_component.html.erb
+++ b/app/components/work_packages/progress/status_based/modal_body_component.html.erb
@@ -24,7 +24,7 @@
<% modal_body.with_row(mt: 3) do |_tooltip| %>
<%= render(Primer::Beta::Text.new(font_weight: :semibold)) { t("work_package.progress.label_note") } %>
<%= render(Primer::Beta::Text.new) { t("work_package.progress.modal.status_based_help_text") } %>
- <%= render(Primer::Beta::Link.new(href: learn_more_href)) { t(:label_learn_more) } %>
+ <%= render(Primer::Beta::Link.new(href: learn_more_href, underline: true)) { t(:label_learn_more) } %>
<% end %>
<% modal_body.with_row(mt: 3) do |_actions_row| %>
diff --git a/app/forms/projects/settings/work_packages/activities/form.rb b/app/forms/projects/settings/work_packages/activities/form.rb
index ce238093c25..989253fd5d5 100644
--- a/app/forms/projects/settings/work_packages/activities/form.rb
+++ b/app/forms/projects/settings/work_packages/activities/form.rb
@@ -52,7 +52,10 @@ module Projects::Settings::WorkPackages::Activities
def caption_text
link = render(
- Primer::Beta::Link.new(href: OpenProject::Static::Links.url_for(:enterprise_features, :internal_comments))
+ Primer::Beta::Link.new(
+ href: OpenProject::Static::Links.url_for(:enterprise_features, :internal_comments),
+ underline: true
+ )
) do
I18n.t("label_learn_more")
end
diff --git a/app/forms/work_package_types/subject_configuration_form.rb b/app/forms/work_package_types/subject_configuration_form.rb
index 12fb12aa513..f4cd7bd16f2 100644
--- a/app/forms/work_package_types/subject_configuration_form.rb
+++ b/app/forms/work_package_types/subject_configuration_form.rb
@@ -94,7 +94,7 @@ module WorkPackageTypes
end
def make_link(href, link_text)
- render(Primer::Beta::Link.new(href:, target: "_blank")) { link_text }
+ render(Primer::Beta::Link.new(href:, target: "_blank", underline: true)) { link_text }
end
end
end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index af5952c93ae..39b62f4fff8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1243,7 +1243,7 @@ en:
comments_sorting: "Display work package activity sorted by"
disable_keyboard_shortcuts: "Disable keyboard shortcuts"
disable_keyboard_shortcuts_caption_html: |-
- You can choose to disable default <a href="%{href}">keyboard shortcuts</a> if you use a screen reader or want to avoid accidentally triggering an action with a shortcut.
+ You can choose to disable default <a href="%{href}">keyboard shortcuts</a> if you use a screen reader or want to avoid accidentally triggering an action with a shortcut.
dismissed_enterprise_banners: "Hidden enterprise banners"
impaired: "Accessibility mode"
auto_hide_popups: "Automatically hide success banners"
diff --git a/lookbook/previews/op_primer/border_box_table_component_preview/default.html.erb b/lookbook/previews/op_primer/border_box_table_component_preview/default.html.erb
index f3db8940ad0..0d274102d2c 100644
--- a/lookbook/previews/op_primer/border_box_table_component_preview/default.html.erb
+++ b/lookbook/previews/op_primer/border_box_table_component_preview/default.html.erb
@@ -39,7 +39,7 @@
end
def foo
- concat render(Primer::Beta::Link.new(scheme: :primary, href: "#")) { "Some link" }
+ concat render(Primer::Beta::Link.new(href: "#", font_weight: :bold)) { "Some link" }
render(Primer::Beta::Text.new(tag: :p, font_size: :small, color: :subtle)) { "Hello there" }
end
diff --git a/lookbook/previews/op_primer/border_box_table_component_preview/with_action_menu.html.erb b/lookbook/previews/op_primer/border_box_table_component_preview/with_action_menu.html.erb
index 606e6ba5d2d..7e5bf410284 100644
--- a/lookbook/previews/op_primer/border_box_table_component_preview/with_action_menu.html.erb
+++ b/lookbook/previews/op_primer/border_box_table_component_preview/with_action_menu.html.erb
@@ -37,7 +37,7 @@
end
def foo
- concat render(Primer::Beta::Link.new(scheme: :primary, href: "#")) { "Some link" }
+ concat render(Primer::Beta::Link.new(href: "#", font_weight: :bold)) { "Some link" }
render(Primer::Beta::Text.new(tag: :p, font_size: :small, color: :subtle)) { "Hello there" }
end
diff --git a/lookbook/previews/op_primer/border_box_table_component_preview/with_footer.html.erb b/lookbook/previews/op_primer/border_box_table_component_preview/with_footer.html.erb
index 50077e2dbeb..1fe77333ca0 100644
--- a/lookbook/previews/op_primer/border_box_table_component_preview/with_footer.html.erb
+++ b/lookbook/previews/op_primer/border_box_table_component_preview/with_footer.html.erb
@@ -50,7 +50,7 @@
def footer
render(Primer::BaseComponent.new(tag: :span)) do
concat render(Primer::Beta::Text.new) { "This can be a custom footer component " }
- concat render(Primer::Beta::Link.new(href: "#")) { "with all sorts of things" }
+ concat render(Primer::Beta::Link.new(href: "#", underline: true)) { "with all sorts of things" }
end
end
diff --git a/modules/costs/app/components/my/time_tracking/time_entry_row.rb b/modules/costs/app/components/my/time_tracking/time_entry_row.rb
index a5e604343a5..7e08b5fee66 100644
--- a/modules/costs/app/components/my/time_tracking/time_entry_row.rb
+++ b/modules/costs/app/components/my/time_tracking/time_entry_row.rb
@@ -81,13 +81,13 @@ module My
def subject
render(Primer::Beta::Link.new(href: project_work_package_path(time_entry.project, time_entry.work_package),
- underline: false)) do
+ underline: true)) do
"##{time_entry.work_package.id}"
end + " - #{time_entry.work_package.subject}"
end
def project
- render(Primer::Beta::Link.new(href: project_path(time_entry.project), underline: false)) do
+ render(Primer::Beta::Link.new(href: project_path(time_entry.project), underline: true)) do
time_entry.project.name
end
end
diff --git a/modules/job_status/app/components/job_status/dialog/body_component.html.erb b/modules/job_status/app/components/job_status/dialog/body_component.html.erb
index 670495bddba..d734a0c5120 100644
--- a/modules/job_status/app/components/job_status/dialog/body_component.html.erb
+++ b/modules/job_status/app/components/job_status/dialog/body_component.html.erb
@@ -19,6 +19,7 @@
render(
Primer::Beta::Link.new(
href: redirect_url,
+ underline: true,
data: {
action: "job-status-polling#redirectClick",
"job-status-polling-target": job_errors.present? ? nil : "redirect"
@@ -36,6 +37,7 @@
link: (render(
Primer::Beta::Link.new(
href: download_url,
+ underline: true,
target: "_blank",
type: mime_type,
# omit download attribute for PDF,
diff --git a/modules/meeting/app/components/meetings/row_component.rb b/modules/meeting/app/components/meetings/row_component.rb
index e38e79c9b69..03cc53b883f 100644
--- a/modules/meeting/app/components/meetings/row_component.rb
+++ b/modules/meeting/app/components/meetings/row_component.rb
@@ -39,18 +39,19 @@ module Meetings
def title
if recurring?
- link_to model.title, project_recurring_meeting_path(project, model)
+ render(Primer::Beta::Link.new(href: project_recurring_meeting_path(project, model), font_weight: :bold)) { model.title }
elsif recurring_meeting.present?
occurrence_title
else
- link_to model.title, project_meeting_path(project, model)
+ render(Primer::Beta::Link.new(href: project_meeting_path(project, model), font_weight: :bold)) { model.title }
end
end
def occurrence_title
safe_join(
- [(link_to model.title, project_meeting_path(project, model)),
- (link_to recurring_label, project_recurring_meeting_path(project, recurring_meeting))], " "
+ [(render(Primer::Beta::Link.new(href: project_meeting_path(project, model), font_weight: :bold)) { model.title }),
+ (render(Primer::Beta::Link.new(href: project_recurring_meeting_path(project, recurring_meeting))) { recurring_label })],
+ " "
)
end
diff --git a/modules/storages/app/components/storages/admin/forms/general_info_form_component.rb b/modules/storages/app/components/storages/admin/forms/general_info_form_component.rb
index 4c4cb5a7a3d..5ef187c7fba 100644
--- a/modules/storages/app/components/storages/admin/forms/general_info_form_component.rb
+++ b/modules/storages/app/components/storages/admin/forms/general_info_form_component.rb
@@ -94,7 +94,7 @@ module Storages::Admin::Forms
end
def application_link_text_for(href, link_text)
- render(Primer::Beta::Link.new(href:, target: "_blank")) { link_text }
+ render(Primer::Beta::Link.new(href:, target: "_blank", underline: true)) { link_text }
end
end
end
diff --git a/modules/storages/app/components/storages/admin/forms/oauth_client_form_component.rb b/modules/storages/app/components/storages/admin/forms/oauth_client_form_component.rb
index 02f4cf8db7c..e7b9dc7e13a 100644
--- a/modules/storages/app/components/storages/admin/forms/oauth_client_form_component.rb
+++ b/modules/storages/app/components/storages/admin/forms/oauth_client_form_component.rb
@@ -58,12 +58,12 @@ module Storages::Admin::Forms
def one_drive_integration_link(target: "_blank")
href = ::OpenProject::Static::Links[:storage_docs][:one_drive_oauth_application][:href]
- render(Primer::Beta::Link.new(href:, target:)) { I18n.t("storages.instructions.one_drive.application_link_text") }
+ render(Primer::Beta::Link.new(href:, underline: true, target:)) { I18n.t("storages.instructions.one_drive.application_link_text") }
end
def nextcloud_integration_link(target: "_blank")
href = Storages::UrlBuilder.url(storage.uri, "settings/admin/openproject")
- render(Primer::Beta::Link.new(href:, target:)) { I18n.t("storages.instructions.nextcloud.integration") }
+ render(Primer::Beta::Link.new(href:, underline: true, target:)) { I18n.t("storages.instructions.nextcloud.integration") }
end
def first_time_configuration?
diff --git a/modules/storages/app/components/storages/admin/general_info_component.html.erb b/modules/storages/app/components/storages/admin/general_info_component.html.erb
index c7a9b7d4193..79ed0d8de62 100644
--- a/modules/storages/app/components/storages/admin/general_info_component.html.erb
+++ b/modules/storages/app/components/storages/admin/general_info_component.html.erb
@@ -11,7 +11,7 @@
if can_show_open_link?
concat(render(Primer::Beta::Text.new) { " - " })
concat(
- render(Primer::Beta::Link.new(href: open_href, target: "_blank")) do |link|
+ render(Primer::Beta::Link.new(href: open_href, target: "_blank", underline: true)) do |link|
link.with_trailing_visual_icon(icon: "link-external", size: :small)
I18n.t("storages.buttons.open_storage")
end
diff --git a/modules/storages/app/components/storages/admin/health/check_result_component.html.erb b/modules/storages/app/components/storages/admin/health/check_result_component.html.erb
index 42cce4ff53c..5329f54b4de 100644
--- a/modules/storages/app/components/storages/admin/health/check_result_component.html.erb
+++ b/modules/storages/app/components/storages/admin/health/check_result_component.html.erb
@@ -47,7 +47,7 @@ See COPYRIGHT and LICENSE files for more details.
if data[:error_code].present?
row.with_column do
- render(Primer::Beta::Link.new(href: data[:docs_href])) do |link|
+ render(Primer::Beta::Link.new(href: data[:docs_href], underline: true)) do |link|
link.with_trailing_visual_icon(icon: :"link-external")
I18n.t(:label_more_information)
end
diff --git a/modules/storages/app/components/storages/open_project_storage_modal_component.rb b/modules/storages/app/components/storages/open_project_storage_modal_component.rb
index b8648abafa5..195680d2b0e 100644
--- a/modules/storages/app/components/storages/open_project_storage_modal_component.rb
+++ b/modules/storages/app/components/storages/open_project_storage_modal_component.rb
@@ -60,7 +60,7 @@ class Storages::OpenProjectStorageModalComponent < ViewComponent::Base
href = OpenProject::Static::Links[:storage_docs][:health_status][:href]
I18n.t(
"storages.open_project_storage_modal.timeout.subtitle",
- storages_health_link: render(Primer::Beta::Link.new(href:, target: "_blank")) do
+ storages_health_link: render(Primer::Beta::Link.new(href:, target: "_blank", underline: true)) do
I18n.t("storages.open_project_storage_modal.timeout.link_text")
end
)
diff --git a/modules/storages/app/forms/storages/admin/managed_project_folders/application_password_input.rb b/modules/storages/app/forms/storages/admin/managed_project_folders/application_password_input.rb
index 4e2609a2fc0..b55aaede446 100644
--- a/modules/storages/app/forms/storages/admin/managed_project_folders/application_password_input.rb
+++ b/modules/storages/app/forms/storages/admin/managed_project_folders/application_password_input.rb
@@ -58,6 +58,7 @@ module Storages::Admin::ManagedProjectFolders
render(
Primer::Beta::Link.new(
href: Storages::UrlBuilder.url(@storage.uri, "settings/admin/openproject"),
+ underline: true,
target: "_blank"
)
) { I18n.t("storages.instructions.#{@storage}.integration") }
diff --git a/modules/storages/app/forms/storages/admin/provider_drive_id_input_form.rb b/modules/storages/app/forms/storages/admin/provider_drive_id_input_form.rb
index 3d8409f67c9..9f9b46c21fe 100644
--- a/modules/storages/app/forms/storages/admin/provider_drive_id_input_form.rb
+++ b/modules/storages/app/forms/storages/admin/provider_drive_id_input_form.rb
@@ -46,7 +46,7 @@ module Storages::Admin
def caption
href = ::OpenProject::Static::Links[:storage_docs][:one_drive_drive_id_guide][:href]
I18n.t("storages.instructions.one_drive.drive_id",
- drive_id_link_text: render(Primer::Beta::Link.new(href:, target: "_blank")) do
+ drive_id_link_text: render(Primer::Beta::Link.new(href:, underline: true, target: "_blank")) do
I18n.t("storages.instructions.one_drive.documentation_link_text")
end)
end
diff --git a/modules/storages/app/forms/storages/admin/provider_tenant_id_input_form.rb b/modules/storages/app/forms/storages/admin/provider_tenant_id_input_form.rb
index 74aed0704bf..82e383eef7b 100644
--- a/modules/storages/app/forms/storages/admin/provider_tenant_id_input_form.rb
+++ b/modules/storages/app/forms/storages/admin/provider_tenant_id_input_form.rb
@@ -47,7 +47,7 @@ module Storages::Admin
def caption
href = ::OpenProject::Static::Links[:storage_docs][:one_drive_oauth_application][:href]
I18n.t("storages.instructions.one_drive.tenant_id",
- application_link_text: render(Primer::Beta::Link.new(href:, target: "_blank")) do
+ application_link_text: render(Primer::Beta::Link.new(href:, underline: true, target: "_blank")) do
I18n.t("storages.instructions.one_drive.application_link_text")
end)
end
diff --git a/spec/features/admin/scim_clients/create_spec.rb b/spec/features/admin/scim_clients/create_spec.rb
index c832f3c5129..400e7b0a1dd 100644
--- a/spec/features/admin/scim_clients/create_spec.rb
+++ b/spec/features/admin/scim_clients/create_spec.rb
@@ -40,7 +40,6 @@ RSpec.describe "Creating a SCIM client", :js, :selenium, driver: :firefox_de do
visit new_admin_scim_client_path
expect(page).to be_axe_clean.within("#content")
- .skipping("link-in-text-block") # https://community.openproject.org/wp/65252
expect(page).to have_no_field("Subject claim")
select "JWT from identity provider", from: "Authentication method"
diff --git a/spec/features/admin/scim_clients/update_spec.rb b/spec/features/admin/scim_clients/update_spec.rb
index 0616f4ffe11..2104956b42b 100644
--- a/spec/features/admin/scim_clients/update_spec.rb
+++ b/spec/features/admin/scim_clients/update_spec.rb
@@ -51,7 +51,6 @@ RSpec.describe "Updating a SCIM client", :js, :selenium, driver: :firefox_de do
it "can update a SCIM client authenticating through JWT", :aggregate_failures, with_ee: [:scim_api] do
visit edit_admin_scim_client_path(sso_scim_client)
expect(page).to be_axe_clean.within("#content")
- .skipping("link-in-text-block") # https://community.openproject.org/wp/65252
expect(page.find_field("Authentication method", disabled: :all)).to be_disabled
fill_in "Name", with: ""
@@ -81,7 +80,6 @@ RSpec.describe "Updating a SCIM client", :js, :selenium, driver: :firefox_de do
it "can update a SCIM client authenticating through client credentials", :aggregate_failures, with_ee: [:scim_api] do
visit edit_admin_scim_client_path(oauth_client_scim_client)
expect(page).to be_axe_clean.within("#content")
- .skipping("link-in-text-block") # https://community.openproject.org/wp/65252
expect(page.find_field("Authentication method", disabled: :all)).to be_disabled
fill_in "Name", with: ""
@@ -111,7 +109,6 @@ RSpec.describe "Updating a SCIM client", :js, :selenium, driver: :firefox_de do
it "can update a SCIM client authenticating through a static access token", :aggregate_failures, with_ee: [:scim_api] do
visit edit_admin_scim_client_path(token_scim_client)
expect(page).to be_axe_clean.within("#content")
- .skipping("link-in-text-block") # https://community.openproject.org/wp/65252
expect(page.find_field("Authentication method", disabled: :all)).to be_disabled
fill_in "Name", with: ""