Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-05 08:59:27 +08:00
Code Packages Activity Actions 11

Small improvements to digest emails and preview mechanism.

Browse source
This commit is contained in:
Robin Ward 2013-06-11 12:27:11 -04:00
parent 45cff9c674
commit 8b4e3402c2
6 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/admin/templates/email_preview_digest.js.handlebars
View file

@ -1,3 +1,5 @@
<p>{{i18n admin.email.preview_digest_desc}}</p>
<div class='admin-controls'> <div class='admin-controls'>
<div class='span7 controls'> <div class='span7 controls'>
<label for='last-seen'>{{i18n admin.email.last_seen_user}}</label> <label for='last-seen'>{{i18n admin.email.last_seen_user}}</label>

2
app/assets/javascripts/discourse/views/view.js
View file

@ -14,7 +14,7 @@ Discourse.View.reopenClass({
/** /**
Register a view helper for ease of use Register a view helper for ease of use
@method registerHElper @method registerHelper
@param {String} helperName the name of the helper @param {String} helperName the name of the helper
@param {Ember.View} helperClass the view that will be inserted by the helper @param {Ember.View} helperClass the view that will be inserted by the helper
**/ **/

4
app/views/user_notifications/digest.text.erb
View file

@ -10,10 +10,10 @@
<%= raw(@markdown_linker.create(t.title, t.relative_url)) %> <%= raw(@markdown_linker.create(t.title, t.relative_url)) %>
<%- if t.best_post.present? %> <%- if t.best_post.present? %>
<%= raw(t.best_post.excerpt(1000, <div class='digest-post'><%= raw(t.best_post.excerpt(1000,
strip_links: true, strip_links: true,
text_entities: true, text_entities: true,
markdown_images: true)) %> markdown_images: true)) %></div>
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

1
config/locales/client.en.yml
View file

@ -1080,6 +1080,7 @@ en:
sent_test: "sent!" sent_test: "sent!"
delivery_method: "Delivery Method" delivery_method: "Delivery Method"
preview_digest: "Preview Digest" preview_digest: "Preview Digest"
preview_digest_desc: "This is a tool for previewing the content of the digest emails sent from your forum."
refresh: "Refresh" refresh: "Refresh"
format: "Format" format: "Format"
html: "html" html: "html"

2
lib/email/renderer.rb
View file

@ -21,7 +21,7 @@ module Email
end end
def html def html
cooked = PrettyText.cook(text, environment: 'email') cooked = PrettyText.cook(text)
if @opts[:html_template] if @opts[:html_template]
ActionView::Base.new(Rails.configuration.paths["app/views"]).render( ActionView::Base.new(Rails.configuration.paths["app/views"]).render(

4
lib/email/styles.rb
View file

@ -36,6 +36,10 @@ module Email
pre.replace(pre.text) pre.replace(pre.text)
end end
fragment.css('div.digest-post').each do |div|
div['style'] = 'margin-left: 15px; margin-top: 20px; max-width: 694px;'
end
fragment.to_html fragment.to_html
end end