biovision-comment 0.1.170914 → 0.7.190905.0

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

@@ -1,6 +1,7 @@
 <% content_for :meta_title, t('.title', page: current_page) %>
 <% content_for :breadcrumbs do %>
-    <span><%= t('admin.comments.nav_item.text') %></span>
+  <%= admin_biovision_component_link(component_handler.component) %>
+  <span><%= t('admin.comments.nav_item.text') %></span>
 <% end %>
 
 <article class="comments">

data/app/views/admin/comments/show.html.erb

@@ -1,30 +1,44 @@
 <% content_for :meta_title, t('.title', id: @entity.id) %>
 <% content_for :breadcrumbs do %>
-    <%= link_to(t('admin.comments.nav_item.text'), admin_comments_path) %>
-    <span>
-      <%= @entity.id %> (<%= @entity.commentable.model_name.human %>
-      <cite><%= @entity.commentable.title %></cite>)
-    </span>
+  <%= admin_biovision_component_link(component_handler.component) %>
+  <%= link_to(t('admin.comments.nav_item.text'), admin_comments_path) %>
+  <span>
+    <%= @entity.id %> (<%= @entity.commentable.model_name.human %>
+    <cite><%= @entity.commentable_title %></cite>)
+  </span>
 <% end %>
 
 <article>
-  <h1><%= @entity.commentable.title %></h1>
+  <h1><%= @entity.commentable_title %></h1>
 
   <ul class="actions">
     <li><%= back_icon(admin_comments_path) %></li>
+    <% unless @entity.deleted? %>
+      <li><%= world_icon(CommentsManager.commentable_path(@entity, true)) %></li>
+    <% end %>
     <% unless @entity.locked? %>
-        <li><%= edit_icon edit_comment_path(@entity.id) %></li>
+      <li><%= edit_icon edit_comment_path(id: @entity.id) %></li>
     <% end %>
   </ul>
 
   <% if @entity.deleted? %>
-      <div class="message-box-alert"><%= t(:deleted_entity) %></div>
+    <div class="message-box-alert"><%= t(:deleted_entity) %></div>
   <% end %>
 
   <dl>
     <dt><%= t('activerecord.attributes.comment.user_id') %></dt>
     <dd><%= admin_user_link(@entity.user) %></dd>
 
+    <% unless @entity.author_name.blank? %>
+      <dt><%= t('activerecord.attributes.comment.author_name') %></dt>
+      <dd><%= @entity.author_name %></dd>
+    <% end %>
+
+    <% unless @entity.author_email.blank? %>
+      <dt><%= t('activerecord.attributes.comment.author_email') %></dt>
+      <dd><%= @entity.author_email %></dd>
+    <% end %>
+
     <dt><%= t('activerecord.attributes.comment.commentable') %></dt>
     <dd><%= comment_link(@entity) %></dd>
 
@@ -33,8 +47,9 @@
 
     <dt><%= t('activerecord.attributes.comment.body') %></dt>
     <dd>
-      <%= prepare_comment_text(@entity) %>
+      <div class="text">
+        <%= simple_format(@entity.body) %>
+      </div>
     </dd>
   </dl>
-
 </article>

data/app/views/admin/components/links/_comments.html.erb

@@ -0,0 +1,3 @@
+<% if handler.allow?('moderator') %>
+  <li><%= render 'admin/comments/nav_item' %></li>
+<% end %>

data/app/views/comment_mailer/entry_reply.text.erb

@@ -1,11 +1,7 @@
 Здравствуйте, <%= @comment.commentable.user.name_for_letter %>.
 
-На вашу запись «<%= @comment.commentable.title %>» на сайте party-npk.ru
+На вашу запись «<%= @comment.commentable.title %>»
 <%= url_for @comment.commentable %>
 
 Сам комментарий (<%= @comment.user.nil? ? 'анонимный' : @comment.user.profile_name %>):
-<%= simple_format @comment.body %>
-
---
-  С уважением.
-  автоматический уведомитель
+<%= @comment.body %>

data/app/views/comments/_comment.html.erb

