fe 0.0.4 → 1.0.0

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

@@ -1,5 +1,5 @@
 <div class="submission_errors">
-  <p>You still need to answer questions on the following pages:</p>
+  <p><%= _('You still need to answer questions on the following pages:') %></p>
   <ul>
     <% @answer_sheet.pages.each do |page| %>
         <% unless page.complete?(@answer_sheet) %>

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

@@ -2,6 +2,6 @@
 <% if session[:attempted_submit] && page_link.page.has_questions? %>
 	<% css_class = page_link.page.complete?(@answer_sheet) ? 'complete' : 'incomplete' %>
 <% end %>
-<%= li_page_active_if(@presenter.active_page && page_link.page == @presenter.active_page, :id => page_link.dom_id + '-li', :class => css_class, :style => ('display:none' if @answer_sheet.question_sheet.hidden_pages(@answer_sheet).include?(page_link.page))) do %>
-  <%= link_to_function(page_link.label, load_page_js(page_link), :id => page_link.dom_id + '-link', 'data-page-id' => page_link.dom_id, :class => 'page_link', :href => page_link.load_path) %>
+<%= li_page_active_if(@presenter.active_page && page_link.page == @presenter.active_page, :id => page_link.dom_id + '-li', :class => css_class, :style => ('display:none' if page_link.page.hidden?(@answer_sheet))) do %>
+  <%= link_to_function(page_link.label(session[:locale]), load_page_js(page_link), :id => page_link.dom_id + '-link', 'data-page-id' => page_link.dom_id, :class => 'page_link', :href => page_link.load_path) %>
 <% end -%>

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

@@ -1,11 +1,11 @@
 <div id="panel-pages">
-  <h4>Application Sections</h4>
+  <h4><%= _('Application Sections') %></h4>
   <div id="page_ajax_spinner" style="display:none;">
     <div>
-      <%= image_tag 'qe/ajax-loader.gif' %> Loading...
+      <%= image_tag 'fe/ajax-loader.gif' %> <%= _('Loading...') %>
     </div>
   </div>
   <ul id="list-pages" class="navigation-list">
     <%= render :partial => 'fe/answer_sheets/page_link', :collection => @presenter.page_links %>
   </ul>
-</div>
+</div>

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

@@ -0,0 +1 @@
+<%= hidden_field_tag 'submit_to', submit_fe_answer_sheet_path(@answer_sheet), :id => 'submit_to' %>

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

@@ -8,8 +8,8 @@
       <%= render :partial => 'fe/answer_sheets/pages_list' %>
     </div>
     <div id="legend">
-      <%= image_tag('fe/icons/question-balloon.png') %> Rolling over this symbol gives you help<br/>
-      <%= image_tag('fe/icons/star-small.png') %> Marks a required field
+      <%= image_tag('fe/icons/question-balloon.png') %> <%= _('Rolling over this symbol gives you help') %><br/>
+      <%= image_tag('fe/icons/star-small.png') %> <%= _('Marks a required field') %>
     </div>
   </div>
 
@@ -23,7 +23,7 @@
       page_handler = $.fe.pageHandler;
       page_handler.initialize('<%= @presenter.active_page_link.try(:dom_id) %>');
       // Event.observe(window, 'unload', page_handler.savePage);
-          
+
       // Validation.add('validate-phone', 'Please enter a valid phone number +1-800-555-1234 x102', {
       //   pattern: /((\(\d{3}\)?)|(\d{3}))((\s|-|\.|\/)?)(\d{3})((\s|-|\.|\/)?)(\d{4})\s*([xX]|[eE][xX][tT])?\.?\s*\d*$/
       // });
@@ -34,33 +34,33 @@
       //    return $F(elm);
       //  });
       // })
