fe 0.0.4 → 1.0.0

data/app/views/fe/admin/elements/create.js.erb

@@ -6,6 +6,7 @@
   $('#element_form_<%= dom_id(@element) %>').show();
   selectElement("#element_<%= @element.id %>");
   $.scrollTo("#element_<%= @element.id %>");
+  setUpSortables();
 <% else %>
   alert('That question already exists on this question sheet')
 <% end %>

data/app/views/fe/admin/elements/drop.js.erb

@@ -1,2 +1,3 @@
 $('#page-preview').html('<%= escape_javascript(render('fe/admin/question_pages/question_page', :page => @page)) %>')
 $('#list-pages li').removeClass('active')
+setUpJsHelpers();

data/app/views/fe/admin/elements/duplicate.js.erb

@@ -1,2 +1,3 @@
 $('#page-preview').html('<%= escape_javascript(render('fe/admin/question_pages/question_page')) %>')
 selectElement("#element_<%= @element.id %>")
+setUpSortables();

data/app/views/fe/admin/panels/_advanced_options.html.erb

@@ -12,7 +12,7 @@
     <%= radio_button_tag :future_affect, "no" %>
     <%= label_tag :future_affect_no, "No" %>
     <% if @element.conditional.present? %>
-      <script>$(function() { $("#future_affect_yes").click(); });</script>
+      <script>$(function() { $("#<%= dom_id(element) %>-pnl-advanced input[name=future_affect][value=yes]").click(); });</script>
     <% end %>
     <div class='future_answer' style='display:none'>
       What answer should show the element or page? <%= f.text_field "conditional_answer" %>
@@ -20,18 +20,24 @@
       Enter multiple answers separated by commas to match using an OR condition.  Ex: "Option A, Option B" will match either "Option A" or "Option B" answers
     </div>
     <div class='future_target' style='display:none'>
-      Should it show the next element or a page further down the application?
+      <label>Should it show the next element or a page further down the application?</label>
       <%= f.radio_button :conditional_type, "Fe::Element" %>
       <%= f.label :conditional_type_feelement, "Next Element" %>
       <%= f.radio_button :conditional_type, "Fe::Page" %>
       <%= f.label :conditional_type_fepage, "Page" %>
+      <%= f.radio_button :conditional_type, "", style: 'display:none' %>
+      <script>$(function() { $("#<%= dom_id(element) %>-pnl-advanced .future_target input[checked]").click(); });</script>
     </div>
     <div class='future_page' style='<%= 'display:none' unless @element.conditional.is_a?(Fe::Page) %>'>
-      Which page? <%= f.collection_select :conditional_id, @page.question_sheet.pages, :id, :label %>
+      <label>Which page? </label>
+      <%= f.collection_select :conditional_id, @page.question_sheet.pages, :id, :label, include_blank: true %>
     </div>
   </div>
   <br/>
 
+	<p><label for="css_class" class="desc">Css Class</label>
+		<%= f.text_field :css_class %></p>
+
 	<p><label for="element_object" class="desc">Object Name</label>
 		<%= f.text_field :object_name %></p>
 

data/app/views/fe/admin/panels/_common_fields.html.erb

@@ -1,16 +1,30 @@
 <p>
-  <label for="element_label" class="desc">Label <span class="required">required</span></label>
+  <label for="element_label" class="desc">Label (English) <span class="required">required</span></label>
   <%= f.text_field :label, :maxlength => Fe::Element.max_label_length %>
 </p>
-<div class="field">
-  <label for="element_tooltip" class="desc">Tip</label>
+<% @page.question_sheet.languages.select(&:present?).each do |language| %>
+  <p>
+  <label for="element_label_translations_<%= language %>" class="desc">Label (<%= Fe::LANGUAGES[language] %>) <span class="required">required</span></label>
+  <%= text_field_tag "element[label_translations][#{language}]", @element.label_translations[language] %>
+  </p>
+<% end %>
+
+<p>
+  <label for="element_tooltip" class="desc">Tip (English)</label>
   <%= f.text_field :tooltip %>
