publify_core 9.0.0.pre5 → 9.2.0

data/app/views/admin/content/autosave.js.erb

@@ -1,5 +1,5 @@
 $('#autosave').html('<%= hidden_field_tag('article[id]', @article.id) %>');
 $('#preview_link').replaceWith('<%= link_to('Preview', {:controller => '/articles', :action => 'preview', :id => @article.id}, {:target => 'new', :class => 'btn btn-default'}); %>');
 <% if @article.state.to_s.downcase == "draft" %>
-  $("#article_published_at").val(<% Time.now() %>);
-<% end %>
+  $("#article_published_at").val(<% Time.zone.now() %>);
+<% end %>

data/app/views/admin/content/edit.html.erb

@@ -1,3 +1,3 @@
-<%= form_tag({action: 'update', id: @article.id}, method: :put, multipart: true, id: "article_form", class: 'autosave') do %>
+<%= form_tag({ action: 'update', id: @article.id }, { method: :put, multipart: true, id: 'article_form', class: 'autosave' }) do %>
   <%= render 'form' %>
 <% end %>

data/app/views/admin/content/index.html.erb

@@ -1,48 +1,58 @@
 <% content_for :page_heading do %>
   <h2>
-    <i class="glyphicon glyphicon-large glyphicon-pencil"></i>
     <%= t('.manage_articles') %>
-    <%= link_to(t('.new_article'), {controller: 'content', action: 'new'}, id: 'dialog-link', class: 'btn btn-info pull-right') %>
+    <%= link_to(t('.new_article'), { controller: 'content', action: 'new' }, { id: 'dialog-link', class: 'btn btn-info pull-right' }) %>
   </h2>
 <% end %>
 
-<%= form_tag({action: 'index'}, {method: :get, name: 'article', remote: true, class: 'form-inline spinnable', :"data-update-success" => 'articleList'}) do %>
+<%= form_tag({ action: 'index' }, { method: :get, name: 'article', remote: true, class: 'form-inline spinnable', "data-update-success": 'articleList' }) do %>
 
   <% if params[:search] and params[:search]['state'] %>
-    <input type="hidden" name="search[state]" value="<%= params[:search]['state'] %>" >
+    <input type="hidden" name="search[state]" value="<%= params[:search]['state'] %>" />
   <% end %>
 
   <p>
-    <%= link_to(t('.all_articles'), {action: 'index'}, {class: 'label label-default'}) %>
-    <%= link_to(t('.published'), {action: 'index', search: {state: 'published'}}, {class: 'label label-success'}) %>
-    <%= link_to(t('.withdrawn'), {action: 'index', search: {state: 'withdrawn'}}, {class: 'label label-danger'}) %>
-    <%= link_to(t('.drafts'), {action: 'index', search: {state: 'drafts'}}, {class: 'label label-info'}) %>
-    <%= link_to(t('.publication_pending'), {action: 'index', search: {state: 'pending'}}, {class: 'label label-warning'}) %>
+    <%= link_to(t('.all_articles'), { action: 'index' }, { class: 'label label-default' }) %>
+    <%= link_to(t('.published'), { action: 'index', search: { state: 'published' } }, { class: 'label label-success' }) %>
+    <%= link_to(t('.withdrawn'), { action: 'index', search: { state: 'withdrawn' } }, { class: 'label label-danger' }) %>
+    <%= link_to(t('.drafts'), { action: 'index', search: { state: 'drafts' } }, { class: 'label label-info' }) %>
+    <%= link_to(t('.publication_pending'), { action: 'index', search: { state: 'pending' } }, { class: 'label label-warning' }) %>
   </p>
 
   <div class="panel panel-default">
     <div class="panel-heading">
       <div class="pull-right">
         <div class="form-group">
-          <%= select_tag('search[user_id]', options_from_collection_for_select(User.all, 'id', 'name'), {prompt: t('.select_an_author'), class: 'form-control'}) %>
+          <%= select_tag('search[user_id]', options_from_collection_for_select(User.all, 'id', 'name'), prompt: t('.select_an_author'), class: 'form-control') %>
         </div>
         <div class="form-group">
-          <%= select_tag('search[published_at]', options_for_select(Article.publication_months), {prompt: t('.publication_date'), class: 'form-control'}) %>
+          <%= select_tag('search[published_at]', options_for_select(Article.publication_months), prompt: t('.publication_date'), class: 'form-control') %>
         </div>
         <div class="form-group">
