my_forum 0.0.1.beta36 → 0.0.1.beta37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf92d8d6547f3a621835289b170e5bc65baf084d
-  data.tar.gz: e6bba7f81fa4dff871a4d16b1864970db5c68263
+  metadata.gz: 03b3cc40a791edfb4194434b71762812b81ef5fc
+  data.tar.gz: 71c82e4793168591520f86bedebabcf1d4946375
 SHA512:
-  metadata.gz: 665a10aad9b2e4068c6ff059ae5162f4bdc13faf590d93209680fbd5147a69a68cbe6c268ea463f67724e10153b4e8e4bbd4dca5b31324e0cbbf3c84a98dae23
-  data.tar.gz: 94d75e3155794dadf18736e9048ec9ef11d33e068a041716ec28a7b19a3422b11359d4a3c7a9a50477f710db706f64355da85797057f8bf59d1d201ebd054f4a
+  metadata.gz: 7dfdcc7b66f9443979596df63d8d0677ff9b53d55c9197d39d91324ddace3376cce45fe726ae82227dbfef917a1a0ed3d7100cfbbc4d050a4348ac8d3d231d2a
+  data.tar.gz: 6e7df886f252d316a6c6ca230f1dd9508bff78f009c1c2cec57c6a20a028c6df9bfb4ae18ca65a7eda24223bec4ae7ec45df6f52ccb9dd92159f4ded1e6bb1cd

data/app/assets/javascripts/my_forum/posts.js.coffee

@@ -0,0 +1,20 @@
+ready = ->
+  $('#post_preview').click (event) ->
+    event.preventDefault()
+
+    elm_id  = $(event.target).data('elm-preview')
+    elm     = $('#' + elm_id)
+
+    return unless elm
+
+    data = elm.val()
+
+    $.ajax
+      url: '/post/preview'
+      type: 'POST'
+      dataType: 'script'
+      data:
+        text: data
+
+$(document).ready(ready)
+$(document).on('page:load', ready)

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

@@ -19,6 +19,12 @@
 @import "font-awesome-sprockets";
 @import "font-awesome";
 
+.modal-dialog {
+  .post_attachment {
+    max-width: 200px;
+  }
+}
+
 .buttons_for_new_topic {
   margin-top: 10px;
 }

data/app/controllers/my_forum/posts_controller.rb

@@ -2,8 +2,10 @@ require_dependency "my_forum/application_controller"
 
 module MyForum
   class PostsController < ApplicationController
-    before_filter :find_topic, except: [:show]
-    before_filter :find_forum, except: [:show]
+    before_filter :find_topic, except: [:show, :preview]
+    before_filter :find_forum, except: [:show, :preview]
+
+    include PostsHelper
 
     def create
       unless params[:post].fetch(:text).blank?
@@ -32,6 +34,11 @@ module MyForum
       end
     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 }
+    end
+
     private
 
     def process_attachments(post)

data/app/helpers/my_forum/posts_helper.rb

@@ -5,10 +5,9 @@ module MyForum
     end
 
     def format_bbcode(text)
-
-
       # Line Breask
       text.gsub!(/\r\n/, '<br />')
+      text.gsub!(/\n/, '<br />')
 
       # Images
       text.gsub!(/\[img\]/i,   '<img src="')

data/app/views/my_forum/shared/_post_preview.haml

@@ -0,0 +1,15 @@
+#modal_post_preview.modal.fade
+  .modal-dialog
+    .modal-content
+      .modal-header
+        %button.close{ type: 'button', aria_label: 'Close', data: { dismiss: 'modal' } }
+          %span{ aria_hidden: "true" }
+            ×
+        %h4.modal-title
+          = t('.preview')
+      .modal-body
+
+
+      .modal-footer
+        %button.btn.btn-default{ type: 'button', aria_label: 'Close', data: { dismiss: 'modal' } }
+          Close

data/app/views/my_forum/shared/post_preview.js.coffee

@@ -0,0 +1,4 @@
+coffee:
+  $(document).ready ->
+    $('#modal_post_preview').find('.modal-body').html("<%= j render(html: preview_html.html_safe) %>")
+    $('#modal_post_preview').modal()

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

@@ -12,7 +12,7 @@
           %i{ class: 'fa fa-underline' }
 
       %div.btn-group
-        =link_to '#', class: 'btn btn-default btn-sm', data: { toggle: 'modal' } do
+        =link_to '#', class: 'btn btn-default btn-sm' do
           %i{ class: 'fa fa-camera-retro' }
 
       %div.btn-group.smiles
@@ -27,6 +27,8 @@
       .form-group= form.text_area :text, class: 'form-control quick-answer', id: 'quick_answer_textarea'
 
       .pull-right
+        %button#post_preview{ class: 'btn btn-primary', data: { elm_preview: 'quick_answer_textarea' }}= t('.quick_answer_preview')
         = form.submit t('.quick_answer'), class: 'btn btn-primary'
 
         = render partial: 'my_forum/shared/upload_photo', locals: { textarea: 'quick_answer_textarea' }
+        = render partial: 'my_forum/shared/post_preview'

data/config/locales/ru.yml

@@ -5,6 +5,9 @@ ru:
       sent: 'Сообщение отправленно'
     mailer:
       new_pm_notification_subject: 'Уведомление о новом личном сообщении'
+    shared:
+      post_preview:
+        preview: 'Предпросмотр сообщения'
 
     profile_popover:
       posts_count: 'Сообщений на форуме: '
@@ -94,6 +97,7 @@ ru:
         user_posts_count: "%{count} сообщений"
       quick_answer:
         quick_answer: 'Быстрый ответ'
+        quick_answer_preview: 'Предварительный просмотр'
         advanced_answer: 'Расширенный ответ'
       post:
         sent: "Отправленно: %{datetime}"

data/config/routes.rb

@@ -5,10 +5,11 @@ MyForum::Engine.routes.draw do
   match 'logout', to: 'users#logout', via: [:get]
   match 'forgot_password',  to: 'users#forgot_password',    via: [:get, :post]
 
-  match 'unread_topics',    to: 'forums#unread_topics',     via: [:get], as: :unread_topics
-  match 'mark_all_as_read', to: 'forums#mark_all_as_read',  via: [:get], as: :mark_all_as_read
+  match 'unread_topics',    to: 'forums#unread_topics',     via: [:get],    as: :unread_topics
+  match 'mark_all_as_read', to: 'forums#mark_all_as_read',  via: [:get],    as: :mark_all_as_read
 
-  match 'post/:id',         to: 'posts#show',               via: [:get], as: :post_content
+  match 'post/:id',         to: 'posts#show',               via: [:get],    as: :post_content
+  match 'post/preview',     to: 'posts#preview',            via: [:post],   as: :post_preview
 
   resources :images
   resources :avatars

data/lib/my_forum/version.rb

@@ -1,3 +1,3 @@
 module MyForum
-  VERSION = "0.0.1.beta36"
+  VERSION = "0.0.1.beta37"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: my_forum
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta36
+  version: 0.0.1.beta37
 platform: ruby
 authors:
 - Vitaly Omelchenko
@@ -242,7 +242,9 @@ files:
 - app/views/my_forum/private_messages/inbox.haml
 - app/views/my_forum/private_messages/new.haml
 - app/views/my_forum/private_messages/show.haml
+- app/views/my_forum/shared/_post_preview.haml
 - app/views/my_forum/shared/_upload_photo.haml
+- app/views/my_forum/shared/post_preview.js.coffee
 - app/views/my_forum/topics/_post.haml
 - app/views/my_forum/topics/_profile_popover.haml
 - app/views/my_forum/topics/_quick_answer.haml