-      
+
       // global responders for all Ajax requests
       $(function() {
-        $('#page_ajax_spinner').ajaxStart(function() {
-          $(this).show();
+        $(document).ajaxStart(function() {
+          $('#page_ajax_spinner').show();
+          $('#page_ajax_spinner').css({top: $(window).scrollTop() + 200});
         }).ajaxComplete(function() {
-          $(this).hide();
+          $('#page_ajax_spinner').hide();
         })
       });
     });
     function updateTotals() {
       // Set up js for all question grids with totals
       <% if @page %>
-        <% @page.question_sheet.pages.collect(&:question_grid_with_totals).flatten.each do |question_grid_with_total| 
+        <% @page.question_sheet.pages.collect(&:question_grid_with_totals).flatten.each do |question_grid_with_total|
             question_grid_with_total.total_cols.split(',').collect(&:to_i).each do |col| -%>
               try {
-                updateTotal('<%= "#{question_grid_with_total.id}_#{col - 1}" %>')
-                $$(".col_<%= "#{question_grid_with_total.id}_#{col - 1}" %>").each(function(e) {
-                  Event.observe(e, 'blur', function(event) {
-                    updateTotal('<%= "#{question_grid_with_total.id}_#{col - 1}" %>')
-                  });
+                updateTotal('<%= "#{question_grid_with_total.id}_#{col - 1}" %>');
+                $(".col_<%= "#{question_grid_with_total.id}_#{col - 1}" %>").change(function(e) {
+                  updateTotal('<%= "#{question_grid_with_total.id}_#{col - 1}" %>');
                 });
               } catch(e) {}
         <%  end
           end %>
       <% end %>
     }
+    $(function() { $(document).trigger('fePageLoaded'); });
   </script>
-  <%= hidden_field_tag 'submit_to', submit_fe_answer_sheet_path(@answer_sheet), :id => 'submit_to' %>
+  <%= render "fe/answer_sheets/submit_to" %>
 <% end %>

data/app/views/fe/answer_sheets/incomplete.js.erb

@@ -1,3 +1,6 @@
+if ($('#submit_message').length == 0) {
+  $("ul#questions_list").filter(":visible").append("<li><div id=\"submit_message\"></div></li>");
+}
 $('#submit_message').html('<%= escape_javascript(render('incomplete')) %>')
 <% @answer_sheet.pages.each do |page| %>
   $('#<%= dom_id(@answer_sheet) %>-<%= dom_id(page) %>-li').replaceWith('<%= escape_javascript(render('fe/answer_sheets/page_link', :page_link => @presenter.new_page_link(@answer_sheet, page))) %>')

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

@@ -1,6 +1,6 @@
 <h1>Questionnaires</h1>
 
-<% form_tag answer_sheets_path() do %>
+<% form_tag fe_answer_sheets_path do %>
   <%= select_tag("question_sheet_id", options_for_select(@question_sheets)) %>
   <%= submit_tag("Capture") %>
 <% end -%>
@@ -8,8 +8,8 @@
 <table cellspacing="0" class="list"> 
 <% for answer_sheet in @answer_sheets %>
   <tr>
-    <td><%= link_to answer_sheet.question_sheet.label, edit_answer_sheet_path(answer_sheet) %></td>
-    <td><%= link_to 'Review', answer_sheet_path(answer_sheet), :method => :get %></td>
+    <td><%= link_to answer_sheet.question_sheet.label, edit_fe_answer_sheet_path(answer_sheet) %></td>
+    <td><%= link_to 'Review', fe_answer_sheet_path(answer_sheet), :method => :get %></td>
   </tr>
 <% end %>
 </table>

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

@@ -8,6 +8,6 @@
 
 <div id="preview" class="answer-page">
     
-<%= render :partial => 'answer_sheets/answer_sheet', :locals => {:answer_sheet => @answer_sheet, :elements => @elements } %>
+<%= render :partial => 'fe/answer_sheets/answer_sheet', :locals => {:answer_sheet => @answer_sheet, :elements => @elements } %>
 
 </div>

data/app/views/fe/applications/_logout.html.erb

@@ -0,0 +1 @@
+<% if user_signed_in? %><%= link_to(_("Log Out"), destroy_user_session_path, { :method => :delete, :style => "color: #fff;", :id => "link-log-out" }) %><% end %>

data/app/views/fe/applications/show.html.erb

@@ -0,0 +1 @@
+Implement the applications show view in your app

data/app/views/fe/questions/fe/_acceptance.html.erb

@@ -5,9 +5,9 @@
        checked,
       :id => dom_id(acceptance),
       :class => css_class,
