Skip to content

Commit 3969645

Browse files
johnsgpmaverickvi
authored andcommitted
Do not use the service_link for the Development environment
1 parent 432608d commit 3969645

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

lib/source/layouts/core.erb

+13-9
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,21 @@
1212
<link rel="canonical" href="<%= meta_tags.canonical_url %>">
1313
<% if config[:tech_docs][:show_govuk_logo] %>
1414
<%
15-
service_link = config[:tech_docs][:service_link] || '/'
16-
# ensure service_link ends with a trailing '/'
17-
if service_link[-1, 1] != '/'
18-
service_link += '/'
15+
if development?
16+
path_prefix = '/'
17+
else
18+
path_prefix = config[:tech_docs][:service_link] || '/'
19+
# ensure service_link ends with a trailing '/'
20+
if path_prefix[-1, 1] != '/'
21+
path_prefix += '/'
22+
end
1923
end
2024
%>
21-
<link rel="icon" sizes="48x48" href="<%= service_link %>assets/govuk/assets/images/favicon.ico">
22-
<link rel="icon" sizes="any" href="<%= service_link %>assets/govuk/assets/images/favicon.svg" type="image/svg+xml">
23-
<link rel="mask-icon" href="<%= service_link %>assets/govuk/assets/images/govuk-icon-mask.svg" color="#0b0c0c">
24-
<link rel="apple-touch-icon" href="<%= service_link %>assets/govuk/assets/images/govuk-icon-180.png">
25-
<link rel="manifest" href="<%= service_link %>assets/govuk/assets/manifest.json">
25+
<link rel="icon" sizes="48x48" href="<%= path_prefix %>assets/govuk/assets/images/favicon.ico">
26+
<link rel="icon" sizes="any" href="<%= path_prefix %>assets/govuk/assets/images/favicon.svg" type="image/svg+xml">
27+
<link rel="mask-icon" href="<%= path_prefix %>assets/govuk/assets/images/govuk-icon-mask.svg" color="#0b0c0c">
28+
<link rel="apple-touch-icon" href="<%= path_prefix %>assets/govuk/assets/images/govuk-icon-180.png">
29+
<link rel="manifest" href="<%= path_prefix %>assets/govuk/assets/manifest.json">
2630
<% else %>
2731
<link rel="icon" sizes="48x48" href="/images/favicon.ico">
2832
<link rel="icon" sizes="any" href="/images/favicon.svg" type="image/svg+xml">

0 commit comments

Comments
 (0)