app/views/events/edit.html.haml in artfully_ose-1.0.0.rc4 vs app/views/events/edit.html.haml in artfully_ose-1.1.0.rc1

@@ -3,38 +3,39 @@
   =render :partial=>'header'
 
 .row
   .span3
     - in_sub_section :details
-    =render :partial=>'menu'
+    = render :partial=>'menu'
   .span9
     = render "shared/error_messages", :target => @event
     = form_for( @event, :html => { :class => 'form-horizontal' } ) do |form|
       .control-group
         =form.label :name, "Event name", :class => 'control-label'
         .controls
           =form.text_field :name, :class => 'input-xlarge', :placeholder=>"Event name"
           
       .control-group
-        =form.label :name, "Producer", :class => 'control-label'
+        =form.label :producer, "Producer", :class => 'control-label'
         .controls
           =form.text_field :producer, :class => 'input-xlarge'
           
       .control-group
-        =form.label :name, "Description", :class => 'control-label'
+        =form.label :description, "Description", :class => 'control-label'
         .controls
           =form.text_area :description, :class => 'input-xlarge', :rows => '6'
           
       .control-group
-        =form.label :name, "Contact email", :class => 'control-label'
+        =form.label :contact_email, "Contact email<br />for patrons".html_safe, :class => 'control-label'
         .controls
-          =form.text_field :contact_email, :class => 'input-xlarge', :placeholder=>"Email"
+          =form.email_field :contact_email, :class => 'input-xlarge email-popup', :placeholder=>"Email", "data-content" => "Your patrons will be able to respond to this email address when receiving ticket/donation receipts. You can change this at any time."
           
       .control-group
-        =form.label :name, "Contact phone", :class => 'control-label'
+        =form.label :contact_phone, "Contact phone<br />for patrons".html_safe, :class => 'control-label'
         .controls
           =form.text_field :contact_phone, :class => 'input-xlarge', :placeholder=>"Phone"
           
       .form-actions
         = form.submit "Save", :class => 'btn'
+        = form.submit "Save &amp; Next".html_safe, :class => 'btn btn-primary'