moved signature to body

app/controllers/replies_controller.rb

@@ -39,12 +39,8 @@ def create
     authorize! :create, @reply
 
     if @reply.save && @reply.notify do |reply|
-        if current_user.agent?
-          TicketMailer.reply(reply)
-        else
-          TicketMailer.notify_agents(reply.ticket, reply)
-        end
-      end
+      NotificationMailer.new_reply(current_user, reply)
+    end
       redirect_to @reply.ticket, notice: I18n::translate(:reply_added)
     else
       render action: 'new'

app/controllers/tickets_controller.rb

@@ -34,7 +34,7 @@ def allow_cors
   def show
     @agents = User.agents
 
-    @reply = @ticket.replies.new
+    @reply = @ticket.replies.new content: '<br /><br />' + current_user.signature.to_s
     @reply.to = @ticket.user.email
 
     @labeling = Labeling.new(labelable: @ticket)
@@ -107,8 +107,16 @@ def update
   end
 
   def new
+    unless current_user.blank?
+      signature = { content: '<br /><br />' + current_user.signature.to_s }
+    else
+      signature = {}
+    end
+
     unless params[:ticket].nil? # prefill params given?
-      @ticket = Ticket.new(ticket_params)
+      @ticket = Ticket.new(signature.merge(ticket_params))
+    else
+      @ticket = Ticket.new(signature)
     end
 
     unless current_user.nil?
@@ -122,7 +130,7 @@ def create
         @ticket = Ticket.new(ticket_params)
 
         if @ticket.save
-          TicketMailer.notify_agents(@ticket, @ticket).deliver
+          NotificationMailer.new_ticket(current_user, @ticket).deliver
 
           if current_user.nil?
             return render text: I18n::translate(:ticket_added)

app/models/reply.rb

@@ -32,8 +32,6 @@ class Reply < ActiveRecord::Base
   }
 
   def notify
-    self.content += '<br /><br />' + self.user.signature.to_s
-
     mail = yield(self)
 
     mail.deliver

app/views/replies/_form.html.erb

@@ -31,7 +31,6 @@
     <% end %>
 
     <%= r.text_area :content, label: false, class: 'tinymce' %>
-    <%= current_user.signature.to_s.html_safe %>
 
     <%= label_tag 'attachment[]', t(:attach_files) %>
     <%= file_field_tag 'attachment[]', multiple: true, label: false %>

app/views/tickets/_form.html.erb

@@ -8,7 +8,6 @@
     <%= f.text_field :subject %>
 
     <%= f.text_area :content, class: 'tinymce' %>
-    <%= current_user.signature.to_s.html_safe unless current_user.nil? %>
 
   </div>
   <p>