@@ -1,25 +1,75 @@
-<div id="comment-<%= comment.id %>" itemscope itemtype="http://schema.org/Comment" class="comment">
-  <% if comment.deleted? %>
-      <div class="deleted"><%= t('.deleted') %></div>
+<% element_id = "comment-#{comment.id}" %>
+<div
+  id="<%= element_id %>"
+  itemscope
+  itemtype="http://schema.org/Comment"
+  class="comment-item"
+  data-id="<%= comment.id %>"
+>
+  <% if comment.deleted? || comment.user&.deleted? %>
+    <div class="deleted"><%= t('.deleted') %></div>
   <% else %>
-      <meta itemprop="url" content="<%= comment_url comment %>"/>
-      <div class="author">
-        <span itemprop="author" itemscope itemtype="http://schema.org/Person">
-          <span itemprop="name"><%= user_link comment.user %></span>
-        </span>
+    <meta itemprop="url" content="<%= url_for(anchor: element_id) %>"/>
+    <% if current_user_has_privilege?(:moderator) %>
+      <ul class="actions">
+        <li><%= edit_icon(edit_comment_path(id: comment.id)) %></li>
+        <li class="danger"><%= destroy_icon(comment) %></li>
+      </ul>
+    <% end %>
+
+    <div class="meta">
+      <div class="avatar covered">
+        <%= user_image_preview(comment.user) %>
+      </div>
+      <div class="info">
+        <div itemprop="author" itemscope itemtype="http://schema.org/Person">
+          <span itemprop="name">
+            <%= comment.user.nil? ? comment.author_name : user_link(comment.user) %>
+          </span>
+        </div>
         <%= time_tag comment.created_at %>
       </div>
+    </div>
+
+    <div class="comment-wrapper">
+      <% if Gem.loaded_specs.key?('biovision-vote') %>
+        <%= render(partial: 'votes/vote_block', locals: { votable: comment }) %>
+      <% end %>
 
       <div class="body" itemprop="about">
-        <%= prepare_comment_text(comment) %>
-        <% if UserPrivilege.user_has_privilege?(current_user, :moderator) %>
-            <ul class="actions">
-              <li><%= edit_icon(edit_comment_path(comment.id)) %></li>
-              <li class="danger"><%= destroy_icon(comment) %></li>
-            </ul>
-        <% end %>
+        <%= simple_format(comment.body) %>
       </div>
+    </div>
+
+    <% if show_container %>
+      <div class="comment-reply-block">
+        <div class="comment-reply-button">
+          <button class="button-nav"><%= t('.reply') %></button>
+        </div>
+        <div class="container hidden">
+          <button class="cancel" type="button" class="button-nav">
+            <%= t('.cancel_reply') %>
+          </button>
+        </div>
+      </div>
+    <% end %>
+  <% end %>
 
-      <%= render(partial: 'votes/vote_block', locals: { votable: comment }) if defined?(Biovision::Vote) %>
+  <% children = comment_tree.select { |_, item| item[:parent_id] == comment.id } %>
+  <% if children.any? %>
+    <div class="children">
+      <% children.each do |_, item| %>
+        <%=
+          render(
+              partial: 'comments/comment',
+              locals: {
+                  comment: item[:comment],
+                  show_container: show_container,
+                  comment_tree: comment_tree
+              }
+          )
+        %>
+      <% end %>
+    </div>
   <% end %>
 </div>

data/app/views/comments/_form.html.erb

@@ -1,23 +1,96 @@
-<%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
+<% model_name = entity.class.to_s.underscore %>
+<%=
+  form_with(
+      model: entity,
+      html: {
+          id: "#{model_name}-form",
+          class: 'comment-form',
+          data: { check_url: check_comments_path }
+      }
+  ) do |f|
+%>
+  <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
+  <div class="fields">
+    <% if entity.id.nil? && entity.user.nil? %>
+      <div class="required">
+        <%= f.label :author_name %>
+        <%=
+          f.text_field(
+              :author_name,
+              id: "#{model_name}_author_name",
+              required: true,
+              size: nil,
+              maxlength: Comment::AUTHOR_LIMIT,
+              data: {
+                  check: :author_name
+              }
+          )
+        %>
+        <div class="check-result-error hidden" data-field="author_name"></div>
+        <div class="guideline">
+          <%= t('.guidelines.author_name') %>
+        </div>
+      </div>
 
