fe 1.0.0 → 2.0.0

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

@@ -1,45 +1,61 @@
 <% reference = reference_question.response(@answer_sheet) %>
 <% reference ||= Fe::ReferenceSheet.new %>
-<% css_class = reference_question.required?(@answer_sheet, @page) ? 'required' : '' %>
-<% email_css_class = reference_question.required?(@answer_sheet, @page) ? 'required email email' : '' %>
-<% phone_css_class = reference_question.required?(@answer_sheet, @page) ? 'required phone phone' : '' %>
-<%#= hidden_field_tag "reference[#{reference.id}]", :class => reference_question.required? && !reference.email_sent? ? 'required' : '' %>
+<% css_class = reference_question.required?(@answer_sheet, @page) ? "required" : "" %>
+<% email_css_class = reference_question.required?(@answer_sheet, @page) ? "required email email" : "" %>
+<% phone_css_class = reference_question.required?(@answer_sheet, @page) ? "required phone phone" : "" %>
+<%#= hidden_field_tag "reference[#{reference.id}]", class: reference_question.required? && !reference.email_sent? ? "required" : "" %>
 <div id="<%= dom_id(reference_question) %>" class="reference_question">
   <ul class="questions level1">
     <li>
-    <label for="<%= "name_#{reference.id}" %>" class="desc"><%= _('First Name') %></label>
-      <%= text_field_tag "reference[#{reference.id}][first_name]", reference.first_name, :class => "text #{css_class}", :id => "name_#{reference.id}", :readonly => !@answer_sheet.try(:can_change_references?), :disabled => !@answer_sheet.try(:can_change_references?) %>
+    <label for="<%= "name_#{reference.id}" %>" class="desc"><%= _("First Name") %></label>
+      <%= text_field_tag "reference[#{reference.id}][first_name]", reference.first_name, class: "#{"form-control" if Fe.bootstrap} text #{css_class}", id: "name_#{reference.id}", readonly: reference.completed? || !@answer_sheet.try(:can_change_references?), disabled: reference.completed? || !@answer_sheet.try(:can_change_references?) %>
     </li>
     <li>
-    <label for="<%= "name_#{reference.id}" %>" class="desc"><%= _('Last Name') %> </label>
-      <%= text_field_tag "reference[#{reference.id}][last_name]", reference.last_name, :class => "text #{css_class}", :id => "name_#{reference.id}", :readonly => !@answer_sheet.try(:can_change_references?), :disabled => !@answer_sheet.try(:can_change_references?) %>
+    <label for="<%= "name_#{reference.id}" %>" class="desc"><%= _("Last Name") %> </label>
+      <%= text_field_tag "reference[#{reference.id}][last_name]", reference.last_name, class: "#{"form-control" if Fe.bootstrap} text #{css_class}", id: "name_#{reference.id}", readonly: reference.completed? || !@answer_sheet.try(:can_change_references?), disabled: reference.completed? || !@answer_sheet.try(:can_change_references?) %>
     </li>
     <li>
-    <label for="<%= "name_#{reference.id}" %>" class="desc"><%= _('Relationship to You') %></label>
-      <%= text_field_tag "reference[#{reference.id}][relationship]", reference.relationship, :class => "text #{css_class}", :id => "name_#{reference.id}", :readonly => !@answer_sheet.try(:can_change_references?), :disabled => !@answer_sheet.try(:can_change_references?) %>
+    <label for="<%= "name_#{reference.id}" %>" class="desc"><%= _("Relationship to You") %></label>
+      <%= text_field_tag "reference[#{reference.id}][relationship]", reference.relationship, class: "#{"form-control" if Fe.bootstrap} text #{css_class}", id: "name_#{reference.id}", readonly: reference.completed? || !@answer_sheet.try(:can_change_references?), disabled: reference.completed? || !@answer_sheet.try(:can_change_references?) %>
     </li>
     <li>
-    <label for="<%= "email_#{reference.id}" %>" class="desc"><%= _('E-mail') %></label>
+    <label for="<%= "email_#{reference.id}" %>" class="desc"><%= _("E-mail") %></label>
       <% if (!reference.email.blank?) %>
         <div class="warningText">
-          <%= _('Please be aware that any changes to this email address after your reference has started filling out their form will cause their answers to be lost.') %>
+          <%= _("Please be aware that any changes to this email address after your reference has started filling out their form will cause their answers to be lost.") %>
         </div>
       <% end %>