-</div>
+</p>
+<% @page.question_sheet.languages.select(&:present?).each do |language| %>
+  <p>
+    <label for="element_tip_translations_<%= language %>" class="desc">Tip (<%= Fe::LANGUAGES[language] %>)</label>
+  <%= text_field_tag "element[tip_translations][#{language}]", @element.tip_translations[language] %>
+  </p>
+<% end %>
+
 <p>
   <label for="element_slug" class="desc">Variable</label>
   <%= f.text_field :slug %>
 <p>
-  
+
 <p>
   <%= f.check_box :required, :class => 'inlinecheck' %>
   <label for="element_required" class="inline">This field is required</label>

data/app/views/fe/admin/panels/_page.html.erb

@@ -1,3 +1,3 @@
-<li id="link-<%= dom_id(page) %>" <% if page == current_page -%> class="active"<% end -%>>
+<li id="link-<%= dom_id(page) %>" class="sortable <% if page == current_page %>active<% end -%>">
   <%= link_to page.label, fe_admin_question_sheet_page_path(page.question_sheet_id, page.id), :remote => true, :method => :get %>
 </li>

data/app/views/fe/admin/panels/_prop_choice_field.html.erb

@@ -17,30 +17,39 @@
 
 <%= render 'fe/admin/panels/common_fields', :f => f %>
 
-<div id="choices_section" style="display:<%= ['acceptance', 'yes-no'].include?(@element.style) ? 'none' : 'block' %>">
+<div class="choices_section" style="display:<%= ['acceptance', 'yes-no'].include?(@element.style) ? 'none' : 'block' %>">
   <h3>Choices<br/>
   <% showXML = !@element.source.blank? %>
-  <a id="link-show-xml" style="font-size: 11px; font-weight: normal; display:<% if showXML -%>none<%else-%>block<%end-%>" href="javascript:void(0);" onclick="$('xmlChoices').show();$('link-show-csv').show();$('link-show-xml').hide();$('csvChoices').hide();">Use External XML Feed</a>
-  <a id="link-show-csv" style="font-size: 11px; font-weight: normal; display:<% if showXML -%>block<%else-%>none<%end-%>" href="javascript:void(0);" onclick="$('csvChoices').show();$('link-show-xml').show();$('link-show-csv').hide();$('xmlChoices').hide();">Manually Enter Choices</a></h3>
+  <a class="link-show-xml" style="font-size: 11px; font-weight: normal; display:<% if showXML -%>none<%else-%>block<%end-%>" href="javascript:void(0);">Use External XML Feed</a>
+  <a class="link-show-csv" style="font-size: 11px; font-weight: normal; display:<% if showXML -%>block<%else-%>none<%end-%>" href="javascript:void(0);">Manually Enter Choices</a></h3>
+
+  <div class="csvChoices" style="display:<% if showXML -%>none<%else-%>block<%end-%>">
+    <p>
+      <label for="element_content" class="desc">Choices (English)</label>
+      <%= f.text_area :content, :rows => 6, :cols => 80 %>
+    </p>
+    <% @page.question_sheet.languages.select(&:present?).each do |language| %>
+      <p>
+        <label for="element_content_translations_<%= language %>" class="desc">Choices (<%= Fe::LANGUAGES[language] %>)</label>
+        <%= text_area_tag "element[content_translations][#{language}]", @element.content_translations[language], :rows => 6, :cols => 80 %>
+      </p>
+    <% end %>
 
-  <div id="csvChoices" style="display:<% if showXML -%>none<%else-%>block<%end-%>">
-      <p><label for="element_content" class="desc">Choices</label>
-          <%= f.text_area :content, :rows => 4, :cols => 25 %></p>
   </div>
 
   <p>
     <%= f.check_box :hide_option_labels, :class => 'inlinecheck' %>
     <label for="element_hide_option_labels" class="inline">Hide Option Labels</label>
   </p>
-  
-  <div id="xmlChoices" style="display:<% if showXML -%>block<%else-%>none<%end-%>">
+
+  <div class="xmlChoices" style="display:<% if showXML -%>block<%else-%>none<%end-%>">
   	<p><label for="element_source" class="desc">XML Feed for Choices</label>
   		<%= f.text_field :source %></p>
