fe 0.0.3 → 0.0.4

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

@@ -1,6 +1,6 @@
 <p>
   <label for="element_label" class="desc">Label <span class="required">required</span></label>
-  <%= f.text_field :label, :maxlength => Element.max_label_length %>
+  <%= f.text_field :label, :maxlength => Fe::Element.max_label_length %>
 </p>
 <div class="field">
   <label for="element_tooltip" class="desc">Tip</label>

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

@@ -3,4 +3,4 @@
   	<%= fields.collection_select :trigger_id, @questions_before_this, :id, :label %> is
   	<%= fields.text_field :expression %>
   </p>
-<% end -%>
+<% end -%>

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

@@ -6,32 +6,32 @@
   your page (you can drag and drop fields to reorder them later). <a href="/fe/help/builder.html" class="lbOn help" id="link-builder-help" >Help</a></p>
      
   <ul id="list-elements" class="list-elements">
-    <li id="sp"><%= link_to "Heading", admin_question_sheet_page_elements_path(route.merge(:element_type => "Fe::Section")),
+    <li id="sp"><%= link_to "Heading", fe_admin_question_sheet_page_elements_path(route.merge(:element_type => "Fe::Section")),
                       :remote => true,
                       :method => :post %></li>
-    <li id="pa"><%= link_to "Paragraph", admin_question_sheet_page_elements_path(route.merge(:element_type => "Fe::Paragraph")),
+    <li id="pa"><%= link_to "Paragraph", fe_admin_question_sheet_page_elements_path(route.merge(:element_type => "Fe::Paragraph")),
                       :remote => true, 
                       :method => :post %></li>
-    <li id="sl"><%= link_to "Short Answer",  new_admin_question_sheet_page_element_path(route.merge(:element_type => "Fe::TextField", :human_type => 'Short Answer')),
+    <li id="sl"><%= link_to "Short Answer",  new_fe_admin_question_sheet_page_element_path(route.merge(:element_type => "Fe::TextField", :human_type => 'Short Answer')),
                       :remote => true %></li>
-    <li id="ml"><%= link_to "Long Answer", new_admin_question_sheet_page_element_path(route.merge(:element_type => "Fe::TextField", :human_type => 'Long Answer')),
+    <li id="ml"><%= link_to "Long Answer", new_fe_admin_question_sheet_page_element_path(route.merge(:element_type => "Fe::TextField", :human_type => 'Long Answer')),
                       :remote => true %></li>
-    <li id="co"><%= link_to "Choose One", new_admin_question_sheet_page_element_path(route.merge(:element_type => "Fe::ChoiceField", :human_type => 'Choose One')),
+    <li id="co"><%= link_to "Choose One", new_fe_admin_question_sheet_page_element_path(route.merge(:element_type => "Fe::ChoiceField", :human_type => 'Choose One')),
                       :remote => true %></li>
-    <li id="cm"><%= link_to "Choose Many", new_admin_question_sheet_page_element_path(route.merge(:element_type => "Fe::ChoiceField", :human_type => 'Choose Many')),
+    <li id="cm"><%= link_to "Choose Many", new_fe_admin_question_sheet_page_element_path(route.merge(:element_type => "Fe::ChoiceField", :human_type => 'Choose Many')),
                       :remote => true %></li>
-    <li id="dt"><%= link_to "Date",  new_admin_question_sheet_page_element_path(route.merge(:element_type => "Fe::DateField", :human_type => 'Date')),
+    <li id="dt"><%= link_to "Date",  new_fe_admin_question_sheet_page_element_path(route.merge(:element_type => "Fe::DateField", :human_type => 'Date')),
                       :remote => true %></li>
-    <li id="qg"><%= link_to "Grid",  new_admin_question_sheet_page_element_path(route.merge(:element_type => "Fe::QuestionGrid", :human_type => 'Grid')),
+    <li id="qg"><%= link_to "Grid",  new_fe_admin_question_sheet_page_element_path(route.merge(:element_type => "Fe::QuestionGrid", :human_type => 'Grid')),
                       :remote => true %></li>
