fe 1.0.0 → 2.0.0

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

@@ -1,17 +1,26 @@
+<% element_id = attachment_field.id; base_element = "#element_#{element_id}" %>
+
 <% if @presenter %>
-  <% if @answer_sheet.frozen? && !@answer_sheet.try(:reference?) %>
-    <% answer = attachment_field.responses(@answer_sheet).first %>
+  <% answer = attachment_field.responses(@answer_sheet).first %>
+  <% if @answer_sheet&.frozen? && !@answer_sheet&.reference? %>
     <% if answer %>
-      Current File: <%= link_to(answer.attachment_file_name, answer.attachment.url) %>
+      Current File: <%= link_to(answer.attachment.filename, url_for(answer.attachment)) %>
+      <%= link_to(image_tag("fe/icons/minus-button.png"),
+                  delete_file_fe_answer_sheet_page_path(@presenter.active_answer_sheet, @page, question_id: element_id, answer_sheet_type: @answer_sheet.class.name),
+                  method: :delete, remote: true) %>
     <% end %>
   <% else %>
+    <div class="legacy_uploader" style="display: none">
       <div class="uploader">
-        <input id="<%= dom_id(attachment_field) %>_file_uploader" name="image_uploader" type="file" />
-        <!-- width: 350px -->
+        <input <% if Fe.bootstrap %>class="form-control"<% end %> id="<%= dom_id(attachment_field) %>_file_uploader" name="image_uploader" type="file" />
+
         <span id="<%= dom_id(attachment_field) %>_filename">
-        <% answer = attachment_field.responses(@answer_sheet).first
-          if answer.present? %>
-            Current File: <%= link_to(answer.attachment_file_name, answer.attachment.url) %>
+          <% answer = attachment_field.sheet_answers.where(answer_sheet: @answer_sheet).first # using responses method doesn't work because it filters out value nil, but on attachments value will be nil
+             if answer&.attachment&.attached? %>
+            Current File: <%= link_to(answer.attachment.filename, url_for(answer.attachment)) %>
+            <%= link_to(image_tag('fe/icons/minus-button.png'),
+                        delete_file_fe_answer_sheet_page_path(@presenter.active_answer_sheet, @page, question_id: element_id, answer_sheet_type: @answer_sheet.class.name),
+                        method: :delete, remote: true) %>
           <% end %>
         </span>
       </div>
@@ -20,9 +29,9 @@
         <% session_key_name = Rails.application.config.session_options[:key] %>
         $('#<%= dom_id(attachment_field) %>_file_uploader').uploadify({
             uploader        : '<%= asset_path "fe/uploadify/uploadify.swf" %>',
-            script          : '<%= save_file_fe_answer_sheet_page_path(@presenter.active_answer_sheet, @page, :question_id => attachment_field.id) %>',
+            script          : '<%= save_file_fe_answer_sheet_page_path(@presenter.active_answer_sheet, @page, question_id: element_id, answer_sheet_type: @answer_sheet.class.name) %>',
             fileDesc        : 'Pick a file',
-            fileExt         : '*.*',
+            fileExt         : '<%= attachment_field.content || "*.*" %>',
             auto            : true,
             sizeLimit       : <%= 100.megabytes %>,
             width           : 350,
@@ -42,5 +51,115 @@
             }
         });
       </script>
