From 71bac0c342631f8baf6652c377fd993d47134966 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 18 Sep 2015 16:12:41 -0400
Subject: [PATCH] Add page title and charset to embedded HTML

---
 app/views/embed/comments.html.erb | 5 +++--
 app/views/layouts/embed.html.erb  | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/app/views/embed/comments.html.erb b/app/views/embed/comments.html.erb
index 8c68d54af0f..511d401fe3f 100644
--- a/app/views/embed/comments.html.erb
+++ b/app/views/embed/comments.html.erb
@@ -39,13 +39,14 @@
   <%- end %>
 
   <% if @topic_view.topic.posts_count > 0 %>
-    <footer>
+    <footer class="clearfix">
+      <%= link_to(image_tag(SiteSetting.logo_url, class: 'logo'), Discourse.base_url, target: '_blank') %>
       <%= link_to(I18n.t('embed.continue'), @topic_view.posts.last.url, class: 'button', target: '_blank') %>
       <%- if @posts_left > 0 %>
         <span class='replies'><%= I18n.t('embed.more_replies', count: @posts_left) %></span>
       <%- end %>
-      <%= link_to(image_tag(SiteSetting.logo_url, class: 'logo'), Discourse.base_url, target: '_blank') %>
     </footer>
+    <div class="clearfix"></div>
   <% end %>
 
 <% end %>
diff --git a/app/views/layouts/embed.html.erb b/app/views/layouts/embed.html.erb
index 3466bd1b522..b4ee7cfa7c2 100644
--- a/app/views/layouts/embed.html.erb
+++ b/app/views/layouts/embed.html.erb
@@ -1,12 +1,18 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta charset="utf-8">
+
     <%= stylesheet_link_tag 'embed' %>
     <%- unless customization_disabled? %>
       <%= SiteCustomization.custom_stylesheet(session[:preview_style], :embedded) %>
     <%- end %>
     <%= javascript_include_tag 'break_string' %>
 
+    <%- if @topic_view && @topic_view.page_title.present? %>
+      <title><%= @topic_view.page_title %> - <%= SiteSetting.title %></title>
+    <%- end %>
+
     <script>
       (function() {
 
