fe 1.0.0 → 2.0.0

data/app/views/fe/admin/question_pages/edit.js.erb

@@ -1,3 +1,3 @@
-$('#panel').html('<%= escape_javascript(render('fe/admin/panels/prop_page', :page => @page)) %>');
+$('#panel').html('<%= escape_javascript(render("fe/admin/panels/prop_page", page: @page)) %>');
 switchTab('properties');
 selectPage();

data/app/views/fe/admin/question_pages/error.js.erb

@@ -1,4 +1,4 @@
-$('#errors').html('<%= escape_javascript(render('errors', :element => @page)) %>')
+$('#errors').html('<%= escape_javascript(render("errors", element: @page)) %>')
 <% @page.errors.each do |attr_name, message| %>
   addError("page_<%= attr_name %>")
 <% end %>

data/app/views/fe/admin/question_pages/show.js.erb

@@ -1,5 +1,5 @@
-$('#page-preview').html('<%= escape_javascript(render('fe/admin/question_pages/question_page')) %>')
-$('#nav-controls').html('<%= escape_javascript(render('fe/admin/panels/nav_controls')) %>')
+$('#page-preview').html('<%= escape_javascript(render("fe/admin/question_pages/question_page")) %>')
+$('#nav-controls').html('<%= escape_javascript(render("fe/admin/panels/nav_controls")) %>')
 switchTab("pages_list")
 $('#list-pages li').removeClass('active')
 $('#link-<%= dom_id(@page) %>').addClass('active')

data/app/views/fe/admin/question_pages/show_panel.js.erb

@@ -1,3 +1,3 @@
-$('#panel').html('<%= escape_javascript(render('fe/admin/panels/' + @panel_name)) %>')
+$('#panel').html('<%= escape_javascript(render("fe/admin/panels/#{@panel_name}")) %>')
 switchTab('<%= @tab_name %>')
 clearCurrentElement()

data/app/views/fe/admin/question_pages/update.js.erb

@@ -1,2 +1,2 @@
 $("#page-name").html('<%= escape_javascript(@page.label) %>')
-$('#panel').html('<%= escape_javascript(render('admin/panels/pages_list')) %>')
+$('#panel').html('<%= escape_javascript(render("admin/panels/pages_list")) %>')

data/app/views/fe/admin/question_sheets/edit.js.erb

@@ -1,3 +1,3 @@
-$('#panel').html('<%= escape_javascript(render('fe/admin/panels/prop_sheet', :question_sheet => @question_sheet)) %>');
+$('#panel').html('<%= escape_javascript(render("fe/admin/panels/prop_sheet", question_sheet: @question_sheet)) %>');
 clearPageName()
 clearCurrentElement()

data/app/views/fe/admin/question_sheets/error.js.erb

@@ -1,4 +1,4 @@
-$('#errors').html('<%= escape_javascript(render('errors', :page => @question_sheet)) %>');
+$('#errors').html('<%= escape_javascript(render("errors", page: @question_sheet)) %>');
 
 <% @question_sheet.errors.each do |attr_name, message| %> 
   addError('question_sheet_<%= attr_name %>')

data/app/views/fe/admin/question_sheets/index.html.erb

@@ -5,7 +5,7 @@
 		<div style="background: #ffe5df; border: solid 1px #efbeb3; padding: 9px; margin: 0 0 18px;"><%= flash[:error] %></div>
 	<% end -%>
 
-  <%= link_to 'New Form', fe_admin_question_sheets_path(), :method => :post, :class => "add-link" %>
+  <%= link_to "New Form", fe_admin_question_sheets_path(), method: :post, class: "add-link" %>
   <br/>	
   <table cellspacing="0" class="list"> 
     <tr>
@@ -14,10 +14,10 @@
     </tr>
     <% for question_sheet in @active_question_sheets %>
       <tr class="<%= cycle("","alt") %>">
