c80_news_tz 0.1.1.24 → 0.1.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99c3ec7555759f8106b24a68a7268a991f371f22
-  data.tar.gz: 0c754f360cfb235f5c93fb862b8b13d1775f0e7f
+  metadata.gz: fdfca018b811d2190fc6420436a90d426d882cd5
+  data.tar.gz: 5a2b40535b355d269a916a3eda96804bd81bb770
 SHA512:
-  metadata.gz: d539c98a390d1d0b3a6496ac8daacde71affae08308ca6d6584686870abb94daab0d76d90753238bad67bd086df494c847b0cd5f2ad934bc69fb8d841d393afd
-  data.tar.gz: bbff23e19172c63569c4b084bf8565d3dadcc77a29b82de00ed386aa6feedc43eb8f740e73f55c66ea8b518de701c0a57370bcf1956d7363de69617a5966bf0f
+  metadata.gz: 47bbaf4ff2f8189eed4ac55ed419a5caaadcfbe32f58ef6c5d40e045d31ed9dec7fbb195afb31a0fa87d33cc0c328a592df0bd7a44b12a55652c0a002cc6aeba
+  data.tar.gz: afe2294ccbc9e0312f4e56d5404994fa26247ea518fd9370df5d1e33faa8d74cda3bba0c9c64afdd0650358674e0ff7957ec55ed7cb039b5e4fcc73e36ec0a7f

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

@@ -47,9 +47,10 @@ function comment_show_form() {
         $form.attr('action', '/comments.js');
     } else {
         var $social = $("#social_buttons");
-        $social.attr('id','social_buttons_2');
-        $social.find('p').text('Чтобы иметь возможность оставлять комментарии, пожалуйста, авторизуйтесь через:');
-        $placeholder.append($social.clone());
+        var $social_cloned = $social.clone();
+        $social_cloned.attr('id','social_buttons_2');
+        $social_cloned.find('p').text('Чтобы иметь возможность оставлять комментарии, пожалуйста, авторизуйтесь через:');
+        $placeholder.append($social_cloned);
     }
     return false
 }

data/app/controllers/c80_news_tz/comments_controller.rb

@@ -1,6 +1,8 @@
 module C80NewsTz
   class CommentsController < ApplicationController
 
+    before_action :check_comments_enabled
+
     def create
 
       mark_spam = false
@@ -35,16 +37,26 @@ module C80NewsTz
 
     end
 
+    private
+
     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
 
+    def check_comments_enabled
+      comments_enabled = CommentsProps.find(1).comments_enabled
+      unless comments_enabled
+        respond_to do |format|
+          format.js { render :action => 'comments_disabled' }
+        end
+      end
+    end
+
   end
 end

data/app/helpers/c80_news_tz/comments_helper.rb

@@ -2,7 +2,7 @@ module C80NewsTz
   module CommentsHelper
 
     # рендер блока с комментариями к публикации
-    def render_comments_block(blurb_or_fact, current_user = nil)
+    def render_comments_block(blurb_or_fact, current_user = nil, comments_enabled = true)
 
       n = blurb_or_fact.comments.count
       # list = [
@@ -61,7 +61,8 @@ module C80NewsTz
                  :form_params => {
                     :current_user => current_user,
                     :r_blurb_id => r_blurb_id,
-                    :fact_id => fact_id
+                    :fact_id => fact_id,
+                    :comments_enabled => comments_enabled
                  }
              }
     end
@@ -84,13 +85,15 @@ module C80NewsTz
 
     # рендер формы либо отправки комментария, либо ответа на комментарий
     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]
-               }
+      if options[:comments_enabled]
+        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
 

data/app/models/c80_news_tz/comments_props.rb

@@ -0,0 +1,5 @@
+module C80NewsTz
+  class CommentsProps < ActiveRecord::Base
+
+  end
+end

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

@@ -0,0 +1,7 @@
+var $form = $('form#comment_form');
+if ($form.length) {
+    var $error_text = $form.find("span#error_text");
+    var $message = $('<span>Возможность комментирования временно отключена, на сайте ведутся технические работы.</span>');
+    $error_text.text("");
+    $error_text.append($message);
+}

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

@@ -9,9 +9,10 @@
             <%= link_to image_tag(comment.user.image_url, :alt => comment.user_name),
                         comment.user.url,
                         :title => comment.user_name,
-                        :class => 'avatar'
+                        :class => 'avatar',
+                        :target => '_blank'
             %>
-        <%= link_to comment.user_name, comment.user.url, :class => 'username' %>
+        <%= link_to comment.user_name, comment.user.url, class:'username', title:comment.user_name, target:'_blank' %>
           </span>
 
       <%# время комментария %>

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

@@ -5,9 +5,11 @@
     <%= render_comments_list(comments_list) %>
   </ul>
 
-  <h2 class="write_comment">
-    <%= link_to "Написать комментарий", "#", onclick: 'return comment_show_form()' %>
-  </h2>
+  <% if form_params[:comments_enabled] %>
+      <h2 class="write_comment">
+        <%= link_to "Написать комментарий", "#", onclick: 'return comment_show_form()' %>
+      </h2>
+  <% end %>
 
   <div id="comment_form_placeholder"></div>
 

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

@@ -8,7 +8,7 @@
       </div>
     </div>
     <div class="buttons">
-      <%= f.submit :id => 'comment_submit', class: 'btn btn-default', disabled:'disabled' %>
+      <%= f.submit 'Отправить', id: 'comment_submit', class: 'btn btn-default', disabled:'disabled' %>
       <span id="error_text" class="error"></span>
     </div>
 <% end %>

data/db/migrate/20160331103030_create_comments_props.rb

@@ -0,0 +1,10 @@
+class CreateCommentsProps < ActiveRecord::Migration
+  def change
+    create_table :c80_news_tz_comments_props, :options => 'COLLATE=utf8_unicode_ci' do |t|
+      t.integer :anitspam_delay
+      t.boolean :comments_enabled
+
+      t.timestamps null: false
+    end
+  end
+end

data/lib/c80_news_tz/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_news_tz
 version: !ruby/object:Gem::Version
-  version: 0.1.1.24
+  version: 0.1.1.25
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,8 +150,9 @@ 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.rb
 - app/models/c80_news_tz/comment_validator.rb
-- app/models/c80_news_tz/comments.rb
+- app/models/c80_news_tz/comments_props.rb
 - app/models/c80_news_tz/company.rb
 - app/models/c80_news_tz/cphoto.rb
 - app/models/c80_news_tz/fact.rb
@@ -187,6 +188,7 @@ files:
 - 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/comments_disabled.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
@@ -241,6 +243,7 @@ files:
 - 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/migrate/20160331103030_create_comments_props.rb
 - db/seeds/19_fill_news_props.rb.example
 - db/seeds/20_fill_rubrics.rb.example
 - db/seeds/21_fill_facts.rb.example