my_forum 0.0.1.beta25 → 0.0.1.beta26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 450d93bead2bc07e807d09fccfc7b72c2fae13a4
-  data.tar.gz: 24a6f03d45035b3644d4a666ea79c6dd12180385
+  metadata.gz: 020ff8affd1ce1d65168d750aaa61b9ae3d57428
+  data.tar.gz: 0ed70a668baca8ce0c11f49131f52d53bfa8104e
 SHA512:
-  metadata.gz: f1371af3d9a66b868d1825114ac635dfa336b63915ef8516f72a596bb5dd2360c6c954ca46e421dc7d1ccc6e619c42ed0c04e3218ccf9327d39f878ad3fcb18a
-  data.tar.gz: 06fd03606e595681df032dd2443b070bb13cfa0de08f42241de6f2a644a39f863298a457100bdd9e2c1d45d7e477b7e6a9cca87eeae380c18f9834ef63e6b5d2
+  metadata.gz: d019565ba88c7ce909f34b25bd78d2a10f10fb81ea2effb8669d1048494a3f7277439c2662ebb9654724d54ea7fdf1039bc34949d5f67bf9329eac4ba3663095
+  data.tar.gz: 07bd3b757f4fa2624a74ba343a02cbd30150ab0c5d21fb831685ddadbf850472f94e34015ac0fda42606d99246592d9c3eb72e9711d61516e7b9e4b2bbd305fb

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

@@ -1,3 +1,7 @@
+.new-pm.badge {
+  background-color: orange !important;
+}
+
 .new_pm_button {
   margin-bottom: 14px;
 }

data/app/controllers/my_forum/attachments_controller.rb

@@ -9,14 +9,19 @@ module MyForum
       # Create dir of not exists
       FileUtils::mkdir_p upload_path
 
-      uploaded_io = params[:file]
-      File.open(File.join(upload_path, uploaded_io.original_filename), 'wb') do |file|
-        file.write(uploaded_io.read)
-      end
+      attachment_ids = []
+
+      params[:files].each do |uploaded_io|
+        file_name = "#{Time.now.to_i}_#{uploaded_io.original_filename}"
+        File.open(File.join(upload_path, file_name), 'wb') do |file|
+          file.write(uploaded_io.read)
+        end
 
-      attachment = Attachment.create(user_id: current_user.id, file_name: uploaded_io.original_filename)
+        attachment = Attachment.create(user_id: current_user.id, file_name: file_name)
+        attachment_ids.push attachment.id
+      end
 
-      render json: { success: true, attachment_id: attachment.id }
+      render json: { success: true, attachments: attachment_ids }.to_json
     end
 
   end

data/app/helpers/my_forum/private_messages_helper.rb

@@ -18,7 +18,7 @@ module MyForum
     def new_private_messages_count_bage
       return unless current_user
       return if (count = new_pm_count).eql?(0)
-      content_tag(:span, count, class: 'badge')
+      content_tag(:span, count, class: 'new-pm badge')
     end
 
   end

data/app/models/my_forum/avatar.rb

@@ -1,4 +1,5 @@
 module MyForum
   class Avatar < Image
+    belongs_to :user
   end
 end

data/app/models/my_forum/user.rb

@@ -9,6 +9,8 @@ module MyForum
     has_many :user_group_links
     has_many :user_groups, through: :user_group_links
 
+    has_one :avatar
+
     scope :online, -> { where("updated_at > ?", 10.minutes.ago) }
     scope :today_visited, -> { where("updated_at > ?", Time.now.beginning_of_day) }
 

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

@@ -57,15 +57,16 @@
           = t('.add_new_photo')
       .modal-body
         = form_for MyForum::Attachment.new, url: attachments_path, multipart: true, remote: true do |f|
-          = f.file_field :file
+          = f.file_field 'file[]', multiple: true, id: 'attachment_files'
 
         #loaded-content
 
         :coffee
-          $('#attachment_file').change ->
-            file_data = $('#attachment_file').prop('files')[0]
+          $('#attachment_files').change ->
             form_data = new FormData()
-            form_data.append('file', file_data)
+
+            files_count = $('#attachment_files').prop('files').length
+            form_data.append('files[]', $('#attachment_files').prop('files')[c]) for c in [0...files_count]
 
             $.ajax({
               url: "#{attachments_path}"
@@ -77,12 +78,14 @@
               type: 'post',
               success: (data, textStatus, jqXHR) ->
                 response = $.parseJSON(data)
-                $('#quick_answer_textarea').append('[attachment=' + response.attachment_id + ']')
+                bbcode_attachments = ''
+                bbcode_attachments += ('[attachment=' + id + '] \n') for id in response.attachments
+                $('#quick_answer_textarea').append(bbcode_attachments)
+                $('#loaded-content').html('#{t('my_forum.successfull_aploaded')}')
+                $('#add_photo').modal('hide')
             })
 
 
       .modal-footer
         %button.btn.btn-default{ type: 'button', aria_label: 'Close', data: { dismiss: 'modal' } }
-          Close
-        %button.btn.btn-primary{ type: 'button' }
-          Save changes
+          Close

data/app/views/my_forum/users/edit.haml

@@ -1,12 +1,20 @@
 %h2= t('.edit_profile')
 
-.row.col-md-4
+.row
+  .col-md-4
 
-  = errors_for(current_user)
+    = errors_for(current_user)
 
-  = form_for current_user, url: user_path(current_user), role: 'form' do |form|
-    .form-group= form.text_field :email, class: 'name form-control', placeholder: t('.email')
-    .form-group= form.password_field :password, value: '', class: 'description form-control', placeholder: t('.current_password')
-    .form-group= form.text_field :new_password, value: '', class: 'description form-control', placeholder: t('.new_password')
+    = form_for current_user, url: user_path(current_user), role: 'form' do |form|
+      .form-group= form.text_field :email, class: 'name form-control', placeholder: t('.email')
+      .form-group= form.password_field :password, value: '', class: 'description form-control', placeholder: t('.current_password')
+      .form-group= form.text_field :new_password, value: '', class: 'description form-control', placeholder: t('.new_password')
 
-    = form.submit class: 'btn btn-primary btn-sm'
+      = form.submit class: 'btn btn-primary btn-sm'
+
+  .col-md-4
+    .row.col-sm-4
+      .thumbnail
+        = user_avatar(current_user)
+    .row.col-sm-4
+      upload

data/config/locales/ru.yml

@@ -7,6 +7,8 @@ ru:
     yesterday: "Вчера в %{hhmm}"
     create_new_pm: 'Написать личное сообщение'
     create_new_topic: 'Создать новую тему'
+    reply_for_pm: 'Ответить на сообщение'
+    successfull_aploaded: 'Файлы успешно загружены'
     bbquote:
       wrote: 'написал'
 

data/lib/my_forum/version.rb

@@ -1,3 +1,3 @@
 module MyForum
-  VERSION = "0.0.1.beta25"
+  VERSION = "0.0.1.beta26"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: my_forum
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta25
+  version: 0.0.1.beta26
 platform: ruby
 authors:
 - Vitaly Omelchenko