fe 0.0.4 → 2.0.0

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

@@ -1,6 +1,11 @@
-<p><%= link_to "Question Grid Help", "/fe/help/question_grid.html", { :class=>"lbOn", :id => "link-question-grid-help" } %></p>
+<p><%= link_to "Question Grid Help", "/fe/help/question_grid.html", { class:"lbOn", id: "link-question-grid-help" } %></p>
 
-<%= render 'fe/admin/panels/common_fields', :f => f %>
+<%= render "fe/admin/panels/common_fields", f: f %>
+
+<p>
+  <%= f.check_box :share, class: "inlinecheck" %>
+  <label for="element_share" class="inline">Make this group available to be copied to other forms</label>
+</p>
 
 <p>
   <label for="element_style" class="desc">Style</label>

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

@@ -1,4 +1,4 @@
-<p><%= link_to "Question Grid Help", "/fe/help/question_grid.html", { :class=>"lbOn", :id => "link-question-grid-help" } %></p>
+<p><%= link_to "Question Grid Help", "/fe/help/question_grid.html", { class:"lbOn", id: "link-question-grid-help" } %></p>
 
 <div class="field">
   <label for="element_slug" class="desc">Column Headings <span class="required">required</span></label>
@@ -11,4 +11,4 @@
   <span class="help">Which columns should be totaled? e.g. 2 OR 2,3</span>
 </div>
 
-<%= render 'fe/admin/panels/common_fields', :f => f %>
+<%= render "fe/admin/panels/common_fields", f: f %>

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

@@ -1,7 +1,7 @@
 <div class="field">
   <label for="element_style" class="desc">Related Question Sheet
-  <%= image_tag('fe/icons/question-balloon.png', :title => "This list includes any template with 'Reference' in the name.") %></label>
-  <%= f.select :related_question_sheet_id, (Fe::QuestionSheet.active.where("label like 'REFERENCE%'").order(:label).all - [@page.question_sheet]).collect {|qs| [qs.label, qs.id]} %>
+  <%= image_tag("fe/icons/question-balloon.png", title: "This list includes any template with "Reference" in the name.") %></label>
+  <%= f.select :related_question_sheet_id, (Fe::QuestionSheet.active.where("label like "REFERENCE%"").order(:label).all - [@page.question_sheet]).collect {|qs| [qs.label, qs.id]} %>
 </div>
 
 <div class="field">
@@ -9,4 +9,4 @@
   <%= f.select :style, [["Peer", "peer"], ["Spiritual", "spiritual"], ["Parent", "parent"]] %>
 </div>
 
-<%= render 'fe/admin/panels/common_fields', :f => f %>
+<%= render "fe/admin/panels/common_fields", f: f %>

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

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

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

@@ -2,16 +2,19 @@
   <p class="instruction">Update the settings for this form.</p>
 
   <div id="errors">
-    <%= render :partial => 'errors', :locals => { :question_sheet => @question_sheet }%>
+    <%= render partial: "errors", locals: { question_sheet: @question_sheet }%>
   </div>
 
-  <%= form_for @question_sheet, :url => fe_admin_question_sheet_path(@question_sheet, :format => 'js'), :remote => true, :method => :put do |f| %>
+  <%= form_for @question_sheet, url: fe_admin_question_sheet_path(@question_sheet, format: "js"), remote: true, method: :put do |f| %>
 
     <p><label for="" class="desc">Label <span class="required">required</span></label>
-    <%= f.text_field :label, :maxlength => 50 %></p>
+    <%= f.text_field :label, maxlength: 50 %></p>
+
+    <p><label for="" class="desc">Languages (in addition to english)</label>
+    <%= f.select :languages, Fe::LANGUAGES.collect {|k, v| [v, k]}, {}, { size: 3, multiple: true }  %></p>
 
     <p class="buttons">