-      :disabled => @answer_sheet.frozen?&&!@answer_sheet.reference?,
-      :readonly => @answer_sheet.frozen?&&!@answer_sheet.reference? %>
+      :disabled => @answer_sheet.frozen?&&!@answer_sheet.try(:reference?),
+      :readonly => @answer_sheet.frozen?&&!@answer_sheet.try(:reference?) %>
 <label class="choice" for="<%= dom_id(acceptance) %>">
-  <%= raw acceptance.label %>
+  <%= raw acceptance.label(session[:locale]) %>
 </label>
 <%= hidden_field_tag "answers[#{acceptance.id}]", '', :id => '' %>

data/app/views/fe/questions/fe/_attachment_field.html.erb

@@ -1,6 +1,9 @@
 <% if @presenter %>
-  <% if @answer_sheet.frozen? && !@answer_sheet.reference? %>
-    Current File: <%= link_to(answer.attachment_file_name, answer.attachment.url) %>
+  <% if @answer_sheet.frozen? && !@answer_sheet.try(:reference?) %>
+    <% answer = attachment_field.responses(@answer_sheet).first %>
+    <% if answer %>
+      Current File: <%= link_to(answer.attachment_file_name, answer.attachment.url) %>
+    <% end %>
   <% else %>
       <div class="uploader">
         <input id="<%= dom_id(attachment_field) %>_file_uploader" name="image_uploader" type="file" />
@@ -34,7 +37,8 @@
               '_http_accept': 'application/javascript',
               '_method': 'post',
               '<%= session_key_name %>' : encodeURIComponent('<%= u cookies[session_key_name] %>'),
-              'authenticity_token': encodeURIComponent('<%= u form_authenticity_token %>')
+              'authenticity_token': encodeURIComponent('<%= u form_authenticity_token %>'),
+              'answer_sheet_type': answer_sheet_type
             }
         });
       </script>

data/app/views/fe/questions/fe/_checkbox_field.html.erb

@@ -2,47 +2,49 @@
   <tr id="<%= dom_id(checkbox_field) %>">
     <td>
       <label for="<%= dom_id(checkbox_field) %>" class="desc">
-        <%= raw checkbox_field.label %>
-        <% if checkbox_field.required?(@answer_sheet) -%><span class="required">required</span><% end -%>
+        <%= raw checkbox_field.label(session[:locale]) %>
+        <% if checkbox_field.required?(@answer_sheet, @page) -%><span class="required">required</span><% end -%>
         <%= tip(checkbox_field.tooltip) if checkbox_field.tooltip.present? %>
       </label>
     </td>
-  <% checkbox_field.choices.each_with_index do |choice, num| -%>
+  <% choices = checkbox_field.choices(session[:locale]) %>
+  <% choices.each_with_index do |choice, num| -%>
     <td>
-      <% css_class = 'checkbox ' -%>
-      <% dom_id = dom_id(checkbox_field) + "_" + pretty_tag(choice[1]) 
-         last_choice = (num == checkbox_field.choices.length - 1)
+      <% css_class = checkbox_field.css_class.to_s + ' checkbox ' -%>
+      <% dom_id = dom_id(checkbox_field) + "_" + pretty_tag(choice[1])
+         last_choice = (num == choices.length - 1)
          css_class += checkbox_field.validation_class(@answer_sheet) if last_choice
       -%>
       <%= hidden_field_tag "answers[#{checkbox_field.id}][#{num}]", '', :id => '' %>
       <div class="field field_check">
         <%= check_box_tag "answers[#{checkbox_field.id}][#{num}]", choice[1],
-              checkbox_field.has_answer?(choice[1], @answer_sheet), 
-              :id => dom_id, 
+              checkbox_field.has_answer?(choice[1], @answer_sheet),
+              :id => dom_id,
               :class => css_class,
-              :disabled => @answer_sheet.frozen?&&!@presenter.reference?,
-              :readonly => @answer_sheet.frozen?&&!@presenter.reference? %>
+              :disabled => @answer_sheet.frozen?&&!@presenter.try(:reference?),
+              :readonly => @answer_sheet.frozen?&&!@presenter.try(:reference?) %>
       </div>
      </td>
   <% end -%>
   </tr>
 <% else %>
   <div id="<%= dom_id(checkbox_field) %>">