-        <td class="title"><%= link_to question_sheet.label, fe_admin_question_sheet_path(question_sheet), :class => "questionnaire" %></td>
-        <td class="actions"><%= link_to 'Duplicate', duplicate_fe_admin_question_sheet_path(question_sheet), data: {confirm: 'This will take some time depending on the number of questions. Please be patient.'}, :method => :post, :class => 'duplicate' %></td>
-        <td class="actions"><%= link_to 'Archive', archive_fe_admin_question_sheet_path(question_sheet), data: {confirm: 'Are you sure you want to archive this Question Sheet?'}, :method => :post, :class => 'archive' %></td>
-        <td class="actions"><%= link_to 'Destroy', fe_admin_question_sheet_path(question_sheet), data: {confirm: 'Are you sure you want to delete this Question Sheet?'}, :method => :delete, :class => "destroy", :class => 'delete' %></td>
+        <td class="title"><%= link_to question_sheet.label, fe_admin_question_sheet_path(question_sheet), class: "questionnaire" %></td>
+        <td class="actions"><%= link_to "Duplicate", duplicate_fe_admin_question_sheet_path(question_sheet), data: {confirm: "This will take some time depending on the number of questions. Please be patient."}, method: :post, class: "duplicate" %></td>
+        <td class="actions"><%= link_to "Archive", archive_fe_admin_question_sheet_path(question_sheet), data: {confirm: "Are you sure you want to archive this Question Sheet?"}, method: :post, class: "archive" %></td>
+        <td class="actions"><%= link_to "Destroy", fe_admin_question_sheet_path(question_sheet), data: {confirm: "Are you sure you want to delete this Question Sheet?"}, method: :delete, class: "destroy delete" %></td>
       </tr>
     <% end %>
   </table>
@@ -31,9 +31,9 @@
     </tr>
     <% for question_sheet in @archived_question_sheets %>
       <tr class="<%= cycle("","alt") %>">
-        <td class="title"><%= link_to question_sheet.label, fe_admin_question_sheet_path(question_sheet), :class => "questionnaire" %></td>
-        <td class="actions"><%= link_to 'Duplicate', duplicate_fe_admin_question_sheet_path(question_sheet), data: {confirm: 'This will take some time depending on the number of questions. Please be patient.'}, :method => :post, :class => 'duplicate' %></td>
-        <td class="actions"><%= link_to 'Un-Archive', unarchive_fe_admin_question_sheet_path(question_sheet), :method => :post, :class => 'unarchive'  %></td>
+        <td class="title"><%= link_to question_sheet.label, fe_admin_question_sheet_path(question_sheet), class: "questionnaire" %></td>
+        <td class="actions"><%= link_to "Duplicate", duplicate_fe_admin_question_sheet_path(question_sheet), data: {confirm: "This will take some time depending on the number of questions. Please be patient."}, method: :post, class: "duplicate" %></td>
+        <td class="actions"><%= link_to "Un-Archive", unarchive_fe_admin_question_sheet_path(question_sheet), method: :post, class: "unarchive"  %></td>
       </tr>
     <% end %>
   </table>

data/app/views/fe/admin/question_sheets/new.html.erb

@@ -2,14 +2,14 @@
 
 <%= error_messages_for :question_sheet %>
 
-<% form_for(:question_sheet, :url => admin_question_sheets_path) do |f| %>
+<%= form_for(:question_sheet, url: fe_admin_question_sheets_path) do |f| %>
   <p>
     <label for="question_sheet_label">Label</label>
-    <%= f.text_field :label, :maxlength => 60 %>
+    <%= f.text_field :label, maxlength: 60 %>
   </p>
   <p>
     <%= submit_tag "Create" %>
   </p>
 <% end %>
 
-<%= link_to 'Back', admin_question_sheets_path %>
+<%= link_to "Back", fe_admin_question_sheets_path %>

data/app/views/fe/admin/question_sheets/show.html.erb

@@ -5,21 +5,21 @@ var activeElement = "";
 <div id="content">
   <div id="controls">
     <ul id="nav-controls">
-      <%= render 'fe/admin/panels/nav_controls' %>
+      <%= render "fe/admin/panels/nav_controls" %>
     </ul>
         
     <div id="panel">
-      <%= render 'fe/admin/panels/pages_list' %>
+      <%= render "fe/admin/panels/pages_list" %>
     </div>
   </div>
 
 
   <div id="preview">
-    <h2 id='sheet-name'>
-      <%= link_to @question_sheet.label, edit_fe_admin_question_sheet_path(@question_sheet), :remote => true, :method => :get , :class => "ctl"  -%>
+    <h2 id="sheet-name">
+      <%= link_to @question_sheet.label, edit_fe_admin_question_sheet_path(@question_sheet), remote: true, method: :get , class: "ctl"  -%>
     </h2>
     <div id="page-preview">
-      <%= render 'fe/admin/question_pages/question_page' %>
+      <%= render "fe/admin/question_pages/question_page" %>
     </div>
   </div>
 

