c80_news_tz 0.1.1.23 → 0.1.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 882d379fd838ab5304443cba28d6583514cdbc06
-  data.tar.gz: 769985240918b79a42d7d40b1377597721053723
+  metadata.gz: 99c3ec7555759f8106b24a68a7268a991f371f22
+  data.tar.gz: 0c754f360cfb235f5c93fb862b8b13d1775f0e7f
 SHA512:
-  metadata.gz: da3c15500734ba6eaaff3a7e3cb09876751b000d850cf1b59860446d59dcaab959b2557966bb3c23960abbffda4a7e10ba79aad36bf6067197e9a018020d6ba9
-  data.tar.gz: 856a9c44a7573a5cf2c2e90288873b9349bea36eb5abddd873ce953a6ed31bab1d28d3cd856ed8fc4dea2622e5b6de3691fcb197913f6731f6aed9e6e1a32d8e
+  metadata.gz: d539c98a390d1d0b3a6496ac8daacde71affae08308ca6d6584686870abb94daab0d76d90753238bad67bd086df494c847b0cd5f2ad934bc69fb8d841d393afd
+  data.tar.gz: bbff23e19172c63569c4b084bf8565d3dadcc77a29b82de00ed386aa6feedc43eb8f740e73f55c66ea8b518de701c0a57370bcf1956d7363de69617a5966bf0f

data/app/assets/javascripts/c80_news_tz/frontend/comments/comments.js

@@ -0,0 +1,97 @@
+$(document).ready(function () {
+
+    var $form = $("#comment_form");
+    var $comment_message = $("#comment_message");
+
+    var fCheckText = function (e) {
+        var $submit = $("input#comment_submit", $form);
+        if (!$submit.hasClass('loading')) {
+            if (!empty($(this).val())) {
+                $submit.removeAttr("disabled");
+            } else {
+                $submit.attr("disabled", true);
+            }
+        }
+    };
+
+    $comment_message.keyup(fCheckText);
+    $comment_message.change(fCheckText);
+    $comment_message.blur(fCheckText);
+    $comment_message.focus(fCheckText);
+
+    $form.submit(function () {
+        $("input#comment_submit", $form)
+            .attr('disabled', true)
+            .addClass('loading');
+    });
+
+});
+
+// показать форму "оставить комментарий к публикации"
+function comment_show_form() {
+    //clearInterval(window.timer);
+    //$(".comment_item .reply").removeClass("hidden");
+    var $form = $("#comment_form");
+    var $placeholder = $("#comment_form_placeholder");
+    if ($form.length) {
+        //$("#preview_placeholder", form).hide();
+        //$('input[name="parent_id"]', form).val(0);
+        //$('input[name="comment_id"]', form).val(0);
+        //$(".time_left", form).text("");
+        $placeholder.append($form);
+        //$(".edit,.delete", form).addClass("hidden");
+        $("input#comment_submit", $form).removeAttr('disabled').removeClass("loading");
+        $form.show();
+        $("#comment_message", $form).val("").focus();
+        $('.comment_answers').addClass('hidden');
+        $form.attr('action', '/comments.js');
+    } else {
+        var $social = $("#social_buttons");
+        $social.attr('id','social_buttons_2');
+        $social.find('p').text('Чтобы иметь возможность оставлять комментарии, пожалуйста, авторизуйтесь через:');
+        $placeholder.append($social.clone());
+    }
+    return false
+}
+
+/*function comment_show_reply_form(comment_id) {
+    //clearInterval(window.timer);
+    //$(".comment_item .reply").removeClass("hidden");
+    var form = $("#comment_form");
+    if (form.length) {
+        //$("#preview_placeholder", form).hide();
+        //$('input[name="parent_id"]', form).val(comment_id);
+        //$('input[name="comment_id"]', form).val(0);
+        //$(".edit,.delete", form).addClass("hidden");
+        //$(".submit", form).removeClass("hidden");
+        //$(".time_left", form).text("");
+        //$("#comment_" + comment_id + " > .comment_body > .reply").addClass("hidden");
+        var $comment_answers = $("#comment_" + comment_id + " > .comment_body > .comment_answers");
+        _show_comment_answers($comment_answers);
+        $comment_answers.find("> .reply_form_placeholder").append(form);
+        form.show();
+        $("#comment_message", form).val("").focus();
+        //_activate_comment_body(comment_id);
+        //mention_autocomplete($("#comment_message"));
+        form.attr('action', '/comments');
+    } else {
+        //var placeholder = $("#expired_placeholder");
+        //$("#comment_" + comment_id + " > .comment_body > .reply").addClass("hidden");
+        //$("#comment_" + comment_id + " > .comment_body > .reply_form_placeholder").append(placeholder);
+        //placeholder.removeClass("hidden")
+    }
+    return false
+}*/
+
+// открыть ответы указанного коментария, ответы остальных комментариев - скрыть
+function _show_comment_answers($comment_answers) {
+    $('.comment_answers').addClass('hidden');
+    $comment_answers.removeClass('hidden');
+}
+
+// подсветить коммент, в который вставлена reply_form
+/*
+ function _activate_comment_body(comment_id) {
+ $('.comment_body').removeClass('active');
+ $("#comment_" + comment_id + " > .comment_body").addClass('active');
+ }*/

