diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb index e7750ecbdda..b55ee1976ad 100644 --- a/app/views/user_notifications/digest.html.erb +++ b/app/views/user_notifications/digest.html.erb @@ -1,404 +1,392 @@
- - - -<%- if I18n.t('user_notifications.digest.custom.html.header').present? %> - + +
- - -
- <%= raw(t 'user_notifications.digest.custom.html.header') %> -
-<%- else %> - - - - -
- - - <%- if logo_url.blank? %> - <%= SiteSetting.title %> - <%- else %> - <%= SiteSetting.title %> - <%- end %> - - -
-<%- end %> - - - - - - -
-
- - + + - - - -
+ <%- if I18n.t('user_notifications.digest.custom.html.header').present? %> + - + + + - -
  + <%= raw(t 'user_notifications.digest.custom.html.header') %> +
- - 		- - +
+ <%- else %> + + + + + + +
+ + <%- if logo_url.blank? %> + <%= SiteSetting.title %> + <%- else %> + <%= SiteSetting.title %> + <%- end %> + +
+ <%- end %> + - + + - -
+ +
+ + + + + + +
 
+
+ 		+ + + + + + +
+
+
<%=t 'user_notifications.digest.since_last_visit' %>
+ + + + <%- @counts.each do |count| -%> + + <%- end -%> + + + <%- @counts.each do |count| -%> + + <%- end -%> + + +
+ <%= count[:value] -%> +
+ <%=t count[:label_key] -%> +
+
<%=t 'user_notifications.digest.popular_topics' %>
+
+ + + + + + +
+ <% @popular_topics.each_with_index do |t, i| %> + + + + + + + + +
+

+ <%= category_badge(t.category, inline_style: true, absolute_url: true) %> +

+ 		+

+ <%= short_date(t.created_at) %> +

+
+ + + + + + +
+

+ + <%= gsub_emoji_to_unicode(t.title.truncate(100, separator: /\s/)) -%> + +

+ <%- if SiteSetting.show_topic_featured_link_in_digest && t.featured_link %> + <%= raw topic_featured_link_domain(t.featured_link) %> + <%- end %> +
+ + + + + + <%- if show_image_with_url(t.image_url) && t.featured_link.nil? && !(@excerpts[t.first_post&.id]||"").include?(t.image_url) -%> + + <%- end -%> + + +
+ <%= t.user.username -%> + + <% if t.user %> + <% if SiteSetting.enable_names? && t.user.name.present? && t.user.name.downcase != t.user.username.downcase %> +
<%= t.user.name -%>
+ <% end %> +

<%= t.user.username -%>

+ <% end %> + 		+ topic image +
+ <%- if t.first_post.present? && !t.first_post.user_deleted %> + + + + + + +
+ <%= @excerpts[t.first_post.id] %> +
+ <%- end %> + + + + + + + + +
+ likes +  <%= t.like_count -%> + + replies +  <%= t.posts_count - 1 -%> + + + + <%=t 'user_notifications.digest.join_the_discussion' %> + + +
+
+ + +
 
+
+ -
-
<%=t 'user_notifications.digest.since_last_visit' %>
- - - - - - - <%- @counts.each do |count| -%> - - <%- end -%> - - - <%- @counts.each do |count| -%> - - <%- end -%> - - -
- <%= count[:value] -%> -
- <%=t count[:label_key] -%> -
- -
<%=t 'user_notifications.digest.popular_topics' %>
+ <% if i < 5 %> + <%= digest_custom_html("below_post_#{i+1}") %> + <% end %> + <% end %> +
+ 		+ +
+ + + + + + +
 
+
- - - - - - -
- -<% @popular_topics.each_with_index do |t, i| %> - - - - - - - - -
-

- <%= category_badge(t.category, inline_style: true, absolute_url: true) %> -

- 		-

- <%= short_date(t.created_at) %> -

-
- - - - - - - -
-

- - <%= gsub_emoji_to_unicode(t.title.truncate(100, separator: /\s/)) -%> - -

- <%- if SiteSetting.show_topic_featured_link_in_digest && t.featured_link %> - <%= raw topic_featured_link_domain(t.featured_link) %> - <%- end %> -
- - - - - - - <%- if show_image_with_url(t.image_url) && t.featured_link.nil? && !(@excerpts[t.first_post&.id]||"").include?(t.image_url) -%> - - <%- end -%> - - -
- <%= t.user.username -%> - - <% if t.user %> - <% if SiteSetting.enable_names? && t.user.name.present? && t.user.name.downcase != t.user.username.downcase %> -
<%= t.user.name -%>
- <% end %> -

<%= t.user.username -%>

- <% end %> - 		- topic image -
- -<%- if t.first_post.present? && !t.first_post.user_deleted %> - - - - - - -
- <%= @excerpts[t.first_post.id] %> -
-<%- end %> - - - - - - - - - -
- likes -  <%= t.like_count -%> - - replies -  <%= t.posts_count - 1 -%> - - - - <%=t 'user_notifications.digest.join_the_discussion' %> - - -
-
- - -
 
