my_forum 0.0.1.beta28 → 0.0.1.beta29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e9c4dc6e1fd0e4d60d78d975bec3ed7a6a27946
-  data.tar.gz: c45c52e592f918069fa6879d4a391da75a75e0ae
+  metadata.gz: 81f9f7e3ca4c8bdfc291d5e53c27f602f5023b6d
+  data.tar.gz: c35fb58614dd1bf75170b626df663a359f6e5b36
 SHA512:
-  metadata.gz: 829a37be49a60d7a44676e195ab285cb8004c926d208c003d1cb010cce148ecd6866173c16dc11855afd03ddb63e0c833cca5177fdfc0deed6a22e6ce42e5db8
-  data.tar.gz: d3cad5b3c19c147d2e48d61279a99fcf8120b2e625eb940d605daa21c2328e7f67e47d836263a45f5d51e170c27371a5398e8178cb02a946983da022c3311417
+  metadata.gz: e820b8589722f67d278cf6a5821fb5f184a9ac5ab384f66bff63672214a34f5ce5ecad25e7cbc5ee922723a79d5476783cd0f00dd22e60a654a24ad6e18702f0
+  data.tar.gz: 4c38f98ecf6fdc739b0ec517dab58cc7562f7f38ae1abce7ebe3f2eb9adb71850b2274ac11a54ae7edd8102585806c8b582221610e5b600c8933b90f768bd083

data/app/assets/stylesheets/my_forum/posts.css.scss

