my_forum 0.0.1.beta36 → 0.0.1.beta37
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/my_forum/posts.js.coffee +20 -0
- data/app/assets/stylesheets/my_forum/application.css.scss +6 -0
- data/app/controllers/my_forum/posts_controller.rb +9 -2
- data/app/helpers/my_forum/posts_helper.rb +1 -2
- data/app/views/my_forum/shared/_post_preview.haml +15 -0
- data/app/views/my_forum/shared/post_preview.js.coffee +4 -0
- data/app/views/my_forum/topics/_quick_answer.haml +3 -1
- data/config/locales/ru.yml +4 -0
- data/config/routes.rb +4 -3
- data/lib/my_forum/version.rb +1 -1
- metadata +3 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 03b3cc40a791edfb4194434b71762812b81ef5fc
|
4
|
+
data.tar.gz: 71c82e4793168591520f86bedebabcf1d4946375
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7dfdcc7b66f9443979596df63d8d0677ff9b53d55c9197d39d91324ddace3376cce45fe726ae82227dbfef917a1a0ed3d7100cfbbc4d050a4348ac8d3d231d2a
|
7
|
+
data.tar.gz: 6e7df886f252d316a6c6ca230f1dd9508bff78f009c1c2cec57c6a20a028c6df9bfb4ae18ca65a7eda24223bec4ae7ec45df6f52ccb9dd92159f4ded1e6bb1cd
|
@@ -0,0 +1,20 @@
|
|
1
|
+
ready = ->
|
2
|
+
$('#post_preview').click (event) ->
|
3
|
+
event.preventDefault()
|
4
|
+
|
5
|
+
elm_id = $(event.target).data('elm-preview')
|
6
|
+
elm = $('#' + elm_id)
|
7
|
+
|
8
|
+
return unless elm
|
9
|
+
|
10
|
+
data = elm.val()
|
11
|
+
|
12
|
+
$.ajax
|
13
|
+
url: '/post/preview'
|
14
|
+
type: 'POST'
|
15
|
+
dataType: 'script'
|
16
|
+
data:
|
17
|
+
text: data
|
18
|
+
|
19
|
+
$(document).ready(ready)
|
20
|
+
$(document).on('page:load', ready)
|
@@ -2,8 +2,10 @@ require_dependency "my_forum/application_controller"
|
|
2
2
|
|
3
3
|
module MyForum
|
4
4
|
class PostsController < ApplicationController
|
5
|
-
before_filter :find_topic, except: [:show]
|
6
|
-
before_filter :find_forum, except: [:show]
|
5
|
+
before_filter :find_topic, except: [:show, :preview]
|
6
|
+
before_filter :find_forum, except: [:show, :preview]
|
7
|
+
|
8
|
+
include PostsHelper
|
7
9
|
|
8
10
|
def create
|
9
11
|
unless params[:post].fetch(:text).blank?
|
@@ -32,6 +34,11 @@ module MyForum
|
|
32
34
|
end
|
33
35
|
end
|
34
36
|
|
37
|
+
def preview
|
38
|
+
preview_html = ActionController::Base.helpers.sanitize format_bbcode(params[:text])
|
39
|
+
render '/my_forum/shared/post_preview.js.coffee', layout: false, locals: { preview_html: preview_html }
|
40
|
+
end
|
41
|
+
|
35
42
|
private
|
36
43
|
|
37
44
|
def process_attachments(post)
|
@@ -0,0 +1,15 @@
|
|
1
|
+
#modal_post_preview.modal.fade
|
2
|
+
.modal-dialog
|
3
|
+
.modal-content
|
4
|
+
.modal-header
|
5
|
+
%button.close{ type: 'button', aria_label: 'Close', data: { dismiss: 'modal' } }
|
6
|
+
%span{ aria_hidden: "true" }
|
7
|
+
×
|
8
|
+
%h4.modal-title
|
9
|
+
= t('.preview')
|
10
|
+
.modal-body
|
11
|
+
|
12
|
+
|
13
|
+
.modal-footer
|
14
|
+
%button.btn.btn-default{ type: 'button', aria_label: 'Close', data: { dismiss: 'modal' } }
|
15
|
+
Close
|
@@ -12,7 +12,7 @@
|
|
12
12
|
%i{ class: 'fa fa-underline' }
|
13
13
|
|
14
14
|
%div.btn-group
|
15
|
-
=link_to '#', class: 'btn btn-default btn-sm'
|
15
|
+
=link_to '#', class: 'btn btn-default btn-sm' do
|
16
16
|
%i{ class: 'fa fa-camera-retro' }
|
17
17
|
|
18
18
|
%div.btn-group.smiles
|
@@ -27,6 +27,8 @@
|
|
27
27
|
.form-group= form.text_area :text, class: 'form-control quick-answer', id: 'quick_answer_textarea'
|
28
28
|
|
29
29
|
.pull-right
|
30
|
+
%button#post_preview{ class: 'btn btn-primary', data: { elm_preview: 'quick_answer_textarea' }}= t('.quick_answer_preview')
|
30
31
|
= form.submit t('.quick_answer'), class: 'btn btn-primary'
|
31
32
|
|
32
33
|
= render partial: 'my_forum/shared/upload_photo', locals: { textarea: 'quick_answer_textarea' }
|
34
|
+
= render partial: 'my_forum/shared/post_preview'
|
data/config/locales/ru.yml
CHANGED
@@ -5,6 +5,9 @@ ru:
|
|
5
5
|
sent: 'Сообщение отправленно'
|
6
6
|
mailer:
|
7
7
|
new_pm_notification_subject: 'Уведомление о новом личном сообщении'
|
8
|
+
shared:
|
9
|
+
post_preview:
|
10
|
+
preview: 'Предпросмотр сообщения'
|
8
11
|
|
9
12
|
profile_popover:
|
10
13
|
posts_count: 'Сообщений на форуме: '
|
@@ -94,6 +97,7 @@ ru:
|
|
94
97
|
user_posts_count: "%{count} сообщений"
|
95
98
|
quick_answer:
|
96
99
|
quick_answer: 'Быстрый ответ'
|
100
|
+
quick_answer_preview: 'Предварительный просмотр'
|
97
101
|
advanced_answer: 'Расширенный ответ'
|
98
102
|
post:
|
99
103
|
sent: "Отправленно: %{datetime}"
|
data/config/routes.rb
CHANGED
@@ -5,10 +5,11 @@ MyForum::Engine.routes.draw do
|
|
5
5
|
match 'logout', to: 'users#logout', via: [:get]
|
6
6
|
match 'forgot_password', to: 'users#forgot_password', via: [:get, :post]
|
7
7
|
|
8
|
-
match 'unread_topics', to: 'forums#unread_topics', via: [:get],
|
9
|
-
match 'mark_all_as_read', to: 'forums#mark_all_as_read', via: [:get],
|
8
|
+
match 'unread_topics', to: 'forums#unread_topics', via: [:get], as: :unread_topics
|
9
|
+
match 'mark_all_as_read', to: 'forums#mark_all_as_read', via: [:get], as: :mark_all_as_read
|
10
10
|
|
11
|
-
match 'post/:id', to: 'posts#show', via: [:get],
|
11
|
+
match 'post/:id', to: 'posts#show', via: [:get], as: :post_content
|
12
|
+
match 'post/preview', to: 'posts#preview', via: [:post], as: :post_preview
|
12
13
|
|
13
14
|
resources :images
|
14
15
|
resources :avatars
|
data/lib/my_forum/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: my_forum
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.1.
|
4
|
+
version: 0.0.1.beta37
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Vitaly Omelchenko
|
@@ -242,7 +242,9 @@ files:
|
|
242
242
|
- app/views/my_forum/private_messages/inbox.haml
|
243
243
|
- app/views/my_forum/private_messages/new.haml
|
244
244
|
- app/views/my_forum/private_messages/show.haml
|
245
|
+
- app/views/my_forum/shared/_post_preview.haml
|
245
246
|
- app/views/my_forum/shared/_upload_photo.haml
|
247
|
+
- app/views/my_forum/shared/post_preview.js.coffee
|
246
248
|
- app/views/my_forum/topics/_post.haml
|
247
249
|
- app/views/my_forum/topics/_profile_popover.haml
|
248
250
|
- app/views/my_forum/topics/_quick_answer.haml
|