wheelhouse-forms 1.1 → 1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c534a2c55072660955b2bd53ec519420794a320c
+  data.tar.gz: eb1167165d71b3f5e7a5998ebccfe09b39df6519
+SHA512:
+  metadata.gz: 11fe367ca692b851a23bdc4bbc29b05b207c5c20f80c76b3bdc73d0b4028b4b048e96968e8fae3d8a915b8c12fd890fe5f46d5d86c6855458ce44292d9cf8de3
+  data.tar.gz: 4f8c98b4920bf81e20c6676861303299731d43c3926b189fd894c5cf7c523aa8d17749a9dfbc783ec652685986a10843b552e9d039d5f00d74504049d52802ba

data/app/assets/javascripts/wheelhouse-forms/designer.js

@@ -6,6 +6,12 @@ $(function() {
 var root = $('#fields');
 var target;
 
+var nextId = 0;
+function uniqueId() {
+  ++nextId;
+  return "content-" + nextId;
+}
+
 function resetTarget() {
   target = $('.fields:last', root);
   if (target.length < 1) target = root;
@@ -22,6 +28,7 @@ function insertFieldHandler(template, optionize, callback) {
     var field = $(template).tmpl({ index: nextIndex, prefix: prefixFor(target, nextIndex) });
 
     field.appendTo(target);
+    $.scrollTo(field, { duration: 300 });
     $('input[placeholder]', field).placeholder().click();
     
     if (optionize) { $('ul.options', field).options(); }
@@ -41,14 +48,18 @@ $('.tools li.radio-buttons a').click(insertFieldHandler("#radio-buttons-template
 $('.tools li.states-dropdown a').click(insertFieldHandler("#states-dropdown-template"));
 $('.tools li.countries-dropdown a').click(insertFieldHandler("#countries-dropdown-template"));
 $('.tools li.content-field a').click(insertFieldHandler("#content-field-template", false, function(field) {
-  $('textarea.editor', field).editor();
+  var textarea = $('textarea.editor', field);
+  textarea.attr('id', uniqueId());
+  textarea.editor();
 }));
 $('.tools li.custom-field a').click(insertFieldHandler("#custom-field-template"));
 
 $('.tools li.field-set a').click(function() {
   var nextIndex = parseInt($('#fields > :last-child').attr('data-index')) + 1 || 0;
   var fieldset = $('#field-set-template').tmpl({ index: nextIndex, prefix: prefixFor(root, nextIndex) });
+  
   fieldset.appendTo(root);
+  $.scrollTo(fieldset, { duration: 300 });
   
   target = $('.fields', fieldset);
   target.sortable(SortableOptions);
@@ -72,41 +83,39 @@ root.delegate('a.delete', 'click', function() {
   return false;
 });
 
+function replacePrefix(input, prefix) {
+  var name = $(input).attr('name').replace(/.*(\[[^\[\]]+\](\[\])?)$/, "$1");
+  $(input).attr('name', prefix + name);
+}
 
-function refreshFields() {
-  function replacePrefix(input, prefix) {
-    var name = $(input).attr('name').replace(/.*(\[[^\[\]]+\](\[\])?)$/, "$1");
-    $(input).attr('name', prefix + name);
-  }
+function updateFieldPrefixes(root) {
+  var children = $('> div', root);
   
-  $('#fields > div').each(function(index) {
-    var prefix = $('#fields').attr("data-prefix") + "[" + index + "]";
-    $(this).attr('data-index', index);
+  children.each(function(index) {
+    var field = $(this);
+    field.attr('data-index', index);
+    
+    var prefix = prefixFor(root, index);
     
-    $('input:not(.fields input), textarea:not(.fields textarea), select:not(.fields select)', this).each(function() {
+    $('input, textarea, select', field).each(function() {
       replacePrefix(this, prefix);
     });
-    $('> .fields', this).attr('data-prefix', prefix + "[fields]");
-  });
-  
-  $('.fields').each(function() {
-    var fieldsPrefix = $(this).attr('data-prefix');
     
-    $('> div', this).each(function(index) {
-      var prefix = fieldsPrefix + "[" + index + "]";
-      $(this).attr('data-index', index);
-      
-      $('input, textarea, select', this).each(function() { replacePrefix(this, prefix); });
-    });
+    var subfields = $('> .fields', field);
+    subfields.attr('data-prefix', prefix + "[fields]");
+    updateFieldPrefixes(subfields)
   });
 }
 
+function refreshFields() {
+  updateFieldPrefixes(root);
+}
+
 var BaseSortableOptions = {
   items:       '> div',
   handle:      '> .drag',
   placeholder: 'drag-placeholder',
   tolerance:   'intersect',
-  toleranceElement: '> .drag-area',
   connectWith: '.fields',
   forcePlaceholderSize: true,
   start: function(e, ui) {
@@ -122,4 +131,21 @@ var SortableOptions = $.extend({}, BaseSortableOptions, { connectWith: '#fields,
 $('#fields').sortable(BaseSortableOptions); // Top-level
 $('.fields').sortable(SortableOptions);     // Fieldsets
 
+$('input:checkbox[data-disable]').on('toggled', function() {
+  var selector = $(this).attr('data-disable');
+  var target = $(selector);
+  
+  if ($(this).is(':checked')) {
+    target.removeClass('disabled')
+    target.find('input, textarea').removeClass('disabled').removeAttr('disabled');
+  } else {
+    target.addClass('disabled');
+    target.find('input, textarea').addClass('disabled').attr('disabled', 'disabled');
+  }
+}).click(function() {
+  $(this).trigger('toggled');
+}).each(function() {
+  $(this).trigger('toggled');
+});
+
 });

data/app/assets/stylesheets/wheelhouse-forms/_fields.css.sass

@@ -0,0 +1,172 @@
+.drag-area
+  padding: 6px 6px 6px 38px
+  margin-left: -32px
+  
+  .field-set > &
+    margin-left: -14px
+    padding-bottom: 0
+    padding-left: 20px
+
+.field
+  li
+    margin-bottom: 0.2em
+
+.fields
+  label
+    display: inline
+    
+  input[type=text]
+    width: 40%
+    display: inline
+
+  select
+    margin: 0.4em 0
+    padding: 0.5% 0.2% 0.2% 0.2%
+    font-size: 110%
+
+  input, select
+    font-size: 100%
+    
+    &.placeholder
+      color: #ccc
+  
+  label
+    color: #545454
+    font-weight: bold
+    margin-right: 0.5em
+    
+    &.required
+      float: right
+      margin: 0.5em 0
+      margin-right: 10%
+      font-weight: normal
+      font-size: 95%
+      
+      input
+        margin-right: 4px
+  
+  span.note
+    font-size: 95%
+    color: #a9a9a9
+  
+  .field-set
+    @extend %field
+    background: #fdfefe
+    border: 1px solid #ccc
+    padding-left: 14px
+    
+    .placeholder, .text-field, .text-area, .select-field, .checkbox, .submit-button, .states-dropdown, .countries-dropdown, .radio-buttons, .checkboxes, .custom-field, .content-field
+      margin-left: 0
+      margin-right: 0
+    
+    .fields
+      margin-right: 5px
+    
+  .text-field, .text-area, .select-field, .checkbox, .submit-button, .states-dropdown, .countries-dropdown, .radio-buttons, .checkboxes, .custom-field, .content-field
+    @extend %field
+    min-height: 26px
+    
+    input[type=text]
+      width: 47%
+      
+    select
+      display: inline
+      width: 17%
+      margin-left: 2%
+    
+    .drag
+      width: 24px
+    
+    a.delete
+      top: 12px
+      right: 8px
+  
+  .text-field, .text-area, .content-field
+    +blue
+  
+  .checkbox, .radio-buttons, .checkboxes
+    +orange
+  
+  .select-field, .states-dropdown, .countries-dropdown
+    +green
+  
+  .submit-button, .custom-field
+    +purple
+  
+  .drag-placeholder
+    @extend %field
+    border: 1px dashed #ccc
+    padding: 0
+  
+  .content-field
+    a.delete
+      top: 14px
+      right: 14px
+    
+  .field-set .content-field
+    a.delete
+      right: 12px
+  
+  .custom-field
+    input[type=text]
+      width: 40%
+  
+  ul.options
+    line-height: 2.6em
+    min-height: 2em
+    margin-top: 0.5em
+    
+    li
+      display: inline
+      margin-right: 5px
+    
+      input[type=text]
+        width: auto
+        min-width: 8em
+  
+  .drag
+    position: absolute
+    top: 0
+    left: 0
+    cursor: move
+    width: 7px
+    height: 100%
+    background: image-url("wheelhouse/backgrounds/drag.png") repeat
+    border-right: 1px solid #dfdfdf
+    +border-left-radius(4px)
+    
+    img
+      margin: 12px 4px
+  
+  .fields
+    min-height: 100px
+  
+  a.delete
+    position: absolute
+    right: 14px
+    top: 16px
+    z-index: 99
+    width: 16px
+    height: 16px
+    background: image-url("wheelhouse/icons/delete-item.png") no-repeat
+    text-indent: -9999px
+    opacity: 0.5
+    
+    &:hover
+      opacity: 1.0
+  
+  .field-set a.delete
+    top: 12px
+
+.field.title
+  label
+    font-size: 115%
+    font-weight: bold
+    
+.shaded.disabled
+  color: #999
+  border-color: #e7e7e7
+  
+  input, textarea
+    color: #999
+  

data/app/assets/stylesheets/wheelhouse-forms/_mixins.css.sass

@@ -0,0 +1,28 @@
+%field
+  position: relative
+  margin: 10px 0
+  padding: 0 0 0 32px
+  +border-radius(4px)
+
+=colored-field( $background, $border, $text )
+  background: $background
+  border: 1px solid $border
+  
+  label
+    color: $text
+  
+  .drag
+    border-right: 1px solid $border
+
+=blue
+  +colored-field(#f3f7fa, #cbd4da, #76828a)
+
+=green
+  +colored-field(#f3f8f4, #d3dbd2, #748572)
+
+=orange
+  +colored-field(#faf8f0, #e1ddc8, #8c8977)
+
+=purple
+  +colored-field(#fdfafd, #e3d2e3, #987898)
+  

data/app/assets/stylesheets/wheelhouse-forms/_sidebar.css.sass

@@ -0,0 +1,16 @@
+.sidebar
+  a.spam-submissions
+    background-image: image-url("wheelhouse-forms/spam-small.png")
+    padding-left: 40px
+  
+  a.latest-submissions
+    background-image: image-url("wheelhouse-forms/submissions.png")
+    padding-left: 40px
+    
+  a.export-csv
+    background-image: image-url("wheelhouse-forms/csv.png")
+    padding-left: 40px
+  
+  button.mark-spam, button.not-spam
+    width: 222px
+    

data/app/assets/stylesheets/wheelhouse-forms/_submissions.css.sass

@@ -0,0 +1,8 @@
+.shaded
+  h2
+    border-bottom: 1px solid #ddd
+    padding-bottom: 5px
+    margin-right: 6%
+  
+  .inline input
+    margin-right: 1em

data/app/assets/stylesheets/wheelhouse-forms/_tools.css.sass

@@ -0,0 +1,44 @@
+.tools li
+  a
+    padding-left: 45px
+    background-position: 17px center
+    
+    &:hover
+      background-color: #d3dadf
+
+  &.text-field a
+    background-image: image-url("wheelhouse-forms/text-field.png")
+
+  &.text-area a
+    background-image: image-url("wheelhouse-forms/text-area.png")
+  
+  &.select-field a
+    background-image: image-url("wheelhouse-forms/select.png")
+  
+  &.checkbox a
+    background-image: image-url("wheelhouse-forms/checkbox.png")
+  
+  &.checkboxes a
+    background-image: image-url("wheelhouse-forms/checkboxes.png")
+
+  &.radio-buttons a
+    background-image: image-url("wheelhouse-forms/radio-buttons.png")
+  
+  &.field-set a
+    background-image: image-url("wheelhouse-forms/field-set.png")
+  
+  &.submit-button a
+    background-image: image-url("wheelhouse-forms/submit-button.png")
+  
+  &.states-dropdown a
+    background-image: image-url("wheelhouse-forms/states.png")
+  
+  &.countries-dropdown a
+    background-image: image-url("wheelhouse-forms/countries.png")
+    
+  &.content-field a
+    background-image: image-url("wheelhouse-forms/content.png")
+    
+  &.custom-field a
+    background-image: image-url("wheelhouse-forms/custom.png")
+    

data/app/assets/stylesheets/wheelhouse-forms/admin.css.sass

@@ -1,256 +1,7 @@
 @import compass
 
-=field
-  position: relative
-  margin: 10px 0
-  padding: 0 0 0 32px
-  +border-radius(4px)
-
-=colored-field( $background, $border, $text )
-  background: $background
-  border: 1px solid $border
-  
-  label
-    color: $text
-  
-  .drag
-    border-right: 1px solid $border
-
-=blue
-  +colored-field(#f3f7fa, #cbd4da, #76828a)
-
-=green
-  +colored-field(#f3f8f4, #d3dbd2, #748572)
-
-=orange
-  +colored-field(#faf8f0, #e1ddc8, #8c8977)
-
-=purple
-  +colored-field(#fdfafd, #e3d2e3, #987898)
-
-.drag-area
-  padding: 6px
-  margin-left: -32px
-  padding-left: 38px
-  
-  .field-set > &
-    margin-left: -14px
-    padding-left: 20px
-
-#fields
-  label
-    display: inline
-    
-  input[type=text]
-    width: 40%
-    display: inline
-
-  select
-    margin: 0.4em 0
-    padding: 0.5% 0.2% 0.2% 0.2%
-    font-size: 110%
-
-  input, select
-    font-size: 100%
-    
-    &.placeholder
-      color: #ccc
-  
-  label
-    color: #545454
-    font-weight: bold
-    margin-right: 0.5em
-    
-    &.required
-      float: right
-      margin: 0.5em 0
-      margin-right: 10%
-      font-weight: normal
-      font-size: 95%
-      
-      input
-        margin-right: 4px
-  
-  span.note
-    font-size: 95%
-    color: #a9a9a9
-  
-  .field-set
-    +field
-    background: #fdfefe
-    border: 1px solid #ccc
-    padding-left: 14px
-    
-    .placeholder, .text-field, .text-area, .select-field, .checkbox, .submit-button, .states-dropdown, .countries-dropdown, .radio-buttons, .checkboxes, .custom-field, .content-field
-      margin-left: 0
-      margin-right: 0
-    
-    .fields
-      margin-right: 5px
-    
-  .text-field, .text-area, .select-field, .checkbox, .submit-button, .states-dropdown, .countries-dropdown, .radio-buttons, .checkboxes, .custom-field, .content-field
-    +field
-    min-height: 26px
-    
-    input[type=text]
-      width: 47%
-      
-    select
-      display: inline
-      width: 17%
-      margin-left: 2%
-    
-    .drag
-      width: 24px
-    
-    a.delete
-      top: 12px
-      right: 8px
-  
-  .text-field, .text-area, .content-field
-    +blue
-  
-  .checkbox, .radio-buttons, .checkboxes
-    +orange
-  
-  .select-field, .states-dropdown, .countries-dropdown
-    +green
-  
-  .submit-button, .custom-field
-    +purple
-  
-  .drag-placeholder
-    +field
-    border: 1px dashed #ccc
-    padding: 6px 6px 6px 38px
-  
-  .content-field
-    a.delete
-      top: 14px
-      right: 14px
-    
-  .field-set .content-field
-    a.delete
-      right: 12px
-  
-  .custom-field
-    input[type=text]
-      width: 40%
-  
-  ul.options
-    line-height: 2.6em
-    min-height: 2em
-    margin-top: 0.5em
-    
-    li
-      display: inline
-      margin-right: 5px
-    
-      input[type=text]
-        width: auto
-        min-width: 8em
-  
-  .drag
-    position: absolute
-    top: 0
-    left: 0
-    cursor: move
-    width: 7px
-    height: 100%
-    background: image-url("wheelhouse/backgrounds/drag.png") repeat
-    border-right: 1px solid #dfdfdf
-    +border-left-radius(4px)
-    
-    img
-      margin: 12px 4px
-  
-  .fields
-    min-height: 100px
-  
-  a.delete
-    position: absolute
-    right: 14px
-    top: 16px
-    z-index: 99
-    width: 16px
-    height: 16px
-    background: image-url("wheelhouse/icons/delete-item.png") no-repeat
-    text-indent: -9999px
-    opacity: 0.5
-    
-    &:hover
-      opacity: 1.0
-
-.tools li
-  a
-    padding-left: 45px
-    background-position: 17px center
-    
-    &:hover
-      background-color: #d3dadf
-
-  &.text-field a
-    background-image: image-url("wheelhouse-forms/text-field.png")
-
-  &.text-area a
-    background-image: image-url("wheelhouse-forms/text-area.png")
-  
-  &.select-field a
-    background-image: image-url("wheelhouse-forms/select.png")
-  
-  &.checkbox a
-    background-image: image-url("wheelhouse-forms/checkbox.png")
-  
-  &.checkboxes a
-    background-image: image-url("wheelhouse-forms/checkboxes.png")
-
-  &.radio-buttons a
-    background-image: image-url("wheelhouse-forms/radio-buttons.png")
-  
-  &.field-set a
-    background-image: image-url("wheelhouse-forms/field-set.png")
-  
-  &.submit-button a
-    background-image: image-url("wheelhouse-forms/submit-button.png")
-  
-  &.states-dropdown a
-    background-image: image-url("wheelhouse-forms/states.png")
-  
-  &.countries-dropdown a
-    background-image: image-url("wheelhouse-forms/countries.png")
-    
-  &.content-field a
-    background-image: image-url("wheelhouse-forms/content.png")
-    
-  &.custom-field a
-    background-image: image-url("wheelhouse-forms/custom.png")
-
-.sidebar
-  a.spam-submissions
-    background-image: image-url("wheelhouse-forms/spam-small.png")
-    padding-left: 40px
-  
-  a.latest-submissions
-    background-image: image-url("wheelhouse-forms/submissions.png")
-    padding-left: 40px
-    
-  a.export-csv
-    background-image: image-url("wheelhouse-forms/csv.png")
-    padding-left: 40px
-  
-  button.mark-spam, button.not-spam
-    width: 222px
-
-.field
-  li
-    margin-bottom: 0.2em
-
-.shaded
-  h2
-    border-bottom: 1px solid #ddd
-    padding-bottom: 5px
-    margin-right: 6%
-  
-  .inline input
-    margin-right: 1em
-    
+@import mixins
+@import fields
+@import tools
+@import sidebar
+@import submissions

data/app/helpers/forms/forms_helper.rb

@@ -1,5 +1,13 @@
 module Forms::FormsHelper
   class FormBuilder < ActionView::Helpers::FormBuilder
+    def initialize(field, prefix, template)
+      if ActionPack::VERSION::STRING >= "4.0.0"
+        super(prefix, field, template, {})
+      else
+        super(prefix, field, template, {}, nil)
+      end
+    end
+    
     def required_field_checkbox
       @template.content_tag(:label, :class => "required") do
         check_box(:required, :id => nil) + " This field is required"
@@ -8,13 +16,12 @@ module Forms::FormsHelper
   end
   
   def form_field(field, options={}, &block)
-    builder = FormBuilder.new(options[:prefix], field, self, {}, block)
-    icon = options[:icon] || field.class.model_name.demodulize.underscore.dasherize
+    builder = FormBuilder.new(field, options[:prefix], self)
     
     content_tag(:div, :class => options[:class], :data => { :index => options[:index] }) do
       concat builder.hidden_field(:type, :value => field.type.demodulize, :id => nil)
       
-      concat content_tag(:div, image_tag("wheelhouse-forms/#{icon}.png", :alt => field.class.model_name.human, :title => field.class.model_name.human), :class => "drag")
+      concat content_tag(:div, form_field_icon(field, options), :class => "drag")
       
       concat content_tag(:div, capture(builder, &block), :class => "drag-area")
       
@@ -33,4 +40,10 @@ module Forms::FormsHelper
       render :partial => klass.partial, :object => klass.new, :locals => { :index => "${index}", :prefix => "${prefix}" }
     end
   end
+  
+  def form_field_icon(field, options)
+    model_name = field.class.model_name
+    icon = options[:icon] || model_name.to_s.demodulize.underscore.dasherize
+    image_tag("wheelhouse-forms/#{icon}.png", :alt => model_name.human, :title => model_name.human)
+  end
 end

data/app/mailers/forms/mailer.rb

@@ -4,8 +4,15 @@ class Forms::Mailer < ActionMailer::Base
   def submission(form, submission)
     @form, @submission = form, submission
     
-    mail(:from => "no-reply@#{form.site.domain}",
-         :to => form.recipients,
+    mail(:from    => form.email_sender,
+         :to      => form.recipients,
          :subject => form.subject)
   end
+  
+  def confirmation(form, submission)
+    mail(:from    => form.email_sender,
+         :to      => submission.email,
+         :subject => form.confirmation_email_subject,
+         :body    => form.confirmation_email_body)
+  end
 end

data/app/models/forms/form.rb

@@ -7,9 +7,15 @@ class Forms::Form < Wheelhouse::Resource
   
   property :title, String, :required => true, :translate => true
   property :fields, FieldCollection, :default => [Forms::Fields::FieldSet.new]
+  
+  property :submission_notification, Boolean, :default => true
   property :recipients, MongoModel::Collection[String]
   property :subject, String, :default => "Form Submission"
   
+  property :confirmation_email, Boolean, :default => false
+  property :confirmation_email_subject, String
+  property :confirmation_email_body, String
+  
   validates_associated :fields
   
   has_many :submissions, :class => "Forms::Submission"
@@ -41,8 +47,13 @@ class Forms::Form < Wheelhouse::Resource
     end
   end
   
+  def email_sender
+    "noreply@#{site.domain}"
+  end
+  
   def deliver(submission)
-    Forms::Mailer.submission(self, submission).deliver unless recipients.empty?
+    Forms::Mailer.submission(self, submission).deliver if deliver_submission_notification?
+    Forms::Mailer.confirmation(self, submission).deliver if deliver_confirmation_email?(submission)
   rescue
     # Mail delivery failed
   end
@@ -63,4 +74,13 @@ class Forms::Form < Wheelhouse::Resource
   def handler
     Forms::FormHandler
   end
+
+protected
+  def deliver_submission_notification?
+    submission_notification? && recipients.any?
+  end
+  
+  def deliver_confirmation_email?(submission)
+    confirmation_email? && submission.email.present?
+  end
 end

data/app/models/forms/submission.rb

@@ -21,6 +21,10 @@ class Forms::Submission < Wheelhouse::BasicResource
     end
   end
   
+  def email
+    params.find { |label, value| label =~ /e-?mail/i }.last
+  end
+  
   def spam!(is_spam)
     Forms::Plugin.config.wheelhouse.forms.spam_filter.train(self, is_spam)
     update_attribute(:spam, is_spam)

data/app/renderers/forms/checkbox_renderer.rb

@@ -1,7 +1,7 @@
 class Forms::CheckboxRenderer < Forms::FieldRenderer
   def render
     super do
-      label_tag { check_box_tag(name, "Yes", value, html_options) + " " + field.label }
+      label_tag { check_box_tag(name, "Yes", value, html_options) + " " + label }
     end
   end
 end

data/app/renderers/forms/checkboxes_renderer.rb

@@ -12,7 +12,7 @@ protected
 
   def checkbox(option)
     content_tag(:label, :class => "option #{option.parameterize}") do
-      check_box_tag("#{name}[]", option, (value || []).include?(option), :id => nil) + " " + option
+      check_box_tag("#{name}[]", option, (value || []).include?(option), :id => nil) + " " + option.html_safe
     end
   end
 end

data/app/renderers/forms/field_renderer.rb

@@ -25,6 +25,10 @@ protected
     field.label
   end
   
+  def label
+    field.label.html_safe
+  end
+  
   def field_class
     field.class.partial.dasherize
   end

data/app/renderers/forms/field_set_renderer.rb

@@ -2,7 +2,7 @@ class Forms::FieldSetRenderer < Forms::FieldRenderer
   def render
     content_tag(:fieldset, :class => field.legend? ? field.legend.parameterize : '') do
       ActiveSupport::SafeBuffer.new.tap do |result|
-        result << content_tag(:legend, field.legend) if field.legend?
+        result << content_tag(:legend, field.legend.html_safe) if field.legend?
         result << field.fields.render(submission, template)
       end
     end

data/app/renderers/forms/labelled_field_renderer.rb

@@ -2,7 +2,7 @@ module Forms::LabelledFieldRenderer
   def render
     super do
       result = ActiveSupport::SafeBuffer.new
-      result << label_tag(name, field.label.html_safe) if field.label?
+      result << label_tag(name, label) if field.label?
       result << yield if block_given?
       result
     end

data/app/renderers/forms/radio_buttons_renderer.rb

@@ -12,7 +12,7 @@ protected
 
   def radio_button(option)
     content_tag(:label, :class => "option #{option.parameterize}") do
-      radio_button_tag(name, option, value == option, :id => nil) + " " + option
+      radio_button_tag(name, option, value == option, :id => nil) + " " + option.html_safe
     end
   end
 end

data/app/renderers/forms/select_field_renderer.rb

@@ -6,4 +6,9 @@ class Forms::SelectFieldRenderer < Forms::FieldRenderer
   def render
     super { select_tag(name, options_for_select(field.options, value), html_options) }
   end
+  
+protected
+  def html_options
+    super.merge(:include_blank => true)
+  end
 end

data/app/renderers/forms/submit_button_renderer.rb

@@ -1,5 +1,5 @@
 class Forms::SubmitButtonRenderer < Forms::FieldRenderer
   def render
-    content_tag(:div, submit_tag(field.label), :class => "field submit")
+    content_tag(:div, submit_tag(label), :class => "field submit")
   end
 end

data/app/views/forms/forms/_field_set.haml

@@ -9,8 +9,8 @@
   
     %span.note (leave blank for none)
 
-  .fields{ "data-prefix" => "form[fields][#{index}][fields]" }
-    = render_fields(field_set.fields, "form[fields][#{index}][fields]")
+  .fields{ "data-prefix" => "#{prefix}[fields]" }
+    = render_fields(field_set.fields, "#{prefix}[fields]")
   
   = link_to "Delete", '#', :class => 'delete'
   

data/app/views/forms/forms/designer.haml

@@ -1,5 +1,5 @@
 - tab :fields do
-  #fields{ "data-prefix" => "form[fields]" }
+  #fields.fields{ "data-prefix" => "form[fields]" }
     = render_fields(@form.fields, "form[fields]")
   
   = field_template "field-set-template", Forms::Fields::FieldSet
@@ -23,12 +23,27 @@
   = content
 
 - tab :email do
-  = field :recipients do
-    = form.text_field :recipients, :value => @form.recipients.join(', ')
-    = note "Separate email addresses with commas."
+  = field :submission_notification, :label => false, :class => "title" do
+    = form.check_box :submission_notification, :label => "Submission Notification", :data => { :disable => "#submission-notification-options" }
   
-  = field :subject do
-    = form.text_field :subject
+  #submission-notification-options.shaded
+    = field :recipients do
+      = form.text_field :recipients, :value => @form.recipients.join(', ')
+      = note "Separate email addresses with commas."
+  
+    = field :subject do
+      = form.text_field :subject
+  
+  = field :confirmation_email, :label => false, :class => "title" do
+    = form.check_box :confirmation_email, :label => "Confirmation Email", :data => { :disable => "#confirmation-email-options" }
+    = note "Confirmation emails will be sent to the first form field with a label containing \"email\"."
+    
+  #confirmation-email-options.shaded
+    = field :confirmation_email_subject do
+      = form.text_field :confirmation_email_subject
+    
+    = field :confirmation_email_body do
+      = form.text_area :confirmation_email_body, :rows => 20
 
 - sidebar do
   = render "wheelhouse/admin/resource/default_sidebar"

data/config/locales/en.yml

@@ -4,4 +4,6 @@ en:
       form:
         title: Form Title
         content: Form Content
+        confirmation_email_subject: Confirmation Email Subject
+        confirmation_email_body: Confirmation Email Body
         

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: wheelhouse-forms
 version: !ruby/object:Gem::Version
-  version: '1.1'
-  prerelease: 
+  version: '1.2'
 platform: ruby
 authors:
 - Sam Pohlenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wheelhouse
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 description: Integrates forms into your Wheelhouse CMS site.
@@ -33,6 +30,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
 - app/assets/images/wheelhouse-forms/checkbox.png
 - app/assets/images/wheelhouse-forms/checkboxes.png
 - app/assets/images/wheelhouse-forms/content.png
@@ -57,6 +56,11 @@ files:
 - app/assets/javascripts/wheelhouse-forms/jquery.autogrow.js
 - app/assets/javascripts/wheelhouse-forms/jquery.options.js
 - app/assets/javascripts/wheelhouse-forms/submissions.js
+- app/assets/stylesheets/wheelhouse-forms/_fields.css.sass
+- app/assets/stylesheets/wheelhouse-forms/_mixins.css.sass
+- app/assets/stylesheets/wheelhouse-forms/_sidebar.css.sass
+- app/assets/stylesheets/wheelhouse-forms/_submissions.css.sass
+- app/assets/stylesheets/wheelhouse-forms/_tools.css.sass
 - app/assets/stylesheets/wheelhouse-forms/admin.css.sass
 - app/controllers/forms/forms_controller.rb
 - app/controllers/forms/submissions_controller.rb
@@ -82,8 +86,8 @@ files:
 - app/models/forms/fields/text_area.rb
 - app/models/forms/fields/text_field.rb
 - app/models/forms/form.rb
-- app/models/forms/submission/parameters.rb
 - app/models/forms/submission.rb
+- app/models/forms/submission/parameters.rb
 - app/renderers/forms/checkbox_renderer.rb
 - app/renderers/forms/checkboxes_renderer.rb
 - app/renderers/forms/content_field_renderer.rb
@@ -98,9 +102,9 @@ files:
 - app/renderers/forms/submit_button_renderer.rb
 - app/renderers/forms/text_area_renderer.rb
 - app/renderers/forms/text_field_renderer.rb
-- app/templates/form/submission.html.haml
 - app/templates/form.html.haml
 - app/templates/form.xhr.haml
+- app/templates/form/submission.html.haml
 - app/views/forms/forms/_checkbox.haml
 - app/views/forms/forms/_checkboxes.haml
 - app/views/forms/forms/_content_field.haml
@@ -130,30 +134,27 @@ files:
 - lib/forms/csv_exporter.rb
 - lib/forms/null_filter.rb
 - lib/wheelhouse-forms.rb
-- README.md
-- LICENSE
 homepage: https://www.wheelhousecms.com
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Wheelhouse CMS Forms Plugin
 test_files: []