+    </div>
+
+    <div class="new_uploader">
+
+      <% if answer&.attachment&.attached? %>
+        Current File: <%= link_to(answer.attachment.filename, url_for(answer.attachment)) %>
+        <%= link_to(image_tag("fe/icons/minus-button.png"),
+                    delete_file_fe_answer_sheet_page_path(@presenter.active_answer_sheet, @page, question_id: element_id, answer_sheet_type: @answer_sheet.class.name),
+                    method: :delete, remote: true, class: 'remove_current') %>
+        <script>
+          $('<%= base_element %> .remove_current').click(function() {
+            $.ajax({
+              type: 'DELETE',
+              url: '<%= delete_file_fe_answer_sheet_page_path(@presenter.active_answer_sheet, @page, question_id: element_id, answer_sheet_type: @answer_sheet.class.name) %>',
+              success: function(result) {
+                $.get("/fe/answer_sheets/<%= @answer_sheet.id %>/page/<%= @page.id %>/edit?answer_sheet_type=<%= @answer_sheet.class.name %>", function(data) {
+                  $('<%= base_element %>').replaceWith($(data).find('<%= base_element %>'))
+                });
+              }
+            });
+            return false;
+          });
+        </script>
+      <% else %>
+
+      <style>
+          .drop_area.file_hover {
+              background:red;
+          }
+
+      </style>
+
+      <input type="file" class="upload_field" <% if attachment_field.content %>accept="<%= attachment_field.content %>"<% end %>/>
+      <div class="drop_area" style="margin:20px 0; width:300px; padding:20px; border:1px dashed black;">or drop a file here</div>
+      <div class="progress_report">
+          <div class="progress_report_name"></div>
+          <div class="progress_report_status" style="font-style: italic;"></div>
+          <div class="progress_report_bar_container" style="width: 90%; height: 5px;">
+            <div class="progress_report_bar" style="background-color: blue; width: 0; height: 100%;"></div>
+          </div>
+          <br/>
+      </div>
+      <script type="text/javascript">
+          $(function() {
+
+              var $input = $("<%= base_element %> .upload_field").html5_upload({
+                  url: function(number) {
+                    return "<%= save_file_fe_answer_sheet_page_path(@presenter.active_answer_sheet, @page, question_id: element_id, answer_sheet_type: @answer_sheet.class.name) %>";
+                  },
+                  sendBoundary: window.FormData || $.browser.mozilla,
+                  onStart: function(event, total) {
+                    return true;
+                    return confirm("You are trying to upload " + total + " files. Are you sure?");
+                  },
+                  onProgress: function(event, progress, name, number, total) {
+                      console.log(progress, number);
+                  },
+                  setName: function(text) {
+                    $("#element_<%= attachment_field.id %> .progress_report_name").text(text);
+                  },
+                  setStatus: function(text) {
+                    if (!$("<%= base_element %> .upload_field").data('error', true)) {
+                      $("<%= base_element %> .progress_report_status").text(text);
+                    }
+                  },
+                  setProgress: function(val) {
+                    $("<%= base_element %> .progress_report_bar").css('width', Math.ceil(val*100)+"%");
+                  },
+                  onFinishOne: function(event, response, name, number, total) {
+                    // Re-render the attachment file to show the current file; use the page view, which is not the
+                    // most efficient way, but lets us avoid making an action just for this.  And the amount of data
+                    // on a page is not that much
+                    $.get("/fe/answer_sheets/<%= @answer_sheet.id %>/page/<%= @page.id %>/edit?answer_sheet_type=<%= @answer_sheet.class.name %>", function(data) {
+                      $('<%= base_element %>').replaceWith($(data).find('<%= base_element %>'))
+                    });
+                  },
+                  onError: function(event, name, error) {
+                    $("<%= base_element %> .upload_field").data('error', true)
+                    $('<%= base_element %> .progress_report_status').text('Error while uploading file ' + name)
+                  }, onBrowserIncompatible: function() {
+                    $("<%= base_element %> .legacy_uploader").show();
+                    $("<%= base_element %> .new_uploader").hide();
+                  },
+              });
+
+              // this is absolutely necessary -- see http://weblog.bocoup.com/using-datatransfer-with-jquery-events/
+              if ($.fn.jquery.substring(0, 2) == "3.") {
+                $.event.addProp('dataTransfer');
+              } else {
+                $.event.props.push('dataTransfer');
+              }
+
+              var $drop = $('<%= base_element %> .drop_area');
+              $drop.on('dragover dragenter', function(e) {
+                  $drop.addClass('file_hover');
+                  return false;
+              }).on('dragleave dragexit', function(e) {
+                  $drop.removeClass('file_hover');
+                  return false;
+              }).on( 'drop', function(e) {
+                  if(e.originalEvent.dataTransfer && e.originalEvent.dataTransfer.files.length) {
+                      $input.trigger('html5_upload.startFromDrop', e );
+                  }
+                  return false;
+              })
+
+          });
+        </script>
+      </div>
+    <% end %>
   <% end %>
 <% end %>

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