-    <li id="at"><%= link_to "Attachment", new_admin_question_sheet_page_element_path(route.merge(:element_type => "Fe::AttachmentField", :human_type => 'Attachment')),
+    <li id="at"><%= link_to "Attachment", new_fe_admin_question_sheet_page_element_path(route.merge(:element_type => "Fe::AttachmentField", :human_type => 'Attachment')),
                       :remote => true %></li>
-    <li id="qgt"><%= link_to "Grid w/Total", new_admin_question_sheet_page_element_path(route.merge(:element_type => "Fe::QuestionGridWithTotal", :human_type => 'Grid w/Total')),
+    <li id="qgt"><%= link_to "Grid w/Total", new_fe_admin_question_sheet_page_element_path(route.merge(:element_type => "Fe::QuestionGridWithTotal", :human_type => 'Grid w/Total')),
                       :remote => true %></li>
-    <%- unless Form.respond_to?(:no_refs) && Form.no_refs -%>
-    <li id="ref"><%= link_to "Reference",  new_admin_question_sheet_page_element_path(route.merge(:element_type => "Fe::ReferenceQuestion", :human_type => 'Reference')),
+    <%#- unless Fe::Form.respond_to?(:no_refs) && Fe::Form.no_refs -%>
+    <li id="ref"><%= link_to "Reference",  new_fe_admin_question_sheet_page_element_path(route.merge(:element_type => "Fe::ReferenceQuestion", :human_type => 'Reference')),
                       :remote => true %></li>
-    <%- end -%>
+    <%#- end -%>
   </ul>
   
   <p style="clear: both;">&nbsp;</p>

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

@@ -1,6 +1,6 @@
 <% route = { :question_sheet_id => @question_sheet.id, :id => @page.id } -%>
 
-<li id="tab-pages_list" class="active"><%= link_to "Pages", show_panel_admin_question_sheet_page_path( route.merge(:panel_name => 'pages_list')), :remote => true, :method => :get %></li>
-<li id="tab-insert"><%= link_to "Elements", show_panel_admin_question_sheet_page_path(route.merge(:panel_name => 'insert')), :remote => true, :method => :get %></li>
-<li id="tab-properties"><%= link_to "Properties", show_panel_admin_question_sheet_page_path(route.merge(:panel_name => 'properties')), :remote => true, :method => :get %></li>
-<div class="clear"></div>
+<li id="tab-pages_list" class="active"><%= link_to "Pages", show_panel_fe_admin_question_sheet_page_path( route.merge(:panel_name => 'pages_list')), :remote => true, :method => :get %></li>
+<li id="tab-insert"><%= link_to "Elements", show_panel_fe_admin_question_sheet_page_path(route.merge(:panel_name => 'insert')), :remote => true, :method => :get %></li>
+<li id="tab-properties"><%= link_to "Properties", show_panel_fe_admin_question_sheet_page_path(route.merge(:panel_name => 'properties')), :remote => true, :method => :get %></li>
+<div class="clear"></div>

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

@@ -1,3 +1,3 @@
 <li id="link-<%= dom_id(page) %>" <% if page == current_page -%> class="active"<% end -%>>
-  <%= link_to page.label, admin_question_sheet_page_path(page.question_sheet_id, page.id), :remote => true, :method => :get %>
-</li>
+  <%= link_to page.label, fe_admin_question_sheet_page_path(page.question_sheet_id, page.id), :remote => true, :method => :get %>
+</li>

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

@@ -1,10 +1,10 @@
 <div id="panel-pages" class="panel">
 <div>
   
-  <%= link_to "Add a page", admin_question_sheet_pages_path(@page.question_sheet_id), :remote => true, :method => :post,  :id => "link-page-add"  %>
+  <%= link_to "Add a page", fe_admin_question_sheet_pages_path(@page.question_sheet_id), :remote => true, :method => :post,  :id => "link-page-add"  %>
      