-		
+
       <p><label for="element_text_xpath" class="desc">XPath to Choice Text</label>
   		<%= f.text_field :text_xpath %></p>
-		
+
       <p><label for="element_value_xpath" class="desc">XPath to Choice Value</label>
   		<%= f.text_field :value_xpath %></p>
   </div>
-</div>		
+</div>

data/app/views/fe/admin/panels/_prop_element.html.erb

@@ -1,6 +1,6 @@
 <div id="panel-properties-element" class="panel" style="display:block;">
     <p>Update the settings for this element.</p>
-    
+
     <div id="errors">
        <%= render 'errors', :element => element %>
     </div>
@@ -8,21 +8,14 @@
 <%= form_for :element, :url => fe_admin_question_sheet_page_element_path( @page.question_sheet_id, @page.id, element.id), :remote => true, :html => {:method => :put} do |f| -%>
 
   <%= render 'fe/admin/panels/prop_' + element.class.to_s.split('::').last.underscore, :f => f, :element => element %>
-  
+
   <% if element.question? -%>
-    <!-- <h3>Dependency</h3>
-    <p><strong>Ask this question if:</strong></p> 
-    <% element.conditions.each_with_index do |condition, i| %>
-      <%#= render :partial => 'fe/admin/panels/condition', :object => condition, :locals => {:i => i} %>
-    <% end %> -->
-    
     <%= render 'fe/admin/panels/advanced_options', :f => f, :element => element %>
   <% end-%>
 
   <p class="buttons">
     <button type="submit"><span>Update</span></button>
     <%= link_to('Close', '#', 'data-dom_id' => dom_id(element), :class => 'close_prop') %>
-    <%#= link_to('Delete', fe_admin_question_sheet_page_element_path( @page.question_sheet_id,  @page.id, element.id), :remote => true, :method => :delete, data: {:confirm => "Are you sure you want to delete this element?"}) %>
   </p>
 
 <% end -%>

data/app/views/fe/admin/panels/_prop_page.html.erb

@@ -6,14 +6,19 @@
     </div>
 
   <%= form_for(page, :url => fe_admin_question_sheet_page_path(page.question_sheet_id, page.id), :remote => true, :html => {:method => :put}) do |f| %>
-    <p><label for="" class="desc">Label <span class="required">required</span></label>
+    <p><label for="" class="desc">Label (English) <span class="required">required</span></label>
         <%= f.text_field :label, maxlength: 100, size: 40 %></p>
-
+      <% page.question_sheet.languages.select(&:present?).each do |language| %>
+        <p>
+        <label for="fe_page_label_translations_<%= language %>" class="desc">Label (<%= Fe::LANGUAGES[language] %>) <span class="required">required</span></label>
+        <%= text_field_tag "fe_page[label_translations][#{language}]", page.label_translations[language] %>
+        </p>
+      <% end %>
     <p><label for="" class="desc">Hidden</label>
         <%= f.check_box :hidden %></p>
 
     <p class="buttons">
-      <%= submit_tag "Update &raquo;".html_safe %>
+      <%= submit_tag "Update &raquo;".html_safe, data: { disable_with: "Please wait..." } %>
     </p>
     <p class="buttons"><%= link_to "Delete", fe_admin_question_sheet_page_path(page.question_sheet_id, page.id), :remote => true, :method => :delete, data: {confirm: "Are you sure you want to delete this page?"} %></p>
   <% end %>

data/app/views/fe/admin/panels/_prop_paragraph.html.erb

@@ -1,32 +1,46 @@
 <p>