data/app/views/fe/admin/question_sheets/update.js.erb

@@ -1,2 +1,2 @@
 $('#sheet-name').html('<%= escape_javascript(@question_sheet.label) %>');
-$('#panel').html('<%= escape_javascript(render('fe/admin/panels/prop_sheet', :question_sheet => @question_sheet)) %>');
+$('#panel').html('<%= escape_javascript(render("fe/admin/panels/prop_sheet", question_sheet: @question_sheet)) %>');

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

@@ -1,6 +1,5 @@
 <% if @presenter.active_page %>
-  <% page_dom = @presenter.active_page_link.dom_id
-     next_js = load_page_js(@presenter.next_page) -%>
+  <% page_dom = @presenter.active_page_link.dom_id %>
 
   <div id="<%= page_dom %>" class="answer-page" style="<% if show_first.nil? -%>display: none;<% end -%>">  <!-- this id is parsed by fe.public.js -->
 
@@ -8,37 +7,37 @@
       <%= 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] %>
+        <%= form_tag @presenter.active_page_link.save_path, id: "#{page_dom}-form", autocomplete: "off", 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.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 style="<%= "display:none" if element.hidden?(@answer_sheet, @presenter.active_page) %>" 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 %><% if element.slug %> data-slug="<%= element.slug %>"<% end %>>
+                <%= render "fe/answer_pages/element", element: element %>
               </li>
               <% previous_element = element %>
             <% end %>
           </ul>
 
-          <% if next_js.empty? -%>
+          <% unless @presenter.next_page -%>
             <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" class="button cru-gold no-left-margin" onclick="page_handler.completeAll(); return false;" id="submit_button"><%= _('Submit') %></button>
+              <button type="button" class="<%= "btn btn-default" if Fe.bootstrap %> button save_button"><%= _("Save Now") %></button>
+              <button type="submit" class="<%= "btn btn-default" if Fe.bootstrap %> 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="fe.pageHandler.next(); return false;"><%= _("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>
@@ -47,7 +46,7 @@
   <% if session[:attempted_submit] %>
     <script type="text/javascript" charset="utf-8">
         $(function() {
-            $.fe.pageHandler.validatePage('<%= page_dom %>')
+            fe.pageHandler.validatePage("<%= page_dom %>")
         });
     </script>
   <% end %>

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

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

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

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

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

@@ -0,0 +1,39 @@
+<% if @presenter.active_page %>
+  <% page_dom = @presenter.active_page_link.dom_id
+     next_js = load_page_js(@presenter.next_page) -%>
+
+  <div id="<%= page_dom %>" class="answer-page">  <!-- this id is parsed by fe.public.js -->
+
+    <div class="page">
+      <%= render "fe/answer_pages/page_name" %>
+
+      <% if @elements.length > 0 -%>
+        <%= form_tag @presenter.active_page_link.save_path, id: "#{page_dom}-form", autocomplete: "off", 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 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 %><% if element.slug %> data-slug="<%= element.slug %>"<% end %>>
+                <%= render "fe/answer_pages/element", element: element %>
+              </li>
+              <% previous_element = element %>
+            <% end %>
+          </ul>
+
+        <% end -%>
+      <% else -%>
+        <div style="background: #ffc;">
+          <p><%= _("There are no questions on this page.") %></p>
+        </div>
+      <% end -%>
+    </div>
+  </div>
+
+  <% if session[:attempted_submit] %>
+    <script type="text/javascript" charset="utf-8">
+      $(function() {
+        fe.pageHandler.validatePage("<%= page_dom %>")
+      });
+    </script>
+  <% end %>
+<% end %>

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

@@ -1,5 +1,13 @@
-$('.last-saved').html('<%= escape_javascript(l(@saved_at_timestamp, :format => :datetime)) %>')
+<% if @saved_at_timestamp.is_a?(Time) || @saved_at_timestamp.is_a?(Date) %>
+  $('.last-saved').html('<%= escape_javascript(l(@saved_at_timestamp, format: :datetime)) %>')
+<% end %>
 <% if @answer && @answer.attachment_file_name %>
-    $('#<%= dom_id(@answer.question) %>_filename').html('Current File: <%= link_to(@answer.attachment_file_name, @answer.attachment.url) %>')
+    $('#<%= dom_id(@answer.question) %>_filename').html('Current File: ' +
+        '<%= link_to(@answer.attachment_file_name, @answer.attachment.expiring_url) %>' +
+        '<%= link_to(image_tag("fe/icons/minus-button.png"),
+                     delete_file_fe_answer_sheet_page_path(@presenter.active_answer_sheet, @page, question_id: @answer.question.id),
+                     method: :delete, remote: true) %>')
     $('#<%= dom_id(@answer.question) %>_filename').effect('highlight')