@@ -1,3 +1,13 @@
+.profile-popover {
+  width: 360px;
+  font-size: 11px;
+  color: #000;
+
+  .pm {
+    margin-top: 10px;
+  }
+}
+
 .topic_posts_info {
   background-color: #d3daed;
   color: #fff;
@@ -14,11 +24,19 @@
     border: 1px solid #DFDFDF;
     background-color: #fff;
 
+    .user_profile_popover {
+      cursor: pointer;
+    }
+
     .post_from_user_login {
       font-weight: bold;
       color: #c1ccf5;
     }
 
+    .post_from_user_login .login:hover {
+      color: #fff;
+    }
+
     .post-header {
       height: 36px;
       line-height: 36px;

data/app/controllers/my_forum/application_controller.rb

@@ -3,7 +3,7 @@ module MyForum
 
     before_filter :user_activity
 
-    helper_method :attachment_img_path, :emoticons_list
+    helper_method :attachment_img_path, :emoticons_list, :is_admin?
 
     def authenticate_user!
       redirect_to admin_signin_path unless current_user
@@ -19,6 +19,11 @@ module MyForum
     end
     helper_method :current_user_id
 
+    def is_admin?
+      return false unless current_user
+      current_user.is_admin?
+    end
+
     def current_user_groups
       return [].push UserGroup::GUEST_GROUP.name unless current_user
       current_user.user_groups.map &:name

data/app/controllers/my_forum/topics_controller.rb

@@ -2,7 +2,8 @@ require_dependency "my_forum/application_controller"
 
 module MyForum
   class TopicsController < ApplicationController
-    before_filter :find_forum, only: [:new, :create, :show]
+    before_filter :find_forum,      only: [:new, :create, :show]
+    before_filter :check_is_admin,  only: [:pin, :close, :delete]
 
     def new
       @topic = @forum.topics.build
@@ -33,8 +34,34 @@ module MyForum
       redirect_to forum_path(@forum)
     end
 
+    def pin
+      return unless topic = Topic.find_by_id(params[:topic_id])
+      topic.toggle!(:pinned)
+
+      redirect_to forum_topic_path(topic.forum, topic)
+    end
+
+    def close
+      return unless topic = Topic.find_by_id(params[:topic_id])
+      topic.toggle!(:closed)
+
+      redirect_to forum_topic_path(topic.forum, topic)
+    end
+
+    def delete
+      return unless topic = Topic.find_by_id(params[:topic_id])
+      topic.update!(deleted: true)
+
+      redirect_to forum_path(topic.forum)
+    end
+
     private
 
+    def check_is_admin
+      return unless current_user
+      return unless current_user.is_admin?
+    end
+
     def find_forum
       @forum = Forum.find(params[:forum_id])
     end

data/app/helpers/my_forum/topics_helper.rb

@@ -8,7 +8,9 @@ module MyForum
     end
 
     def can_quick_answer?(forum)
-      return false unless current_user
+      return false  unless current_user
+      return true   if is_admin?
+      return false  if forum.closed?
       true
     end
 

data/app/helpers/my_forum/users_helper.rb

@@ -17,6 +17,10 @@ module MyForum
       user.posts_count
     end
 
+    def is_online_user?(user_login)
+      User.online.pluck(:login).include?(user_login)
+    end
+
     def online_user_marker(user_login)
       return unless User.online.pluck(:login).include?(user_login)
       content_tag :div, ' '.html_safe, class: 'label label-success'

data/app/models/my_forum/forum.rb

@@ -34,7 +34,7 @@ module MyForum
         FROM my_forum_topics
         JOIN my_forum_posts ON my_forum_posts.id = my_forum_topics.latest_post_id
         JOIN my_forum_users ON my_forum_posts.user_id = my_forum_users.id
-        WHERE my_forum_topics.forum_id = #{self.id}
+        WHERE my_forum_topics.forum_id = #{self.id} AND my_forum_topics.deleted IS FALSE
         ORDER BY my_forum_posts.id DESC
       ", page: page, per_page: per_page)
     end
@@ -48,7 +48,7 @@ module MyForum
         FROM my_forum_topics
         JOIN my_forum_posts ON my_forum_posts.id = my_forum_topics.latest_post_id
         JOIN my_forum_users ON my_forum_posts.user_id = my_forum_users.id
-        WHERE my_forum_topics.id NOT IN (#{log_topic_ids.join(',')})
+        WHERE my_forum_topics.id NOT IN (#{log_topic_ids.join(',')}) AND my_forum_topics.deleted IS FALSE
         ORDER BY my_forum_posts.id DESC
       ", page: page, per_page: per_page)
     end

data/app/models/my_forum/topic.rb

@@ -4,6 +4,8 @@ module MyForum
     belongs_to  :forum, counter_cache: true
     belongs_to  :user
 
+    default_scope { where(deleted: false) }
+
     def info
       author  = (post = posts.first).user.login
       created = post.created_at

data/app/views/my_forum/private_messages/new.haml

@@ -13,9 +13,9 @@
           .form-group= form.text_field :recipient, value: @reply_pm.sender_login, class: 'subject form-control'
           .form-group= form.text_field :subject, value: @reply_pm.subject ,class: 'subject form-control', placeholder: t('.subject')
         - else
-          .form-group= form.text_field :recipient, class: 'subject form-control autocomplete', placeholder: t('.recipient'), data: { autocomplete_path: autocomplete_users_path }
+          .form-group= form.text_field :recipient, value: params[:to], class: 'subject form-control autocomplete', placeholder: t('.recipient'), data: { autocomplete_path: autocomplete_users_path }
           .form-group= form.text_field :subject, class: 'subject form-control', placeholder: t('.subject')
 
         .form-group= form.text_area :body, class: 'body form-control', placeholder: t('.body')
 
-        = form.submit class: 'btn btn-primary btn-sm'
+        = form.submit t('.send'), class: 'btn btn-primary btn-sm'

data/app/views/my_forum/topics/_post.haml

@@ -1,10 +1,12 @@
 - post_counter += 1
 
 .row.post-header{ id: "post_number_#{post_counter}"}
-  .col-md-10.post_from_user_login
-    - user_login = post.user.try(:login)
-    = online_user_marker(user_login)
-    = user_login
+  .col-md-10
+    %span.post_from_user_login
+      - user_login = post.user.try(:login)
+      %span.user_profile_popover{ title: user_login, data: { toggle: 'popover', content: (render partial: 'profile_popover', locals: { user: post.user })}}
+        = online_user_marker(user_login)
+        %span.login= user_login
   .col-md-2.post_number.text-right
     - # TODO optimize condition!
     - if current_user and current_user.is_admin? and post.topic.posts.first != post

data/app/views/my_forum/topics/_profile_popover.haml

@@ -0,0 +1,22 @@
+.profile-popover
+  .row
+    .col-sm-5
+      = t('my_forum.profile_popover.posts_count')
+    .col-sm-4
+      = user.posts_count
+
+  .row
+    .col-sm-5
+      = t('my_forum.profile_popover.registered_at')
+    .col-sm-4
+      = time(user.created_at)
+
+  .row
+    .col-sm-5
+      = t('my_forum.profile_popover.status')
+    .col-sm-4
+      = is_online_user?(user.login) ? t('my_forum.profile_popover.online') : t('my_forum.profile_popover.offline')
+
+  .row.pm
+    .col-sm-12
+      = link_to t('my_forum.profile_popover.write_pm'), new_private_message_path(to: user.login), class: 'btn btn-xs btn-warning'

data/app/views/my_forum/topics/show.haml

@@ -16,14 +16,49 @@
         .row
           = will_paginate @topic_posts
 
+      - if is_admin?
+        .row
+          - options = { method: :patch, data: { confirm: t('.are_you_sure?') } }
+
+          - @topic.pinned? ? options.merge!(class: 'btn btn-sm btn-info') : options.merge!(class: 'btn btn-sm btn-warning')
+          = link_to (@topic.pinned? ? t('.unpin_topic') : t('.pin_topic')), forum_topic_pin_path(@topic.forum, @topic), options
+
+          - @topic.closed? ? options.merge!(class: 'btn btn-sm btn-info') : options.merge!(class: 'btn btn-sm btn-danger')
+          = link_to (@topic.closed? ? t('.unlock_topic') : t('.lock_topic')), forum_topic_close_path(@topic.forum, @topic), options
+
+          - options.merge!(class: 'btn btn-sm btn-danger')
+          = link_to t('.delete_topic'), forum_topic_delete_path(@topic.forum, @topic), options
+
       - if can_quick_answer?(@topic)
         #quick_answer
+          - if @topic.closed?
+            .alert.alert-danger=t('.warning_closed_topic')
           = render 'quick_answer', forum: @forum, topic: @topic
 
 :coffee
   $(document).on 'ready page:load', ->
+
+    $('.user_profile_popover').popover(
+      trigger: 'click'
+      html: true
+      delay:
+        'show': 100
+        'hide': 200
+    ).on('mouseenter', ->
+        _this = this
+        $(this).popover("show")
+        $(this).siblings(".popover").on('mouseleave', ->
+          $(_this).popover('hide')
+        )
+      )
+      .on('mouseleave', ->
+        _this = this
+        setTimeout (-> $(_this).popover("hide") if !$(".popover:hover").length ), 300
+      )
+
+
     container = $('body')
     scroll_to = $('post_number_' + "#{params[:show_post]}")
     scroll_to = 'post_number_' + "#{params[:show_post]}"
 
-    $('body').scrollTo(scroll_to);
+    $('body').scrollTo(scroll_to)

data/config/locales/ru.yml

@@ -3,6 +3,15 @@ ru:
   my_forum:
     mailer:
       new_pm_notification_subject: 'Уведомление о новом личном сообщении'
+
+    profile_popover:
+      posts_count: 'Сообщений на форуме: '
+      registered_at: 'Дата регистрации: '
+      status: 'Текущий статус:'
+      online: 'на форуме'
+      offline: 'не на форуме'
+      write_pm: 'Написать ЛС'
+
     today: "Сегодня в %{hhmm}"
     yesterday: "Вчера в %{hhmm}"
     create_new_pm: 'Написать личное сообщение'
@@ -71,6 +80,13 @@ ru:
         create_new_topic_in: "Создать новую тему в '%{topic_name}'"
       show:
         messages_in_topic: "Сообщений в теме: %{count}"
+        pin_topic: 'Закрепить тему'
+        unpin_topic: 'Открепить тему'
+        lock_topic: 'Закрыть тему'
+        unlock_topic: 'Открыть тему'
+        delete_topic: 'Удалить тему'
+        are_you_sure?: 'Вы уверены?'
+        warning_closed_topic: 'Внимание! Эта тема закрыта, никто кроме вас, не сможет ответить!'
       user_info:
         user_posts_count: "%{count} сообщений"
       quick_answer:
@@ -118,6 +134,8 @@ ru:
         recipient: 'Кому'
         subject: 'Тема'
         body: 'Сообщение'
+        new_private_message: 'Написать личное сообщение'
+        send: 'Отправить'
       create:
         cant_find_recipient: 'Ошибка, пользователя адресата не существует'
 

data/config/routes.rb

@@ -16,6 +16,7 @@ MyForum::Engine.routes.draw do
 
   resources :users do
     patch :avatar_update
+
     collection do
       get :autocomplete
     end
@@ -25,6 +26,9 @@ MyForum::Engine.routes.draw do
 
   resources :forums, only: [:index, :show] do
     resources :topics do
+      patch :pin
+      patch :close
+      patch :delete
       resources :posts
     end
   end

data/lib/my_forum/version.rb

@@ -1,3 +1,3 @@
 module MyForum
-  VERSION = "0.0.1.beta28"
+  VERSION = "0.0.1.beta29"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_forum
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta28
+  version: 0.0.1.beta29
 platform: ruby
 authors:
 - Vitaly Omelchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -254,6 +254,7 @@ files:
 - app/views/my_forum/private_messages/show.haml
 - app/views/my_forum/shared/_upload_photo.haml
 - app/views/my_forum/topics/_post.haml
+- app/views/my_forum/topics/_profile_popover.haml
 - app/views/my_forum/topics/_quick_answer.haml
 - app/views/my_forum/topics/_topic_header.haml
 - app/views/my_forum/topics/_user_info.haml