-      <%= text_field_tag "reference[#{reference.id}][email]", reference.email, :class => "text #{email_css_class}", :id => "email_#{reference.id}", :readonly => !@answer_sheet.try(:can_change_references?), :disabled => !@answer_sheet.try(:can_change_references?) %>
+      <%= text_field_tag "reference[#{reference.id}][email]", reference.email, class: "#{"form-control" if Fe.bootstrap} text #{email_css_class}", id: "email_#{reference.id}", readonly: reference.completed? || !@answer_sheet.try(:can_change_references?), disabled: reference.completed? || !@answer_sheet.try(:can_change_references?) %>
     </li>
     <li>
-    <label for="<%= "phone_#{reference.id}" %>" class="desc"><%= _('Phone') %></label>
-      <%= text_field_tag "reference[#{reference.id}][phone]", reference.phone, :class => "text #{phone_css_class}", :id => "phone_#{reference.id}", :readonly => !@answer_sheet.try(:can_change_references?), :disabled => !@answer_sheet.try(:can_change_references?) %>
+    <label for="<%= "phone_#{reference.id}" %>" class="desc"><%= _("Phone") %></label>
+      <%= text_field_tag "reference[#{reference.id}][phone]", reference.phone, class: "#{"form-control" if Fe.bootstrap} text #{phone_css_class}", id: "phone_#{reference.id}", readonly: reference.completed? || !@answer_sheet.try(:can_change_references?), disabled: reference.completed? || !@answer_sheet.try(:can_change_references?) %>
     </li>
-    <li><p>
-      <%= _("An invitation will be sent to this reference when you submit your application.  If you would " \
-            "like to get a head start, please feel free to click 'Send Email Invitation' below.") %><br/>
-            <em><strong>
-      <%= _('If you already submitted your application and have returned to update your reference information - you must click "Send Email Invitation" after you ' \
-        'have edited the information in order for your reference to receive another email.') %>
-  </strong></em></p></li>
+    <li>
+      <% if reference.completed? %>
+        <p><strong><%= _("This reference is completed") %></strong></p>
+      <% else %>
+        <p>
+        <%= _("An invitation will be sent to this reference when you submit your application.  If you would " \
+              "like to get a head start, please feel free to click "Send Email Invitation" below.") %><br/>
+              <em><strong>
+        <%= _("If you already submitted your application and have returned to update your reference information - you must click "Send Email Invitation" after you " \
+          "have edited the information in order for your reference to receive another email.") %>
+    </strong></em></p></li>
 
-    <li><%= link_to(_('Send Email Invitation'), @answer_sheet ? send_reference_invite_fe_answer_sheet_path(@answer_sheet, :reference_id => reference.id) : '#', :class => 'reference_send_invite button no-left-margin') %>
-  <br/><%= _('Invitation last sent:') %> <span id="ref_last_sent_<%= reference.id %>"><% if reference.email_sent_at.nil? -%><%= _('Never') %><% else %><%= reference.email_sent_at.strftime("%Y-%m-%d @ %I:%M%p") %><% end %></span></li>
+      <li><%= link_to(_("Send Email Invitation"), @answer_sheet ? send_reference_invite_fe_answer_sheet_path(@answer_sheet, reference_id: reference.id) : "#", class: "#{"form-control" if Fe.bootstrap} reference_send_invite button no-left-margin", disabled: !reference.all_affecting_questions_answered) %>
+      <% if reference.question && !reference.all_affecting_questions_answered %>
+        <div>
+          <strong><i>This button is disabled because there are questions that affect whether this reference is required that need to answered first:</i></strong>
+          <ul>
+            <% reference.question.visibility_affecting_questions.each do |q| %>
+              <% next if q.has_response?(@answer_sheet) %>
+              <li>"<%= q.pages.where(question_sheet_id: @answer_sheet.question_sheet_ids).first.label %>" Page: "<%= q.label %>"</li>
+            <% end %>
+          </ul>
+        </div>
+      <% end %>
+    <br/><%= _("Invitation last sent:") %> <span id="ref_last_sent_<%= reference.id %>"><% if reference.email_sent_at.nil? -%><%= _("Never") %><% else %><%= reference.email_sent_at.strftime("%Y-%m-%d @ %I:%M%p") %><% end %></span></li>
+      <% end %>
   </ul>
 </div>

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
-<% locked = state_chooser.locked?(params, @answer_sheet, @presenter) %>
+<% locked = state_chooser.locked?(params, @answer_sheet, @presenter, current_person) %>
 <%= select_tag "answers[#{state_chooser.id}]",