-  <label for="element_content" class="desc">Paragraph Content</label>
-  <%= f.text_area :content, :rows => 4, :cols => 25, :id => "element_content_#{element.id}" %>
+  <label for="element_content" class="desc">Paragraph Content (English)</label>
+  <%= f.text_area :content, :rows => 6, :cols => 80, :id => "element_content_#{element.id}" %>
+</p>
+<% @page.question_sheet.languages.select(&:present?).each do |language| %>
+  <p>
+    <label for="element_content_translations_<%= language %>" class="desc">Paragraph Content (<%= Fe::LANGUAGES[language] %>)</label>
+    <%= text_area_tag "element[content_translations][#{language}]", @element.content_translations[language], :rows => 6, :cols => 80 %>
+  </p>
+<% end %>
+
+<p>
+  <label for="element_css_class" class="desc">Css Class</label>
+  <%= f.text_field :css_class %>
 </p>
 
 <script type="text/javascript" charset="utf-8">
 $(function() {
-  if (CKEDITOR.instances['element_content_<%= element.id %>']) {
-    CKEDITOR.instances['element_content_<%= element.id %>'].destroy();
-  }
-  editor = CKEDITOR.replace( 'element_content_<%= element.id %>', {
-        toolbar : [['Bold', 'Italic', '-', 'NumberedList', 'BulletedList', '-', 'Link']],
-        on :
-        {
-            instanceReady : function( ev )
-            {
-                // Output paragraphs as <p>Text</p>.
-                this.dataProcessor.writer.setRules( 'p',
-                    {
-                        indent : false,
-                        breakBeforeOpen : true,
-                        breakAfterOpen : false,
-                        breakBeforeClose : false,
-                        breakAfterClose : true
-                    });
-            }
-        }
+  if (typeof(CKEDITOR) !== 'undefined') {
+    if (CKEDITOR.instances['element_content_<%= element.id %>']) {
+      CKEDITOR.instances['element_content_<%= element.id %>'].destroy();
+    }
+    editor = CKEDITOR.replace( 'element_content_<%= element.id %>', {
+          toolbar : [['Bold', 'Italic', '-', 'NumberedList', 'BulletedList', '-', 'Link']],
+          on :
+          {
+              instanceReady : function( ev )
+              {
+                  // Output paragraphs as <p>Text</p>.
+                  this.dataProcessor.writer.setRules( 'p',
+                      {
+                          indent : false,
+                          breakBeforeOpen : true,
+                          breakAfterOpen : false,
+                          breakBeforeClose : false,
+                          breakAfterClose : true
+                      });
+              }
+          }
 
-      } 
-    );
+        }
+      );
+  }
 });
 </script>
+

data/app/views/fe/admin/panels/_prop_section.html.erb

@@ -1,2 +1,8 @@
-    <p><label for="element_label" class="desc">Heading Label <span class="required">required</span></label>
-        <%= f.text_field :label, :maxlength => Fe::Element.max_label_length %></p>
+<p><label for="element_label" class="desc">Heading Label <span class="required">required</span></label>
+    <%= f.text_field :label, :maxlength => Fe::Element.max_label_length %></p>
+<% @page.question_sheet.languages.select(&:present?).each do |language| %>
+  <p>
+  <label for="element_label_translations_<%= language %>" class="desc">Label (<%= Fe::LANGUAGES[language] %>) <span class="required">required</span></label>
+  <%= text_field_tag "element[label_translations][#{language}]", @element.label_translations[language] %>
+  </p>
+<% end %>

data/app/views/fe/admin/panels/_prop_sheet.html.erb

@@ -10,8 +10,11 @@
     <p><label for="" class="desc">Label <span class="required">required</span></label>
     <%= f.text_field :label, :maxlength => 50 %></p>
 
+    <p><label for="" class="desc">Languages (in addition to english)</label>
+    <%= f.select :languages, Fe::LANGUAGES.collect {|k, v| [v, k]}, {}, { size: 3, multiple: true }  %></p>
+
     <p class="buttons">
-    <%= submit_tag"Update &raquo;".html_safe %></p>
+    <%= submit_tag "Update &raquo;".html_safe, data: { disable_with: "Please wait..." } %></p>
 
   <% end %>
 </div>

data/app/views/fe/admin/question_pages/_element.html.erb

