my_forum 0.0.1.beta56 → 0.0.1.beta57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b99919419adc515dae69ac72fed68472de713b5
-  data.tar.gz: fe552695d52f7bfd995b1c683dfa7a2721e9c338
+  metadata.gz: 27cb7d7f0bb08f12f2d2668c46bed635e33dcd83
+  data.tar.gz: d3692ef0a7cce204f15e70d42d9b11188dc7dfa1
 SHA512:
-  metadata.gz: 793c9a79c2b11bb7790ca38b50e0b4f5de3baf9e91612e0e9dbdd377f8ff96361eaabb9b3c3a35753fb1fc89c7b11395e606ac314181db448a960f6d35791101
-  data.tar.gz: e04820058000d9cc9e6b65049c7a97c04a8f049a6da625c2895a4f2c0f2d916e90d522473c68f77185a97a28dfa97825a530353e03e906c2da84a8e375d0dbb1
+  metadata.gz: 1c95c056ade0b979bcb1c8bd3bfa15903d189a1809327d26702b3d21bd5f38c001971aa92f3f4b1afcbe1a53206b7f507cf29ef3953af2fcef268ad64f95b9c7
+  data.tar.gz: 34ac695ce54b8722794f1f8bd4f717e684318e45eab28a8e358554600fee60b3e0f9441edfdb3490bc2107601f22431fcc7f99057c82d3e967aab1cc330df65e

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

@@ -72,6 +72,13 @@
       border: 1px solid black;
     }
 
+    .edited_by {
+      padding: 10px 40px;
+      font-size: 10px;
+      font-weight: bold;
+      font-style: italic;
+    }
+
     .bbqoute {
 
       .quote_info {
@@ -123,3 +130,9 @@
 #quick_answer {
   margin: 26px 0;
 }
+
+#edit-post {
+  textarea {
+    width: 100%;
+  }
+}

data/app/controllers/my_forum/posts_controller.rb

@@ -2,6 +2,7 @@ require_dependency "my_forum/application_controller"
 
 module MyForum
   class PostsController < ApplicationController
+    before_filter :verify_admin, only: [:edit, :update]
     before_filter :find_topic, except: [:show, :preview]
     before_filter :find_forum, except: [:show, :preview]
 
@@ -34,6 +35,21 @@ module MyForum
       end
     end
 
+    def edit
+      @forum  = Forum.find(params[:forum_id])
+      @topic  = Topic.find(params[:topic_id])
+      @post   = Post.find(params[:id])
+    end
+
+    def update
+      post = Post.find(params[:id])
+      post.text       = params[:post][:text]
+      post.edited_by  = current_user.login
+      post.save
+
+      redirect_to forum_topic_path(post.topic.forum, post.topic, page: params[:page])
+    end
+
     def preview
       preview_html = ActionController::Base.helpers.sanitize format_bbcode(params[:text])
       render '/my_forum/shared/post_preview.js.coffee', layout: false, locals: { preview_html: preview_html }

data/app/models/my_forum/forum.rb

@@ -8,11 +8,10 @@ module MyForum
       return false unless current_user
 
       latest_post_ids = self.topics.where('latest_post_created_at >= ?', current_user.created_at).pluck(:latest_post_id)
-      read_log = LogReadMark.where("user_id = ? AND post_id IN (?)", current_user.id, latest_post_ids).pluck(:post_id)
+      read_log = []
+      read_log = LogReadMark.where("user_id = ? AND post_id IN (?)", current_user.id, latest_post_ids).pluck(:post_id) unless latest_post_ids.blank?
 
       !(latest_post_ids - read_log).empty?
-      #latest_post_ids.length != read_log
-      #read_log >= latest_post_ids.length
     end
 
     # Forum index page

data/app/views/my_forum/posts/edit.html.haml

