summaryrefslogtreecommitdiffstats
path: root/app/views
diff options
context:
space:
mode:
Diffstat (limited to 'app/views')
-rw-r--r--app/views/mailer/news_comment_added.text.html.rhtml5
-rw-r--r--app/views/mailer/news_comment_added.text.plain.rhtml6
-rw-r--r--app/views/news/show.rhtml1
3 files changed, 12 insertions, 0 deletions
diff --git a/app/views/mailer/news_comment_added.text.html.rhtml b/app/views/mailer/news_comment_added.text.html.rhtml
new file mode 100644
index 000000000..ef2be0f65
--- /dev/null
+++ b/app/views/mailer/news_comment_added.text.html.rhtml
@@ -0,0 +1,5 @@
+<h1><%= link_to(h(@news.title), @news_url) %></h1>
+
+<p><%= l(:text_user_wrote, :value => h(@comment.author)) %></p>
+
+<%= textilizable @comment, :comments, :only_path => false %>
diff --git a/app/views/mailer/news_comment_added.text.plain.rhtml b/app/views/mailer/news_comment_added.text.plain.rhtml
new file mode 100644
index 000000000..aadbc37c0
--- /dev/null
+++ b/app/views/mailer/news_comment_added.text.plain.rhtml
@@ -0,0 +1,6 @@
+<%= @news.title %>
+<%= @news_url %>
+
+<%= l(:text_user_wrote, :value => @comment.author) %>
+
+<%= @comment.comments %>
diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml
index 0dc3fe358..28db44e96 100644
--- a/app/views/news/show.rhtml
+++ b/app/views/news/show.rhtml
@@ -1,4 +1,5 @@
<div class="contextual">
+<%= watcher_tag(@news, User.current) %>
<%= link_to(l(:button_edit),
edit_news_path(@news),
:class => 'icon icon-edit',