-          <input id="search" type="text" name="search[searchstring]" class="form-control">
+          <input id="search" type="text" name="search[searchstring]" class="form-control" />
         </div>
         <div class="form-group">
-          <%= submit_tag(t('.search'), {class: 'btn btn-success'}) %>
+          <%= submit_tag(t('.search'), class: 'btn btn-success') %>
           <span id="spinner" style="display:none;"><%= image_tag('spinner.gif') %></span>
         </div>
       </div>
-      <br style="clear: both">
+      <br style="clear: both" />
     </div>
   </div>
   <table class="table table-hover">
+    <thead>
+      <tr>
+        <th><%= t(".title") %></th>
+        <th><%= t(".author") %></th>
+        <th><%= t(".created_at") %></th>
+        <th><%= t(".published_at") %></th>
+        <th><%= t(".feedback") %></th>
+        <th><%= t(".text_filter") %></th>
+        <th><%= t(".actions") %></th>
+      </tr>
+    </thead>
     <tbody id="articleList">
-      <%= render 'article_list', { articles: @articles } %>
+      <%= render 'article_list', articles: @articles %>
     </tbody>
   </table>
 <% end %>

data/app/views/admin/content/new.html.erb

@@ -1,3 +1,3 @@
-<%= form_tag({action: 'create'}, id: 'article_form', multipart: true, class: 'autosave') do %>
+<%= form_tag({ action: 'create' }, { id: 'article_form', multipart: true, class: 'autosave' }) do %>
   <%= render partial: 'form' %>
-<% end %>
+<% end %>

data/app/views/admin/dashboard/_comment.html.erb

@@ -1,18 +1,18 @@
 <% if @comments.size == 0 %>
-  <li class='alert alert-info'><%= t(".no_comments_yet") %></li>
+  <li class='alert alert-info'><%= t('.no_comments_yet') %></li>
 <% else %>
   <% for comment in @comments %>
     <li id='feedback_<%= comment.id %>'>
-    <%= avatar_tag(:email => comment.email, :url => comment.url, class: 'pull-left img-circle gravatar') %>
+    <%= avatar_tag(email: comment.email, url: comment.url, class: 'pull-left img-circle gravatar') %>
     <h5>
-      <%= t(".by") %> <%= comment.url.blank? ? h(comment.author) : nofollowify_links(link_to(h(comment.author), comment.url)) %>
+      <%= t('.by') %> <%= comment.url.blank? ? h(comment.author) : nofollowify_links(link_to(h(comment.author), comment.url)) %>
       <%= display_date_and_time comment.created_at %>
     </h5>
     <p>
     <%= comment.html.strip_html.slice(0..300) %>
     </p>
-    <%= show_feedback_actions(comment, 'dashboard') %>
-    <hr>
+    <%= button_to_conversation(comment) %>
+    <hr />
     </li>
   <% end %>
 <% end %>

data/app/views/admin/dashboard/_comments.html.erb

@@ -1,10 +1,10 @@
 <div class="panel panel-default">
   <div class="panel-heading">
-    <h3 class='panel-title'><%= t(".latest_comments") %></h3>
+    <h3 class='panel-title'><%= t('.latest_comments') %></h3>
   </div>
   <div class="panel-body">
     <ul class='list-unstyled' id="commentList">
-      <%= render partial: "comment" %>
+      <%= render partial: 'comment' %>
     </ul>
   </div>
 </div>

data/app/views/admin/dashboard/_drafts.html.erb

@@ -1,22 +1,22 @@
 <div class="panel panel-default">
   <div class="panel-heading">
-    <h3 class='panel-title'><%= t(".your_drafts") %></h3>
+    <h3 class='panel-title'><%= t('.your_drafts') %></h3>
   </div>
   <div class="panel-body">
     <ul class='list-unstyled'>
       <% if @drafts.empty? %>
         <li class='alert alert-info'>
-        <%= link_to t(".no_drafts_yet"), controller: 'content', action: 'new' %> ?
+        <%= link_to t('.no_drafts_yet'), controller: 'content', action: 'new' %> ?
         </li>
       <% else %>
         <% for post in @drafts %>
           <li>
           <h5>
-            <%= link_to(post.title, controller: "admin/content", action: "edit", id: post.id) %>
+            <%= link_to(post.title, controller: 'admin/content', action: 'edit', id: post.id) %>
             <%= display_date_and_time(post.created_at) %>
           </h5>