+<% elsif @answer %>
+    $('#<%= dom_id(@answer.question) %>_filename').html('')
 <% end %>

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

@@ -1,15 +1,15 @@
-<h3 id='sheet-name'><%= answer_sheet.question_sheet.label %></h3>
+<h3 id="sheet-name"><%= answer_sheet.question_sheet.label %></h3>
 
 <% if elements.length > 0 -%>
 
     <% elements.each do |page, page_elements| -%>
         <% next unless page.has_questions? %>
-        <a name="<%= dom_id(page) %>"></a>
+        <a name="<%= dom_id(page) %>" class="anchor"></a>
 
         <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} %>
+            <%= render partial: "fe/answer_sheets/element", collection: page_elements, locals: {elements: page_elements} %>
           </ul>
         </div>
 
@@ -20,7 +20,7 @@
 <% else -%>
 
     <div style="background: #ffc;">
-      <p>That's odd. There are no answers to review.</p>
+      <p>That"s odd. There are no answers to review.</p>
     </div>
 
 <% end -%>

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

@@ -1,11 +1,13 @@
 <% if element.kind == "Fe::QuestionGrid" || element.kind == "Fe::QuestionGridWithTotal"-%>
   <li>
-    <label class="desc"><%= raw element.label %></label>
+    <% unless element.hide_label? %>
+      <label class="desc"><%= raw element.label %></label>
+    <% end %>
     <table class="grid">
     <%- if element.cols -%>
     <tr>
-    <%- element.cols.split(';').each do |header| -%>
-      <th><%= raw header || '&nbsp;' %></th>
+    <%- element.cols.split(";").each do |header| -%>
+      <th><%= raw header || "&nbsp;" %></th>
     <%- end -%>
     </tr>
     <%- end -%>
@@ -31,10 +33,10 @@
           <%- end -%>
         <% elsif grid_element.is_a?(Fe::QuestionGrid) || grid_element.is_a?(Fe::QuestionGridWithTotal) %>
           <ul>
-            <%= render :partial => 'fe/answer_sheets/element', :object => grid_element %>
+            <%= render partial: "fe/answer_sheets/element", object: grid_element %>
           </ul>
         <% else %>
-          <%= render :partial => 'fe/questions/' + element.ptemplate, :object => element %>
+          <%= render partial: "fe/questions/" + element.ptemplate, object: element %>
         <% end %>
       <% end -%>
       </td>
@@ -63,10 +65,10 @@
         <span class="answer"><%= simple_format element.display_response(@answer_sheet) %></span>
       <%- end -%>
     <% else -%>
-      <%= render :partial => 'fe/questions/' + element.ptemplate, :object => element %>
+      <%= 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 %>
+    <%= render "fe/answer_sheets/element", element: choice_field_child %>
   <% end %>
 <% end -%>

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

@@ -1,7 +1,9 @@
-<% css_class = '' %>
-<% 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 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 -%>
+<div class="application_section">
+  <% css_class = "" %>
+  <% 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 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 -%>
+</div>

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 'fe/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 %>
+    <%= render partial: "fe/answer_sheets/page_link", collection: @presenter.page_links %>
   </ul>
 </div>

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

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

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

@@ -1 +1 @@
-<h3 id='sheet-name'><%= @presenter.sheet_title %></h3>
+<h3 id="sheet-name"><%= @presenter.sheet_title %></h3>

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

@@ -5,31 +5,31 @@
 <% else %>
   <div id="controls">
     <div id="panel">
-      <%= render :partial => 'fe/answer_sheets/pages_list' %>
+      <%= 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>
 
   <div id="preview">