-    <%= submit_tag"Update &raquo;".html_safe %></p>
+    <%= submit_tag "Update &raquo;".html_safe, data: { disable_with: "Please wait..." } %></p>
 
   <% end %>
 </div>

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

@@ -1,20 +1,20 @@
-<%- options = [ Fe::OptionGroup.new('Short Answer', [
-                    Fe::Option.new('short', 'Simple'),
-                    Fe::Option.new('number', 'Number'),
-                    Fe::Option.new('currency-dollar', 'Currency'),
-                    Fe::Option.new('email', 'E-mail address'),
-                    Fe::Option.new('url', 'Web address'),
-                    Fe::Option.new('phone', 'Telephone number')
+<%- options = [ Fe::OptionGroup.new("Short Answer", [
+                    Fe::Option.new("short", "Simple"),
+                    Fe::Option.new("number", "Number"),
+                    Fe::Option.new("currency-dollar", "Currency"),
+                    Fe::Option.new("email", "E-mail address"),
+                    Fe::Option.new("url", "Web address"),
+                    Fe::Option.new("phone", "Telephone number")
                   ]),
-                Fe::OptionGroup.new('Long Answer', [
-                    Fe::Option.new('essay', 'Essay')
+                Fe::OptionGroup.new("Long Answer", [
+                    Fe::Option.new("essay", "Essay")
                   ])
               ]
 %>
 <div class="field">
   <label for="element_style" class="desc">Style</label>
-  <%= select_tag 'element[style]', 
-        option_groups_from_collection_for_select(options, 'group', 'label', 'key', 'value', @element.style) %>
+  <%= select_tag "element[style]", 
+        option_groups_from_collection_for_select(options, "group", "label", "key", "value", @element.style) %>
 </div>
 
-<%= render 'fe/admin/panels/common_fields', :f => f %>
+<%= render "fe/admin/panels/common_fields", f: f %>

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

@@ -1,18 +1,28 @@
-<li class="element" id="element_<%= element.id %>">
+<% container_element = element.is_a?(Fe::QuestionGrid) || (element.is_a?(Fe::ChoiceField) && element.style == "yes-no") %>
+<% if container_element %>
+  <!-- add a droppable block before and after each container element (question_grid / choice_field) so that the admin can move elements out of a container element -->
+  <li class="droppable around-container before-container" data-element_id="<%= element.id %>" data-url="<%= drop_fe_admin_question_sheet_page_element_path(@page.question_sheet_id, @page.id, element.id, before: true) %>"></li>
+<% end %>
+
+<li class="element sortable <%= "container" if container_element %>" id="element_<%= element.id %>" data-element_id="<%= element.id %>">
   <div class="controls">
   	<ul>
-  		<li><%= link_to "edit", edit_fe_admin_question_sheet_page_element_path(@page.question_sheet.id, @page.id, element.id), :remote => true, :method => :get, :class => "edit", :title => "Edit this element" %></li>
+  		<li><%= link_to "edit", edit_fe_admin_question_sheet_page_element_path(@page.question_sheet.id, @page.id, element.id), remote: true, method: :get, class: "edit", title: "Edit this element" %></li>
   <% if in_grid -%>		
-  		<li><%= link_to("remove", remove_from_grid_fe_admin_question_sheet_page_element_path(@page.question_sheet.id, @page.id, element.id), :remote => true, :class => "remove", :title => "remove" )%></li>
+  		<li><%= link_to("remove", remove_from_grid_fe_admin_question_sheet_page_element_path(@page.question_sheet.id, @page.id, element.id), remote: true, class: "remove", title: "remove" )%></li>
   <% end -%>
-      <li><%= link_to "duplicate",  duplicate_fe_admin_question_sheet_page_element_path(@page.question_sheet.id, @page.id, element.id), :remote => true, :method => :post, :class => "duplicate", :title => "Duplicate this element" %></li>
-      <li><%= link_to('Delete', fe_admin_question_sheet_page_element_path( @page.question_sheet_id,  @page.id, element.id), :remote => true, :method => :delete, :class => "delete", data: {confirm: "Are you sure you want to remove this element from this form?"}, :title => "Permanently delete this item") %></li>
+      <li><%= link_to "duplicate",  duplicate_fe_admin_question_sheet_page_element_path(@page.question_sheet.id, @page.id, element.id), remote: true, method: :post, class: "duplicate", title: "Duplicate this element" %></li>
+      <li><%= link_to("Delete", fe_admin_question_sheet_page_element_path( @page.question_sheet_id,  @page.id, element.id), remote: true, method: :delete, class: "delete", data: {confirm: "Are you sure you want to remove this element from this form?"}, title: "Permanently delete this item") %></li>
   		<li><a href="#" class="handle" title="Reorder this element">drag</a></li>
   	</ul>
   </div>
   <div class="q" id="element_<%= dom_id(element) %>">
-      <%= render 'fe/admin/question_pages/element_show', :element => element %>
+      <%= render "fe/admin/question_pages/element_show", element: element %>
   </div>
   <div class="q q_form" id="element_form_<%= dom_id(element) %>">
   </div>
 </li>
+
+<% if container_element %>
+  <li class="droppable around-container after-container" data-element_id="<%= element.id %>" data-url="<%= drop_fe_admin_question_sheet_page_element_path(@page.question_sheet_id, @page.id, element.id, after: true) %>"></li>
+<% end %>

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

@@ -3,8 +3,8 @@
   <label for="<%= dom_id(element) %>" class="desc">
     <%= raw element.label %>
     <% if element.required? -%><span class="required">required</span><% end -%>
-    <%= image_tag('fe/icons/question-balloon.png', :class => 'tip', :title => element.tooltip) if element.tooltip.present? %>
+    <%= image_tag("fe/icons/question-balloon.png", class: "tip", title: element.tooltip) if element.tooltip.present? %>
   </label>
 <% end -%>
     
-<%= render :partial => 'fe/questions/' + element.ptemplate, :object => element, :locals => {:col => nil} %>
+<%= render partial: "fe/questions/" + element.ptemplate, object: element, locals: {col: nil} %>

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

@@ -1,13 +1,13 @@
 <div class="page">
-  <h3 id='page-name'>
-    <%= link_to @page.label, edit_fe_admin_question_sheet_page_path(@page.question_sheet_id, @page.id), :remote => true, :method => :get ,  :class => "ctl", :id => "link-page-name"  -%>
+  <h3 id="page-name">
+    <%= link_to @page.label, edit_fe_admin_question_sheet_page_path(@page.question_sheet_id, @page.id), remote: true, method: :get ,  class: "ctl", id: "link-page-name"  -%>
   </h3>
   <% if @page.elements.length > 0 %>
     <ul>
     <ul class="questions" id="questions_list" data-sortable="true" data-sortable-url="<%= reorder_fe_admin_question_sheet_page_elements_path(@page.question_sheet_id, @page.id) %>" data-sortable-handle=".handle">
-      <%= render :partial => 'fe/admin/question_pages/element', :collection => @page.elements, :locals => {:in_grid => false} %>
+      <%= render partial: "fe/admin/question_pages/element", collection: @page.elements, locals: {in_grid: false} %>
     </ul>
   <% else %>
-    <div style="background: #ffc;"><p>You don't have any questions on this page yet.</p></div>
+    <div style="background: #ffc;"><p>You don"t have any questions on this page yet.</p></div>
   <% end %>
 </div>

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

@@ -1,6 +1,6 @@
-$('#page-preview').html('<%= escape_javascript(render('fe/admin/question_pages/question_page')) %>')
-$('#panel').html('<%= escape_javascript(render('fe/admin/panels/prop_page', :page => @page)) %>')
-$('#nav-controls').html('<%= escape_javascript(render('fe/admin/panels/nav_controls')) %>')
+$('#page-preview').html('<%= escape_javascript(render("fe/admin/question_pages/question_page")) %>')
+$('#panel').html('<%= escape_javascript(render("fe/admin/panels/prop_page", page: @page)) %>')
+$('#nav-controls').html('<%= escape_javascript(render("fe/admin/panels/nav_controls")) %>')
 switchTab('properties');
 selectPage();
 $('#list-pages li').removeClass('active')

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

@@ -1,5 +1,5 @@
-$('#panel').html('<%= escape_javascript(render('fe/admin/panels/pages_list')) %>')
-$('#page-preview').html('<%= escape_javascript(render('fe/admin/question_pages/question_page')) %>')
-$('#nav-controls').html('<%= escape_javascript(render('fe/admin/panels/nav_controls')) %>')
+$('#panel').html('<%= escape_javascript(render("fe/admin/panels/pages_list")) %>')
+$('#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")
 

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,43 +1,43 @@
 <% 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 -->
 
     <div class="page">
-      <h4 id='page-name'><%= @presenter.active_page.label %></h4>
+      <%= render "fe/answer_pages/page_name" %>
 
       <% if @elements.length > 0 -%>
-        <%= form_tag @presenter.active_page_link.save_path, :id => "#{page_dom}-form", :onsubmit => "$.fe.pageHandler.savePage($('#sp_application_55716-page_331')); return false;", :multipart => true do -%>
+        <%= 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 %> <%= element.style.to_s.downcase %> <%= 'conditional' if element.conditional %>" id="element_<%= element.id %>" <% if element.conditional %>data-conditional_id="<%= element.conditional_id %>" data-conditional_type="<%= element.conditional_type %>" data-conditional_answer="<%= element.conditional_answer %>" data-application_id="<%= @answer_sheet.id %>"<% end %>>
-              <%= 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" style="background-color: #f9b625; border: 2px solid #f8ae0c; color: white !important;" class="button cru-gold no-left-margin" onclick="page_handler.completeAll(); return false;" id="submit_button">Submit</button>
+              <button type="button" class="<%= "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>
@@ -46,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,13 +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 %>
-    <% if element.required?(@answer_sheet) -%><span class="required">required</span><% end -%>
+    <%= raw element.label(session[:locale]) %>
+    <% if element.required?(@answer_sheet, @page) -%><span class="required"><%= _("required") %></span><% end -%>
     <%= tip(element.tooltip) if element.tooltip.present? %>
   </label>
 <% end -%>
 
-<% begin %>
-  <%= render :partial => 'fe/questions/' + element.ptemplate, :object => element, :locals => {:col => nil} %>
-<% rescue => ex %>
-  <% raise ex %>
+<% col ||= nil %>
+<%= render partial: "fe/questions/" + element.ptemplate, object: element, locals: {col: col} %>
+
 <% end %>

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

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

data/app/views/fe/answer_pages/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(@answer_sheet.updated_at, :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 %>
-    $('#attachment_field_<%= @answer.question_id %>_filename').html('Current File: <%= link_to(@answer.attachment_file_name, @answer.attachment.url) %>')
-    $('#attachment_field_<%= @answer.question_id %>_filename').effect('highlight')
+    $('#<%= dom_id(@answer.question) %>_filename').html('Current File: ' +
+        '<%= link_to(@answer.attachment_file_name, @answer.attachment.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_id, page_elements| -%>
-        <% page = Fe::Page.find(page_id) %>
+    <% elements.each do |page, page_elements| -%>
         <% next unless page.has_questions? %>
+        <a name="<%= dom_id(page) %>" class="anchor"></a>
 
-        <div class="page">
+        <div class="page" data-page-id="<%= page.id %>">
           <h3><%= page.label %></h3>
           <ul class="questions readonly" start="<%= @question_number %>">
-            <%= render :partial => 'fe/answer_sheets/element', :collection => page_elements, :locals => {:elements => page_elements} %>
+            <%= 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 -%>