-
- - -<% if i < 5 %> -<%= digest_custom_html("below_post_#{i+1}") %> -<% end %> - -<% end %> - -
- 		- -
- - - - - -
 
-
-
+ <% if @popular_posts.present? %> + +
+ <%=t 'user_notifications.digest.popular_posts' %> +
+ + + + + + +
  -<% if @popular_posts.present? %> + <% @popular_posts.each do |post| %> -
- <%=t 'user_notifications.digest.popular_posts' %> -
+ + + + + + + +
+ <%= email_excerpt(post.cooked, post) %> +
- - - - - - - -
  + + + + + + +
+
+
-<% @popular_posts.each do |post| %> + + + + + + + + +
+ <%= post.user.username -%> + + <% if post.user %> + <% if SiteSetting.enable_names? && post.user.name && post.user.name.downcase != post.user.username.downcase %> +
<%= post.user.name -%>
+ <% end %> +

<%= post.user.username -%>

+ <% end %> + 		+

+ <%= gsub_emoji_to_unicode(post.topic.title.truncate(100, separator: /\s/)) -%> +

+ + <%=t 'user_notifications.digest.join_the_discussion' %> + +
- - - - - - - -
- <%= email_excerpt(post.cooked, post) %> -
+
+ + +
 
+
+ - - - - - - -
-
-
+ <% end %> - - - - - + + +
- <%= post.user.username -%> - - <% if post.user %> - <% if SiteSetting.enable_names? && post.user.name && post.user.name.downcase != post.user.username.downcase %> -
<%= post.user.name -%>
- <% end %> -

<%= post.user.username -%>

+ 		 
<% end %> - 		-

- <%= gsub_emoji_to_unicode(post.topic.title.truncate(100, separator: /\s/)) -%> -

- - <%=t 'user_notifications.digest.join_the_discussion' %> - -
-
- - + <%= digest_custom_html("above_popular_topics") %> + + <% if @other_new_for_you.present? %> + +
<%=t 'user_notifications.digest.more_new' %>
+ +
 
+ + + + + +
  + + + + + <% @other_new_for_you.each do |t| %> + + + + + + + + + + + + <% end %> + + +
+ + <%= gsub_emoji_to_unicode(t.title.truncate(100, separator: /\s/)) -%> + + <%- if SiteSetting.show_topic_featured_link_in_digest && t.featured_link %> + <%= raw topic_featured_link_domain(t.featured_link) %> + <%- end %> +

+ <%= category_badge(t.category, inline_style: true, absolute_url: true) %> +

+ 		+ likes +

<%= t.like_count -%>

+ 		+ replies +

<%= t.posts_count - 1 -%>

+
 
+ + 		 
+ + <% end %> + + <%= digest_custom_html("below_popular_topics") %> + + + + <%= digest_custom_html("above_footer") %> + + + + + + + +
+ <%=raw(t 'user_notifications.digest.unsubscribe', + site_link: html_site_link, + email_preferences_link: link_to(t('user_notifications.digest.your_email_settings'), Discourse.base_url + '/my/preferences/emails'), + unsubscribe_link: link_to(t('user_notifications.digest.click_here'), "#{Discourse.base_url}/email/unsubscribe/#{@unsubscribe_key}")) %> +
+ + <%= digest_custom_html("below_footer") %> +
- - -<% end %> - - 		 
- -<% end %> - - -<%= digest_custom_html("above_popular_topics") %> - -<% if @other_new_for_you.present? %> -
<%=t 'user_notifications.digest.more_new' %>
- - - - - - - -
  - - - - -<% @other_new_for_you.each do |t| %> - - - - - - - - - - - -<% end %> - - -
- - <%= gsub_emoji_to_unicode(t.title.truncate(100, separator: /\s/)) -%> - - <%- if SiteSetting.show_topic_featured_link_in_digest && t.featured_link %> - <%= raw topic_featured_link_domain(t.featured_link) %> - <%- end %> -

- <%= category_badge(t.category, inline_style: true, absolute_url: true) %> -

- 		- likes -

<%= t.like_count -%>

- 		- replies -

<%= t.posts_count - 1 -%>

-
 
- - 		 
- -<% end %> - -<%= digest_custom_html("below_popular_topics") %> - - - -   - - - - - -<%= digest_custom_html("above_footer") %> - - - - - -
- <%=raw(t 'user_notifications.digest.unsubscribe', - site_link: html_site_link, - email_preferences_link: link_to(t('user_notifications.digest.your_email_settings'), Discourse.base_url + '/my/preferences/emails'), - unsubscribe_link: link_to(t('user_notifications.digest.click_here'), "#{Discourse.base_url}/email/unsubscribe/#{@unsubscribe_key}")) %> -
- -<%= digest_custom_html("below_footer") %> - -