-          <p><%= post.body.strip_html.slice(0,300) if post.body %></p>
-          <hr>
+          <p><%= post.body&.strip_html&.slice(0, 300) %></p>
+          <hr />
           </li>
         <% end %>
       <% end %>

data/app/views/admin/dashboard/_overview.html.erb

@@ -3,21 +3,19 @@
     <span aria-hidden="true">&times;</span>
     <span class="sr-only">Close</span>
   </button>
-  <%
-    links = []
-    links << link_to(t('.write_a_post'), controller: 'content', action: 'new') if can? :new, 'admin/content'
-    links << link_to(t('.write_a_page'), controller: 'pages', action: 'new') if can? :new, 'admin/pages'
-    links << link_to(t('.update_your_profile_or_change_your_password'), controller: 'profiles', action: 'index')
-  %>
+  <% links = []
+     links << link_to(t('.write_a_post'), controller: 'content', action: 'new') if can? :new, 'admin/content'
+     links << link_to(t('.write_a_page'), controller: 'pages', action: 'new') if can? :new, 'admin/pages'
+     links << link_to(t('.update_your_profile_or_change_your_password'), controller: 'profiles', action: 'index') %>
   <p>
-    <%= t(".dashboard_explain_html", available_actions: safe_join(links, ', ')) %>
+    <%= t('.dashboard_explain_html', available_actions: safe_join(links, ', ')) %>
   </p>
   <% if can? :index, 'admin/themes' %>
   <p>
-    <%= t(".customization_explain_html", theme_link: link_to(t(".change_your_blog_presentation"), controller: 'themes'), sidebar_link: link_to(t(".enable_plugins"), controller: 'sidebar')) %>
+    <%= t('.customization_explain_html', theme_link: link_to(t('.change_your_blog_presentation'), controller: 'themes'), sidebar_link: link_to(t('.enable_plugins'), controller: 'sidebar')) %>
   </p>
   <% end %>
   <p>
-  <%= t(".help_explain_html", doc_link: link_to(t('.read_our_documentation'), 'http://publify.co')) %>
+  <%= t('.help_explain_html', doc_link: link_to(t('.read_our_documentation'), 'https://publify.github.io/')) %>
   </p>
 </div>

data/app/views/admin/dashboard/_welcome.html.erb

@@ -1,27 +1,27 @@
 <div class="panel panel-default">
   <div class="panel-heading">
-    <h3 class="panel-title"><%= t(".today") %></h3>
+    <h3 class="panel-title"><%= t('.today') %></h3>
   </div>
   <div class="panel-body">
-    <p><%= t(".articles_and_comments_count_since", articles_count: @newposts_count, comments_count: @newcomments_count) %></p>
-    <p><%= t(".running_publify", version: PublifyCore::VERSION) %> <%= @version_message %></p>
+    <p><%= t('.articles_and_comments_count_since', articles_count: @newposts_count, comments_count: @newcomments_count) %></p>
+    <p><%= t('.running_publify', version: PublifyCore::VERSION) %> <%= @version_message %></p>
     <div class='col-md-6'>
       <% if can? :index, 'admin/content' %>
-        <h4 class='page-header'><%= t(".content") %></h4>
-        <p><%= link_to(t(".articles_count", count: @statposts), controller: 'admin/content') %></p>
-        <p><%= link_to(t(".your_articles_count", count: @statuserposts), controller: 'admin/content', "search[user_id]" => current_user.id) %></p>
-        <p><%= link_to(t(".drafts_count", count: @statsdrafts), controller: 'admin/content', "search[state]" => "drafts") %></p>
-        <p><%= link_to(t(".pages_count", count: @statspages), controller: 'admin/pages') %></p>
-        <p><%= link_to(t(".notes_count", count: @statuses), controller: 'admin/notes') %></p>
+        <h4 class='page-header'><%= t('.content') %></h4>
+        <p><%= link_to(t('.articles_count', count: @statposts), controller: 'admin/content') %></p>
+        <p><%= link_to(t('.your_articles_count', count: @statuserposts), controller: 'admin/content', 'search[user_id]' => current_user.id) %></p>
+        <p><%= link_to(t('.drafts_count', count: @statsdrafts), controller: 'admin/content', 'search[state]' => 'drafts') %></p>
+        <p><%= link_to(t('.pages_count', count: @statspages), controller: 'admin/pages') %></p>
+        <p><%= link_to(t('.notes_count', count: @statuses), controller: 'admin/notes') %></p>
       <% end %>
     </div>
     <div class='col-md-6'>
       <% if can? :index, 'admin/feedback' %>