-<%= form_for entity do |f| %>
-    <dl>
-      <dt><%= f.label :body %></dt>
-      <dd><%= f.text_area :body, required: true, cols: 60, rows: 7 %></dd>
-    </dl>
-    <% if current_user_has_privilege?(:administrator) && !entity.id.nil? %>
-        <ul class="flags">
-          <li>
-            <%= f.check_box :deleted %>
-            <%= f.label :deleted %>
-          </li>
-        </ul>
+      <div class="required">
+        <%= f.label :author_email %>
+        <%=
+          f.email_field(
+              :author_email,
+              id: "#{model_name}_author_email",
+              required: true,
+              size: nil,
+              maxlength: Comment::AUTHOR_LIMIT,
+              data: {
+                  check: :author_email
+              }
+          )
+        %>
+        <div class="check-result-error hidden" data-field="author_email"></div>
+        <div class="guideline">
+          <%= t('.guidelines.author_email') %>
+        </div>
+      </div>
+
+      <div class="disclaimer">
+        <%= check_box_tag :agree, '1', false, class: 'hidden', tabindex: '-1' %>
+        <%= t('.disclaimer') %>
+      </div>
     <% end %>
-    <div class="buttons">
-      <% if entity.id.nil? %>
-          <%= f.hidden_field :commentable_id %>
-          <%= f.hidden_field :commentable_type %>
-      <% end %>
-      <%= f.button t(:submit), type: 'submit' %>
+
+    <div class="required">
+      <%= f.label :body %>
+      <%=
+        f.text_area(
+            :body,
+            id: "#{model_name}_body",
+            required: true,
+            cols: 60,
+            rows: 5,
+            maxlength: Comment::BODY_LIMIT,
+            class: 'auto-expand',
+            data: {
+                min_rows: 5,
+                max_rows: 30,
+                check: :body
+            }
+        )
+      %>
+      <div class="check-result-error hidden" data-field="body"></div>
+      <div class="guideline"><%= t('.guidelines.body') %></div>
     </div>
+  </div>
+
+  <%= render 'shared/forms/state_container' %>
+
+  <div class="buttons">
+    <%= hidden_field_tag :return_url, url_for %>
+    <%= hidden_field_tag :entity_id, entity.id %>
+    <% if entity.id.nil? %>
+      <%= f.hidden_field :commentable_id %>
+      <%= f.hidden_field :commentable_type %>
+      <%= f.hidden_field :parent_id %>
+    <% end %>
+    <%= f.button t(:submit), type: 'submit', class: 'button-primary button-action' %>
+  </div>
 <% end %>

data/app/views/comments/_list.html.erb

@@ -1,19 +1,17 @@
-<section class="comments">
-  <% if comments.any? %>
-      <h2><%= t(:comments_list) %></h2>
-
-      <% comments.recent.each do |comment| %>
-          <%= render comment %>
-      <% end %>
-  <% end %>
-
-  <% if commentable.respond_to?(:commentable_by?) && commentable.commentable_by?(current_user) %>
-      <section class="reply-container">
-        <h2><%= t(:add_comment) %></h2>
-
-        <div class="container">
-          <%= render partial: 'comments/form', locals: { entity: Comment.new(commentable: commentable) } %>
-        </div>
-      </section>
-  <% end %>
-</section>
+<% if collection.any? %>
+  <div>
+    <% comment_tree = Comment.tree(collection) %>
+    <% comment_tree.select { |_, item| item[:parent_id].nil? }.each do |_, item| %>
+      <%=
+        render(
+            partial: 'comments/comment',
+            locals: {
+                comment: item[:comment],
+                show_container: show_reply_container,
+                comment_tree: comment_tree
+            }
+        )
+      %>
+    <% end %>
+  </div>
+<% end %>

data/app/views/comments/_reply_container.html.erb

@@ -0,0 +1,15 @@
+<section class="reply-container">
+  <h3><%= t(:add_comment) %></h3>
+
+  <div class="container">
+    <%=
+      render(
+          partial: 'comments/form',
+          locals: {
+              entity: Comment.new(commentable: entity, user: current_user),
+              handler: handler
+          }
+      )
+    %>
+  </div>
+</section>

