0
@@ -68,11 +68,12 @@
0
       end
0
       respond_to do |format|
0
         @message = messages.first
0
-        if  @message.save
0
+        if !preview? and @message.save
0
           messages.each { |m| m.save }
0
           flash[:success] = 'Message sent to everyone!'
0
           format.html { redirect_to messages_url }
0
         else
0
+          @preview = @message.content if preview?
0
           format.html { render :action => "new" }
0
         end
0
       end
0
0
@@ -81,10 +82,11 @@
0
                                                     :recipient => @recipient))
0
     
0
       respond_to do |format|
0
-        if  @message.save
0
+        if !preview? and @message.save
0
           flash[:success] = 'Message sent!'
0
           format.html { redirect_to messages_url }
0
         else
0
+          @preview = @message.content if preview?
0
           format.html { render :action => "new" }
0
         end
0
       end
0
@@ -156,5 +158,10 @@
0
     def not_current_person(message)
0
       message.sender == current_person ? message.recipient : message.sender
0
     end
0
+
0
+    def preview?
0
+      params["commit"] == "Preview"
0
+    end
0
+
0
 end

0
@@ -86,11 +86,11 @@
0
     respond_to do |format|
0
       case params[:type]
0
       when 'info_edit'
0
-        if @person.update_attributes(params[:person]) and !preview?
0
+        if !preview? and @person.update_attributes(params[:person])
0
           flash[:success] = 'Profile updated!'
0
           format.html { redirect_to(@person) }
0
         else
0
-          @preview = @person.description
0
+          @preview = @person.description if preview?
0
           format.html { render :action => "edit" }
0
         end
0
       when 'password_edit'

0
@@ -6,6 +6,11 @@
0
 
0
   <%= error_messages_for :message %>
0
   
0
+  <%- unless @preview.nil? -%>
0
+    <h3>Message preview</h3>
0
+    <%= display @preview %>
0
+  <%- end -%>
0
+  
0
   <%= image_link @recipient, :image => :thumbnail %>
0
 
0
   <% form_for(:message,
0
@@ -34,6 +39,7 @@
0
     </div>
0
     <div class="form_row">
0
       <%= f.submit "Send!", :class => "button", :id => "message_submit" %>
0
+      <%= f.submit "Preview", :class => "button", :id => "preview" %>
0
       <%= f.submit "Cancel", :class => "button", :id => "cancel" %>
0
       <%- if current_person?(@recipient) and current_person.admin? -%>
0
         <%= f.submit "Send to all", :class => "button", :id => "all_people" %>