-    options_for_select(["", ['Not Listed','N/A']] + state_chooser.choices, [state_chooser.response(@answer_sheet).to_s]),
-    :class => 'select ' + state_chooser.validation_class(@answer_sheet),
-    :id => dom_id(state_chooser), 
-    :disabled => locked,
-    :readonly => locked %>
+    options_for_select(["", ["Not Listed","N/A"]] + state_chooser.choices(session[:locale]), [state_chooser.response(@answer_sheet).to_s]),
+      class: "#{"form-control" if Fe.bootstrap} select " + state_chooser.validation_class(@answer_sheet, @page),
+      id: dom_id(state_chooser),
+      disabled: locked,
+      readonly: locked %>

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

@@ -1,13 +1,17 @@
-<% max_length = text_area_field.max_length.to_i > 0 ? text_area_field.max_length : 4000 %>
+<%
+  max_length = text_area_field.max_length.to_i > 0 ? text_area_field.max_length : 4000
+  locked = text_area_field.locked?(params, @answer_sheet, @presenter, current_person)
+%>
 <% response = text_area_field.response(@answer_sheet).to_s %>
 <%= text_area_tag "answers[#{text_area_field.id}]", response, 
-      :class => 'text ' + text_area_field.validation_class(@answer_sheet),
-      :id => dom_id(text_area_field),
-      :rows => 6,
-      :disabled => @answer_sheet.frozen?&&!@presenter.try(:reference?),
-      :readonly => @answer_sheet.frozen?&&!@presenter.try(:reference?),
-      :maxlength => max_length %>
-<div class="small" align="right"><span class="small notice"><%= _('(Please use paragraphs for long answers)') %></span> 
-<%= _('Characters remaining: ') %>
-<input type="text" id="<%= dom_id(text_area_field)+'_count' %>" size="4" value="<%= max_length - response.length %>" disabled="" class="small char-count">
+      class: "text #{"form-control" if Fe.bootstrap}" + text_area_field.validation_class(@answer_sheet, @page),
+      id: dom_id(text_area_field),
+      rows: 6,
+      autocomplete: "off",
+      disabled: locked,
+      readonly: locked,
+      maxlength: max_length %>
+<div class="small" align="right"><span class="small notice"><%= _("(Please use paragraphs for long answers)") %></span> 
+<%= _("Characters remaining: ") %>
+<input type="text" id="<%= dom_id(text_area_field)+"_count" %>" size="4" value="<%= max_length - response.length %>" disabled="" class="small char-count">
 </div>

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

@@ -1,8 +1,9 @@
-<% locked = text_field.locked?(params, @answer_sheet, @presenter) %>
+<% locked = text_field.locked?(params, @answer_sheet, @presenter, current_person) %>
 <%= text_field_tag "answers[#{text_field.id}]", text_field.response(@answer_sheet),
-      :class => "text #{text_field.css_class} #{text_field.question_grid_id.present? ? "col_#{text_field.question_grid_id}_#{col}" : ''}" + text_field.validation_class(@answer_sheet),
-      :id => dom_id(text_field),
-      :disabled => locked,
-      :readonly => locked,
-      :maxlength => text_field.max_length.to_i > 0 ? text_field.max_length : 255 %>
+      class: "#{"form-control" if Fe.bootstrap} text #{text_field.css_class} #{text_field.question_grid_id.present? ? "col_#{text_field.question_grid_id}_#{col}" : ""}" + text_field.validation_class(@answer_sheet, @page),
+      id: dom_id(text_field),
+      disabled: locked,
+      autocomplete: "off",
+      readonly: locked,
+      maxlength: text_field.max_length.to_i > 0 ? text_field.max_length : 255 %>
 

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

@@ -1,17 +1,17 @@
-<%- 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, yes_no.id) %>">
-    <%= render 'fe/questions/fe/yes_no_field', :yes_no => yes_no %>
+    <%= render "fe/questions/fe/yes_no_field", yes_no: yes_no %>
   	<ul class="questions" id="questions_list_<%= yes_no.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">
-      <%= render :partial => 'fe/admin/question_pages/element', :collection => yes_no.elements, :locals => {:in_grid => true} %>
+      <%= render partial: "fe/admin/question_pages/element", collection: yes_no.elements, locals: {in_grid: true} %>
     </ul>
   </div>
 <% else %>