-      <%= render :partial => 'fe/answer_sheets/title' %>
-      <%= render :partial => 'fe/answer_pages/answer_page', :locals => { :show_first => true } %>
+      <%= render partial: "fe/answer_sheets/title" %>
+      <%= render partial: "fe/answer_pages/answer_page", locals: { show_first: true } %>
   </div>
 
   <script type="text/javascript">
     $(function() {
-      page_handler = $.fe.pageHandler;
-      page_handler.initialize('<%= @presenter.active_page_link.try(:dom_id) %>');
-      // Event.observe(window, 'unload', page_handler.savePage);
+      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', {
+      // 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*$/
       // });
-      // Validation.add('validate-rating', 'Please select one of the above options.', function(v,elm) {
+      // Validation.add("validate-rating", "Please select one of the above options.", function(v,elm) {
       //  var p = elm.parentNode.parentNode;
-      //  var options = p.getElementsByTagName('INPUT');
+      //  var options = p.getElementsByTagName("INPUT");
       //  return $A(options).any(function(elm) {
       //    return $F(elm);
       //  });
@@ -38,10 +38,10 @@
       // global responders for all Ajax requests
       $(function() {
         $(document).ajaxStart(function() {
-          $('#page_ajax_spinner').show();
-          $('#page_ajax_spinner').css({top: $(window).scrollTop() + 200});
+          $("#page_ajax_spinner").show();
+          $("#page_ajax_spinner").css({top: $(window).scrollTop() + 200});
         }).ajaxComplete(function() {
-          $('#page_ajax_spinner').hide();
+          $("#page_ajax_spinner").hide();
         })
       });
     });
@@ -49,18 +49,18 @@
       // 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|
-            question_grid_with_total.total_cols.split(',').collect(&:to_i).each do |col| -%>
+            question_grid_with_total.total_cols.split(",").collect(&:to_i).each do |col| -%>
               try {
-                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}" %>');
+                  updateTotal("<%= "#{question_grid_with_total.id}_#{col - 1}" %>");
                 });
               } catch(e) {}
         <%  end
           end %>
       <% end %>
     }
-    $(function() { $(document).trigger('fePageLoaded'); });
+    $(function() { $(document).trigger("fePageLoaded"); });
   </script>
   <%= render "fe/answer_sheets/submit_to" %>
 <% end %>

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

@@ -1,8 +1,11 @@
-if ($('#submit_message').length == 0) {
+if ($('#submit_message, .submit_message').length == 0) {
   $("ul#questions_list").filter(":visible").append("<li><div id=\"submit_message\"></div></li>");
 }
-$('#submit_message').html('<%= escape_javascript(render('incomplete')) %>')
+$('#submit_message, .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))) %>')
+  $page = $('<%= escape_javascript(render("fe/answer_sheets/page_link", page_link: @presenter.new_page_link(@answer_sheet, page))) %>');
+  <% id = "##{dom_id(@answer_sheet)}-#{dom_id(page)}-li" %> 
+  $('<%= id %>').replaceWith($page.find('<%= id %>'));
 <% end %>
-$('#submit_message').show();
+$('#submit_message, .submit_message').show();
+$('#'+fe.pageHandler.current_page+'-li').addClass('active');

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

@@ -9,7 +9,7 @@
 <% for answer_sheet in @answer_sheets %>
   <tr>
     <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>
+    <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 => 'fe/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

@@ -1 +1 @@
-<% if user_signed_in? %><%= link_to(_("Log Out"), destroy_user_session_path, { :method => :delete, :style => "color: #fff;", :id => "link-log-out" }) %><% end %>
+<% 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/questions/fe/_acceptance.html.erb

@@ -1,13 +1,14 @@
-<% css_class = 'checkbox ' + acceptance.validation_class(@answer_sheet)
-   checked = acceptance.has_answer?('1', @answer_sheet)
--%>
-<%= check_box_tag "answers[#{acceptance.id}]", '1',
+<% css_class = "checkbox " + acceptance.validation_class(@answer_sheet, @page)
+   checked = acceptance.has_answer?("1", @answer_sheet)
+   locked = acceptance.locked?(params, @answer_sheet, @presenter, current_person)
+%>
+<%= check_box_tag "answers[#{acceptance.id}]", "1",
        checked,
-      :id => dom_id(acceptance),
-      :class => css_class,
-      :disabled => @answer_sheet.frozen?&&!@answer_sheet.try(:reference?),
-      :readonly => @answer_sheet.frozen?&&!@answer_sheet.try(:reference?) %>
+      id: dom_id(acceptance),
+      class: css_class,
+      disabled: locked,
+      readonly: locked %>
 <label class="choice" for="<%= dom_id(acceptance) %>">
   <%= raw acceptance.label(session[:locale]) %>
 </label>
-<%= hidden_field_tag "answers[#{acceptance.id}]", '', :id => '' %>
+<%= hidden_field_tag "answers[#{acceptance.id}]", "", id: "" %>