fe 0.0.4 → 1.0.0

data/app/assets/stylesheets/fe/fe.screen.css.scss.erb

@@ -182,6 +182,7 @@ ul#nav-controls li a:hover {
 .list-elements #at a {  background-image: url("<%= asset_path('fe/icons/paper-clip.png') %>");}
 .list-elements #ref a {  background-image: url("<%= asset_path('fe/icons/book-open-list.png') %>");}
 
+.fe_textfield textarea { width: 90%; }
 
 
 /* BODY SIDE */
@@ -236,7 +237,7 @@ span.required {
     width:16px;
 }
 
-label {
+label:not(.no_label_styles) { /* allow labels without styling, for the feature of clicking the label and having focus go to its corresponding input field */
     min-width: 150px;
     font-weight: bold;
     font-size: 14px;
@@ -263,7 +264,8 @@ ul.questions li {
 }
 
 .field_check input[type=checkbox],
-.field_check input[type=radio] {
+.field_check input[type=radio],
+.radio-set input[type=radio] {
     float: left;
 }
 
@@ -473,6 +475,9 @@ td.actions a {padding: 2px 10px 2px 20px;}
 .archive {background: url("<%= asset_path('fe/icons/briefcase.png') %>") no-repeat 0% 50%;}
 .delete {background: url("<%= asset_path('fe/icons/minus-button.png') %>") no-repeat 0% 50%;}
 
+table.ratings tr {
+  margin-right: 20px;
+}
 
 /* HEADER */
 #header {
@@ -487,17 +492,17 @@ td.actions a {padding: 2px 10px 2px 20px;}
 
 #header li a {
     color: #fff;
-    padding: 0px;
+    padding: 6px;
+    display: block;
 }
 
 #header li {
     float: left;
+    margin-right: 5px;
 }
 
 #header li.active a {
     background: #2e7ba7;
-    padding: 6px;
-    display: block;
 }
 
 #nav-main {
@@ -524,10 +529,30 @@ td.actions a {padding: 2px 10px 2px 20px;}
     width:auto;
 }
 .droppable-active {
-    min-height: 200px;
-    border-width: 4px;
-    padding: 4px;
-    margin: -8px;
+  background: #EBFCEB;
+  min-height: 200px;
+  border-width: 4px;
+  padding: 4px;
+  margin: -8px;
+}
+.droppable-hover {
+  background: #2F7EAB;
+}
+
+.droppable.around-container {
+  //border: 1px solid black;
+  border: 0px;
+}
+
+.droppable.around-container:not(.droppable-activated) {
+  height: 0px;
+}
+.droppable-active.around-container {
+  //display: inline;
+  padding: 0px;
+  margin: 10px 0px 10px 0px;;
+  min-height: 100px;
+  border-width: 1px;
 }
 
 .inlinecheck {
@@ -543,4 +568,38 @@ td.actions a {padding: 2px 10px 2px 20px;}
         color:red;
         font-weight: bold;
     }
-}
+}
+
+.future_affect {
+  label { display: inline-block; min-width: 0px; }
+  input[type=radio] { margin-left: 10px; }
+}
+
+/* SPINNER */
+
+#page_ajax_spinner {
+    position: absolute;
+    top: -52px;
+    width: 1000px;
+    z-index: 100;
+}
+
+#page_ajax_spinner div {
+    -moz-box-shadow: 0 0 10px #666666;
+    -webkit-box-shadow: 0 0 10px #666666;
+    box-shadow: 0 0 10px #666666;
+    background: none repeat scroll 0 0 #FFFFFF;
+    border: 2px solid #411E08;
+    color: #411E08;
+    margin: 0 auto;
+    padding: 10px;
+    text-align: center;
+    width: 200px;
+}
+
+input[type="text"].char-count {
+  font-size: 10px;
+  display: inline-block;
+  width: 50px;
+}
+

data/app/controllers/fe/admin/elements_controller.rb

@@ -1,44 +1,35 @@
 class Fe::Admin::ElementsController < ApplicationController
   before_filter :check_valid_user
   layout 'fe/fe.admin'
-  
-  before_filter :get_page
-  
-  # GET /elements/1
-  def show
-    @element = Fe::Element.find(params[:id])
 