-        <h4 class='page-header'><%= t(".feedback") %></h4>
+        <h4 class='page-header'><%= t('.feedback') %></h4>
         <p><%= link_to(t('.comments_count', count: @statcomments), controller: 'admin/feedback') %></p>
         <p><%= link_to(t('.approved_count', count: @confirmed), controller: 'admin/feedback', only: 'ham') %></p>
         <p><%= link_to(t('.unconfirmed_count', count: @unconfirmed), controller: 'admin/feedback', only: 'unapproved') %></p>
-        <p><%= link_to(t(".spam_count", count: @statspam), controller: 'admin/feedback', only: 'spam') %></p>
+        <p><%= link_to(t('.spam_count', count: @statspam), controller: 'admin/feedback', only: 'spam') %></p>
       <% end %>
     </div>
   </div>

data/app/views/admin/dashboard/index.html.erb

@@ -1,17 +1,22 @@
 <% content_for :page_heading do %>
-<i class="glyphicon glyphicon-large glyphicon-home"></i>
-<h2 class="page-title"><%= t(".welcome_back", user_name: current_user.name) %></h2>
+<h2 class="page-title"><%= t('.welcome_back', user_name: current_user.name) %></h2>
 <% end %>
 
-<%= render "overview" %>
+<%= render 'overview' %>
+<% if Content.where(text_filter_name: "textile").any? || Feedback.where(text_filter_name: "textile").any? %>
+  <div class="alert alert-warning">
+    <p>
+    <%= t('.textile_deprecated_html') %>
+    </p>
+  </div>
+<% end %>
 
 <div class='row'>
   <div class='col-md-6'>
-    <%= render "welcome" %>
-    <%= render "comments" %>
+    <%= render 'welcome' %>
+    <%= render 'comments' %>
   </div>
   <div class='col-md-6'>
-    <%= render "drafts" %>
-    <%= render "inbound" %>
+    <%= render 'drafts' %>
   </div>
 </div>

data/app/views/admin/feedback/_button.html.erb

@@ -1,19 +1,19 @@
-<%= hidden_field_tag "confirmed", params[:confirmed] %>
-<%= hidden_field_tag "published", params[:published] %>
+<%= hidden_field_tag 'confirmed', params[:confirmed] %>
+<%= hidden_field_tag 'published', params[:published] %>
 
 <div class="panel panel-default">
   <div class="panel-heading">
     <div class='form-group'>
-      <button name='<%= "bulkop_#{position}" %>' class="btn btn-success btn-sm" value='Mark Checked Items as Ham'><%= t(".mark_checked_items_as_ham") %></button>
+      <button name='<%= "bulkop_#{position}" %>' class="btn btn-success btn-sm" value='Mark Checked Items as Ham'><%= t('.mark_checked_items_as_ham') %></button>
     </div>
     <div class='form-group'>
-      <button name='<%= "bulkop_#{position}" %>' class="btn btn-warning btn-sm" value='Mark Checked Items as Spam'><%= t(".mark_checked_items_as_spam") %></button>
+      <button name='<%= "bulkop_#{position}" %>' class="btn btn-warning btn-sm" value='Mark Checked Items as Spam'><%= t('.mark_checked_items_as_spam') %></button>
     </div>
     <div class='form-group'>
-      <button name='<%= "bulkop_#{position}" %>' class="btn btn-danger btn-sm" value='Delete Checked Items'><%= t(".delete_checked_items") %></button>
+      <button name='<%= "bulkop_#{position}" %>' class="btn btn-danger btn-sm" value='Delete Checked Items'><%= t('.delete_checked_items') %></button>
     </div>
     <div class='form-group pull-right'>
-      <button name='<%= "bulkop_#{position}" %>' class="btn btn-danger btn-sm" value='Delete all spam'><%= t(".delete_all_spam") %></button>
+      <button name='<%= "bulkop_#{position}" %>' class="btn btn-danger btn-sm" value='Delete all spam'><%= t('.delete_all_spam') %></button>
     </div>
   </div>
 </div>

data/app/views/admin/feedback/_feedback.html.erb

@@ -1,7 +1,7 @@
 <tr id='feedback_<%= comment.id %>' class='<%= comment.state.to_s.downcase %>'>