data/app/views/comments/_section.html.erb

@@ -0,0 +1,34 @@
+<%
+  handler = CommentHandler.new(current_user)
+  collection = handler.list(entity)
+  show_reply_container = handler.allow_reply?(entity)
+%>
+
+<section class="comments" id="comments">
+  <div class="comments-list">
+    <h3><%= t(:comment_count, count: entity.comments_count) %></h3>
+
+    <%=
+      render(
+          partial: 'comments/list',
+          locals: {
+              collection: collection.load,
+              handler: handler,
+              show_reply_container: show_reply_container
+          }
+      )
+    %>
+  </div>
+
+  <% if show_reply_container %>
+    <%=
+      render(
+          partial: 'comments/reply_container',
+          locals: {
+              entity: entity,
+              handler: handler
+          }
+      )
+    %>
+  <% end %>
+</section>

data/app/views/comments/edit.html.erb

@@ -1,12 +1,13 @@
 <% content_for :meta_title, t('.title') %>
 <% content_for :breadcrumbs do %>
-    <%= link_to(t('admin.comments.nav_item.text'), admin_comments_path) %>
-    <%= admin_comment_link(@entity) %>
-    <span><%= t(:edit) %></span>
+  <%= admin_biovision_component_link(component_handler.component) %>
+  <%= link_to(t('admin.comments.nav_item.text'), admin_comments_path) %>
+  <%= admin_comment_link(@entity) %>
+  <span><%= t('.nav_text') %></span>
 <% end %>
 
-<article class="edit-comment">
-  <h1><%= t('.title') %></h1>
+<article>
+  <h1><%= t('.heading') %></h1>
 
   <ul class="actions">
     <li><%= return_icon(admin_comment_path(@entity.id)) %></li>

data/app/views/comments/new.html.erb

@@ -1,7 +1,7 @@
 <% content_for :meta_title, t('.title') %>
 
-<article class="edit-comment">
+<article>
   <h1><%= t('.title') %></h1>
 
-  <%= render partial: 'form', locals: { entity: @entity } %>
+  <%= render(partial: 'form', locals: { entity: @entity }) %>
 </article>

data/config/locales/comments-ru.yml

@@ -24,12 +24,17 @@ ru:
               not_commentable: "недоступен вам для комментирования"
     attributes:
       comment:
+        approved: "Одобрен"
+        author_email: "Email"
+        author_name: "Имя"
+        body: "Текст"
         commentable: "Комментируемый объект" # Comment validates_presence_of :commentable
         commentable_id: "Комментируемый объект"
         commentable_type: "Тип комментируемого объекта"
-        user_id: "Автор"
         deleted: "Комментарий удалён"
-        body: "Текст"
+        spam: "Спам"
+        user_id: "Автор"
+        visible: "Показывать"
   admin:
     comments:
       nav_item:
@@ -40,6 +45,12 @@ ru:
         heading: "Комментарии"
       show:
         title: "Комментарий №%{id}"
+      comment:
+        deleted: "Комментарий удалён"
+    index:
+      dashboard:
+        biovision_comment:
+          heading: "Комментарии"
   my:
     comments:
       index:
@@ -57,9 +68,28 @@ ru:
       title: "Добавление комментария"
     edit:
       title: "Редактирование комментария"
+      nav_text: "Редактировать"
+      heading: "Редактирование комментария"
     show:
       title: "Комментарий №%{id}"
     entry_reply:
       subject: "Новый комментарий к вашей записи"
     comment:
       deleted: "Комментарий удалён"
+      cancel_reply: "Отменить"
+      reply: "Ответить"
+    form:
+      guidelines:
+        author_name: "Максимум 100 символов, обязательное поле."
+        author_email: "Не показывается публично. Максимум 100 символов, обязательное поле."
+        body: "Максимум 5000 символов."
+      disclaimer: "Отправляя комментарий, вы принимаете пользовательское соглашение и даёте своё согласие на обработку ваших персональных данных."
+  biovision:
+    components:
+      comments:
+        name: "Комментарии"
+        privileges:
+          moderator: "Модератор"
+        settings:
+          premoderation: "Премодерация"
+          auto_approve_threshold: "Порог автоматического одобрения"