-  <% css_class = 'checkbox ' -%>
-  <% checkbox_field.choices.each_with_index do |choice, num| -%>
-    <% dom_id = dom_id(checkbox_field) + "_" + pretty_tag(choice[1]) 
-       last_choice = (num == checkbox_field.choices.length - 1)
-       css_class += checkbox_field.validation_class(@answer_sheet) if last_choice
-    -%>
-    <%= hidden_field_tag "answers[#{checkbox_field.id}][#{num}]", '', :id => '' %>
-    <div class="field field_check">
-    <%= check_box_tag "answers[#{checkbox_field.id}][#{num}]", choice[1],
-          checkbox_field.has_answer?(choice[1], @answer_sheet), 
-          :id => dom_id, 
+    <% css_class = checkbox_field.css_class.to_s + ' checkbox ' -%>
+    <% choices = checkbox_field.choices(session[:locale]) %>
+    <% choices.each_with_index do |choice, num| -%>
+      <% dom_id = dom_id(checkbox_field) + "_" + pretty_tag(choice[1])
+         last_choice = (num == choices.length - 1)
+         css_class += checkbox_field.validation_class(@answer_sheet) if last_choice
+      %>
+      <%= hidden_field_tag "answers[#{checkbox_field.id}][#{num}]", '', :id => '' %>
+      <div class="field field_check">
+      <%= check_box_tag "answers[#{checkbox_field.id}][#{num}]", choice[1],
+          checkbox_field.has_answer?(choice[1], @answer_sheet),
+          :id => dom_id,
           :class => css_class,
-          :disabled => @answer_sheet.frozen?&&!@presenter.reference?,
-          :readonly => @answer_sheet.frozen?&&!@presenter.reference? %>
-    <label class="choice" for="<%= dom_id %>"><%= choice[0] %></label>
+          :disabled => @answer_sheet.frozen?&&!@presenter.try(:reference?),
+          :readonly => @answer_sheet.frozen?&&!@presenter.try(:reference?) %>
+      <label class="choice" for="<%= dom_id %>"><%= choice[0] %></label>
     </div>
   <% end -%>
   </div>

data/app/views/fe/questions/fe/_date_field.html.erb

@@ -1,7 +1,6 @@
 <%= calendar_date_select_tag "answers[#{date_field.id}]", date_field.format_date_response(@answer_sheet),
       :class => 'text ' + date_field.validation_class(@answer_sheet),
       :id => dom_id(date_field),
-      :disabled => @answer_sheet.frozen?&&!@presenter.reference?,
+      :disabled => @answer_sheet.frozen?&&!@presenter.try(:reference?),
       :readonly => true %>
-<div id="advice-validate-date-<%= dom_id(date_field) %>" class="validation-advice" style="display: none;">Please enter a valid date (MM/DD/YYYY).</div>
 <div id="advice-required-<%= dom_id(date_field) %>" class="validation-advice" style="display: none;">This is a required field.</div>

data/app/views/fe/questions/fe/_date_field_mmyy.html.erb

@@ -1,8 +1,8 @@
 <%= select_month(date_field_mmyy.response(@answer_sheet), :include_blank => true,
       :prefix => "answers[#{date_field_mmyy.id}]",
-      :class => 'select ' + date_field_mmyy.validation_class(@answer_sheet)) %> 
+      :class => 'select ' + date_field_mmyy.validation_class(@answer_sheet)) %>
 <%= select_year(date_field_mmyy.response(@answer_sheet), :include_blank => true,
-      :start_year => Time.now.year - 50, :end_year => Time.now.year + 7, 
+      :start_year => Time.now.year - 50, :end_year => Time.now.year + 7,
       :prefix => "answers[#{date_field_mmyy.id}]",
       :class => 'select ' + date_field_mmyy.validation_class(@answer_sheet)) %>
 

data/app/views/fe/questions/fe/_drop_down_field.html.erb

@@ -1,7 +1,8 @@
+<% choices = drop_down_field.choices(session[:locale]) %>
 <% locked = drop_down_field.locked?(params, @answer_sheet, @presenter) %>
 <%= select_tag "answers[#{drop_down_field.id}]",