@@ -1,4 +1,4 @@
-<% if checkbox_field.hide_option_labels? && !['question_pages', 'question_sheets', 'elements'].include?(controller.controller_name) %>
+<% if checkbox_field.hide_option_labels? && !["question_pages", "question_sheets", "elements"].include?(controller.controller_name) %>
   <tr id="<%= dom_id(checkbox_field) %>">
     <td>
       <label for="<%= dom_id(checkbox_field) %>" class="desc">
@@ -10,40 +10,42 @@
   <% choices = checkbox_field.choices(session[:locale]) %>
   <% choices.each_with_index do |choice, num| -%>
     <td>
-      <% css_class = checkbox_field.css_class.to_s + ' checkbox ' -%>
+      <% 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 => '' %>
+         css_class += checkbox_field.validation_class(@answer_sheet, @page) if last_choice
+         locked = checkbox_field.locked?(params, @answer_sheet, @presenter, current_person)
+      %>
+      <%= 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.try(:reference?),
-              :readonly => @answer_sheet.frozen?&&!@presenter.try(:reference?) %>
+              id: dom_id,
+              class: css_class,
+              disabled: locked,
+              readonly: locked %>
       </div>
      </td>
   <% end -%>
   </tr>
 <% else %>
   <div id="<%= dom_id(checkbox_field) %>">
-    <% css_class = checkbox_field.css_class.to_s + ' checkbox ' -%>
+    <% 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
+         css_class += checkbox_field.validation_class(@answer_sheet, @page) if last_choice
+         locked = checkbox_field.locked?(params, @answer_sheet, @presenter, current_person)
       %>
-      <%= hidden_field_tag "answers[#{checkbox_field.id}][#{num}]", '', :id => '' %>
+      <%= 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.try(:reference?),
-          :readonly => @answer_sheet.frozen?&&!@presenter.try(:reference?) %>
+          id: dom_id,
+          class: css_class,
+          disabled: locked,
+          readonly: locked %>
       <label class="choice" for="<%= dom_id %>"><%= choice[0] %></label>
     </div>
   <% end -%>

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

@@ -1,7 +1,7 @@
-<% locked = country.locked?(params, @answer_sheet, @presenter) %>
+<% locked = country.locked?(params, @answer_sheet, @presenter, current_person) %>
 <%= select_tag "answers[#{country.id}]", 
-      options_for_select([''] + Carmen.countries, country.response(@answer_sheet).to_s),
-      :class => 'select ' + country.validation_class(@answer_sheet), 
-      :id => dom_id(country),
-      :disabled => locked,
-      :readonly => locked %>
+      options_for_select([""] + Carmen.countries, country.response(@answer_sheet).to_s),
+      class: "#{"form-control" if Fe.bootstrap} select " + country.validation_class(@answer_sheet, @page), 
+      id: dom_id(country),
+      disabled: locked,
+      readonly: locked %>

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

@@ -1,6 +1,7 @@
+<% locked = date_field.locked?(params, @answer_sheet, @presenter, current_person) %>
 <%= 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.try(:reference?),
-      :readonly => true %>
+      class: "#{"form-control" if Fe.bootstrap} text " + date_field.validation_class(@answer_sheet, @page),
+      id: dom_id(date_field),
+      disabled: locked,
+      readonly: true %>
 <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,9 +1,9 @@
-<%= 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)) %>
-<%= select_year(date_field_mmyy.response(@answer_sheet), :include_blank => true,
-      :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)) %>
+<%= select_month(date_field_mmyy.response(@answer_sheet), include_blank: true,
+      prefix: "answers[#{date_field_mmyy.id}]",
+      class: "#{"form-control" if Fe.bootstrap} select " + date_field_mmyy.validation_class(@answer_sheet, @page)) %>
+<%= select_year(date_field_mmyy.response(@answer_sheet), include_blank: true,
+      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, @page)) %>
 
-<% # not validated because class doesn't pass, see ticket #6000 -%>
+<% # not validated because class doesn"t pass, see ticket #6000 -%>

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

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

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