-    respond_to do |format|
-      format.js
-    end
-  end
+  before_filter :get_page
 
   # GET /element/1/edit
   def edit
-    @element = Fe::Element.find(params[:id])
-    
+    @element = @page.all_elements.find(params[:id])
+
     # for dependencies
     if @element.question?
       (3 - @element.conditions.length).times { @element.conditions.build }
-      @questions_before_this = @page.questions_before_position(@element.position(@page)) 
+      @questions_before_this = @page.questions_before_position(@element.position(@page))
     end
-    
+
     respond_to do |format|
       format.js
     end
   end
-  
+
   def new
     @questions = params[:element_type].constantize.active.order('label')
 
     @style = element_params[:style]
     if @style
-      @questions = @questions.where(:style => @style).uniq
+      @questions = @questions.where(:style => @style).to_a.uniq
     end
   end
-  
+
   def use_existing
-    @element = Fe::Element.find(params[:id])
+    @element = Fe::Element.find(params[:id]) # NOTE the enclosing app might want to override this method and check that they have access to the questionnaire that the existing element is used on
     # Don't put the same question on a questionnaire twice
     unless @page.question_sheet.elements.include?(@element)
       @page_element = Fe::PageElement.create(:element => @element, :page => @page)
@@ -54,24 +45,24 @@ class Fe::Admin::ElementsController < ApplicationController
     @question_sheet = @page.question_sheet
 
     respond_to do |format|
-      if @element.save!
+      if @element.save
         @page_element = Fe::PageElement.create(:element => @element, :page => @page)
         format.js
       else
-        format.js { render :action => 'error.rjs' }
+        format.js { render :action => 'error.js.erb' }
       end
     end
   end
 
   # PUT /elements/1
   def update
-    @element = Fe::Element.find(params[:id])
+    @element = @page.all_elements.find(params[:id])
 
     respond_to do |format|
       if @element.update_attributes(element_params)
         format.js
       else
-        format.js { render :action => 'error.rjs' }
+        format.js { render :action => 'error.js.erb' }
       end
     end
   end
@@ -79,11 +70,11 @@ class Fe::Admin::ElementsController < ApplicationController
   # DELETE /elements/1
   # DELETE /elements/1.xml
   def destroy
-    @element = Fe::Element.find(params[:id])
+    @element = @page.all_elements.find(params[:id])
     # Start by removing the element from the page
     page_element = Fe::PageElement.where(:element_id => @element.id, :page_id => @page.id).first
     page_element.destroy if page_element
-    
+
     # If this element is not on any other pages, is not a question or has no answers, Destroy it
     if @element.reuseable? && (Fe::PageElement.where(:element_id => params[:id]).present? || @element.has_response?)
       @element.update_attributes(:question_grid_id => nil, :conditional_id => nil)
@@ -95,24 +86,24 @@ class Fe::Admin::ElementsController < ApplicationController
       format.js
     end
   end
-  
-  def reorder 
+
+  def reorder
     # since we don't know the name of the list, just find the first param that is an array
-    params.each_key do |key| 
+    params.each_key do |key|
       if key.include?('questions_list')
         grid_id = key.sub('questions_list_', '').to_i
         # See if we're ordering inside of a grid
         if grid_id > 0
-          Fe::Element.find(grid_id).elements.each do |element|
+          @page.all_elements.find(grid_id).elements.each do |element|
             if index = params[key].index(element.id.to_s)
-              element.position = index + 1 
+              element.position = index + 1
               element.save(:validate => false)
             end
           end
         else
           @page.page_elements.each do |page_element|
             if index = params[key].index(page_element.element_id.to_s)
-              page_element.position = index + 1 
+              page_element.position = index + 1
               page_element.save(:validate => false)
               @element = page_element.element
             end
@@ -120,17 +111,36 @@ class Fe::Admin::ElementsController < ApplicationController
         end
       end
     end
-    
+
     respond_to do |format|
       format.js
     end
   end
-  
+
   def drop