-  <% if comment.state.to_s.downcase == 'spam'%>
-    <%= render :partial => 'spam', :locals => { :comment => comment } %>
+  <% if comment.state.to_s.downcase == 'spam' %>
+    <%= render partial: 'spam', locals: { comment: comment } %>
   <% else %>
-  <%= render :partial => 'ham', :locals => { :comment => comment } %>
+  <%= render partial: 'ham', locals: { comment: comment } %>
 <% end %>
 </tr>

data/app/views/admin/feedback/_ham.html.erb

@@ -1,17 +1,35 @@
-<td><input class= "feedback_check" type="checkbox" name="feedback_check[<%= comment.id %>]"></td>
-<td style='text-align: center'>
-  <%= avatar_tag(:email => comment.email, :url => comment.url, :size => 80, :class => 'img-circle') %>
-  <p class='action'><span class='label <%= comment_class comment.state.to_s.downcase %>'><%= t("admin.feedback.state.#{comment.state}") %></span></p>
+<td>
+  <input class="feedback_check" type="checkbox" name="feedback_check[<%= comment.id %>]" />
 </td>
 <td>
-  <%= link_to comment.article.title, :controller => 'feedback', :action => 'article', :id => comment.article_id %>
-  <p>
+  <%= avatar_tag(email: comment.email, url: comment.url, size: 36, class: 'img-circle') %>
+  <% if comment.email.present? %>
+    <%= mail_to comment.email, comment.author %>
+  <% else %>
+    <%= comment.author %>
+  <% end %>
+  <% if comment.url.present? %>
     <small>
-      <%= t('.by')%> <%= mail_to h(comment.email), h(comment.author) %>
-      <%= link_to "(#{h(comment.url)})".html_safe, comment.url unless comment.url.blank? %>
-      <%= t('.created_on') %> <%= l(comment.created_at) %>
+      <%= link_to "(#{h(comment.url)})".html_safe, comment.url %>
     </small>
+  <% end %>
+</td>
+<td>
+  <%= l(comment.created_at) %>
+</td>
+<td>
+  <span class='label <%= comment_class comment.state.to_s.downcase %>'>
+    <%= t("admin.feedback.state.#{comment.state}") %>
+  </span>
+</td>
+<td>
+  <p>
+  <%= link_to comment.article.title, controller: 'feedback', action: 'article', id: comment.article_id %>
+  </p>
+  <p>
   </p>
   <%= comment.html(:all) %>
+</td>
+<td>
   <%= show_feedback_actions comment %>
 </td>

data/app/views/admin/feedback/_spam.html.erb

@@ -1,23 +1,33 @@
-<td></td>
-<td style='text-align: center'>
-  <%= avatar_tag(:email => comment.email, :url => comment.url, :size => 48, :class => 'img-circle') %>
-  <p class='action'><span class='label label-danger'><%= t("admin.feedback.state.#{comment.state}") %></span></p>
+<td>
 </td>
-<td colspan='4'>
-  <%= link_to comment.article.title, :controller => 'feedback', :action => 'article', :id => comment.article_id %>
-  <p>
+<td>
+  <%= avatar_tag(email: comment.email, url: comment.url, size: 36, class: 'img-circle') %>
+  <% if comment.email.present? %>
+    <%= mail_to comment.email, comment.author %>
+  <% else %>
+    <%= comment.author %>
+  <% end %>
+  <% if comment.url.present? %>
     <small>
-      <%= t('.by')%> <%= mail_to h(comment.email), h(comment.author) %>
-      <%= link_to "(#{h(comment.url)})".html_safe, comment.url unless comment.url.blank? %>
-      <%= t('.created_on') %> <%= l(comment.created_at) %>
+      <%= link_to "(#{h(comment.url)})".html_safe, comment.url %>
     </small>
+  <% end %>
+</td>
+<td>
+  <%= l(comment.created_at) %>
+</td>
+<td>
+  <span class='label label-danger'>
+    <%= t("admin.feedback.state.#{comment.state}") %>
+  </span>
+</td>
+<td>
+  <p>
+  <%= link_to comment.article.title, controller: 'feedback', action: 'article', id: comment.article_id %>
   </p>
   <p>