-      options_for_select([""] + drop_down_field.choices, drop_down_field.response(@answer_sheet).to_s),
-      :class => 'select ' + drop_down_field.validation_class(@answer_sheet),
+      options_for_select([""] + choices, drop_down_field.response(@answer_sheet).to_s),
+      :class => 'form-control select ' + drop_down_field.validation_class(@answer_sheet) + " #{drop_down_field.css_class}",
       :id => dom_id(drop_down_field),
       :disabled => locked,
       :readonly => locked %>

data/app/views/fe/questions/fe/_paragraph.html.erb

@@ -1 +1 @@
-<div class="p_content"><%= raw paragraph.content %></div>
+<div class="p_content <%= paragraph.css_class %>"><%= raw paragraph.content(session[:locale]) %></div>

data/app/views/fe/questions/fe/_question_grid.html.erb

@@ -2,8 +2,8 @@
   <div class="droppable" data-url="<%= drop_fe_admin_question_sheet_page_element_path(@page.question_sheet_id, @page.id, question_grid.id) %>">
     <% if question_grid.label.present? && !question_grid.hide_label? -%>
       <label class="desc gridname">
-				<%= raw question_grid.label %>
-    		<% if question_grid.required?(@answer_sheet) -%><span class="required">required</span><% end -%>
+				<%= raw question_grid.label(session[:locale]) %>
+    		<% if question_grid.required?(@answer_sheet, @page) -%><span class="required">required</span><% end -%>
 			</label>
     <% end %>
     <div class="sub_q">
@@ -19,7 +19,7 @@
   </div>
 <%- else -%>
   <% if question_grid.label.present? && !question_grid.hide_label? -%>
-    <label class="desc gridname"><%= raw question_grid.label %></label>
+    <label class="desc gridname"><%= raw question_grid.label(session[:locale]) %></label>
   <% end %>
   <% headers = question_grid.cols.to_s.split(';') %>
   <% if headers.length > 1 %>
@@ -37,16 +37,17 @@
     	<% end %>
     <% else %>
     	<tr >
-    		<%- col_count = 0
+    		<%- col_count = 0; previous_element = nil;
     			question_grid.elements.each do |element| -%>
-    			<td id="element_<%= element.id %>" class="hidecell">
+          <td style="<%= 'display:none' if previous_element && previous_element.conditional == element && !previous_element.conditional_match(@answer_sheet) %>" class="hidecell <%= 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 %>>
     				<%# grid_el = @elements.to_a.find {|el| el.id == element.id} %>
     				<%= render :partial => 'fe/answer_pages/element', :object => element, :locals => {:col => col_count} %>
     			</td>
-    			<%- 	col_count += 1
-    					if col_count % question_grid.num_cols == 0  && element != question_grid.elements.last then col_count = 0 -%></tr><tr><%- end -%>
+          <%- previous_element = element;
+              col_count += 1
+              if col_count % question_grid.num_cols == 0  && element != question_grid.elements.last then col_count = 0 -%></tr><tr><%- end -%>
     		<%-	end -%>
-    		<%- while col_count < question_grid.num_cols do 
+    		<%- while col_count < question_grid.num_cols do
     				col_count += 1-%>
     				<td>&nbsp;</td>
     		<%- end unless col_count == 0-%>
@@ -57,8 +58,12 @@
     <% if headers[0].to_s.strip.present? %>
       <div class="header"><%= headers[0] %></div>
     <% end %>
+    <% previous_element = nil %>
     <% question_grid.elements.each do |element| -%>
-      <div class="row" id="element_<%= element.id %>"><%= render :partial => 'fe/answer_pages/element', :object => element, :locals => {:in_grid => true} %></div>
+      <div style="<%= 'display:none' if previous_element && previous_element.conditional == element && !previous_element.conditional_match(@answer_sheet) %>" class="row <%= 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 :partial => 'fe/answer_pages/element', :object => element, :locals => {:in_grid => true} %>
+      </div>
+      <% previous_element = element %>
     <% end %>
     <div class="clear"></div>
   <% end %>

data/app/views/fe/questions/fe/_question_grid_with_total.html.erb