@@ -1,4 +1,4 @@
-<%- if ['question_pages', 'question_sheets', 'elements'].include?(controller.controller_name) -%>
+<%- 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.id) %>">
     <% if question_grid.label.present? && !question_grid.hide_label? -%>
       <label class="desc gridname">
@@ -10,7 +10,7 @@
       <!-- Create a sortable list for each grid on the page -->
     	<ul class="questions" id="questions_list_<%= question_grid.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.elements.length > 0 -%>
-        <%= render :partial => 'fe/admin/question_pages/element', :collection => question_grid.elements, :locals => {:in_grid => true} %>
+        <%= render partial: "fe/admin/question_pages/element", collection: question_grid.elements, locals: {in_grid: true} %>
     	<%- else -%>
     		Grid
     	<%- end -%>
@@ -21,27 +21,27 @@
   <% if question_grid.label.present? && !question_grid.hide_label? -%>
     <label class="desc gridname"><%= raw question_grid.label(session[:locale]) %></label>
   <% end %>
-  <% headers = question_grid.cols.to_s.split(';') %>
+  <% headers = question_grid.cols.to_s.split(";") %>
   <% if headers.length > 1 %>
   	<table class="grid <%= question_grid.css_class %>" id="<%= question_grid.css_id %>">
 	  <% if headers.detect {|h| h.strip.present?} %>
     	<tr>
     	<%- headers.each do |header| -%>
-    		<th><%= raw header || '&nbsp;' %></th>
+    		<th><%= raw header || "&nbsp;" %></th>
     	<%- end -%>
     	</tr>
     <% end %>
-    <% if question_grid.style == 'radio' %>
+    <% if question_grid.style == "radio" %>
     	<% question_grid.elements.each do |element| -%>
-    	  <%= render :partial => 'fe/answer_pages/element', :object => element %>
+    	  <%= render partial: "fe/answer_pages/element", object: element %>
     	<% end %>
     <% else %>
     	<tr >
     		<%- col_count = 0; previous_element = nil;
     			question_grid.elements.each do |element| -%>
-          <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 %>>
+          <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} %>
+    				<%= render partial: "fe/answer_pages/element", object: element, locals: {col: col_count} %>
     			</td>
           <%- previous_element = element;
               col_count += 1
@@ -60,8 +60,8 @@
     <% end %>
     <% previous_element = nil %>
     <% question_grid.elements.each do |element| -%>
-      <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 style="<%= "display:none" if previous_element && previous_element.conditional == element && !previous_element.conditional_match(@answer_sheet) %>" class="<%= "row" unless Fe.bootstrap %> <%= 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 %>

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

@@ -1,10 +1,10 @@
-<%- if ['question_pages', 'question_sheets', 'elements'].include?(controller.controller_name) -%>
+<%- 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(session[:locale]) %></label>
     <div>
       <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 => 'fe/admin/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 -%>
@@ -14,11 +14,11 @@
 <%- else -%>
   <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(';') %>
+	  <% headers = question_grid_with_total.cols.to_s.split(";") %>
 	  <% if headers.detect {|h| h.strip.present?} %>
     	<tr>
     	<%- headers.each do |header| -%>
-    		<th><%= header || '&nbsp;' %></th>
+    		<th><%= header || "&nbsp;" %></th>
     	<%- end -%>
     	</tr>
     <% end %>
@@ -27,8 +27,8 @@
   			question_grid_with_total.elements.each do |element| -%>
   			<td id="element_<%= element.id %>">
   				<%# 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} %>
+          <% col_count = col_count % question_grid_with_total.num_cols unless Fe.bootstrap %>
+  				<%= 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 -%>
@@ -41,12 +41,12 @@
   	<%- if question_grid_with_total.total_cols.present? -%>
     	<tr class="total">
     		<td>Total</td>
-      	<%- total_cols = question_grid_with_total.total_cols.split(',').collect(&:to_i)
+      	<%- 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 %>
+            	    <%= 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 %>");

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

@@ -1,9 +1,15 @@
 <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),