@@ -1,4 +1,10 @@
-<li class="element" id="element_<%= element.id %>">
+<% container_element = element.is_a?(Fe::QuestionGrid) || (element.is_a?(Fe::ChoiceField) && element.style == 'yes-no') %>
+<% if container_element %>
+  <!-- add a droppable block before and after each container element (question_grid / choice_field) so that the admin can move elements out of a container element -->
+  <li class="droppable around-container before-container" data-element_id="<%= element.id %>" data-url="<%= drop_fe_admin_question_sheet_page_element_path(@page.question_sheet_id, @page.id, element.id, before: true) %>"></li>
+<% end %>
+
+<li class="element sortable <%= 'container' if container_element %>" id="element_<%= element.id %>" data-element_id="<%= element.id %>">
   <div class="controls">
   	<ul>
   		<li><%= link_to "edit", edit_fe_admin_question_sheet_page_element_path(@page.question_sheet.id, @page.id, element.id), :remote => true, :method => :get, :class => "edit", :title => "Edit this element" %></li>
@@ -16,3 +22,7 @@
   <div class="q q_form" id="element_form_<%= dom_id(element) %>">
   </div>
 </li>
+
+<% if container_element %>
+  <li class="droppable around-container after-container" data-element_id="<%= element.id %>" data-url="<%= drop_fe_admin_question_sheet_page_element_path(@page.question_sheet_id, @page.id, element.id, after: true) %>"></li>
+<% end %>

data/app/views/fe/answer_pages/_answer_page.html.erb

@@ -5,14 +5,15 @@
   <div id="<%= page_dom %>" class="answer-page" style="<% if show_first.nil? -%>display: none;<% end -%>">  <!-- this id is parsed by fe.public.js -->
 
     <div class="page">
-      <h4 id='page-name'><%= @presenter.active_page.label %></h4>
+      <%= render "fe/answer_pages/page_name" %>
 
       <% if @elements.length > 0 -%>
         <%= form_tag @presenter.active_page_link.save_path, :id => "#{page_dom}-form", :onsubmit => "$.fe.pageHandler.savePage($('#sp_application_55716-page_331')); return false;", :multipart => true do -%>
+          <%= hidden_field_tag 'a', params[:a] %>
           <ul class="questions" id="questions_list">
             <% previous_element = nil %>
             <% @elements.each do |element| %>
-            <li style="<%= 'display:none' if previous_element && previous_element.conditional == element && !previous_element.conditional_match(@answer_sheet) %>" class="<%= element.class.to_s.downcase %> <%= element.style.to_s.downcase %> <%= 'conditional' if element.conditional %>" id="element_<%= element.id %>" <% if element.conditional %>data-conditional_id="<%= element.conditional_id %>" data-conditional_type="<%= element.conditional_type %>" data-conditional_answer="<%= element.conditional_answer %>" data-application_id="<%= @answer_sheet.id %>"<% end %>>
+            <li style="<%= 'display:none' if previous_element && previous_element.conditional == element && !previous_element.conditional_match(@answer_sheet) %>" class="<%= element.class.to_s.downcase.gsub('::','_') %> <%= element.style.to_s.downcase %> <%= 'conditional' if element.conditional %>" id="element_<%= element.id %>" <% if element.conditional %>data-conditional_id="<%= element.conditional_id %>" data-conditional_type="<%= element.conditional_type %>" data-conditional_answer="<%= element.conditional_answer %>" data-application_id="<%= @answer_sheet.id %>" data-answer_sheet_id_prefix="<%= @answer_sheet.class.name.underscore.gsub('/','_') %>"<% end %>>
               <%= render 'fe/answer_pages/element', :element => element %>
               </li>
               <% previous_element = element %>
@@ -22,22 +23,22 @@
           <% if next_js.empty? -%>
             <div id="submit_message" class="validation-advice" style="display: none;"></div>
             <div>
-              <button type="button" class="button save_button">Save Now</button>
-              <button type="submit" style="background-color: #f9b625; border: 2px solid #f8ae0c; color: white !important;" class="button cru-gold no-left-margin" onclick="page_handler.completeAll(); return false;" id="submit_button">Submit</button>
+              <button type="button" class="button save_button"><%= _('Save Now') %></button>
+              <button type="submit" class="button cru-gold no-left-margin" onclick="page_handler.completeAll(); return false;" id="submit_button"><%= _('Submit') %></button>
             </div>
           <% else -%>
             <div class="savestatus">