-    element = Fe::Element.find(params[:draggable_element].split('_')[1])  # element being dropped
-    target = Fe::Element.find(params[:id])
+    element = @page.all_elements.find(params[:draggable_element].split('_')[1])  # element being dropped
+    target = @page.all_elements.find(params[:id])
+
+    if [params[:before], params[:after]].include?('true')
+      # move the element out of its parent and back onto the page directly, placing it before the target
+      page_element = Fe::PageElement.where(page_id: @page.id, element_id: element.id).first_or_create
+      @page.page_elements << page_element
+
+      parent_element = element.question_grid || element.choice_field
+      parent_page_element = @page.page_elements.find_by(element_id: parent_element.id)
+      if params[:before]
+        page_element.insert_at(parent_page_element.position)
+      else
+        page_element.insert_at(parent_page_element.position + 1)
+      end
+
+      # remove question grid / choice_field ref since it's directly on the page now
+      element.update_attributes(question_grid_id: nil, choice_field_id: nil)
+      return
+    end
+
     case target.class.to_s
-    when 'QuestionGrid', 'QuestionGridWithTotal'
+    when 'Fe::QuestionGrid', 'Fe::QuestionGridWithTotal'
       # abort if the element is already in this box
       if element.question_grid_id == params[:id].to_i
         render :nothing => true
@@ -138,48 +148,54 @@ class Fe::Admin::ElementsController < ApplicationController
         element.question_grid_id = params[:id]
         element.save!
       end
-    when 'ChoiceField'
+    when 'Fe::ChoiceField'
       # abort if the element is already in this box
-      if element.conditional_id == params[:id].to_i
+      if element.choice_field_id == params[:id].to_i
         render :nothing => true
       else
-        element.conditional_id = params[:id]
+        element.choice_field_id = params[:id]
         element.save!
       end
     end
     # Remove page element for this page since it's now in a grid
     Fe::PageElement.where(:page_id => @page.id, :element_id => element.id).first.try(:destroy)
   end
-  
+
   def remove_from_grid
-    element = Fe::Element.find(params[:id])
+    element = @page.all_elements.find(params[:id])
     Fe::PageElement.create(:element_id => element.id, :page_id => @page.id) unless Fe::PageElement.where(:element_id => element.id, :page_id => @page.id).first
     if element.question_grid_id
-      element.set_position(element.question_grid.position(@page), @page) 
+      element.set_position(element.question_grid.position(@page), @page)
       element.question_grid_id = nil
     elsif element.choice_field_id
-      element.set_position(element.choice_field.position(@page), @page) 
+      element.set_position(element.choice_field.position(@page), @page)
       element.choice_field_id = nil
     end
     element.save!
     render :action => :drop
   end
-  
+
   def duplicate
-    element = Fe::Element.find(params[:id])
-    @element = element.duplicate(@page, element.question_grid || element.choice_field)
+    element = @page.all_elements.find(params[:id])
+    @element = element.duplicate(@page, element.question_grid || element.question_grid_with_total || element.choice_field)
     respond_to do |format|
-      format.js 
+      format.js
     end
   end
-  
+
   private
   def get_page
     @page = Fe::Page.find(params[:page_id])
   end
 
   def element_params
-    params.fetch(:element, {}).permit(:style, :label, :tooltip, :position, :source, :value_xpath, :text_xpath, :question_grid_id, :cols, :total_cols, :css_id, :css_class, :related_question_sheet_id, :conditional_id, :hide_option_labels, :slug, :required, :is_confidential, :hide_label, :object_name, :attribute_name, :max_length, :content, :conditional_type, :conditional_id, :conditional_answer)
+    params.fetch(:element, {}).permit({label_translations: Fe::LANGUAGES.keys}, {tip_translations: Fe::LANGUAGES.keys}, {content_translations: Fe::LANGUAGES.keys},
+                                      :style, :label, :tooltip,
+                                      :position, :source, :value_xpath,
+                                      :text_xpath, :question_grid_id, :cols, :total_cols, :css_id, :css_class,
+                                      :related_question_sheet_id, :conditional_id, :hide_option_labels, :slug,
+                                      :required, :is_confidential, :hide_label, :object_name, :attribute_name,
+                                      :max_length, :content, :conditional_type, :conditional_id, :conditional_answer)
   end
 
 end

data/app/controllers/fe/admin/email_templates_controller.rb

@@ -31,7 +31,7 @@ class Fe::Admin::EmailTemplatesController < ApplicationController
     
     respond_to do |format|
       if @email_template.save
