surveyor 0.18.2 → 0.19.0

data/.gitignore

@@ -22,4 +22,5 @@ pkg
 testbed/log/*.log
 testbed/db/*
 testbed/.bundle
-surveys/fixtures/*.yml
+testbed/*
+surveys/fixtures/*.yml

data/CHANGELOG

@@ -1,3 +1,15 @@
+0.19.0
+
+* reload to correctly calculate dependencies
+* date picker. closes #58
+* hide section menu for fewer than three sections
+* cleaning up features from merge
+* correcing spec to reject blank radio responses. fixing response set spec
+* modifications for repeaters and response groups
+* merge formtastic
+* default value for pick none answers. closes #103.
+* view changes and updates.
+
 0.18.2
 
 * redcap text and string answers. closes #99

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gem.authors = ["Brian Chamberlain", "Mark Yoon"]
     gem.add_dependency 'haml'
     gem.add_dependency 'fastercsv'
+    gem.add_dependency 'formtastic'
     gem.add_development_dependency "yard", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.18.2
+0.19.0

data/app/helpers/surveyor_helper.rb

@@ -1,16 +1,18 @@
 module SurveyorHelper
-
   # Layout: stylsheets and javascripts
   def surveyor_includes
     surveyor_stylsheets + surveyor_javascripts    
   end
   def surveyor_stylsheets
-    stylesheet_link_tag 'surveyor/reset', 'surveyor', 'surveyor/ui.theme.css','surveyor/jquery-ui-slider-additions'
+    stylesheet_link_tag 'surveyor/reset', 'surveyor/dateinput', 'surveyor'
   end
   def surveyor_javascripts
-    javascript_include_tag 'surveyor/jquery-1.2.6.js', 'surveyor/jquery-ui-personalized-1.5.3.js', 'surveyor/accessibleUISlider.jQuery.js','surveyor/jquery.form.js', 'surveyor/surveyor.js'
+    javascript_include_tag 'surveyor/jquery.tools.min', 'surveyor/jquery.surveyor'
+  end
+  # Helper for displaying warning/notice/error flash messages
+  def flash_messages(types)
+    types.map{|type| content_tag(:div, "#{flash[type]}".html_safe, :class => type.to_s)}.join.html_safe
   end
-  
   # Section: dependencies, menu, previous and next
   def dependency_explanation_helper(question,response_set)
     # Attempts to explain why this dependent question needs to be answered by referenced the dependent question and users response
@@ -25,35 +27,51 @@ module SurveyorHelper
     submit_tag(section.title, :name => "section[#{section.id}]")
   end
   def previous_section
-    # submit_tag("#{t ('surveyor.previous_section')} »", :name => "section[#{@section.previous.id}]") unless @section.previous.nil?
-    # refactored to use copy in memory instead of making extra db calls
+    # use copy in memory instead of making extra db calls
     submit_tag(t('surveyor.previous_section'), :name => "section[#{@sections[@sections.index(@section)-1].id}]") unless @sections.first == @section
   end
   def next_section
-    # @section.next.nil? ? submit_tag(t ('surveyor.click_here_to_finish'), :name => "finish") : submit_tag("Next section «", :name => "section[#{@section.next.id}]")
-    # refactored to use copy in memory instead of making extra db calls
+    # use copy in memory instead of making extra db calls
     @sections.last == @section ? submit_tag(t('surveyor.click_here_to_finish'), :name => "finish") : submit_tag(t('surveyor.next_section'), :name => "section[#{@sections[@sections.index(@section)+1].id}]")
   end
   
   # Questions
-  def next_number
+  def q_text(obj)
     @n ||= 0
-    "#{@n += 1}<span style='padding-left:0.1em;'>)</span>"
-  end
-  def split_text(text = "") # Split text into with "|" delimiter - parts to go before/after input element
-    {:prefix => text.split("|")[0].blank? ? "&nbsp;" : text.split("|")[0], :postfix => text.split("|")[1] || "&nbsp;"}
-  end
-  def question_help_helper(question)
-    question.help_text.blank? ? "" : %Q(<span class="question-help">#{question.help_text}</span>)
+    return image_tag(obj.text) if obj.is_a?(Question) and obj.display_type == "image"
+    return obj.text if obj.is_a?(Question) and (obj.dependent? or obj.display_type == "label" or obj.part_of_group?)
+    "#{@n += 1}) #{obj.text}"
   end
-
+  # def split_text(text = "") # Split text into with "|" delimiter - parts to go before/after input element
+  #   {:prefix => text.split("|")[0].blank? ? "&nbsp;" : text.split("|")[0], :postfix => text.split("|")[1] || "&nbsp;"}
+  # end
+  # def question_help_helper(question)
+  #   question.help_text.blank? ? "" : %Q(<span class="question-help">#{question.help_text}</span>)
+  # end
+  
   # Answers
-  def fields_for_response(response, response_group = nil, &block)
-    name = response_group.nil? ? "responses[#{response.question_id}][#{response.answer_id}]" : "response_groups[#{response.question_id}][#{response_group}][#{response.answer_id}]"
-    fields_for(name, response, :builder => SurveyFormBuilder, &block)
+  def rc_to_attr(type_sym)
+    case type_sym.to_s
+    when /^date|time$/ then :datetime_value
+    when /(string|text|integer|float|datetime)/ then "#{type_sym.to_s}_value".to_sym
+    else :answer_id
+    end
   end
-  def fields_for_radio(response, &block)
-    fields_for("responses[#{response.question_id}]", response, :builder => SurveyFormBuilder, &block)
+  def rc_to_as(type_sym)
+    case type_sym.to_s
+    when /(integer|float)/ then :string
+    else type_sym
+    end
   end
   
+  # Responses
+  def response_for(response_set, question, answer = nil, response_group = nil)
+    return nil unless response_set && question && question.id
+    result = response_set.responses.detect{|r| (r.question_id == question.id) && (answer.blank? ? true : r.answer_id == answer.id) && (r.response_group.blank? ? true : r.response_group.to_i == response_group.to_i)}
+    result.blank? ? response_set.responses.build(:question_id => question.id, :response_group => response_group) : result
+  end
+  def response_idx(increment = true)
+    @rc ||= 0
+    (increment ? @rc += 1 : @rc).to_s
+  end  
 end

data/app/views/layouts/surveyor_default.html.erb

@@ -7,7 +7,6 @@
   <%= surveyor_includes %>
 </head>
 <body>
-  <div id="flash"><%= flash[:notice] %></div>
   <%= yield %>
 </body>
 </html>

data/app/views/partials/_answer.html.haml

@@ -1,58 +1,19 @@
-- renderer = answer.renderer(question)
-- response_group ||= nil
-- hide_label ||= false
-- disabled ||= false
-- fields_for_response(response_obj, response_group) do |response_form|
-  - case renderer
-  - when :any_answer
-    = response_form.survey_check_box(:selected, :class => (answer.is_exclusive? ? "exclusive" : ""))
-    = response_form.label("selected", answer.text) unless hide_label # This is a temp fix til I figure out why the id of the checkbox is all jacked up
-  - when :any_other_and_string
-    = response_form.survey_check_box(:selected, :class => (answer.is_exclusive? ? "exclusive" : ""))
-    %label Other
-    = response_form.text_field(:other_value)
-    = response_form.text_field(:string_value)
-  - when :any_string
-    = response_form.survey_check_box(:selected, :class => (answer.is_exclusive? ? "exclusive" : ""))
-    = response_form.label(:answer_id, answer.text)
-    = response_form.text_field(:string_value, :size => 25, :maxlength => 250)
-  - when :one_answer, :one_string, :one_integer
-    - fields_for_radio(response_obj) do |radio_form|
-      = radio_form.radio_button(:answer_id, answer.id, :checked => response_obj.selected?, :title => answer.text)
-      = radio_form.label("answer_id_#{answer.id}", split_text(answer.text)[:prefix]) unless hide_label
-      - if renderer == :one_string
-        = response_form.text_field(:string_value, :size => 25, :maxlength => 250, :autocomplete => "off")
-      - if renderer == :one_integer
-        = response_form.text_field(:integer_value, :size => 5, :maxlength => 10, :autocomplete => "off")    
-      = radio_form.label("answer_id_#{answer.id}", split_text(answer.text)[:postfix]) unless hide_label
-  - when :none_date
-    = response_form.label(:datetime_value, split_text(answer.text)[:prefix], :class => "#{(disabled)? 'disabled' : 'enabled'}") unless hide_label
-    = response_form.text_field(:datetime_value)
-    = response_form.label(:datetime_value, split_text(answer.text)[:postfix], :class => "#{(disabled)? 'disabled' : 'enabled'}") unless hide_label
-  - when :none_datetime
-    = response_form.label(:datetime_value, split_text(answer.text)[:prefix], :class => "#{(disabled)? 'disabled' : 'enabled'}") unless hide_label
-    = response_form.datetime_select(:datetime_value, {:include_blank => true})
-    = response_form.label(:datetime_value, split_text(answer.text)[:postfix], :class => "#{(disabled)? 'disabled' : 'enabled'}") unless hide_label
-  - when :none_float
-    = response_form.label(:float_value, split_text(answer.text)[:prefix]) unless hide_label
-    = response_form.text_field(:float_value, :size => 5, :maxlength => 10, :autocomplete => "off")
-    = response_form.label(:float_value, split_text(answer.text)[:postfix]) unless hide_label
-  - when :none_integer
-    = response_form.label(:integer_value, split_text(answer.text)[:prefix], :class => "#{(disabled)? 'disabled' : 'enabled'}") unless hide_label
-    = response_form.text_field(:integer_value, :size => 5, :maxlength => 10, :autocomplete => "off", :disabled => disabled)
-    = response_form.label(:integer_value, split_text(answer.text)[:postfix], :class => "#{(disabled)? 'disabled' : 'enabled'}") unless hide_label
-  - when :none_string
-    = response_form.label(:string_value, split_text(answer.text)[:prefix], :class => "#{(disabled)? 'disabled' : 'enabled'}") unless hide_label
-    = response_form.text_field(:string_value, :size => 25, :maxlength => 250, :autocomplete => "off", :disabled => disabled)
-    = response_form.label(:string_value, split_text(answer.text)[:postfix], :class => "#{(disabled)? 'disabled' : 'enabled'}") unless hide_label
-  - when :none_text
-    = response_form.label(:text_value, split_text(answer.text)[:prefix]) unless hide_label
-    = response_form.text_area(:text_value, :cols => 80, :rows => 10)
-    = response_form.label(:text_value, split_text(answer.text)[:postfix]) unless hide_label
-  - when :none_time
-    = response_form.label(:datetime_value, split_text(answer.text)[:prefix], :class => "#{(disabled)? 'disabled' : 'enabled'}") unless hide_label
-    = response_form.time_select(:datetime_value,{ :include_blank => true })
-    = response_form.label(:datetime_value, split_text(answer.text)[:postfix], :class => "#{(disabled)? 'disabled' : 'enabled'}") unless hide_label
-  - else
-    = answer.text
-  
+-# TODO: disabled
+- rg ||= nil
+- r = response_for(@response_set, q, a, rg)
+- i = response_idx(q.pick != "one") # argument will be false (don't increment i) if we're on radio buttons
+- f.semantic_fields_for i, r do |ff|
+  = ff.quiet_input :question_id unless q.pick == "one" # don't repeat question_id if we're on radio buttons
+  = ff.quiet_input :id unless q.pick == "one" or r.new_record?
+  = ff.quiet_input :response_group, :value => rg if q.pick != "one" && g && g.display_type == "repeater"
+  - case q.pick
+  - when "one"
+    = ff.input :answer_id, :as => :surveyor_radio, :collection => [[a.text, a.id]], :label => false, :input_html => {:class => a.css_class}, :response_class => a.response_class
+  - when "any"
+    = ff.input :answer_id, :as => :surveyor_check_boxes, :collection => [[a.text, a.id]], :label => false, :input_html => {:class => a.css_class}, :response_class => a.response_class
+  - when "none"
+    - if %w(date datetime time float integer string text).include? a.response_class
+      = ff.quiet_input :answer_id, :input_html => {:class => a.css_class, :value => a.id}
+      = ff.input rc_to_attr(a.response_class), :as => rc_to_as(a.response_class), :label => a.split_or_hidden_text(:pre).blank? ? false : a.split_or_hidden_text(:pre), :hint => a.split_or_hidden_text(:post), :input_html => {:value => a.default_value}
+    - else
+      = a.text

data/app/views/partials/_dependents.html.haml

@@ -0,0 +1,5 @@
+#dependents
+  .title Follow-up questions from your answers on the previous page
+  -# @dependents.each_with_index do |question, index|
+    = dependency_explanation_helper(question, @response_set)
+    = render question.custom_renderer || "/partials/question", :question => question, :response_set => @response_set, :number => "D#{index+1}"

data/app/views/partials/_question.html.haml

@@ -1,72 +1,24 @@
-- renderer = question.renderer(question_group ||= nil)
-- case renderer
-- when :label
-  - div_for question, :class => "label #{question.css_class(response_set)}" do
-    %span.text= question.text
-    %span.help= question.help_text
-- when :image
-  .image= image_tag(question.text)
-- when :dropdown, :slider
-  - if renderer == :slider
-    %script{:type => "text/javascript"}= "$(function(){$('#slider_#{question.id}').accessibleUISlider({width: 400, labels:#{question.answers.size} }).hide();});"
-  - div_for question, :class => question.css_class(response_set) do
-    .number= next_number unless question.dependent?
-    %fieldset
-      %legend{:style => "display:inline;"}
-        %span.text= question.text
-        %span.help= question.help_text
-        = hidden_field_tag("responses[#{question.id}][question_id]", question.id)
-      %ol.answers
-        %li.answer
-          - options = question.answers.collect{|a| "<option #{ (response_set.response_for(question.id, a.id).selected?)? "selected='selected'" : nil } value ='#{a.id}'>#{a.text}</option>" }
-          = renderer == :slider ? select_tag("responses[#{question.id}][answer_id]", options, {:id => "slider_#{question.id}"}) : select_tag("responses[#{question.id}][answer_id]", ["<option value=''>#{t('surveyor.Select_one')}</option>"].concat(options))
-- when :grid_default
-  - reset_cycle("col")
-  - content_tag_for :tr, question, :class => question.css_class(response_set) do
-    %th.question_prefix
-      %span.text= split_text(question.text)[:prefix]
-      %span.help= question.help_text
-      = hidden_field_tag("responses[#{question.id}][question_id]", question.id)
-    - question.answers.each do |answer|
-      %td{:class => "#{cycle("column_highlight", "", :name => "col")}"}
-        .answer{:class => answer.custom_class}= render(:partial => answer.custom_renderer || "/partials/answer", :locals => {:answer => answer, :question => question, :response_obj => @response_set.response_for(question.id, answer.id), :hide_label => true})
-    %th.question_postfix
-      %span.text= split_text(question.text)[:postfix]
-- when :repeater_default, :repeater_dropdown
-  - disabled ||= false
-  - div_for question, :class => "#{disabled ? 'dis' : 'en'}abled #{question.css_class(response_set)}" do
-    %span.text= question.text
-    %span.help= question.help_text
-    = hidden_field_tag("response_groups[#{question.id}][#{response_group}][response_group]", response_group)
-    = hidden_field_tag("response_groups[#{question.id}][#{response_group}][question_id]", question.id)
-    %br
-    %ol.answers
-      - if renderer == :repeater_default  
-        - question.answers.each do |answer|
-          - content_tag_for :li, answer, :class => answer.custom_class do
-            = render(:partial => answer.custom_renderer || "/partials/answer", :locals => {:answer => answer, :question => question, :response_obj => @response_set.response_for(question.id, answer.id, response_group), :response_group => response_group, :hide_label => true, :disabled => disabled})
-      - else
-        %li.answer
-          - options = question.answers.collect{|a| "<option #{ (response_set.response_for(question.id, a.id, response_group).selected?)? "selected='selected'" : nil } value ='#{a.id}'>#{a.text}</option>" }
-          = select_tag("response_groups[#{question.id}][#{response_group}][answer_id]", ["<option value=''>Select one...</option>"].concat(options), :disabled => disabled)
-- when :inline_default, :inline_dropdown
-  - div_for question, :class => "inline #{question.css_class(response_set)}" do
-    = hidden_field_tag("responses[#{question.id}][question_id]", question.id)
-    - if renderer == :inline_default
-      - question.answers.each do |answer|
-        .answer{:class => answer.custom_class}= render(:partial => answer.custom_renderer || "/partials/answer", :locals => {:answer => answer, :question => question, :response_obj => @response_set.response_for(question.id, answer.id), :hide_label => answer.hide_label})
-    - else
-      - options = question.answers.collect{|a| "<option #{ (response_set.response_for(question.id, a.id).selected?)? "selected='selected'" : nil } value ='#{a.id}'>#{a.text}</option>" }
-      = select_tag("responses[#{question.id}][answer_id]", ["<option value=''>Select one...</option>"].concat(options))
-- else # :default, :inline
-  - div_for question, :class => question.css_class(response_set) do
-    .number= next_number unless question.dependent?
-    %fieldset
-      %legend
-        %span.text= question.text
-        %span.help= question.help_text
-        = hidden_field_tag("responses[#{question.id}][question_id]", question.id)
-      %ol.answers{:class => renderer == :inline ? "inline" : nil}
-        - question.answers.each do |answer|
-          - content_tag_for :li, answer, :class => answer.custom_class do
-            = render(:partial => answer.custom_renderer || "/partials/answer", :locals => {:answer => answer, :question => question, :response_obj => @response_set.response_for(question.id, answer.id), :hide_label => answer.hide_label})
+-# TODO: js for slider
+- rg ||= nil
+- renderer = q.renderer(g ||= nil)
+- f.inputs q_text(q), :id => rg ? "q_#{q.id}_#{rg.id}" : "q_#{q.id}", :class => "q_#{renderer} #{q.css_class(@response_set)}" do
+  %span.help= q.help_text
+  - case renderer
+  - when :image, :label
+  - when :dropdown, :inline_dropdown, :slider
+    - r = response_for(@response_set, q, nil, rg)
+    - i = response_idx
+    - f.semantic_fields_for i, r do |ff|
+      = ff.quiet_input :question_id
+      = ff.quiet_input :response_group, :value => rg if g && g.display_type == "repeater"
+      = ff.input :answer_id, :as => :select, :collection => q.answers.map{|a| [a.text, a.id]}, :label => false
+  - else # :default, :inline, :inline_default
+    - if q.pick == "one"
+      - r = response_for(@response_set, q, nil, rg)
+      - i = response_idx  # increment the response index since the answer partial skips for q.pick == one
+      - f.semantic_fields_for i, r do |ff|
+        = ff.quiet_input :question_id
+        = ff.quiet_input :response_group, :value => rg if g && g.display_type == "repeater"
+        = ff.quiet_input :id unless r.new_record?
+    - q.answers.each do |a|
+      = render a.custom_renderer || '/partials/answer', :q => q, :a => a, :f => f, :rg => rg, :g => g

data/app/views/partials/_question_group.html.haml

@@ -1,39 +1,30 @@
-- renderer = question_group.renderer
-- locals = {:question_group => question_group, :response_set => response_set, :hide_label => true}
-- div_for question_group, :class => question_group.css_class(response_set) do
-  .head
-    .number= next_number
-    %span.text= question_group.text
-    %span.help= question_group.help_text
-
-  - case question_group.renderer
-  - when :grid
-    %table.grid
-      %thead
-        %tr
-          %th= " "
-          - reset_cycle("column_highlight")
-          - group_questions.first.answers.each do |answer|
-            %th{:class => "#{cycle("column_highlight", "", :name => "column_highlight")}"}= answer.text
-      %tbody
-        - group_questions.each_with_index do |question, i|
-          = render(:partial => question.custom_renderer || "/partials/question", :locals => locals.merge({:question => question}))
-          - if i%10 == 9
-            %th= " "
-            - reset_cycle("column_highlight")
-            - group_questions.first.answers.each do |answer|
-              %th{:class => "#{cycle("column_highlight", "", :name => "column_highlight")}"}= answer.text
-  - when :repeater
-    %ul.repeater
-      - (response_set.count_group_responses(group_questions) + 1).times do |group_number|
-        %li.repeater
-          - group_questions.each do |question|
-            = render(:partial => question.custom_renderer || "/partials/question", :locals => locals.merge({:question => question, :response_group => group_number, :disabled => false}))
-      %li.repeater
-        - group_questions.each do |question|
-          = render(:partial => question.custom_renderer || "/partials/question", :locals => locals.merge({:question => question, :response_group => 9999, :disabled => true}))
-        = submit_tag("<= add row", :name => "section[#{group_questions.first.survey_section_id}]question_group_#{question_group.id}", :class => "add_row")
-  - else # :inline
-    %ul
-      - group_questions.each do |question|
-        %li{:class => question_group.renderer == :inline ? "inline" : nil}= render(:partial => question.custom_renderer || "/partials/question", :locals => locals.merge({:question => question}))
+- renderer = g.renderer
+- f.inputs q_text(g), :id => "g_#{g.id}", :class => "g_#{renderer} #{g.css_class(@response_set)}" do
+  %li.help= g.help_text
+  - case renderer
+    - when :grid
+      %li
+        %table
+          %tbody
+            - qs.each_slice(10) do |ten_questions| # header row every 10
+              %tr
+                %th  
+                - ten_questions.first.answers.each do |a|
+                  %th= a.text
+                %th  
+              - ten_questions.each_with_index do |q, i|
+                %tr{:id => "q_#{q.id}", :class => "q_#{renderer} #{q.css_class(@response_set)}"}
+                  %th= q.split_text(:pre)
+                  - response_idx if q.pick == "one" # increment the response index since the answer partial skips for q.pick == one
+                  - q.answers.each do |a|
+                    %td= render a.custom_renderer || '/partials/answer', :g => g, :q => q, :a => a, :f => f
+                  %th= q.split_text(:post)
+    - when :repeater
+      - (@response_set.count_group_responses(qs) + 1).times do |rg|
+        %li
+          - qs.each do |q|
+            = render q.custom_renderer || "/partials/question", :g => g, :rg => rg, :q => q, :f => f
+      = submit_tag("+ add row", :name => "section[#{@section.id}][g_#{g.id}]", :class => "add_row")
+    - else # :inline
+      - qs.each do |q|
+        = render q.custom_renderer || "/partials/question", :g => g, :q => q, :f => f

data/app/views/partials/_section.html.haml

@@ -1,13 +1,12 @@
 - div_for @section, :class => @section.custom_class do
   %span.title= @section.title
-  .questions
-    - group_questions ||= []
-    - @questions.each_with_index do |question, index|
-      - unless question.part_of_group?
-        = render(:partial => question.custom_renderer || "/partials/question", :locals => {:question => question, :response_set => @response_set})
-      - else # gather up the group questions
-        - group_questions << question
-        - if (index + 1 >= @questions.size) or (question.question_group_id != @questions[index + 1].question_group_id)
-          - # this is the last question of the section, or the group
-          = render(:partial => question.question_group.custom_renderer || "/partials/question_group", :locals => {:question_group => question.question_group, :response_set => @response_set, :group_questions => group_questions})
-          - group_questions = []
+  - qs ||= []
+  - (questions = @section.questions).each_with_index do |q, i|
+    - if q.part_of_group?
+      - qs << q # gather up the group questions
+      - if (i+1 >= questions.size) or (q.question_group_id != questions[i+1].question_group_id)
+        - # this is the last question of the section, or the group
+        = render q.question_group.custom_renderer || "/partials/question_group", :g => q.question_group, :qs => qs, :f => f
+        - qs = []
+    - else # gather up the group questions
+      = render q.custom_renderer || "/partials/question", :q => q, :f => f

data/app/views/partials/_section_menu.html.haml

@@ -0,0 +1,5 @@
+.surveyor_menu
+  = t('surveyor.sections')
+  %ul
+    - @sections.each do |s|
+      %li{:class => ("active" if s == @section)}= menu_button_for(s)

data/app/views/surveyor/edit.html.haml

@@ -1,28 +1,16 @@
 #surveyor
-  - form_tag(update_my_survey_path, :method => :put, :id => "survey_form", :class => @survey.custom_class) do
-    = hidden_field_tag :current_section_id, @section.id
-    - unless @sections.size < 3
-      #menu
-        = t('surveyor.sections')
-        %ul
-          - @sections.each do |s|
-            %li{:class => ("active" if s == @section)}= menu_button_for(s)
-    #header
-      .title= @survey.title
+  - unless (types = flash.keys.select{|k| [:notice, :error, :warning].include?(k)}).blank?
+    .surveyor_flash
+      = flash_messages(types)
+      .close
+  - semantic_form_for(:r, @response_set, :url => update_my_survey_path, :html => {:method => :put, :id => "survey_form", :class => @survey.custom_class}) do |f|
+    = render 'partials/section_menu' unless @sections.size < 3
+    .survey_title= @survey.title
     .previous_section= previous_section
-    - unless @dependents.empty?
-      #dependents
-        .title Follow-up questions from your answers on the previous page
-        -# @dependents.each_with_index do |question, index|
-          = dependency_explanation_helper(question, @response_set)
-          = render(:partial => question.custom_renderer || "/partials/question", :locals => {:question => question, :response_set => @response_set, :number => "D#{index+1}"})
-    -# cache section if there are no responses for that section in th current response_set
-    - if @response_set.no_responses_for_section?(@section)
-      - cache("section_#{@section.id}") do
-        -# cache
-        = render(:partial => "/partials/section", :locals => {:section => @section, :questions => @questions, :response_set => @response_set})
-    - else
-      -# no cache
-      = render(:partial => "/partials/section", :locals => {:section => @section, :questions => @questions, :response_set => @response_set})
+    = render 'partials/dependents' unless @dependents.empty?
+    - if @response_set.no_responses_for_section?(@section) # cache if response_set has no responses for current section
+      = cache("section_#{@section.id}"){ render "/partials/section", :f => f }
+    - else # no cache
+      = render "/partials/section", :f => f
     .next_section= next_section
-      
+  %br