-  <%= render 'fe/questions/fe/yes_no_field', :yes_no => yes_no %>
-  <ul class="questions" id="questions_list_<%= yes_no.id %>" style="<%= yes_no.has_answer?(1,@answer_sheet) ? '' : 'display:none' %>">
-    <%= render :partial => 'fe/answer_pages/element', :collection => yes_no.elements, :locals => {:in_grid => false, :in_conditional => true} %>
+  <%= render "fe/questions/fe/yes_no_field", yes_no: yes_no %>
+  <ul class="questions" id="questions_list_<%= yes_no.id %>" style="<%= yes_no.has_answer?(1,@answer_sheet) ? "" : "display:none" %>">
+    <%= render partial: "fe/answer_pages/element", collection: yes_no.elements, locals: {in_grid: false, in_conditional: true} %>
   </ul>
   <script type="text/javascript" charset="utf-8">
-    $(document).on('click', '#<%= dom_id(yes_no) %>_1', function() {$('#questions_list_<%= yes_no.id %>').show(); $('input', '#questions_list_<%= yes_no.id %>').addClass('required'); });
-    $(document).on('click', '#<%= dom_id(yes_no) %>_0', function() {$('#questions_list_<%= yes_no.id %>').hide(); $('input', '#questions_list_<%= yes_no.id %>').removeClass('required'); });
+    $(document).on("click", "#<%= dom_id(yes_no) %>_1", function() {$("#questions_list_<%= yes_no.id %>").show(); $("input", "#questions_list_<%= yes_no.id %>").addClass("required"); });
+    $(document).on("click", "#<%= dom_id(yes_no) %>_0", function() {$("#questions_list_<%= yes_no.id %>").hide(); $("input", "#questions_list_<%= yes_no.id %>").removeClass("required"); });
   </script>
 <% end %>

data/app/views/fe/questions/fe/_yes_no_field.erb

@@ -1,16 +1,19 @@
+<% locked = yes_no.locked?(params, @answer_sheet, @presenter, current_person) %>
 <div id="<%= dom_id(yes_no) %>" class="choice_field" style="white-space: nowrap;">
   <% css_class = "#{yes_no.css_class} " -%>
   <% yes_no.choices.each_with_index do |choice, num| -%>
     <% dom_id = dom_id(yes_no) + "_" + pretty_tag(choice[1]) 
-       css_class += yes_no.validation_class(@answer_sheet) if num == 0
+       css_class += yes_no.validation_class(@answer_sheet, @page) if num == 0
        checked = yes_no.has_answer?(choice[1],@answer_sheet) -%>
-    <div class="field field_check yesno">
-      <%= radio_button_tag "answers[#{yes_no.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 horiz" for="<%= dom_id %>"><%= choice[0] %></label>
+    <div class="<% if Fe.bootstrap %>radio<% end %> field field_check yesno">
+      <% if Fe.bootstrap %><label class="choice horiz" for="<%= dom_id %>"><% end %>
+        <%= radio_button_tag "answers[#{yes_no.id}]", choice[1], checked, 
+              id: dom_id, 
+              class: css_class,
+              disabled: locked,
+              readonly: locked %>
+        <% if Fe.bootstrap %><%= choice[0] %><% end %>
+      <% unless Fe.bootstrap %><label class="choice horiz" for="<%= dom_id %>"><%= choice[0] %></label><% end %>
     </div>
   <% end -%>
   <div class="clear"></div>

data/app/views/fe/reference_pages/_reference.html.erb

@@ -4,28 +4,28 @@
 
 <ul class="questions">
 <li>
-  <label for="<%= "name_#{index}" %>" class="desc"><%= _('Name') %></label>
-  <%= text_field_tag "references[#{index}][name]", reference.name, :class => 'text required', :id => "name_#{index}" %>
+  <label for="<%= "name_#{index}" %>" class="desc"><%= _("Name") %></label>
+  <%= text_field_tag "references[#{index}][name]", reference.name, class: "text required", id: "name_#{index}" %>
 </li>
 <li>
-  <label for="<%= "email_#{index}" %>" class="desc"><%= _('E-mail') %></label>
+  <label for="<%= "email_#{index}" %>" class="desc"><%= _("E-mail") %></label>
   <% if (!reference.email.blank?) %><div class="warningText">Please be aware that any changes to this email address after your reference has started filling out their form will cause their answers to be lost.</div><% end %>