-    <small>
-      <%= t(".this_comment_by_was_flagged_as_spam_html",
-            author: comment.author,
-            cancel_link: link_to(t('.cancel'), url: {action: 'change_state', id: comment.id, remote: true})) %>
-      <%= toggle_element "feedback_#{comment.id}" %>
-    </small>
   </p>
 </td>
+<td>
+  <%= change_status(comment) %>
+</td>

data/app/views/admin/feedback/article.html.erb

@@ -1,69 +1,68 @@
 <% content_for :page_heading do %>
 <h2 class="page-title">
-  <i class="glyphicon glyphicon-large glyphicon-comment"></i>
-  <%= t(".comments_for_html", title: @article.title) %>
+  <%= t('.comments_for_html', title: @article.title) %>
 </h2>
 <% end %>
 
-<%= form_tag({action: 'bulkops'}, {class: 'form-inline'}) do %>
+<%= form_tag({ action: 'bulkops' }, { class: 'form-inline' }) do %>
 
   <%= hidden_field 'article_id', @article.id %>
-  <%= render 'button', { :position => 'top' } %>
+  <%= render 'button', position: 'top' %>
 
-  <br class='clear'>
+  <br class='clear' />
   <table class='table hover'>
     <thead>
       <tr class='noborder'>
         <th colspan='5'>
-          <input type="checkbox" name="checkall" id="checkall" onclick="check_all(this);">
-          <%= t(".select_all") %>
+          <input type="checkbox" name="checkall" id="checkall" onclick="check_all(this);" />
+          <%= t('.select_all') %>
         </th>
       </tr>
     </thead>
     <% if @feedback.empty? %>
       <tr>
         <td colspan="5">
-          <%= t(".no_feedback") %>
+          <%= t('.no_feedback') %>
         </td>
       </tr>
     <% end %>
 
     <% @feedback.each do |comment| %>
-      <%= render 'feedback', {:comment => comment} %>
+      <%= render 'feedback', comment: comment %>
     <% end %>
   </table>
 <% end %>
 
-<%= form_tag :action => "create" do %>
+<%= form_tag action: 'create' do %>
   <%= hidden_field_tag('article_id', @article.id) %>
-  <fieldset  class='form-horizontal'>
-    <legend><%= t(".add_a_comment")%></legend>
+  <fieldset class='form-horizontal'>
+    <legend><%= t('.add_a_comment') %></legend>
     <div class="form-group">
-      <label for="comment_author" class='control-label col-sm-2'><%= t(".author")%></label>
+      <label for="comment_author" class='control-label col-sm-2'><%= t('.author') %></label>
       <div class='col-sm-5'>
-        <%= text_field 'comment', 'author', :class => 'form-control' %>
+        <%= text_field 'comment', 'author', class: 'form-control' %>
       </div>
     </div>
     <div class='form-group'>
-      <label for="comment_email" class='control-label col-sm-2'><%= t(".email")%></label>
+      <label for="comment_email" class='control-label col-sm-2'><%= t('.email') %></label>
       <div class='col-sm-5'>
-        <%= text_field 'comment', 'email', :class => 'form-control' %>
+        <%= text_field 'comment', 'email', class: 'form-control' %>
       </div>
     </div>
     <div class='form-group'>
-      <label for="comment_url" class='control-label col-sm-2'><%= t(".url") %></label>
+      <label for="comment_url" class='control-label col-sm-2'><%= t('.url') %></label>
       <div class='col-sm-5'>
-        <%= text_field 'comment', 'url', :class => 'form-control' %>
+        <%= text_field 'comment', 'url', class: 'form-control' %>
       </div>
     </div>
     <div class='form-group'>
-      <label for='comment_body' class='control-label col-sm-2'><%= t(".your_comment") %></label>
+      <label for='comment_body' class='control-label col-sm-2'><%= t('.your_comment') %></label>
       <div class='col-sm-5'>
-        <%= text_area 'comment', 'body', { :rows => '10', :class => 'form-control'} %>
+        <%= text_area 'comment', 'body', rows: '10', class: 'form-control' %>
       </div>
     </div>
     <div class='form-group col-md-12'>
-      <%= t(".action_or_other_html", first_action: link_to(t(".cancel"), {action: 'index'}), second_action: submit_tag(t(".save"), class: 'btn btn-primary')) %>
+      <%= t('.action_or_other_html', first_action: link_to(t('.cancel'), action: 'index'), second_action: submit_tag(t('.save'), class: 'btn btn-primary')) %>
     </div>
   </fieldset>
 <% end %>