@@ -1,19 +1,19 @@
 <%- if ['question_pages', 'question_sheets', 'elements'].include?(controller.controller_name) -%>
   <div class="droppable" data-url="<%= drop_fe_admin_question_sheet_page_element_path(@page.question_sheet_id, @page.id, question_grid_with_total.id) %>">
-    <label class="desc"><%= raw question_grid_with_total.label %></label>
+    <label class="desc"><%= raw question_grid_with_total.label(session[:locale]) %></label>
     <div>
-    	<ul class="questions" id="questions_list_<%= question_grid_with_total.id %>">
+      <ul class="questions" id="questions_list_<%= question_grid_with_total.id %>" data-sortable="true" data-sortable-url="<%= reorder_fe_admin_question_sheet_page_elements_path(@page.question_sheet_id, @page.id) %>" data-sortable-handle=".handle">
     	<%- if question_grid_with_total.elements.length > 0 -%>
-        <%= render :partial => 'question_pages/element', :collection => question_grid_with_total.elements, :locals => {:in_grid => true} %>
+        <%= render :partial => 'fe/admin/question_pages/element', :collection => question_grid_with_total.elements, :locals => {:in_grid => true} %>
     	<%- else -%>
     		Grid
     	<%- end -%>
        </ul>
     </div>
-  </div>      
+  </div>
 <%- else -%>
-  <label class="desc"><%= raw question_grid_with_total.label %></label>
-  	<table class="grid">
+  <label class="desc"><%= raw question_grid_with_total.label(session[:locale]) %></label>
+  	<table class="grid with_total">
 	  <% headers = question_grid_with_total.cols.to_s.split(';') %>
 	  <% if headers.detect {|h| h.strip.present?} %>
     	<tr>
@@ -22,29 +22,36 @@
     	<%- end -%>
     	</tr>
     <% end %>
-  	<tr >
+  	<tr>
   		<%- col_count = 0
   			question_grid_with_total.elements.each do |element| -%>
   			<td id="element_<%= element.id %>">
-  				<% grid_el = @elements.to_a.find {|el| el.id == element.id} %>
-  				<%= render :partial => 'answer_pages/element', :object => grid_el, :locals => {:in_grid => true, :col => col_count} if grid_el %>
+  				<%# grid_el = @elements.to_a.find {|el| el.id == element.id} %>
+          <% col_count = (col_count + 1) % question_grid_with_total.num_cols %>
+  				<%= render :partial => 'fe/answer_pages/element', :object => element, :locals => {:in_grid => true, :col => col_count} %>
   			</td>
   			<%- 	col_count += 1
   					if col_count % question_grid_with_total.num_cols == 0  && element != question_grid_with_total.elements.last then col_count = 0 -%></tr><tr><%- end -%>
   		<%-	end -%>
-  		<%- while col_count < question_grid_with_total.num_cols do 
+  		<%- while col_count < question_grid_with_total.num_cols do
   				col_count += 1-%>
   				<td>&nbsp;</td>
   		<%- end unless col_count == 0-%>
   	</tr>
   	<%- if question_grid_with_total.total_cols.present? -%>
-    	<tr>
+    	<tr class="total">
     		<td>Total</td>
-      	<%- total_cols = question_grid_with_total.total_cols.split(',').collect(&:to_i) 
-      	    (question_grid_with_total.num_cols - 1).times do |i| 
-      	      if total_cols.include?(i + 2) -%>
+      	<%- total_cols = question_grid_with_total.total_cols.split(',').collect(&:to_i)
+      	    (question_grid_with_total.num_cols - 1).times do |i|
+              ci = i + 2
+      	      if total_cols.include?(ci) -%>
             	  <td>
             	    <%= text_field_tag "total_#{question_grid_with_total.id}_#{i + 1}", '', :class => 'text validate-number', :readonly => true %>
+                  <script>
+                    $("#<%= "total_#{question_grid_with_total.id}_#{i + 1}" %>").closest("table").find("td:nth-child(<%= ci %>)").change(function() {
+                      updateTotal("<%= question_grid_with_total.id %>_<%= i+1 %>");
+                    });
+                  </script>
             	  </td>
             <% else %>
               <td>&nbsp;</td>