-  <%= text_field_tag "references[#{index}][email]", reference.email, :class => 'text required validate-email', :id => "email_#{index}" %>
+  <%= text_field_tag "references[#{index}][email]", reference.email, class: "text required validate-email", id: "email_#{index}" %>
 </li>
 <li>
-<label for="<%= "phone_#{index}" %>" class="desc"><%= _('Phone') %></label>
-  <%= text_field_tag "references[#{index}][phone]", reference.phone, :class => 'text required validate-phone', :id => "phone_#{index}" %>
+<label for="<%= "phone_#{index}" %>" class="desc"><%= _("Phone") %></label>
+  <%= text_field_tag "references[#{index}][phone]", reference.phone, class: "text required validate-phone", id: "phone_#{index}" %>
 </li>
 <li>
-  <label for="<%= "months_known_#{index}" %>" class="desc"><%= _('Length of acquaintance') %></label>
+  <label for="<%= "months_known_#{index}" %>" class="desc"><%= _("Length of acquaintance") %></label>
   <%= select_tag "references[#{index}][months_known]",
         options_for_select([""] + Fe::ReferencePagesController::MONTHS_KNOWN_OPTIONS, reference.months_known),
-        :class => 'select validate-selection',
-        :id => "months_known[#{index}]" %>
+        class: "select validate-selection",
+        id: "months_known[#{index}]" %>
 </li>
 <li><p><%= _("An invitation will be sent to this reference when you submit your application.  If you would " \
-             "like to get a headstart, please feel free to click 'Send Email Invitation' below.") %></p></li>
+             "like to get a headstart, please feel free to click "Send Email Invitation" below.") %></p></li>
 
-<li><%= submit_tag(_('Send Email Invitation')) %>
-  <%= _('Invitation last sent:') %> <span id="ref_last_sent_<%= reference.id %>"><% unless reference.email_sent_at.nil? -%><%= reference.email_sent_at.strftime("%Y-%m-%d @ %I:%M%p") %><% end -%></span></li>
+<li><%= submit_tag(_("Send Email Invitation")) %>
+  <%= _("Invitation last sent:") %> <span id="ref_last_sent_<%= reference.id %>"><% unless reference.email_sent_at.nil? -%><%= reference.email_sent_at.strftime("%Y-%m-%d @ %I:%M%p") %><% end -%></span></li>
 </ul>

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

@@ -1,4 +1,4 @@
-<% page_dom = 'reference_page'
+<% page_dom = "reference_page"
    next_js = load_page_js(@next_page) -%>
 
 <div id="<%= page_dom %>" class="answer-page" style="display: none;">  <!-- this id is parsed by public.js -->
@@ -10,13 +10,13 @@
 
     <%= form_tag fe_application_reference_page_path(@application), remote: true, id: "#{page_dom}-form", onsubmit: next_js + "; return false;"  do %>
 
-      <p><%= _('Please provide your references.') %></p>
+      <p><%= _("Please provide your references.") %></p>
 
-      <%= render :partial => 'reference', :collection => @references, :locals => {:page_dom => page_dom} %>
+      <%= render partial: "reference", collection: @references, locals: {page_dom: page_dom} %>
 
     <% end -%>
 
-    <%= button_to_function _('Next'), next_js unless next_js.empty? %>
+    <%= button_to_function _("Next"), next_js unless next_js.empty? %>
 
     </div>
   </div>

data/app/views/fe/reference_sheets/done.html.erb

@@ -1,2 +1,2 @@
-<p><%= _('Thank you for completing this reference. Your input is so valuable to us. If you are not familiar with Cru, why not visit our website to learn more?') %> <%= link_to('http://cru.org', 'http://cru.org') %></p>
-<p><%= _('If you have any questions or concerns, email us at %{email}') % { email: Fe.from_email } %></p>
+<p><%= _("Thank you for completing this reference. Your input is so valuable to us. If you are not familiar with Cru, why not visit our website to learn more?") %> <%= link_to("http://cru.org", "http://cru.org") %></p>
+<p><%= _("If you have any questions or concerns, email us at %{email}") % { email: Fe.from_email } %></p>

data/app/views/fe/reference_sheets/not_found.html.erb