data/app/assets/javascripts/c80_news_tz/frontend/comments/comments_icon_animate_scroll.js

@@ -0,0 +1,16 @@
+$(document).ready(function() {
+    $('.fact_time_issue').find('a.comments').click(function (e) {
+        e.preventDefault();
+        e.stopImmediatePropagation();
+
+        $('html, body').animate(
+            {
+            scrollTop: $("#comments_block").offset().top
+            }, {
+                duration: 1000,
+                easing: "easeOutSine"
+            }
+        );
+
+    });
+});

data/app/assets/javascripts/c80_news_tz/frontend/comments/comments_utils.js

@@ -0,0 +1,9 @@
+function empty(text) {
+    var allSpacesRe = /\s+/g;
+    text = text.replace(allSpacesRe, "");
+    if (text === "") {
+        return true
+    } else {
+        return false
+    }
+}

data/app/assets/stylesheets/c80_news_tz/application.scss

@@ -2,4 +2,4 @@
  *= require_self
  */
 
-@import "frontend/*";
+@import "frontend/**/*";

data/app/assets/stylesheets/c80_news_tz/frontend/comments/comment_form.scss

@@ -0,0 +1,48 @@
+form#comment_form {
+  display: block;
+
+  div.editor {
+    position: relative;
+    margin-bottom: 10px;
+
+    div.text_holder {
+      border: 1px solid #dcdcdc;
+      padding: 0;
+      background: #fff;
+      box-sizing: border-box;
+
+      textarea {
+        width: 100%;
+        padding: 4px;
+        border: 0;
+        margin: 0;
+        font-size: 14px;
+        outline: 0;
+        height: 120px;
+        vertical-align: top;
+        box-sizing: border-box;
+      }
+
+    }
+
+  }
+
+  span.error {
+    color: red;
+  }
+
+  .btn {
+
+    &:hover,
+    &:focus,
+    &.focus {
+      background-color: #ffffff !important;
+    }
+
+    &.loading {
+      background: #ffffff url(image_path('loader_button.gif')) repeat 0 0;
+    }
+    
+  }
+
+}

data/app/assets/stylesheets/c80_news_tz/frontend/comments/comments_block.scss