@@ -0,0 +1,31 @@
+%h2= t('.edit_post_in', topic_name: @topic.name)
+
+#edit-post
+  = form_for @post, url: forum_topic_post_path(@forum, @topic, @post, page: params[:page]), role: 'form' do |form|
+    .row
+      .col-md-12
+        .text-editor-buttons{ data: { apply_to: 'post_text' } }
+          %div.btn-group
+            =link_to '#', class: 'btn btn-default btn-sm' do
+              %i{ class: 'fa fa-bold' }
+            =link_to '#', class: 'btn btn-default btn-sm' do
+              %i{ class: 'fa fa-italic' }
+            =link_to '#', class: 'btn btn-default btn-sm' do
+              %i{ class: 'fa fa-strikethrough' }
+            =link_to '#', class: 'btn btn-default btn-sm' do
+              %i{ class: 'fa fa-underline' }
+
+          %div.btn-group
+            =link_to '#', class: 'btn btn-default btn-sm', data: { toggle: 'modal' } do
+              %i{ class: 'fa fa-camera-retro' }
+
+          %div.btn-group.smiles
+            - emoticons_list.each do |code, path|
+              =link_to '#', class: 'btn btn-default btn-sm smile-past' do
+                %img{ src: path, class: 'smile', data: { code: code } }
+
+        .form-group= form.text_area :text, placeholder: t('.post_text'), class: 'form-control', rows: 10
+
+    = form.submit class: 'btn '
+
+    = render partial: 'my_forum/shared/upload_photo', locals: { textarea: 'post_text' }

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

@@ -1,15 +1,16 @@
 - post_counter += 1
 
 .row.post-header{ id: "post_number_#{post_counter}"}
-  .col-md-10
+  .col-md-9
     %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
+  .col-md-3.post_number.text-right
     - # TODO optimize condition!
     - if current_user and current_user.is_admin? and post.topic.posts.first != post
+      =link_to t('.edit'), edit_forum_topic_post_path(@forum, post.topic, post, page: params[:page]), class: 'btn btn-xs btn-info', data: { confirm: "Are you sure?" }
       =link_to t('.delete'), forum_topic_post_path(@forum, post.topic, post), class: 'btn btn-xs btn-danger', method: :delete, data: { confirm: "Are you sure?" }
     %button.btn.btn-xs.btn-warning.quote-post{ data: { post_id: post.id } }
       =t('.quote')
@@ -20,4 +21,8 @@
   .col-md-10
     .created_at= t('.sent', datetime: time(post.created_at))
     #post_container{ id: post.id }
-      = sanitize format_post_text(post)
+      = sanitize format_post_text(post)
+
+-if post.edited_by
+  .row
+    .edited_by.text-right= t('.edited_by', login: post.edited_by, date: time(post.updated_at))

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

@@ -1,4 +1,4 @@
 .row.topic-header
   .col-md-12
     %h2= topic.name.html_safe
-    .info= "#{topic.info[:author]}, #{topic.info[:created]}"
+    .info= "#{topic.info[:author]}, #{time(topic.info[:created])}"

data/config/locales/ru.yml

@@ -110,11 +110,18 @@ ru:
         quick_answer_preview: 'Предварительный просмотр'
         advanced_answer: 'Расширенный ответ'
       post:
+        edited_by: "Было отредактированно %{login}, %{date}"
         sent: "Отправленно: %{datetime}"
         number: "Сообщение #%{post_number}"
         quote: 'Цитировать'
+        edit: 'изменить'
         delete: 'удалить'
 
+    posts:
+      edit:
+        post_text: 'Текст поста'
+        edit_post_in: "Редактировать пост в '%{topic_name}'"
+
     users:
       signin:
         sign_in_head: 'Вход на форум'

data/db/migrate/20160214085201_add_edited_by_for_post.rb

@@ -0,0 +1,5 @@
+class AddEditedByForPost < ActiveRecord::Migration
+  def change
+    add_column :my_forum_posts, :edited_by, :string, default: nil
+  end
+end

data/lib/my_forum/version.rb

@@ -1,3 +1,3 @@
 module MyForum
-  VERSION = "0.0.1.beta56"
+  VERSION = "0.0.1.beta57"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_forum
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta56
+  version: 0.0.1.beta57
 platform: ruby
 authors:
 - Vitaly Omelchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -238,6 +238,7 @@ files:
 - app/views/my_forum/admin/users/index.haml
 - app/views/my_forum/forums/_topic_subject.html.haml
 - app/views/my_forum/forums/show.haml
+- app/views/my_forum/posts/edit.html.haml
 - app/views/my_forum/private_messages/_sidebar.haml
 - app/views/my_forum/private_messages/inbox.haml
 - app/views/my_forum/private_messages/new.haml
@@ -285,6 +286,7 @@ files:
 - db/migrate/20151221205045_my_forum_change_user_avatar.rb
 - db/migrate/20160122202142_add_latest_post_info_for_topic.rb
 - db/migrate/20160210130805_add_indexes_for_topics.rb
+- db/migrate/20160214085201_add_edited_by_for_post.rb
 - lib/my_forum.rb
 - lib/my_forum/engine.rb
 - lib/my_forum/version.rb