@@ -1,5 +1,5 @@
-<%= _("We weren't able to find a reference associated with this link. The are two common reason for this issue:") %>
+<%= _("We weren"t able to find a reference associated with this link. The are two common reason for this issue:") %>
 <ol>
-  <li><%= _('The applicant has picked someone else to do their reference.') %></li>
-  <li><%= _('The link in your email was wrapped onto two lines. Check to make sure what you see in the address bar of your browser is the full link you see in your email.') %></li>
+  <li><%= _("The applicant has picked someone else to do their reference.") %></li>
+  <li><%= _("The link in your email was wrapped onto two lines. Check to make sure what you see in the address bar of your browser is the full link you see in your email.") %></li>
 </ol>

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

@@ -1,8 +1,8 @@
-<%= _("We're sorry, but the reference form you are trying to access is no longer available.") %><br/>
+<%= _("We"re sorry, but the reference form you are trying to access is no longer available.") %><br/>
 <br/>
-<%= _('If the applicant (the person you are attempting to fill out a reference for) has changed or updated any information about the reference, ' \
-'that would invalidate this form.  If you know that you are supposed to fill out a reference for this person, please check the link ' \
-'that you clicked on and make sure the entire address is displayed in the address bar.  Sometimes the link doesn’t fully cut and paste.') %><br/>
+<%= _("If the applicant (the person you are attempting to fill out a reference for) has changed or updated any information about the reference, " \
+"that would invalidate this form.  If you know that you are supposed to fill out a reference for this person, please check the link " \
+"that you clicked on and make sure the entire address is displayed in the address bar.  Sometimes the link doesn’t fully cut and paste.") %><br/>
 <br/>
-<%= _('If you still require assistance, please forward the email you received that contained the link you clicked to %{email} with a description of your problem.') %
+<%= _("If you still require assistance, please forward the email you received that contained the link you clicked to %{email} with a description of your problem.") %
   { email: Fe.from_email } %>

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

@@ -4,8 +4,8 @@
      <% unless @reference.question_sheet.nil? -%>
         <h2><%= @reference.question_sheet.label %></h2>
 
-        <p><label class="desc"><%= _('Applicant:') %></label> <%= @application.applicant.informal_full_name %></p>
-        <p><label class="desc"><%= _('Reference:') %></label> <%= @reference.name %></p>
+        <p><label class="desc"><%= _("Applicant:") %></label> <%= @application.applicant.informal_full_name %></p>
+        <p><label class="desc"><%= _("Reference:") %></label> <%= @reference.name %></p>
      <% end -%>
 	</div>
   </div>
@@ -13,6 +13,6 @@
 
 <div id="preview" class="answer-page">
 
-<%= render :partial => '/answer_sheets/answer_sheet', :locals => {:answer_sheet => @answer_sheet, :elements => @elements } %>
+<%= render partial: "/answer_sheets/answer_sheet", locals: {answer_sheet: @answer_sheet, elements: @elements } %>
 
 </div>

data/app/views/fe/references/submit.js.erb

@@ -1,3 +1,3 @@
-$('#submit_message').html("<%= _('Thank you for submitting your reference.') %>")
-$('#submit_message').show()
-$('#submit_button').hide()
+$('#submit_message, .submit_message').html("<%= _("Thank you for submitting your reference.") %>")
+$('#submit_message, .submit_message').show()
+$('.page:visible #submit_button').hide()

data/app/views/fe/submit_pages/_thankyou.html.erb

@@ -1,2 +1,2 @@
-<p><%= _('Thank you for submitting your application.  It has been accepted for processing.') %></p>
+<p><%= _("Thank you for submitting your application.  It has been accepted for processing.") %></p>
 

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

@@ -1,4 +1,4 @@
-<% page_dom = 'submit_page'
+<% page_dom = "submit_page"
    next_js = load_page_js(@next_page) -%>
 
 <div id="<%= page_dom %>" class="answer-page">  <!-- this id is parsed by public.js -->
@@ -8,24 +8,24 @@
   <div id="page-preview">
     <div class="page">
 
-    <%= form_tag fe_application_submit_page_path(@application), :id => "#{page_dom}-form", :onsubmit => "page_handler.validateAll(); return false;" do -%>
+    <%= form_tag fe_application_submit_page_path(@application), id: "#{page_dom}-form", autocomplete: "off", onsubmit: "page_handler.validateAll(); return false;" do -%>
 
   	<div id="submit_app">
 		<% if @application.frozen? -%>
-      <p><%= _('You have already submitted this application.') %></p>
+      <p><%= _("You have already submitted this application.") %></p>
 		<% else -%>
-  		<p><%= _('If you are sure you are finished with the application, click "Submit Application". ' \
-  			'After you submit your application, you will not be able to edit your answers in your ' \
-  			'application, but you will be able to change your your personal information, your ' \
-        'school information, and your reference information as necessary.') %></p>
+  		<p><%= _("If you are sure you are finished with the application, click "Submit Application". " \
+  			"After you submit your application, you will not be able to edit your answers in your " \
+  			"application, but you will be able to change your your personal information, your " \
+        "school information, and your reference information as necessary.") %></p>
 
 	    <div id="application_errors">
-	       <%= render :partial => "errors"%>
+	       <%= render partial: "errors"%>
 	    </div>
 
 	    <%= hidden_field_tag "submit_to", submit_fe_application_submit_page_path(@application) %>
 	    <div id="submit_message" class="validation-advice" style="display: none;"></div>
-  		<p class="buttons"><%= submit_tag(_('Submit Application')) %></p>
+  		<p class="buttons"><%= submit_tag(_("Submit Application")) %></p>
   		<% end -%>
   	</div>
 

data/app/views/fe/submit_pages/error.js.erb

@@ -1 +1 @@
-page.replace_html 'application_errors', :partial => 'errors', :locals => {:application => @application}
+page.replace_html 'application_errors', partial: 'errors', locals: {application: @application}

data/app/views/fe/submit_pages/submit.js.erb

@@ -1,3 +1,3 @@
-page.replace_html "submit_app", :partial => "thankyou"
-page.replace "meta", :partial => "fe/applications/meta_info"
+page.replace_html "submit_app", partial: "thankyou"
+page.replace "meta", partial: "fe/applications/meta_info"
 page << "new Effect.ScrollTo('meta');"

data/app/views/layouts/fe/_error_messages_for.html.erb

@@ -1,4 +1,4 @@
-<% if record.errors.any? %>
+<% if record && record.errors.any? %>
   <ul>
     <% record.errors.full_messages.each do |msg| %>
       <li><%= msg %></li>

data/app/views/layouts/fe/application.html.erb

@@ -4,15 +4,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
   <title><%= @title %></title>
-  <%= stylesheet_link_tag "print", :media => 'print' %>
+  <%= stylesheet_link_tag "print", media: "print" %>
   <%= stylesheet_link_tag "base" %>
 
   <script type="text/javascript" charset="utf-8">
-    var answer_sheet_type = '<%= @answer_sheet.class %>'
+    var answer_sheet_type = "<%= @answer_sheet.class %>"
   </script>
   <%= csrf_meta_tag %>
-  <%= stylesheet_link_tag 'message_block' %>
-  <%= stylesheet_link_tag asset_path('fe/fe.screen.css') %>
+  <%= stylesheet_link_tag asset_path("fe/fe.screen.css") %>
   <script type="text/javascript" charset="utf-8">
     <%#= raw Rack::TimeZone::Javascript %>
     setTimezoneCookie()

data/app/views/layouts/fe/fe_admin.html.erb

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+  <title>Dynamic Forms</title>
+  <%= stylesheet_link_tag "fe/fe.screen" %>
+
+  <%= javascript_include_tag "fe/admin" %>
+  <%= csrf_meta_tag %>
+</head>
+<body>
+
+<div id="status" style="display: none;"><div class="status_content"><%= image_tag("fe/status.gif", id: "status-img" ) %> <span id="status-msg">Please Wait...</span></div></div>
+
+<div id="wrapper">
+   <div id="header">
+      <ul id="nav-main">
+        <li class="active"><%= link_to "Forms", fe_admin_question_sheets_path %></li>
+        <div class="clear"></div>
+      </ul>
+   </div>
+
+   <div id="main">
+   <%= yield %>
+   </div>
+</div>
+
+</body>
+</html>

data/app/views.current/fe/admin/elements/_errors.html.erb

@@ -0,0 +1,11 @@
+<% if @element.errors.any? %>
+  <div class="errors">
+    <h2>There was a problem saving this element</h2>
+    <ul>
+      <% @element.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>
+

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

@@ -0,0 +1,12 @@
+<% if @page_element %>
+  $('#question_modal').dialog('close');
+  $('#page-preview').html('<%= escape_javascript(render("fe/admin/question_pages/question_page")) %>');
+  $('#element_<%= dom_id(@element) %>').hide();
+  $('#element_form_<%= dom_id(@element) %>').html('<%= escape_javascript(render("fe/admin/panels/prop_element", element: @element)) %>');
+  $('#element_form_<%= dom_id(@element) %>').show();
+  selectElement("#element_<%= @element.id %>");
+  scrollTo("#element_<%= @element.id %>");
+  setUpSortables();
+<% else %>
+  alert('That question already exists on this question sheet')
+<% end %>

data/app/views.current/fe/admin/elements/destroy.js.erb

@@ -0,0 +1,4 @@
+$('#element_<%= @element.id %>').remove()
+$('#panel').html('<%= escape_javascript(render("fe/admin/panels/insert")) %>')
+activeElement = ''
+switchTab('insert')

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

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

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

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

data/app/views.current/fe/admin/elements/edit.js.erb

@@ -0,0 +1,4 @@
+$('#element_<%= dom_id(@element) %>').hide()
+$('#element_form_<%= dom_id(@element) %>').html('<%= escape_javascript(render("fe/admin/panels/prop_element", element: @element)) %>')
+$('#element_form_<%= dom_id(@element) %>').show();
+selectElement("#element_<%= @element.id %>")

data/app/views.current/fe/admin/elements/error.js.erb

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

data/app/views.current/fe/admin/elements/new.js.erb

@@ -0,0 +1,17 @@
+<% if @questions.any? %>
+if ($('#question_modal')[0] == null) {
+	$('body').append('<div id="question_modal"></div>');
+}
+$('#question_modal').html('<%= link_to("Add \"#{params[:human_type]}\"", fe_admin_question_sheet_page_elements_path(question_sheet_id: @page.question_sheet_id, page_id: @page.id,
+                                            element_type: params[:element_type], "element[style]" => @style, format: :js),
+                                            remote: true,
+                                            method: :post,
+                                            class: "add_type",
+                                            data: { disable_with: "Add \"#{params[:human_type]}\"" }) %><p>Or you can also copy an existing <%= params[:human_type] %> element. If you are unsure, just <strong>Add <%= params[:human_type] %>.</strong></p><div id="questions_div" title=""></div>');
+$('#questions_div').html("<%= escape_javascript(render("fe/questions/fe/questions", questions: @questions)) %>")
+$('#question_modal').dialog({width: 500, height: 400});
+<% else %>
+  $.post('<%= fe_admin_question_sheet_page_elements_path(question_sheet_id: @page.question_sheet_id, 
+                                                    page_id: @page.id,
+                                                    element_type: params[:element_type], "element[style]" => @style, format: :js) %>');
+<% end %>

data/app/views.current/fe/admin/elements/update.js.erb

@@ -0,0 +1,9 @@
+$('#element_form_<%= dom_id(@element) %>').hide();
+$('#element_<%= dom_id(@element) %>').html('<%= escape_javascript(render("fe/admin/question_pages/element_show", element: @element)) %>')
+$('#element_<%= dom_id(@element) %>').show()
+clearCurrentElement()
+$('#questions_list').sortable('refresh');
+
+<% @page.question_grids.each do |grid| %>
+  $('#questions_list_<%= grid.id %>').sortable('refresh');
+<% end %>

data/app/views.current/fe/admin/email_templates/_form.html.erb

@@ -0,0 +1,8 @@
+      <p><label for="email_template_name" class="desc">Template Name</label>
+        <%= f.text_field :name, class: "text", size: 93 %></p>
+
+      <p><label for="email_template_subject" class="desc">Subject</label>
+        <%= f.text_field :subject, class: "text", size: 93 %></p>
+
+      <p><label for="email_template_content" class="desc">Content</label>
+        <%= f.text_area :content, rows: 25, cols: 80, class: "text" %>

data/app/views.current/fe/admin/email_templates/edit.html.erb

@@ -0,0 +1,13 @@
+<div id="content">
+  <h1>Edit Email Template</h1>
+
+  <%= error_messages_for :email_template %>
+
+  <%= form_for(:email_template, url: fe_admin_email_template_path(@email_template), html: { method: :put } ) do |f| %>
+    <%= render "form", f: f %>
+
+    <p><%= submit_tag "Update" %> or <%= link_to "Cancel", fe_admin_email_templates_path, class: "cancel" %></p>
+  <% end %>
+
+
+</div>