data/app/views/fe/questions/fe/_questions.html.erb

@@ -1,8 +1,8 @@
 <ul>
 	<% questions.each do |question| %>
-		<li><%= link_to(use_existing_fe_admin_question_sheet_page_element_path(:question_sheet_id => @page.question_sheet_id, :page_id => @page.id, :id => question.id), 
+		<li><%= link_to(use_existing_fe_admin_question_sheet_page_element_path(:question_sheet_id => @page.question_sheet_id, :page_id => @page.id, :id => question.id),
 										:remote => true, :method => :post) do %>
-					<span>select</span><label><%= raw question.label %></label>
+					<span>select</span><label><%= raw question.label(session[:locale]) %></label>
 				<% end %>
 		</li>
 	<% end %>

data/app/views/fe/questions/fe/_radio_button_field.html.erb

@@ -1,41 +1,42 @@
+<% choices = radio_button_field.choices(session[:locale]) %>
 <% css_class = 'radio ' -%>
-<% css_class += 'required' if radio_button_field.required? %>
+<% css_class += 'required' if radio_button_field.required?(@answer_sheet, @page) %>
 <% if radio_button_field.hide_option_labels? && !['question_pages', 'question_sheets', 'elements'].include?(controller.controller_name) %>
   <tr id="<%= dom_id(radio_button_field) %>">
     <td class="col1">
       <label for="<%= dom_id(radio_button_field) %>" class="desc">
-        <%= raw radio_button_field.label %>
-        <% if radio_button_field.required?(@answer_sheet) -%><span class="required">required</span><% end -%>
+        <%= raw radio_button_field.label(session[:locale]) %>
+        <% if radio_button_field.required?(@answer_sheet, @page) -%><span class="required">required</span><% end -%>
         <%= tip(radio_button_field.tooltip) if radio_button_field.tooltip.present? %>
       </label>
     </td>
-  <% radio_button_field.choices.each_with_index do |choice, num| -%>
+  <% choices.each_with_index do |choice, num| -%>
     <td class="col">
       <% dom_id = dom_id(radio_button_field) + "_" + pretty_tag(choice[1])
-         last_choice =  (num == radio_button_field.choices.length - 1)
+         last_choice =  (num == choices.length - 1)
          css_class += radio_button_field.validation_class(@answer_sheet) if last_choice
          checked = radio_button_field.has_answer?(choice[1], @answer_sheet) -%>
       <%= radio_button_tag "answers[#{radio_button_field.id}]", choice[1], checked,
             :id => dom_id,
             :class => css_class,
-            :disabled => @answer_sheet.frozen?&&!@presenter.reference?,
-            :readonly => @answer_sheet.frozen?&&!@presenter.reference? %>
+            :disabled => @answer_sheet.frozen?&&!@presenter.try(:reference?),
+            :readonly => @answer_sheet.frozen?&&!@presenter.try(:reference?) %>
      </td>
   <% end -%>
   </tr>
 <% else %>
   <div id="<%= dom_id(radio_button_field) %>">
-  <% radio_button_field.choices.each_with_index do |choice, num| -%>
+  <% choices.each_with_index do |choice, num| -%>
     <% dom_id = dom_id(radio_button_field) + "_" + pretty_tag(choice[1])
-       last_choice =  (num == radio_button_field.choices.length - 1)
+       last_choice =  (num == choices.length - 1)
        css_class += radio_button_field.validation_class(@answer_sheet) if last_choice
        checked = radio_button_field.has_answer?(choice[1], @answer_sheet) -%>
     <div class="radio-set">
       <%= radio_button_tag "answers[#{radio_button_field.id}]", choice[1], checked,
                 :id => dom_id,
                 :class => css_class,
-                :disabled => @answer_sheet.frozen?&&!@presenter.reference?,
-                :readonly => @answer_sheet.frozen?&&!@presenter.reference? %>
+                :disabled => @answer_sheet.frozen?&&!@presenter.try(:reference?),
+                :readonly => @answer_sheet.frozen?&&!@presenter.try(:reference?) %>
           <label class="choice" for="<%= dom_id %>"><%= choice[0] %></label>
     </div>
   <% end -%>