-  <ul id="list-pages" data-sortable="true" data-sortable-url="<%= reorder_admin_question_sheet_pages_path(@page.question_sheet_id) %>">
-    <%= render :partial => 'admin/panels/page', :collection => @all_pages, :locals => { :current_page => @page } %>
+  <ul id="list-pages" data-sortable="true" data-sortable-url="<%= reorder_fe_admin_question_sheet_pages_path(@page.question_sheet_id) %>">
+    <%= render :partial => 'fe/admin/panels/page', :collection => @all_pages, :locals => { :current_page => @page } %>
   </ul>
   
   
@@ -13,4 +13,4 @@
 </div>
 
 <p class="instruction">Select a page to edit.  Click 'Add a page' 
-to add a page to your form. <a href="/fe/help/builder.html" class="help" id="link-builder-help" >Help</a></p>
+to add a page to your form. <a href="/fe/help/builder.html" class="help" id="link-builder-help" >Help</a></p>

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

@@ -1,2 +1,2 @@
 <%= hidden_field_tag 'element[style]', 'file' %>
-<%= render 'admin/panels/common_fields', :f => f %>
+<%= render 'fe/admin/panels/common_fields', :f => f %>

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

@@ -1,13 +1,13 @@
-<%- options = [ OptionGroup.new('Choose One', [
-                    Option.new('drop-down', 'Drop Down'),
-                    Option.new('radio', 'Radio Buttons'),
-					          Option.new('rating', 'Rating'),
-					          Option.new('acceptance', 'Acceptance'),
-	                  Option.new('yes-no', 'Yes/No'),
-                    Option.new('country', 'Country')
+<%- options = [ Fe::OptionGroup.new('Choose One', [
+                    Fe::Option.new('drop-down', 'Drop Down'),
+                    Fe::Option.new('radio', 'Radio Buttons'),
+					          Fe::Option.new('rating', 'Rating'),
+					          Fe::Option.new('acceptance', 'Acceptance'),
+	                  Fe::Option.new('yes-no', 'Yes/No'),
+                    Fe::Option.new('country', 'Country')
                   ]),
-                OptionGroup.new('Choose Many', [
-                    Option.new('checkbox', 'Checkboxes')
+                Fe::OptionGroup.new('Choose Many', [
+                    Fe::Option.new('checkbox', 'Checkboxes')
                   ])
               ]
 %>
@@ -15,7 +15,7 @@
         <%= select_tag 'element[style]', option_groups_from_collection_for_select(options, 'group', 'label', 'key', 'value', @element.style),
           :onchange => "if(['acceptance', 'yes-no'].include($F('element[style]'))) $('choices_section').hide(); else $('choices_section').show();" %></div>
 
-<%= render 'admin/panels/common_fields', :f => f %>
+<%= render 'fe/admin/panels/common_fields', :f => f %>
 
 <div id="choices_section" style="display:<%= ['acceptance', 'yes-no'].include?(@element.style) ? 'none' : 'block' %>">
   <h3>Choices<br/>

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

@@ -4,4 +4,4 @@
   <%= f.select :style, [["Calendar", "date"], ["Month/Year", "mmyy"]] %>
 </p>
 
-<%= render 'admin/panels/common_fields', :f => f %>
+<%= render 'fe/admin/panels/common_fields', :f => f %>

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

@@ -2,29 +2,29 @@
     <p>Update the settings for this element.</p>
     
     <div id="errors">
-       <%= render :partial => 'errors', :locals => { :element => element }%>
+       <%= render 'errors', :element => element %>
     </div>
 
-<%= form_for :element, :url => admin_question_sheet_page_element_path( @page.question_sheet_id, @page.id, element.id), :remote => true, :html => {:method => :put} do |f| -%>
+<%= form_for :element, :url => fe_admin_question_sheet_page_element_path( @page.question_sheet_id, @page.id, element.id), :remote => true, :html => {:method => :put} do |f| -%>
 
-  <%= render :partial => 'admin/panels/prop_' + element.class.to_s.underscore, :locals => { :f => f, :element => element } %>
+  <%= render 'fe/admin/panels/prop_' + element.class.to_s.split('::').last.underscore, :f => f, :element => element %>
   
   <% if element.question? -%>
     <!-- <h3>Dependency</h3>
     <p><strong>Ask this question if:</strong></p> 
     <% element.conditions.each_with_index do |condition, i| %>
-      <%#= render :partial => 'admin/panels/condition', :object => condition, :locals => {:i => i} %>
+      <%#= render :partial => 'fe/admin/panels/condition', :object => condition, :locals => {:i => i} %>
     <% end %> -->
     
-    <%= render :partial => 'admin/panels/advanced_options', :locals => { :f => f, :element => element } %>
+    <%= render 'fe/admin/panels/advanced_options', :f => f, :element => element %>
   <% end-%>
 
   <p class="buttons">
     <button type="submit"><span>Update</span></button>
     <%= link_to('Close', '#', 'data-dom_id' => dom_id(element), :class => 'close_prop') %>
-    <%#= link_to('Delete', admin_question_sheet_page_element_path( @page.question_sheet_id,  @page.id, element.id), :remote => true, :method => :delete, data: {:confirm => "Are you sure you want to delete this element?"}) %>
+    <%#= link_to('Delete', fe_admin_question_sheet_page_element_path( @page.question_sheet_id,  @page.id, element.id), :remote => true, :method => :delete, data: {:confirm => "Are you sure you want to delete this element?"}) %>
   </p>
 
 <% end -%>
 
-</div>
+</div>

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

@@ -5,7 +5,7 @@
        <%= render :partial => 'errors', :locals => { :page => page }%>
     </div>
 
-  <%= form_for(page, :url => admin_question_sheet_page_path(page.question_sheet_id, page.id), :remote => true, :html => {:method => :put}) do |f| %>
+  <%= form_for(page, :url => fe_admin_question_sheet_page_path(page.question_sheet_id, page.id), :remote => true, :html => {:method => :put}) do |f| %>
     <p><label for="" class="desc">Label <span class="required">required</span></label>
         <%= f.text_field :label, maxlength: 100, size: 40 %></p>
 
@@ -15,7 +15,7 @@
     <p class="buttons">
       <%= submit_tag "Update &raquo;".html_safe %>
     </p>
-    <p class="buttons"><%= link_to "Delete", admin_question_sheet_page_path(page.question_sheet_id, page.id), :remote => true, :method => :delete, data: {confirm: "Are you sure you want to delete this page?"} %></p>
+    <p class="buttons"><%= link_to "Delete", fe_admin_question_sheet_page_path(page.question_sheet_id, page.id), :remote => true, :method => :delete, data: {confirm: "Are you sure you want to delete this page?"} %></p>
   <% end %>
 
 </div>

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

@@ -29,4 +29,4 @@ $(function() {
       } 
     );
 });
-</script>
+</script>

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

@@ -0,0 +1 @@
+<%= render 'admin/panels/common_fields', :f => f %>

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

@@ -1,6 +1,6 @@
 <p><%= link_to "Question Grid Help", "/fe/help/question_grid.html", { :class=>"lbOn", :id => "link-question-grid-help" } %></p>
 
-<%= render 'admin/panels/common_fields', :f => f %>
+<%= render 'fe/admin/panels/common_fields', :f => f %>
 
 <p>
   <label for="element_style" class="desc">Style</label>
@@ -20,4 +20,4 @@
 <div class="field">
   <label for="css_class" class="desc">Css Class</label>
   <%= f.text_field :css_class %>
-</div>
+</div>

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

@@ -11,4 +11,4 @@
   <span class="help">Which columns should be totaled? e.g. 2 OR 2,3</span>
 </div>
 
-<%= render '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, (QuestionSheet.active.where("label like '%reference%'").order(:label).all - [@page.question_sheet]).collect {|qs| [qs.label, qs.id]} %>
+  <%= 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 '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,2 @@
     <p><label for="element_label" class="desc">Heading Label <span class="required">required</span></label>
-        <%= f.text_field :label, :maxlength => Element.max_label_length %></p>
+        <%= f.text_field :label, :maxlength => Fe::Element.max_label_length %></p>

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

@@ -1,17 +1,17 @@
 <div id="panel-properties-sheet" class="panel" style="display:block;">
-    <p class="instruction">Update the settings for this form.</p>
-    
-    <div id="errors">
-       <%= render :partial => 'errors', :locals => { :question_sheet => @question_sheet }%>
-    </div>
+  <p class="instruction">Update the settings for this form.</p>
 
-<%= form_for @question_sheet, :url => admin_question_sheet_path(@question_sheet), :remote => true, :method => :put do |f| %>
+  <div id="errors">
+    <%= 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| %>
 
     <p><label for="" class="desc">Label <span class="required">required</span></label>
-        <%= f.text_field :label, :maxlength => 60 %></p>
+    <%= f.text_field :label, :maxlength => 50 %></p>
 
     <p class="buttons">
-        <%= submit_tag"Update &raquo;".html_safe %></p>
+    <%= submit_tag"Update &raquo;".html_safe %></p>
 
-<% end %>
+  <% end %>
 </div>

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

@@ -1,13 +1,13 @@
-<%- options = [ OptionGroup.new('Short Answer', [
-                    Option.new('short', 'Simple'),
-                    Option.new('number', 'Number'),
-                    Option.new('currency-dollar', 'Currency'),
-                    Option.new('email', 'E-mail address'),
-                    Option.new('url', 'Web address'),
-                    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')
                   ]),
-                OptionGroup.new('Long Answer', [
-                    Option.new('essay', 'Essay')
+                Fe::OptionGroup.new('Long Answer', [
+                    Fe::Option.new('essay', 'Essay')
                   ])
               ]
 %>
@@ -17,4 +17,4 @@
         option_groups_from_collection_for_select(options, 'group', 'label', 'key', 'value', @element.style) %>
 </div>
 
-<%= render '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,17 +1,17 @@
 <li class="element" id="element_<%= element.id %>">
   <div class="controls">
   	<ul>
-  		<li><%= link_to "edit", edit_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_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_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', 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 '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>

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

@@ -7,4 +7,4 @@
   </label>
 <% end -%>
     
-<%= render :partial => '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/_errors.html.erb

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

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

@@ -1,11 +1,11 @@
 <div class="page">
   <h3 id='page-name'>
-    <%= link_to @page.label, edit_admin_question_sheet_page_path(@page.question_sheet_id, @page.id), :remote => true, :method => :get ,  :class => "ctl", :id => "link-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_admin_question_sheet_page_elements_path(@page.question_sheet_id, @page.id) %>" data-sortable-handle=".handle">
-      <%= render :partial => 'admin/question_pages/element', :collection => @page.elements, :locals => {:in_grid => false} %>
+    <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} %>
     </ul>
   <% else %>
     <div style="background: #ffc;"><p>You don't have any questions on this page yet.</p></div>

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

@@ -1,6 +1,6 @@
-$('#page-preview').html('<%= escape_javascript(render('admin/question_pages/question_page')) %>')
-$('#panel').html('<%= escape_javascript(render('admin/panels/prop_page', :page => @page)) %>')
-$('#nav-controls').html('<%= escape_javascript(render('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('admin/panels/pages_list')) %>')
-$('#page-preview').html('<%= escape_javascript(render('admin/question_pages/question_page')) %>')
-$('#nav-controls').html('<%= escape_javascript(render('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('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/show.js.erb

@@ -1,8 +1,9 @@
-$('#page-preview').html('<%= escape_javascript(render('admin/question_pages/question_page')) %>')
-$('#nav-controls').html('<%= escape_javascript(render('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')
 clearCurrentElement()
 activeElement = ''
 $(".tip[title]").tooltip();
+setUpSortables();

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

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

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

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

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

@@ -1,3 +1,3 @@
-$('#panel').html('<%= escape_javascript(render('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

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