my_forum 0.0.1.beta35 → 0.0.1.beta36

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (18) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/my_forum/my_forum.js.coffee +3 -0
  3. data/app/controllers/my_forum/private_messages_controller.rb +2 -0
  4. data/app/views/layouts/my_forum/application.haml +4 -2
  5. data/app/views/my_forum/private_messages/new.haml +2 -2
  6. data/config/locales/ru.yml +2 -0
  7. data/lib/my_forum/version.rb +1 -1
  8. metadata +2 -12
  9. data/app/assets/images/my_forum/smiles/acute.gif +0 -0
  10. data/app/assets/images/my_forum/smiles/aggressive.gif +0 -0
  11. data/app/assets/images/my_forum/smiles/beee.gif +0 -0
  12. data/app/assets/images/my_forum/smiles/blum2.gif +0 -0
  13. data/app/assets/images/my_forum/smiles/blush2.gif +0 -0
  14. data/app/assets/images/my_forum/smiles/cray.gif +0 -0
  15. data/app/assets/images/my_forum/smiles/dirol.gif +0 -0
  16. data/app/assets/images/my_forum/smiles/download.gif +0 -0
  17. data/app/assets/images/my_forum/smiles/i-m_so_happy.gif +0 -0
  18. data/app/assets/images/my_forum/smiles/ireful2.gif +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f1b8e2e416f1d2559dd93477707ffa0df09ed4e8
4
- data.tar.gz: 6d0e2ca16cfc453d53e9ea9ccd156eaf3ae40222
3
+ metadata.gz: cf92d8d6547f3a621835289b170e5bc65baf084d
4
+ data.tar.gz: e6bba7f81fa4dff871a4d16b1864970db5c68263
5
5
  SHA512:
6
- metadata.gz: 0f60590bf0e0d967e64e1c14f527542c3cf523f84b5b7f0c00fbd2b7d8d989ca721d2924b9614e0c4caae26fa275c8770ed8d17f6ef4336d3d14537bd5806733
7
- data.tar.gz: 22bdb4267b287511993a9791f2a408091af8cde798dc1fdc1843c9271f5a168b361d1b0462f470865bba64696ba02e7e6eadcdd102336aadc064e15a5f6d917c
6
+ metadata.gz: 665a10aad9b2e4068c6ff059ae5162f4bdc13faf590d93209680fbd5147a69a68cbe6c268ea463f67724e10153b4e8e4bbd4dca5b31324e0cbbf3c84a98dae23
7
+ data.tar.gz: 94d75e3155794dadf18736e9048ec9ef11d33e068a041716ec28a7b19a3422b11359d4a3c7a9a50477f710db706f64355da85797057f8bf59d1d201ebd054f4a
data/app/assets/javascripts/my_forum/my_forum.js.coffee CHANGED
@@ -90,6 +90,9 @@ autocomplete_popup = (autocomplete_list, object) ->
90
90
  popup_container = $("<div id='#{popup_id}'></div>")
91
91
  $(object).after(popup_container)
92
92
 
93
+ $('body').click ->
94
+ popup_container.remove()
95
+
93
96
  # Show lists
94
97
  html_list = $('<ul/>')
95
98
  $.map autocomplete_list, (item) ->
data/app/controllers/my_forum/private_messages_controller.rb CHANGED
@@ -50,6 +50,8 @@ module MyForum
50
50
 
51
51
  UserMailer.pm_notification(recipient, current_user).deliver_now if @pm.save
52
52
 
53
+ flash[:notice] = I18n.t('my_forum.pm.sent')
54
+
53
55
  redirect_to action: :index
54
56
  end
55
57
 
data/app/views/layouts/my_forum/application.haml CHANGED
@@ -9,12 +9,14 @@
9
9
  %body.container-fluid
10
10
 
11
11
  #forum_header
12
- =link_to root_path do
13
- = image_tag('lada_head.jpg')
14
12
  #guest_navbar
15
13
  = render current_user ? '/layouts/my_forum/user_navbar' : '/layouts/my_forum/guest_navbar'
16
14
 
17
15
  #body
16
+ - if flash[:notice]
17
+ .row
18
+ .alert.alert-success.text-center{ role: 'alert' }
19
+ = flash[:notice]
18
20
  .row
19
21
  .col-md-6
20
22
  #forum-navigation= draw_navigation
data/app/views/my_forum/private_messages/new.haml CHANGED
@@ -8,9 +8,9 @@
8
8
 
9
9
  = errors_for @pm
10
10
 
11
- = form_for @pm, url: private_messages_path, role: 'form' do |form|
11
+ = form_for @pm, url: private_messages_path, role: 'form', autocomplete: 'off' do |form|
12
12
  - if params[:reply]
13
- .form-group= form.text_field :recipient, value: @reply_pm.sender_login, class: 'subject form-control'
13
+ .form-group= form.text_field :recipient, value: @reply_pm.sender_login, autocomplete: 'off', class: 'subject form-control'
14
14
  .form-group= form.text_field :subject, value: @reply_pm.subject ,class: 'subject form-control', placeholder: t('.subject')
15
15
  - else
16
16
  .form-group= form.text_field :recipient, value: params[:to], class: 'subject form-control autocomplete', placeholder: t('.recipient'), data: { autocomplete_path: autocomplete_users_path }
data/config/locales/ru.yml CHANGED
@@ -1,6 +1,8 @@
1
1
  ru:
2
2
  today: "Сегодня"
3
3
  my_forum:
4
+ pm:
5
+ sent: 'Сообщение отправленно'
4
6
  mailer:
5
7
  new_pm_notification_subject: 'Уведомление о новом личном сообщении'
6
8
 
data/lib/my_forum/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module MyForum
2
- VERSION = "0.0.1.beta35"
2
+ VERSION = "0.0.1.beta36"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: my_forum
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.1.beta35
4
+ version: 0.0.1.beta36
5
5
  platform: ruby
6
6
  authors:
7
7
  - Vitaly Omelchenko
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-12-23 00:00:00.000000000 Z
11
+ date: 2015-12-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -146,16 +146,6 @@ files:
146
146
  - MIT-LICENSE
147
147
  - README.rdoc
148
148
  - Rakefile
149
- - app/assets/images/my_forum/smiles/acute.gif
150
- - app/assets/images/my_forum/smiles/aggressive.gif
151
- - app/assets/images/my_forum/smiles/beee.gif
152
- - app/assets/images/my_forum/smiles/blum2.gif
153
- - app/assets/images/my_forum/smiles/blush2.gif
154
- - app/assets/images/my_forum/smiles/cray.gif
155
- - app/assets/images/my_forum/smiles/dirol.gif
156
- - app/assets/images/my_forum/smiles/download.gif
157
- - app/assets/images/my_forum/smiles/i-m_so_happy.gif
158
- - app/assets/images/my_forum/smiles/ireful2.gif
159
149
  - app/assets/javascripts/my_forum/admin/categories.js.coffee
160
150
  - app/assets/javascripts/my_forum/admin/dashboard.js.coffee
161
151
  - app/assets/javascripts/my_forum/admin/forums.js.coffee