-        format.html { redirect_to admin_email_templates_path }
+        format.html { redirect_to fe_admin_email_templates_path }
       else
         format.html { render :action => :new }
       end
@@ -55,7 +55,7 @@ class Fe::Admin::EmailTemplatesController < ApplicationController
     @email_template.destroy
 
     respond_to do |format|
-      format.html { redirect_to email_templates_path }
+      format.html { redirect_to fe_admin_email_templates_path }
     end
   end
 

data/app/controllers/fe/admin/question_pages_controller.rb

@@ -108,6 +108,6 @@ class Fe::Admin::QuestionPagesController < ApplicationController
   end
 
   def page_params
-    params.fetch(:fe_page, {}).permit(:label, :hidden, :no_cache)
+    params.fetch(:fe_page, {}).permit({label_translations: Fe::LANGUAGES.keys}, :label, :hidden, :no_cache)
   end
 end

data/app/controllers/fe/admin/question_sheets_controller.rb

@@ -1,107 +1,6 @@
 # QuestionSheets is used exclusively on the administration side to design a Questionniare
 #  which can than be instantiated as an AnswerSheet for data capture on the front-end
-
 class Fe::Admin::QuestionSheetsController < ApplicationController
-  before_filter :check_valid_user
-  before_filter :get_question_sheet, :only => [:show, :archive, :unarchive, :destroy, :edit, :update, :duplicate]
-  layout 'fe/fe.admin'
-
-  # list of all questionnaires/forms to edit
-  # GET /question_sheets
-  def index
-    @active_question_sheets = Fe::QuestionSheet.active.order('label')
-    @archived_question_sheets = Fe::QuestionSheet.archived.order('label')
-
-    respond_to do |format|
-      format.html # index.rhtml
-      format.xml  { render :xml => @question_sheets.to_xml }
-    end
-  end
-
-  def archive
-    @question_sheet.update_attribute(:archived, true)
-    redirect_to :back
-  end
-
-  def unarchive
-    @question_sheet.update_attribute(:archived, false)
-    redirect_to :back
-  end
-
-  def duplicate
-    @question_sheet.duplicate
-    redirect_to :back
-  end
-
-  # entry point: display form designer with page 1 and panels loaded
-  # GET /question_sheets/1
-  def show
-    @all_pages = @question_sheet.pages
-    @page = @all_pages[0]
-
-    respond_to do |format|
-      format.html # show.rhtml
-      format.xml  { render :xml => @question_sheet.to_xml }
-    end
-  end
-
-  # create sheet with inital page, redirect to show
-  # POST /question_sheets
-  def create
-    @question_sheet = Fe::QuestionSheet.new_with_page
-
-    respond_to do |format|
-      if @question_sheet.save
-        format.html { redirect_to fe_admin_question_sheet_path(@question_sheet) }
-        format.xml  { head :created, :location => admin_question_sheet_path(@question_sheet) }
-      else
-        format.html { render :action => "new" }
-        format.xml  { render :xml => @question_sheet.errors.to_xml }
-      end
-    end
-  end
-
-
-  # display sheet properties panel
-  # GET /question_sheets/1/edit
-  def edit
-
-    respond_to do |format|
-      format.js
-    end
-  end
-
-  # save changes to properties panel (label, language)
-  # PUT /question_sheets/1
-  def update
-    params.require(:fe_question_sheet).permit!
-
-    respond_to do |format|
-      if @question_sheet.update_attributes(params[:fe_question_sheet])
-        format.html { redirect_to fe_admin_question_sheet_path(@question_sheet) }
-        format.js
-        format.xml  { head :ok }
-      else
-        format.html { render :action => "edit" }
-        format.js { render :action => "error.rjs"}
-        format.xml  { render :xml => @question_sheet.errors.to_xml }
-      end
-    end
-  end
-
-  # mark sheet as destroyed
-  # DELETE /question_sheets/1
-  def destroy
-    @question_sheet.destroy
-
-    respond_to do |format|
-      format.html { redirect_to fe_admin_question_sheets_path }
-      format.xml  { head :ok }
-    end
-  end
-
-  protected
-  def get_question_sheet
-    @question_sheet = Fe::QuestionSheet.find(params[:id])
-  end
+  include Fe::Admin::QuestionSheetsControllerConcern
 end
+