@@ -0,0 +1,203 @@
+div#comments_block {
+  border-top: 1px solid #767676;
+  padding: 15px 0 20px 0;
+
+  h2 {
+    margin-top: 0;
+    color: #4d4d4d;
+    font-size: 18px;
+    line-height: 25px;
+    margin-bottom: 10px;
+
+    &.write_comment {
+      color: #AFA56A;
+      margin-bottom: 20px;
+      padding-left: 23px;
+      letter-spacing: -1px;
+      position: relative;
+
+      &:before {
+        display: block;
+        position: absolute;
+        font-family: FontAwesome;
+        content: '\f0e5';
+        top:0;
+        left:0;
+      }
+
+      a {
+        text-decoration: none;
+        border-bottom: 1px dashed;
+        color: #AFA56A;
+      }
+    }
+  }
+
+  ul#comments_list {
+    list-style: none;
+    padding-left: 0;
+
+    li.comment_item {
+      margin-bottom: 20px;
+      position: relative;
+
+      div.comment_body {
+        position: relative;
+        z-index: 10;
+
+        &.active {
+          /*background-color: #E7E7E8;*/
+        }
+
+        div.comment_info {
+          font-size: 11px;
+          font-family: tahoma, sans-serif;
+          height: 24px;
+          line-height: 24px;
+          background: #DEDFE1;
+
+          div.folding-dot-holder {
+            display: none;
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 1px;
+            height: 1px;
+
+            .folding-dot {
+              width: 500px;
+              height: 5px;
+              right: 1px;
+              top: 9px;
+              position: absolute;
+              background: transparent url(image_path('bg-folding-dot-light.png')) 5px 0 repeat-x;
+            }
+
+          }
+
+          span.user-info {
+            display: inline-block;
+            vertical-align: middle;
+
+            a.avatar {
+              display: inline-block;
+              vertical-align: top;
+              margin-right: 10px;
+              width: 24px;
+              height: 24px;
+              position: relative;
+
+              img {
+                display: block;
+                width: 24px;
+                height: 24px;
+                border-radius: 3px;
+                position: relative;
+                top: -1px;
+              }
+
+            }
+
+            a.username {
+              display: inline-block;
+              vertical-align: top;
+              margin-left: -3px;
+              margin-right: 10px;
+              color: #666;
+              font-weight: 700;
+            }
+
+          }
+
+          time.time_published {
+            margin-left: -3px;
+            font-size: 10px;
+            color: #666;
+            display: inline-block;
+            vertical-align: middle;
+          }
+
+          span.controls {
+            height: 100%;
+            display: inline-block;
+            vertical-align: middle;
+            line-height: 24px;
+            margin-left: 6px;
+
+            a.anchor {
+              text-decoration: none;
+              &:before {
+                color: #9ac2ce;
+                font-size: 12px;
+                content: "\e90a";
+                font-family: tacos;
+                /*speak: none;*/
+                font-style: normal;
+                font-weight: 400;
+                font-variant: normal;
+                text-transform: none;
+                line-height: 1;
+                display: inline-block;
+                vertical-align: text-top;
+                -webkit-font-smoothing: antialiased;
+              }
+            }
+
+          }
+
+        }
+
+        div.message {
+          font-size: 14px;
+          font-family: Arial, sans-serif;
+          line-height: 140%;
+          padding-bottom: 5px;
+          padding-top: 10px;
+        }
+
+        div.reply {
+          a.reply_link {
+            font-size: 11px;
+            text-decoration: none;
+            border-bottom: 1px dashed;
+            margin-right: 10px;
+          }
+        }
+
+        div.comment_answers {
+          padding: 15px 0 0 48px;
+
+          ul {
+            padding: 0;
+            margin: 0;
+            list-style: none;
+          }
+        }
+
+      }
+
+      div.new_comment_indicator {
+        position: absolute;
+        top: -5px;
+        bottom: -5px;
+        left: -5px;
+        right: -5px;
+        z-index: 5;
+        background-color: rgba(127, 255, 0, 0.56);
+        display: none;
+      }
+
+    }
+
+  }
+
+  div#comment_form_placeholder {
+    div#social_buttons_2 {
+      background-color: rgba(204, 204, 204, 0.68);
+      padding: 20px;
+      border: 2px dashed rgba(9, 9, 9, 0.12);
+      text-align: center;
+    }
+  }
+
+}

data/app/assets/stylesheets/c80_news_tz/frontend/pubs_medium.scss

@@ -39,13 +39,16 @@ div.pub_medium {
     }
   }
 