-              Last Saved: <span class="last-saved"><%= l(@answer_sheet.updated_at, :format => :datetime) %></span><%= spinner(page_dom) %>
+              <%= _('Last Saved:') %> <span class="last-saved"><%= l(@answer_sheet.updated_at, :format => :datetime) %></span><%= spinner(page_dom) %>
             </div>
             <div>
-              <button type="button" class="button no-left-margin save_button">Save Now</button>
-              <button type="button" class="button cru-gold" onclick="<%= next_js %>">Next >></button>
+              <button type="button" class="button no-left-margin save_button"><%= _('Save Now') %></button>
+              <button type="button" class="button cru-gold" onclick="<%= next_js %>"><%= _('Next >>') %></button>
             </div>
           <% end -%>
         <% end -%>
       <% else -%>
         <div style="background: #ffc;">
-          <p>There are no questions on this page.</p>
+          <p><%= _('There are no questions on this page.') %></p>
         </div>
       <% end -%>
     </div>

data/app/views/fe/answer_pages/_element.html.erb

@@ -1,13 +1,12 @@
+
 <% if element.question? && element.default_label? && element.label.present? && !element.hide_label? -%>
   <label for="<%= dom_id(element) %>" class="desc">
-    <%= raw element.label %>
-    <% if element.required?(@answer_sheet) -%><span class="required">required</span><% end -%>
+    <%= raw element.label(session[:locale]) %>
+    <% if element.required?(@answer_sheet, @page) -%><span class="required"><%= _('required') %></span><% end -%>
     <%= tip(element.tooltip) if element.tooltip.present? %>
   </label>
 <% end -%>
 
-<% begin %>
-  <%= render :partial => 'fe/questions/' + element.ptemplate, :object => element, :locals => {:col => nil} %>
-<% rescue => ex %>
-  <% raise ex %>
-<% end %>
+<% col ||= nil %>
+<%= render :partial => 'fe/questions/' + element.ptemplate, :object => element, :locals => {:col => col} %>
+

data/app/views/fe/answer_pages/_page_name.html.erb

@@ -0,0 +1 @@
+<h4 id='page-name'><%= @presenter.active_page.label(session[:locale]) %></h4>

data/app/views/fe/answer_pages/update.js.erb

@@ -1,5 +1,5 @@
-$('.last-saved').html('<%= escape_javascript(l(@answer_sheet.updated_at, :format => :datetime)) %>')
+$('.last-saved').html('<%= escape_javascript(l(@saved_at_timestamp, :format => :datetime)) %>')
 <% if @answer && @answer.attachment_file_name %>
-    $('#attachment_field_<%= @answer.question_id %>_filename').html('Current File: <%= link_to(@answer.attachment_file_name, @answer.attachment.url) %>')
-    $('#attachment_field_<%= @answer.question_id %>_filename').effect('highlight')
+    $('#<%= dom_id(@answer.question) %>_filename').html('Current File: <%= link_to(@answer.attachment_file_name, @answer.attachment.url) %>')
+    $('#<%= dom_id(@answer.question) %>_filename').effect('highlight')
 <% end %>

data/app/views/fe/answer_sheets/_answer_sheet.html.erb

@@ -2,11 +2,11 @@
 
 <% if elements.length > 0 -%>
 
-    <% elements.each do |page_id, page_elements| -%>
-        <% page = Fe::Page.find(page_id) %>
+    <% elements.each do |page, page_elements| -%>
         <% next unless page.has_questions? %>
+        <a name="<%= dom_id(page) %>"></a>
 
-        <div class="page">
+        <div class="page" data-page-id="<%= page.id %>">
           <h3><%= page.label %></h3>
           <ul class="questions readonly" start="<%= @question_number %>">
             <%= render :partial => 'fe/answer_sheets/element', :collection => page_elements, :locals => {:elements => page_elements} %>

data/app/views/fe/answer_sheets/_element.html.erb

@@ -1,39 +1,54 @@
-<% if element.kind == "Fe::QuestionGrid" -%>
+<% if element.kind == "Fe::QuestionGrid" || element.kind == "Fe::QuestionGridWithTotal"-%>
   <li>