-										:remote => true, :method => :post) do %>
-					<span>select</span><label><%= raw question.label(session[:locale]) %></label>
-				<% end %>
-		</li>
+    <li class="new-dialog-<%= dom_id(question) %>">
+      <% unless Fe.never_reuse_elements %>
+        <%= 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, onClick: "$('li.new-dialog-#{dom_id(question)}').html('Inserting...')") do %>
+          <span>Insert</span><label>
+        <% end %>
+      <% end %>
+      <%= link_to(copy_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, onClick: "$('li.new-dialog-#{dom_id(question)}').html('Copying... This can take a minute')") do %>
+        <span>Copy</span>
+      <% end %>
+      <label><%= raw question.label(session[:locale]) %></label>
+    </li>
 	<% end %>
 </ul>

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

@@ -1,7 +1,7 @@
 <% choices = radio_button_field.choices(session[:locale]) %>
-<% css_class = 'radio ' -%>
-<% 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) %>
+<% css_class = "radio " -%>
+<% 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">
@@ -14,13 +14,15 @@
     <td class="col">
       <% dom_id = dom_id(radio_button_field) + "_" + pretty_tag(choice[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) -%>
+         css_class += radio_button_field.validation_class(@answer_sheet, @page) if last_choice
+         checked = radio_button_field.has_answer?(choice[1], @answer_sheet) 
+         locked = radio_button_field.locked?(params, @answer_sheet, @presenter, current_person)
+       %>
       <%= radio_button_tag "answers[#{radio_button_field.id}]", choice[1], checked,
-            :id => dom_id,
-            :class => css_class,
-            :disabled => @answer_sheet.frozen?&&!@presenter.try(:reference?),
-            :readonly => @answer_sheet.frozen?&&!@presenter.try(:reference?) %>
+            id: dom_id,
+            class: css_class,
+            disabled: locked,
+            readonly: locked %>
      </td>
   <% end -%>
   </tr>
@@ -29,16 +31,30 @@
   <% choices.each_with_index do |choice, num| -%>
     <% dom_id = dom_id(radio_button_field) + "_" + pretty_tag(choice[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.try(:reference?),
-                :readonly => @answer_sheet.frozen?&&!@presenter.try(:reference?) %>
-          <label class="choice" for="<%= dom_id %>"><%= choice[0] %></label>
-    </div>
+       css_class += radio_button_field.validation_class(@answer_sheet, @page) if last_choice
+       checked = radio_button_field.has_answer?(choice[1], @answer_sheet)
+       locked = radio_button_field.locked?(params, @answer_sheet, @presenter, current_person)
+     %>
+    <% if Fe.bootstrap %>
+    <div class="radio <%= "disabled" if locked %> radio-set">
+      <label class="choice" for="<%= dom_id %>">
+        <%= radio_button_tag "answers[#{radio_button_field.id}]", choice[1], checked,
+          id: dom_id,
+          class: css_class,
+          disabled: locked,
+          readonly: locked %>
+        <%= choice[0] %>
+      </label>
+    <% else %>
+      <div class="radio-set">
+        <%= radio_button_tag "answers[#{radio_button_field.id}]", choice[1], checked,
+                  id: dom_id,
+                  class: css_class,
+                  disabled: locked,
+                  readonly: locked %>
+            <label class="choice" for="<%= dom_id %>"><%= choice[0] %></label>
+      </div>
+    <% end %>
   <% end -%>
   </div>
 <% end %>

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

@@ -1,26 +1,64 @@
 <% choices = rating.choices(session[:locale]) %>
 <% dom_id = "" %>
+<% locked = rating.locked?(params, @answer_sheet, @presenter, current_person) %>
 <div id="<%= dom_id(rating) %>">
 <table cellspacing="0" class="rating">
 	<tr>
-	<% css_class = ' ' -%>
-	<% choices.each_with_index do |choice, num| -%>
-	  <% dom_id = dom_id(rating) + "_" + pretty_tag(choice[1])
-	     last_choice =  (num == choices.length - 1)
-	     css_class += rating.validation_class(@answer_sheet) if last_choice
-	     checked = rating.has_answer?(choice[1],@answer_sheet) -%>
-	  <td><%= radio_button_tag "answers[#{rating.id}]", choice[1], checked,
-	        :id => dom_id,
-            :class => css_class,
-            :disabled => @answer_sheet.frozen?&&!@presenter.try(:reference?),
-            :readonly => @answer_sheet.frozen?&&!@presenter.try(:reference?) %></td>
-    <% end -%>
-	</tr>
-	<tr>
-		<% choices.each do |choice| %>
-		<td><%= choice[0] %></td>
-		<% end -%>
+    <% if rating.rating_before_label.present? %>
+      <td class="rating_before">
+        <% first_dom = dom_id(rating) + "_" + pretty_tag(choices.first[1]) %>
+        <label class="no_label_styles" for="<%= first_dom %>">
+          <%= rating.rating_before_label(session[:locale]) %>
+        </label>
+      </td>
+    <% end %>
+    <% css_class = " " %>
+    <% choices.each_with_index do |choice, num| %>
+      <% dom_id = dom_id(rating) + "_" + pretty_tag(choice[1])
+         last_choice =  (num == choices.length - 1)
+         css_class += rating.validation_class(@answer_sheet, @page) if last_choice
+         checked = rating.has_answer?(choice[1],@answer_sheet) %>
+      <td class="rating_choice"><%= radio_button_tag "answers[#{rating.id}]", choice[1], checked,
+            id: dom_id,
+              class: css_class,
+              disabled: locked,
+              readonly: locked %></td>
+    <% end %>
+    <% if rating.rating_after_label.present? %>
+      <td class="rating_after">
+        <% last_dom = dom_id(rating) + "_" + pretty_tag(choices.last[1]) %>
+        <label class="no_label_styles" for="<%= last_dom %>">
+          <%= rating.rating_after_label(session[:locale]) %>
+        </label>
+      </td>
+    <% end %>
+    <% if rating.rating_na_label.present? %>
+      <% choice = "na"
+         dom_id = dom_id(rating) + "_" + pretty_tag(choice)
+         checked = rating.has_answer?(choice, @answer_sheet) %>
+      <td class="rating_na">
+        <%= radio_button_tag "answers[#{rating.id}]", "na", checked,
+          id: dom_id,
+          class: "",
+          disabled: locked,
+          readonly: locked %>
+      </td>
+      <td class="rating_na_label">
+        <label class="no_label_styles" for="<%= dom_id %>">
+          <%= rating.rating_na_label(session[:locale]) %>
+        </label>
+      </td>
+    <% end %>
 	</tr>
+  <% unless rating.hide_option_labels %>
+    <tr>
+      <% if rating.rating_before_label.present? %><td></td><% end %>
+      <% choices.each do |choice| %>
+      <td class="rating_choice"><%= choice[0].html_safe %></td>
+      <% end %>
+      <% if rating.rating_after_label.present? %><td></td><% end %>
+    </tr>
+  <% end %>
 </table>
-<div id="advice-validate-rating-<%= dom_id %>" class="validation-advice" style="display: none;"><%= _('Please select one of the above options.') %></div>
+<div id="advice-validate-rating-<%= dom_id %>" class="validation-advice" style="display: none;"><%= _("Please select one of the above options.") %></div>
 </div>

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

@@ -1 +1 @@
-<%= render 'fe/questions/fe/reference_question', :reference_question => reference_discipler, :title => _('Discipler Reference') %>
+<%= render "fe/questions/fe/reference_question", reference_question: reference_discipler, title: _("Discipler Reference") %>

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

@@ -1 +1 @@
-<%= render 'fe/questions/fe/reference_question', :reference_question => reference_friend, :title => _('Friend Reference') %>
+<%= render "fe/questions/fe/reference_question", reference_question: reference_friend, title: _("Friend Reference") %>

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

@@ -1 +1 @@
-<%= render 'fe/questions/fe/reference_question', :reference_question => reference_parent, :title => _('Parent Reference') %>
+<%= render "fe/questions/fe/reference_question", reference_question: reference_parent, title: _("Parent Reference") %>

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

@@ -1 +1 @@
-<%= render 'fe/questions/fe/reference_question', :reference_question => reference_peer, :title => _('Peer Reference') %>
+<%= render "fe/questions/fe/reference_question", reference_question: reference_peer, title: _("Peer Reference") %>