aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/views/request/_view_html_stylesheet.html.erb9
-rw-r--r--lib/attachment_to_html/template.html.erb1
-rw-r--r--spec/lib/attachment_to_html/view_spec.rb1
3 files changed, 6 insertions, 5 deletions
diff --git a/app/views/request/_view_html_stylesheet.html.erb b/app/views/request/_view_html_stylesheet.html.erb
index f3d8799da..09f295346 100644
--- a/app/views/request/_view_html_stylesheet.html.erb
+++ b/app/views/request/_view_html_stylesheet.html.erb
@@ -1,17 +1,16 @@
<% if AlaveteliConfiguration::responsive_styling || params[:responsive] %>
<!--[if LTE IE 7]>
- <link href="/assets/responsive/application-lte-ie7.css" media="all" rel="stylesheet" title="Main" type="text/css" />
+ <link href="/assets/responsive/application-lte-ie7.css" media="all" rel="stylesheet" title="Main" type="text/css" charset="UTF-8" />
<![endif]-->
<!--[if IE 8]>
- <link href="/assets/responsive/application-ie8.css" media="all" rel="stylesheet" title="Main" type="text/css" />
+ <link href="/assets/responsive/application-ie8.css" media="all" rel="stylesheet" title="Main" type="text/css" charset="UTF-8" />
<![endif]-->
<!--[if GT IE 8]><!-->
- <link href="/assets/responsive/application.css" media="all" rel="stylesheet" title="Main" type="text/css" />
+ <link href="/assets/responsive/application.css" media="all" rel="stylesheet" title="Main" type="text/css" charset="UTF-8" />
<!--<![endif]-->
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<% else %>
- <link type="text/css" title="Main" rel="stylesheet" media="screen" href="/assets/application.css">
-
+ <link type="text/css" title="Main" rel="stylesheet" media="screen" href="/assets/application.css" charset="UTF-8" />
<% end %>
diff --git a/lib/attachment_to_html/template.html.erb b/lib/attachment_to_html/template.html.erb
index 38286a5f9..b898b1750 100644
--- a/lib/attachment_to_html/template.html.erb
+++ b/lib/attachment_to_html/template.html.erb
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<head>
+ <meta charset="UTF-8">
<title><%= title %></title>
<%= content_for(:head_suffix) %>
</head>
diff --git a/spec/lib/attachment_to_html/view_spec.rb b/spec/lib/attachment_to_html/view_spec.rb
index 65eff4cad..50179b0f7 100644
--- a/spec/lib/attachment_to_html/view_spec.rb
+++ b/spec/lib/attachment_to_html/view_spec.rb
@@ -119,6 +119,7 @@ describe AttachmentToHTML::View do
<!DOCTYPE html>
<html>
<head>
+ <meta charset="UTF-8">
<title>An attachment.txt</title>
</head>
<body>