-  	<label class="desc"><%= raw element.label %></label>
-  	<table class="grid">
-  	<%- if element.cols -%>
-  	<tr>
-  	<%- element.cols.split(';').each do |header| -%>
-  		<th><%= raw header || '&nbsp;' %></th>
-  	<%- end -%>
-  	</tr>
-  	<%- end -%>
-  	<tr>
-  		<%- col_count = 0
-  			element.elements.each do |grid_element| -%>
-  		<td id="element_<%= element.id %>">
-  			<% if %w(Fe::Paragraph).include?(grid_element.kind) -%>
-    			<%= simple_format grid_element.content %>
-  			<% else -%>
-    			<%# el = elements.detect {|el| el.id == grid_element.id } -%>
-                        <% if grid_element.question? -%>
-                          <label class="desc"><%= raw grid_element.label %></label>
-                        <% end %>
-                        <span class="answer"><%= simple_format grid_element.display_response(@answer_sheet) %></span>
-  			<% end -%>
-  		</td>
-  		<%- 	col_count += 1
-  				if col_count % element.num_cols == 0 then col_count = 0 -%></tr><tr><%- end -%>
-  		<%-	end -%>
-  		<%- while col_count < element.num_cols do 
-  				col_count += 1-%>
-  				<td>&nbsp;</td>
-  		<%- end unless col_count == 0-%>
-  	</tr>
-  	</table>
+    <label class="desc"><%= raw element.label %></label>
+    <table class="grid">
+    <%- if element.cols -%>
+    <tr>
+    <%- element.cols.split(';').each do |header| -%>
+      <th><%= raw header || '&nbsp;' %></th>
+    <%- end -%>
+    </tr>
+    <%- end -%>
+    <tr>
+      <%- col_count = 0
+        element.elements.each do |grid_element| -%>
+      <td id="element_<%= element.id %>">
+      <% if %w(Fe::Paragraph).include?(grid_element.kind) -%>
+        <%= simple_format grid_element.content %>
+      <% else -%>
+        <%# el = elements.detect {|el| el.id == grid_element.id } -%>
+        <% if grid_element.question? -%>
+          <label class="desc"><%= raw grid_element.label %></label>
+          <%- if @collating -%>
+            <%- for answer_sheet in @collated_answer_sheets[@answer_sheet] -%>
+              <div class="answer collate">
+              <span class="reviewer_name"><%= answer_sheet.collat_title %>:</span>
+              <span class="reviewer_answer"><%= simple_format grid_element.display_response(answer_sheet) %></span>
+              </div>
+            <%- end -%>
+          <%- else -%>
+            <span class="answer"><%= simple_format grid_element.display_response(@answer_sheet) %></span>
+          <%- end -%>
+        <% elsif grid_element.is_a?(Fe::QuestionGrid) || grid_element.is_a?(Fe::QuestionGridWithTotal) %>
+          <ul>
+            <%= render :partial => 'fe/answer_sheets/element', :object => grid_element %>
+          </ul>
+        <% else %>
+          <%= render :partial => 'fe/questions/' + element.ptemplate, :object => element %>
+        <% end %>
+      <% end -%>
+      </td>
+      <%-   col_count += 1
+          if col_count % element.num_cols == 0 then col_count = 0 -%></tr><tr><%- end -%>
+      <%- end -%>
+      <%- while col_count < element.num_cols do 
+          col_count += 1-%>
+          <td>&nbsp;</td>
+      <%- end unless col_count == 0-%>
+    </tr>
+    </table>
   </li>
-<% elsif element.question_grid_id.nil? && element.conditional_id.nil? -%>
+<% else %>
   <li>
     <% if element.question? -%>
       <label class="desc"><%= raw element.label %></label>
@@ -51,4 +66,7 @@
       <%= render :partial => 'fe/questions/' + element.ptemplate, :object => element %>
     <% end -%>
   </li>
+  <% element.choice_field_children.each do |choice_field_child| %>
+    <%= render 'fe/answer_sheets/element', element: choice_field_child %>
+  <% end %>
 <% end -%>