-  div.comments {
+  a.comments {
     cursor: pointer;
     color: #9c9c9c;
     font-size: 12px;
 
+    margin: 0;
+    height: 41px;
+    line-height: 41px;
     position: absolute;
-    bottom: 5px;
+    bottom: 0;
 
     i {
       width: 12px;

data/app/controllers/c80_news_tz/comments_controller.rb

@@ -0,0 +1,50 @@
+module C80NewsTz
+  class CommentsController < ApplicationController
+
+    def create
+
+      mark_spam = false
+      time_delta = 0
+      user = User.find(params[:comment][:user_id])
+
+      # проверим, не спамер ли это?
+      unless user.last_comment_ts.nil?
+        time_delta = Time.now.to_i - user.last_comment_ts
+        mark_spam = time_delta < 30
+      end
+
+      if mark_spam
+        respond_to do |format|
+          @time_elapsed = 30 - time_delta
+          format.js { render :action => 'antispam' }
+        end
+      else
+        @comment = Comment.create(comment_params)
+        if @comment.save
+          update_user_last_comment(user)
+          @comments_count = @comment.blurb_or_fact.comments.count
+          respond_to do |format|
+            format.js { render :action => 'created'}
+          end
+        else
+          respond_to do |format|
+            format.js { render :json => @comment.errors }
+          end
+        end
+      end
+
+    end
+
+    def comment_params
+      params.require(:comment).permit(:message, :user_id, :fact_id, :r_blurb_id)
+    end
+
+    private
+
+    def update_user_last_comment(user)
+      user.last_comment_ts = Time.now.to_i
+      user.save
+    end
+
+  end
+end

data/app/helpers/c80_news_tz/comments_helper.rb

@@ -0,0 +1,98 @@
+module C80NewsTz
+  module CommentsHelper
+
+    # рендер блока с комментариями к публикации
+    def render_comments_block(blurb_or_fact, current_user = nil)
+
+      n = blurb_or_fact.comments.count
+      # list = [
+      #     {id: 12,
+      #      parent_id: 0,
+      #      user_name: 'Иван Николаевич',
+      #      time_published: '28 Март 2016 в 13:40',
+      #      user_profile_url: '/',
+      #      user_avatar_url: 'https://habrastorage.org/getpro/habr/avatars/97b/8ed/8d6/97b8ed8d6a0d24783dedb33192aeb604_small.jpg',
+      #      message: "все по поводу той же производительности ssd дисков.",
+      #      answers: [
+      #          {id: 22,
+      #           parent_id: 12,
+      #           user_name: 'Николай',
+      #           time_published: '28 Март 2016 в 15:15',
+      #           user_profile_url: '/',
+      #           user_avatar_url: 'https://habrastorage.org/getpro/habr/avatars/a0b/46e/dfa/a0b46edfa07bca1309a04541cde4cd1a.jpg',
+      #           message: "Кажется, ваш стэнд мы видели на NextCastleParty. Очень рад за вас, так держать."
+      #          },
+      #          {id: 23,
+      #           parent_id: 12,
+      #           user_name: 'Sample Dark',
+      #           time_published: '28 Март 2016 в 15:45',
+      #           user_profile_url: '/',
+      #           user_avatar_url: 'https://habrastorage.org/getpro/habr/avatars/0f0/a62/41f/0f0a6241fb94bacfd568f0df071ce01a_small.jpg',
+      #           message: "Бизнес суров, а игры — особенно применительно к теме краудфандинга — товар, который мы должны продать как можно большему числу людей."
+      #          }
+      #      ]
+      #     },
+      #     {id: 13,
+      #      parent_id: 0,
+      #      user_name: 'Sample Dark',
+      #      time_published: '28 Март 2016 в 13:45',
+      #      user_profile_url: '/',
+      #      user_avatar_url: 'https://habrastorage.org/getpro/habr/avatars/43e/9b4/de5/43e9b4de535dc4d0477313f70c63a4d2_small.jpg',
+      #      message: "Вот, например, большой открытый проект на 2.0: https://www.humhub.org/en",
+      #      answers: []
+      #     }
+      #
+      # ]
+
+      list = blurb_or_fact.comments
+
+      if blurb_or_fact.is_a?(Fact)
+        r_blurb_id = -1
+        fact_id = blurb_or_fact.id
+      else
+        r_blurb_id = blurb_or_fact.id
+        fact_id = -1
+      end
+
+      render :partial => "c80_news_tz/comments/shared/comments_block",
+             :locals => {
+                 :comments_count => n,
+                 :comments_list => list,
+                 :form_params => {
+                    :current_user => current_user,
+                    :r_blurb_id => r_blurb_id,
+                    :fact_id => fact_id
+                 }
+             }
+    end
+
+    # рендер списка комментариев
+    def render_comments_list(list)
+      render :partial => 'c80_news_tz/comments/shared/comments_list',
+             :locals => {
+                 :list => list
+             }
+    end
+
+    # рендер одного комментария (в списке)
+    def render_comment_item(comment)
+      render :partial => "c80_news_tz/comments/shared/comment_item",
+             :locals => {
+                 comment: comment
+             }
+    end
+
+    # рендер формы либо отправки комментария, либо ответа на комментарий
+    def render_comment_form(options)
+      unless options[:current_user].nil?
+        render :partial => "c80_news_tz/comments/shared/reply_comment_form",
+               :locals => {
+                   current_user_id: options[:current_user].id,
+                   r_blurb_id: options[:r_blurb_id],
+                   fact_id: options[:fact_id]
+               }
+      end
+    end
+
+  end
+end

data/app/helpers/c80_news_tz/publications_helper.rb

@@ -76,7 +76,7 @@ module C80NewsTz
           title: pub.title,
           rubric: pub.rubric_title,
           time: local_time(pub[:created_at], format: '%H:%M %d.%m.%Y'),
-          comments_count: 12,
+          comments_count: pub.comments.count,
           href: url_for_fact(pub) # TODO_MY:: используется в _simple_preview_list.html.erb, надо использовать везде
       }
 

data/app/models/c80_news_tz/comment_validator.rb

@@ -0,0 +1,9 @@
+module C80NewsTz
+  class CommentValidator < ActiveModel::Validator
+    def validate(record)
+      unless record.message.present?
+        record.errors[:message] = 'Сообщение не может быть пустым.'
+      end
+    end
+  end
+end

data/app/models/c80_news_tz/comments.rb

@@ -0,0 +1,29 @@
+module C80NewsTz
+  class Comment < ActiveRecord::Base
+    validates_with CommentValidator
+    belongs_to :fact
+    belongs_to :r_blurb
+    belongs_to :user
+
+    before_create :set_user_name
+
+    def answers
+      []
+    end
+
+    def blurb_or_fact
+      if fact.present?
+        fact
+      else
+        r_blurb
+      end
+    end
+
+    private
+
+    def set_user_name
+      self.user_name = user.name
+    end
+
+  end
+end

data/app/models/c80_news_tz/fact.rb

@@ -14,6 +14,7 @@ module C80NewsTz
     has_and_belongs_to_many :rubrics, :join_table => 'c80_news_tz_facts_rubrics'
     has_and_belongs_to_many :companies, :join_table => 'c80_news_tz_companies_facts'
     has_and_belongs_to_many :locations, :join_table => 'c80_news_tz_facts_locations'
+    has_many :comments, :dependent => :destroy
 
     validates_with FactValidator
     default_scope {order(:created_at => :desc)}

data/app/models/c80_news_tz/r_blurb.rb

@@ -15,6 +15,7 @@ module C80NewsTz
     has_and_belongs_to_many :issues, :join_table => 'c80_news_tz_blurbs_issues'
     has_and_belongs_to_many :rubrics, :join_table => 'c80_news_tz_blurbs_rubrics'
     has_and_belongs_to_many :r_advertisers, :join_table => 'c80_news_tz_advs_blurbs'
+    has_many :comments, :dependent => :destroy
 
     validates_with FactValidator
     default_scope {order(:created_at => :desc)}

data/app/models/c80_news_tz/user.rb

@@ -1,6 +1,8 @@
 module C80NewsTz
   class User < ActiveRecord::Base
 
+    has_many :comments, :dependent => :nullify
+
     def self.from_omniauth(auth_hash)
       user = find_or_create_by(uid: auth_hash['uid'], provider: auth_hash['provider'])
       user.name = auth_hash['info']['name']

data/app/views/c80_news_tz/comments/antispam.js.erb

@@ -0,0 +1,21 @@
+var $form = $('form#comment_form');
+if ($form.find('span#t').length == 0) {
+    var time_elapsed = <%= @time_elapsed %>;
+    var $error_text = $form.find("span#error_text");
+    var $submit = $form.find('#comment_submit');
+    var $message = $('<span>Чтобы оставить новый комментарий, Вам необходимо подождать <span id="t"><%= @time_elapsed %></span> сек</span>');
+    var $time_elapsed = $message.find('span#t');
+    $error_text.append($message);
+
+    var refreshTimer = function () {
+        time_elapsed -= 1;
+        if (time_elapsed == 0) {
+            $error_text.html('');
+            $submit.removeClass('loading').removeAttr("disabled");
+            clearInterval(interval);
+        } else {
+            $time_elapsed.text(time_elapsed);
+        }
+    };
+    var interval = setInterval(refreshTimer, 1000);
+}

data/app/views/c80_news_tz/comments/created.js.erb

@@ -0,0 +1,16 @@
+
+var $comment = $("<%= j render_comment_item(@comment) %>");
+var $comments_list = $('ul#comments_list');
+var $form = $('form#comment_form');
+var $comment_block = $('div#comments_block');
+
+$comments_list.append($comment);
+$form.hide();
+
+var $li_bg = $comment.find('.new_comment_indicator');
+$li_bg.css("display","block").fadeOut(10000);
+
+$comment_block.find('h2.title span').text("<%= @comments_count %>");
+$('div.fact_time_issue a.comments')
+        .attr('title','Комментариев: <%= @comments_count %>')
+        .find('span').text("<%= @comments_count %>");

data/app/views/c80_news_tz/comments/shared/_comment_item.html.erb

@@ -0,0 +1,49 @@
+<li class="comment_item" id="comment_<%= comment.id %>">
+
+  <div class="comment_body">
+
+    <div class="comment_info" rel="<%= comment.id %>">
+
+      <%# аватар и никнейм %>
+      <span class="user-info" rel="user-popover" data-user-login="<%= comment.user_name %>" data-target="webuiPopover0">
+            <%= link_to image_tag(comment.user.image_url, :alt => comment.user_name),
+                        comment.user.url,
+                        :title => comment.user_name,
+                        :class => 'avatar'
+            %>
+        <%= link_to comment.user_name, comment.user.url, :class => 'username' %>
+          </span>
+
+      <%# время комментария %>
+      <time class="time_published"><%= local_time(comment.created_at, format: '%H:%M %d.%m.%Y') %></time>
+
+      <%# кнопки взаимодействия с комментарием %>
+      <span class="controls">
+            <%= link_to "", "#comment_#{comment.id}", :class => 'anchor', :title => 'Ссылка на комментарий' %>
+          </span>
+
+    </div>
+
+    <div class="message"><%= comment.message %></div>
+
+    <% unless comment.answers.nil? %>
+        <%# кнопка покажет ответы на комментарий %>
+        <!--<div class="reply">-->
+          <%# TODO_MY:: вставить вместо 1 количество ответов на комментарий %>
+          <%# link_to "ответов: 1",
+                      '#reply',
+                      :class => 'reply_link',
+                      :onclick => "return comment_show_reply_form(#{comment.id})"
+          %>
+        <!--</div>-->
+
+        <div class="comment_answers hidden">
+          <ul><%= render_comments_list(comment.answers) %></ul>
+          <div class="reply_form_placeholder"></div>
+        </div>
+    <% end %>
+  </div>
+
+  <div class="new_comment_indicator"></div>
+
+</li>

data/app/views/c80_news_tz/comments/shared/_comments_block.html.erb

@@ -0,0 +1,18 @@
+<div id="comments_block">
+  <h2 class="title">Комментарии (<span><%= comments_count %></span>)</h2>
+
+  <ul id="comments_list">
+    <%= render_comments_list(comments_list) %>
+  </ul>
+
+  <h2 class="write_comment">
+    <%= link_to "Написать комментарий", "#", onclick: 'return comment_show_form()' %>
+  </h2>
+
+  <div id="comment_form_placeholder"></div>
+
+</div>
+
+<div id="shadow" class="hidden">
+    <%= render_comment_form(form_params) %>
+</div>

data/app/views/c80_news_tz/comments/shared/_comments_list.html.erb

@@ -0,0 +1,3 @@
+<% list.each do |comment| %>
+    <%= render_comment_item(comment) %>
+<% end %>

data/app/views/c80_news_tz/comments/shared/_reply_comment_form.html.erb

@@ -0,0 +1,14 @@
+<%= form_for :comment, remote: true, :html => {id: 'comment_form'} do |f| %>
+    <%= f.hidden_field(:user_id, value: current_user_id) %>
+    <%= f.hidden_field(:fact_id, value: fact_id) %>
+    <%= f.hidden_field(:r_blurb_id, value: r_blurb_id) %>
+    <div class="editor">
+      <div class="text_holder">
+        <%= f.text_area :message, id: 'comment_message', rows: 10, cols: 30 %>
+      </div>
+    </div>
+    <div class="buttons">
+      <%= f.submit :id => 'comment_submit', class: 'btn btn-default', disabled:'disabled' %>
+      <span id="error_text" class="error"></span>
+    </div>
+<% end %>

data/app/views/shared/_news_list.html.erb

@@ -11,10 +11,12 @@
           <a title="<%= pub[:title] %>" href="<%= pub[:pi][:a_href]%>"><%= pub[:title] %></a>
         </div>
         <%= render_image_link_lazy(pub[:cl]) if pub[:cl].present? %>
-        <div class="comments" title="Комментариев: <%= pub[:comments_count]%>">
-          <i class="fa fa-comment"></i>
-          <%= pub[:comments_count]%>
-        </div>
+        <%= link_to("#{pub[:href]}#comments_block",
+                    title: "Комментариев: #{pub[:comments_count]}",
+                    class: 'comments') do %>
+            <i class="fa fa-comment"></i>
+            <%= pub[:comments_count] %>
+        <% end %>
       </div>
       <% if k == 2 && index != news_for_render.count-1 %>
       <div class="hr"></div>

data/config/routes.rb

@@ -5,4 +5,6 @@ C80NewsTz::Engine.routes.draw do
   get '/auth/:provider/callback', to: 'sessions#create'
   delete '/logout', to: 'sessions#destroy'
 
+  resources :comments, :only => :create
+
 end

data/db/migrate/20160325122727_create_comments.rb

@@ -0,0 +1,12 @@
+class CreateComments < ActiveRecord::Migration
+  def change
+    create_table :c80_news_tz_comments, :options => 'COLLATE=utf8_unicode_ci' do |t|
+      t.text :message, :limit => 1100
+      t.references :fact, :index => true
+      t.references :r_blurb, :index => true
+      t.references :user, :index => true
+      t.string :user_name # если удалить пользователя - здесь сохранится его имя
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20160330152627_add_antispam_last_comment_ts_to_users.rb

@@ -0,0 +1,8 @@
+class AddAntispamLastCommentTsToUsers < ActiveRecord::Migration
+  def change
+
+      #remove_column :c80_news_tz_users, :last_comment_ts
+      add_column :c80_news_tz_users, :last_comment_ts, :integer
+
+  end
+end

data/lib/c80_news_tz/version.rb

@@ -1,3 +1,3 @@
 module C80NewsTz
-  VERSION = "0.1.1.23"
+  VERSION = "0.1.1.24"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_news_tz
 version: !ruby/object:Gem::Version
-  version: 0.1.1.23
+  version: 0.1.1.24
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,7 @@ files:
 - app/admin/c80_news_tz/rubrics.rb
 - app/admin/c80_news_tz/spots.rb
 - app/assets/images/c80_news_tz/.keep
+- app/assets/images/loader_button.gif
 - app/assets/javascripts/c80_news_tz/application.js.coffee
 - app/assets/javascripts/c80_news_tz/backend.js.coffee
 - app/assets/javascripts/c80_news_tz/backend/collapsable-groups.js
@@ -116,6 +117,9 @@ files:
 - app/assets/javascripts/c80_news_tz/backend/r_advertisers.js
 - app/assets/javascripts/c80_news_tz/backend/r_blurbs.js
 - app/assets/javascripts/c80_news_tz/backend/rubrics.js
+- app/assets/javascripts/c80_news_tz/frontend/comments/comments.js
+- app/assets/javascripts/c80_news_tz/frontend/comments/comments_icon_animate_scroll.js
+- app/assets/javascripts/c80_news_tz/frontend/comments/comments_utils.js
 - app/assets/javascripts/c80_news_tz/frontend/facts_ajax.js
 - app/assets/javascripts/c80_news_tz/frontend/nabbers.js
 - app/assets/stylesheets/c80_news_tz/application.scss
@@ -127,14 +131,18 @@ files:
 - app/assets/stylesheets/c80_news_tz/backend/r_advertisers.scss
 - app/assets/stylesheets/c80_news_tz/backend/r_lives.scss
 - app/assets/stylesheets/c80_news_tz/backend/spots.scss
+- app/assets/stylesheets/c80_news_tz/frontend/comments/comment_form.scss
+- app/assets/stylesheets/c80_news_tz/frontend/comments/comments_block.scss
 - app/assets/stylesheets/c80_news_tz/frontend/pubs_medium.scss
 - app/controllers/c80_news_tz/application_controller.rb
 - app/controllers/c80_news_tz/banners_controller.rb
+- app/controllers/c80_news_tz/comments_controller.rb
 - app/controllers/c80_news_tz/sessions_controller.rb
 - app/helpers/c80_news_tz/advertisers_helper.rb
 - app/helpers/c80_news_tz/application_helper.rb
 - app/helpers/c80_news_tz/banners_helper.rb
 - app/helpers/c80_news_tz/blurbs_helper.rb
+- app/helpers/c80_news_tz/comments_helper.rb
 - app/helpers/c80_news_tz/publications_helper.rb
 - app/helpers/c80_news_tz/subj_helper.rb
 - app/models/c80_news_tz/adress.rb
@@ -142,6 +150,8 @@ files:
 - app/models/c80_news_tz/banner02.rb
 - app/models/c80_news_tz/banner03.rb
 - app/models/c80_news_tz/banner_validator.rb
+- app/models/c80_news_tz/comment_validator.rb
+- app/models/c80_news_tz/comments.rb
 - app/models/c80_news_tz/company.rb
 - app/models/c80_news_tz/cphoto.rb
 - app/models/c80_news_tz/fact.rb
@@ -176,6 +186,12 @@ files:
 - app/uploaders/c80_news_tz/r_bphoto_uploader.rb
 - app/views/c80_news_tz/application/guru.js.erb
 - app/views/c80_news_tz/banners/counter.html.erb
+- app/views/c80_news_tz/comments/antispam.js.erb
+- app/views/c80_news_tz/comments/created.js.erb
+- app/views/c80_news_tz/comments/shared/_comment_item.html.erb
+- app/views/c80_news_tz/comments/shared/_comments_block.html.erb
+- app/views/c80_news_tz/comments/shared/_comments_list.html.erb
+- app/views/c80_news_tz/comments/shared/_reply_comment_form.html.erb
 - app/views/layouts/c80_news_tz/application.html.erb
 - app/views/shared/_banner_01.html.erb
 - app/views/shared/_banner_02.html.erb
@@ -223,6 +239,8 @@ files:
 - db/migrate/20160310114242_create_banners03.rb
 - db/migrate/20160314093945_create_users.rb
 - db/migrate/20160314093946_add_users_indexes.rb
+- db/migrate/20160325122727_create_comments.rb
+- db/migrate/20160330152627_add_antispam_last_comment_ts_to_users.rb
 - db/seeds/19_fill_news_props.rb.example
 - db/seeds/20_fill_rubrics.rb.example
 - db/seeds/21_fill_facts.rb.example