IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Better error messages when embedding fails

Browse Source
This commit is contained in:
Robin Ward
2016-12-13 14:37:37 -05:00
parent 1f0793ac50
commit 03bc6f70f9
5 changed files with 62 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/views/embed/embed_error.html.erb Normal file
View File

@@ -0,0 +1,25 @@
<header class='discourse'>
<h3><%= t 'embed.error' %></h3>
<%= link_to(image_tag(SiteSetting.logo_url, class: 'logo'), Discourse.base_url) %>
<div class='clearfix'></div>
</header>
<%- if @show_reason %>
<div class='embed-error'>
<%- if @hosts.present? %>
<p><%= t 'embed.referer' %><code><%= request.referer %></code></p>
<p><%= t 'embed.mismatch' %></p>
<ul>
<%- @hosts.each do |eh| %>
<li>
<%= eh.host %><%- if eh.path_whitelist.present? %><%= eh.path_whitelist %><% end %>
</li>
<%- end %>
</ul>
<%- else %>
<p><%= t 'embed.no_hosts' %></p>
<%- end %>
<p><%= link_to(t('embed.configure'), @setup_url, target: '_blank') %></p>
</div>
<%- end %>

8
app/views/embed/loading.html.erb
View File

@@ -1,12 +1,12 @@
<header>
<%= t 'embed.loading' %>
<header class='discourse'>
<h3><%= t 'embed.loading' %></h3>
<%= link_to(image_tag(SiteSetting.logo_url, class: 'logo'), Discourse.base_url) %>
<div class='clearfix'></div>
</header>
<script>
(function() {
setTimeout(function() {
document.location.reload();
}, 30000);
})();
</script>
</script>