activeadmin-selleo-cms 0.0.54 → 0.0.58

data/app/assets/javascripts/activeadmin-selleo-cms/forms.storage.js

@@ -69,4 +69,15 @@ function setupCmsForm(form_id) {
     $.each($('.file_upload'), function(){
         $(this).find('.files').load('/form_answers/attachments?form_uuid='+localStorage[form_id]+'&form_question_id='+$(this).data('question-id'));
     });
+}
+
+function deleteFormAttachment(answer_id, att_id) {
+    if(confirm('Are you sure?')) {
+        $.ajax({
+            url: '/form_answers/'+answer_id+'/form_answer_attachments/' + att_id + '.js',
+            type: 'DELETE'
+        }).error(function(){
+                alert('An error occured while trying to delete the asset');
+            });
+    }
 }

data/app/assets/stylesheets/active_admin/jquery-ui.css.scss

@@ -243,25 +243,25 @@ body .ui-tooltip { border-width: 2px; }
 .ui-widget { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; font-size: 1.1em/*{fsDefault}*/; }
 .ui-widget .ui-widget { font-size: 1em; }
 .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; font-size: 1em; }
-.ui-widget-content { border: 1px solid #aaaaaa/*{borderColorContent}*/; background: #ffffff/*{bgColorContent}*/ url(images/ui-bg_flat_75_ffffff_40x100.png)/*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/; color: #222222/*{fcContent}*/; }
+.ui-widget-content { border: 1px solid #aaaaaa/*{borderColorContent}*/; background: #ffffff/*{bgColorContent}*/ url(ui-bg_flat_75_ffffff_40x100.png)/*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/; color: #222222/*{fcContent}*/; }
 .ui-widget-content a { color: #222222/*{fcContent}*/; }
-.ui-widget-header { border: 1px solid #aaaaaa/*{borderColorHeader}*/; background: #cccccc/*{bgColorHeader}*/ url(images/ui-bg_highlight-soft_75_cccccc_1x100.png)/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/; color: #222222/*{fcHeader}*/; font-weight: bold; }
+.ui-widget-header { border: 1px solid #aaaaaa/*{borderColorHeader}*/; background: #cccccc/*{bgColorHeader}*/ url(ui-bg_highlight-soft_75_cccccc_1x100.png)/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/; color: #222222/*{fcHeader}*/; font-weight: bold; }
 .ui-widget-header a { color: #222222/*{fcHeader}*/; }
 
 /* Interaction states
 ----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3/*{borderColorDefault}*/; background: #e6e6e6/*{bgColorDefault}*/ url(images/ui-bg_glass_75_e6e6e6_1x400.png)/*{bgImgUrlDefault}*/ 50%/*{bgDefaultXPos}*/ 50%/*{bgDefaultYPos}*/ repeat-x/*{bgDefaultRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #555555/*{fcDefault}*/; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3/*{borderColorDefault}*/; background: #e6e6e6/*{bgColorDefault}*/ url(ui-bg_glass_75_e6e6e6_1x400.png)/*{bgImgUrlDefault}*/ 50%/*{bgDefaultXPos}*/ 50%/*{bgDefaultYPos}*/ repeat-x/*{bgDefaultRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #555555/*{fcDefault}*/; }
 .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555/*{fcDefault}*/; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999/*{borderColorHover}*/; background: #dadada/*{bgColorHover}*/ url(images/ui-bg_glass_75_dadada_1x400.png)/*{bgImgUrlHover}*/ 50%/*{bgHoverXPos}*/ 50%/*{bgHoverYPos}*/ repeat-x/*{bgHoverRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcHover}*/; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999/*{borderColorHover}*/; background: #dadada/*{bgColorHover}*/ url(ui-bg_glass_75_dadada_1x400.png)/*{bgImgUrlHover}*/ 50%/*{bgHoverXPos}*/ 50%/*{bgHoverYPos}*/ repeat-x/*{bgHoverRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcHover}*/; }
 .ui-state-hover a, .ui-state-hover a:hover, .ui-state-hover a:link, .ui-state-hover a:visited { color: #212121/*{fcHover}*/; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa/*{borderColorActive}*/; background: #ffffff/*{bgColorActive}*/ url(images/ui-bg_glass_65_ffffff_1x400.png)/*{bgImgUrlActive}*/ 50%/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcActive}*/; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa/*{borderColorActive}*/; background: #ffffff/*{bgColorActive}*/ url(ui-bg_glass_65_ffffff_1x400.png)/*{bgImgUrlActive}*/ 50%/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcActive}*/; }
 .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121/*{fcActive}*/; text-decoration: none; }
 
 /* Interaction Cues
 ----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fcefa1/*{borderColorHighlight}*/; background: #fbf9ee/*{bgColorHighlight}*/ url(images/ui-bg_glass_55_fbf9ee_1x400.png)/*{bgImgUrlHighlight}*/ 50%/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*/; color: #363636/*{fcHighlight}*/; }
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fcefa1/*{borderColorHighlight}*/; background: #fbf9ee/*{bgColorHighlight}*/ url(ui-bg_glass_55_fbf9ee_1x400.png)/*{bgImgUrlHighlight}*/ 50%/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*/; color: #363636/*{fcHighlight}*/; }
 .ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636/*{fcHighlight}*/; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a/*{borderColorError}*/; background: #fef1ec/*{bgColorError}*/ url(images/ui-bg_glass_95_fef1ec_1x400.png)/*{bgImgUrlError}*/ 50%/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*/; color: #cd0a0a/*{fcError}*/; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a/*{borderColorError}*/; background: #fef1ec/*{bgColorError}*/ url(ui-bg_glass_95_fef1ec_1x400.png)/*{bgImgUrlError}*/ 50%/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*/; color: #cd0a0a/*{fcError}*/; }
 .ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a/*{fcError}*/; }
 .ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a/*{fcError}*/; }
 .ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
@@ -273,14 +273,14 @@ body .ui-tooltip { border-width: 2px; }
 ----------------------------------*/
 
 /* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/; }
-.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/; }
-.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png)/*{iconsHeader}*/; }
-.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png)/*{iconsDefault}*/; }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png)/*{iconsHover}*/; }
-.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png)/*{iconsActive}*/; }
-.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png)/*{iconsHighlight}*/; }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png)/*{iconsError}*/; }
+.ui-icon { width: 16px; height: 16px; background-image: url(ui-icons_222222_256x240.png)/*{iconsContent}*/; }
+.ui-widget-content .ui-icon {background-image: url(ui-icons_222222_256x240.png)/*{iconsContent}*/; }
+.ui-widget-header .ui-icon {background-image: url(ui-icons_222222_256x240.png)/*{iconsHeader}*/; }
+.ui-state-default .ui-icon { background-image: url(ui-icons_888888_256x240.png)/*{iconsDefault}*/; }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(ui-icons_454545_256x240.png)/*{iconsHover}*/; }
+.ui-state-active .ui-icon {background-image: url(ui-icons_454545_256x240.png)/*{iconsActive}*/; }
+.ui-state-highlight .ui-icon {background-image: url(ui-icons_2e83ff_256x240.png)/*{iconsHighlight}*/; }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(ui-icons_cd0a0a_256x240.png)/*{iconsError}*/; }
 
 /* positioning */
 .ui-icon-carat-1-n { background-position: 0 0; }
@@ -470,8 +470,8 @@ body .ui-tooltip { border-width: 2px; }
 .ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px/*{cornerRadius}*/; -webkit-border-bottom-right-radius: 4px/*{cornerRadius}*/; -khtml-border-bottom-right-radius: 4px/*{cornerRadius}*/; border-bottom-right-radius: 4px/*{cornerRadius}*/; }
 
 /* Overlays */
-.ui-widget-overlay { background: #aaaaaa/*{bgColorOverlay}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/; opacity: .7;filter:Alpha(Opacity=70)/*{opacityOverlay}*/; }
-.ui-widget-shadow { margin: -8px/*{offsetTopShadow}*/ 0 0 -8px/*{offsetLeftShadow}*/; padding: 8px/*{thicknessShadow}*/; background: #aaaaaa/*{bgColorShadow}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityShadow}*/; -moz-border-radius: 8px/*{cornerRadiusShadow}*/; -khtml-border-radius: 8px/*{cornerRadiusShadow}*/; -webkit-border-radius: 8px/*{cornerRadiusShadow}*/; border-radius: 8px/*{cornerRadiusShadow}*/; }
+.ui-widget-overlay { background: #aaaaaa/*{bgColorOverlay}*/ url(ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/; opacity: .7;filter:Alpha(Opacity=70)/*{opacityOverlay}*/; }
+.ui-widget-shadow { margin: -8px/*{offsetTopShadow}*/ 0 0 -8px/*{offsetLeftShadow}*/; padding: 8px/*{thicknessShadow}*/; background: #aaaaaa/*{bgColorShadow}*/ url(ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityShadow}*/; -moz-border-radius: 8px/*{cornerRadiusShadow}*/; -khtml-border-radius: 8px/*{cornerRadiusShadow}*/; -webkit-border-radius: 8px/*{cornerRadiusShadow}*/; border-radius: 8px/*{cornerRadiusShadow}*/; }
 
 li.hidden {
     display: none;

data/app/controllers/form_answer_attachments_controller.rb

@@ -0,0 +1,8 @@
+class FormAnswerAttachmentsController < ApplicationController
+
+  def destroy
+    @attachment = ActiveadminSelleoCms::FormAnswerAttachment.find(params[:id])
+    @attachment.destroy
+  end
+
+end

data/app/controllers/form_answers_controller.rb

@@ -31,8 +31,11 @@ class FormAnswersController < ApplicationController
   end
 
   def attachments
-    @form_answer = ActiveadminSelleoCms::FormAnswer.where(form_uuid: params[:form_uuid], form_question_id: params[:form_question_id]).first
-    render partial: 'attachments'
+    if @form_answer = ActiveadminSelleoCms::FormAnswer.where(form_uuid: params[:form_uuid], form_question_id: params[:form_question_id]).first
+      render partial: 'attachments'
+    else
+      render nothing: true
+    end
   end
 
 end

data/app/controllers/forms_controller.rb

@@ -21,7 +21,11 @@ class FormsController < ApplicationController
   def deliver
     respond_to do |format|
       format.html do
-        ActiveadminSelleoCms::FormMailer.form_submission(@form, params[:form_uuid]).deliver
+        if ActiveadminSelleoCms::FormMailer.respond_to? :delay
+          ActiveadminSelleoCms::FormMailer.delay.form_submission(@form, params[:form_uuid])
+        else
+          ActiveadminSelleoCms::FormMailer.form_submission(@form, params[:form_uuid]).deliver
+        end
         flash[:notice] = "Your form has been sent. Thank you."
       end
     end

data/app/views/activeadmin_selleo_cms/form_mailer/form_submission.html.erb

@@ -6,7 +6,13 @@
 <body>
 <h3>A new form "<%= @form.title %>" has been submitted!</h3>
 <p>
-  <%= link_to "Click here for details.", "http://#{ActionMailer::Base.default_url_options[:host]}/forms/#{@form.id}/download?form_uuid=#{@form_uuid}" %>
+  <%= link_to "Click here to preview the form", "http://#{ActionMailer::Base.default_url_options[:host]}/forms/#{@form.id}/download?form_uuid=#{@form_uuid}" %>
+</p>
+<p>
+  <%= link_to "Print", "http://#{ActionMailer::Base.default_url_options[:host]}/forms/#{@form.id}/download?form_uuid=#{@form_uuid}&print=true" %>
+</p>
+<p>
+  <%= link_to "Download PDF", "http://#{ActionMailer::Base.default_url_options[:host]}/forms/#{@form.id}/download.pdf?form_uuid=#{@form_uuid}" %>
 </p>
 </body>
 </html>

data/app/views/form_answer_attachments/destroy.js.erb

@@ -0,0 +1 @@
+$('[data-attachment-id="<%= @attachment.id %>"]').remove();

data/app/views/form_answers/_attachments.html.haml

@@ -1,3 +1,5 @@
 %ol
   - @form_answer.form_answer_attachments.each do |att|
-    %li= att.data_file_name
+    %li{ :data => { "attachment-id" => att.id } }
+      = att.data_file_name
+      %small= link_to_function t("active_admin.cms.forms.delete"), "deleteFormAttachment(#{@form_answer.id},#{att.id})"

data/app/views/forms/_download.haml

@@ -0,0 +1,40 @@
+!!!
+%html{:lang => "en", "xml:lang" => "en", :xmlns => "http://www.w3.org/1999/xhtml"}
+  %head
+    %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
+    = wicked_pdf_stylesheet_link_tag "components/forms"
+  %body
+    = form_tag '/forms', multipart: true, id: dom_id(@form), data: {form_id: @form.id} do
+      %ol.questions
+        - @form.questions.each do |question|
+          %li{:class => "question #{question.input_type}"}
+            - unless question.input_type == :legend
+              .questions_labels
+                = label_tag dom_id(question), question.title
+                - if question.hint.present?
+                  %p.hint= question.hint
+            - if [:check_box_tag].include? question.input_type
+              .questions_options
+                - question.options.each do |option|
+                  = send(question.input_type, "#{dom_id(question)}[]", option.id, ActiveadminSelleoCms::FormAnswer.value_for(params[:form_uuid], dom_id(option))=="true", required: question.is_required, id: dom_id(option), data: {form_question_id: question.id} )
+                  = label_tag dom_id(option), option.title
+                - if question.has_other_option
+                  = label_tag "#{dom_id(question)}_other", t("active_admin.cms.forms.other")
+                  = text_field_tag "#{dom_id(question)}_other", ActiveadminSelleoCms::FormAnswer.value_for(params[:form_uuid], "#{dom_id(question)}_other"), data: {form_question_id: question.id} if question.has_other_option
+            - elsif [:radio_button_tag].include? question.input_type
+              .questions_options
+                - question.options.each do |option|
+                  = send(question.input_type, dom_id(question), option.id, ActiveadminSelleoCms::FormAnswer.value_for(params[:form_uuid], dom_id(option)), required: question.is_required, id: dom_id(option), data: {form_question_id: question.id})
+                  = label_tag dom_id(option), option.title
+                - if question.has_other_option
+                  = label_tag "#{dom_id(question)}_other", t("active_admin.cms.forms.other")
+                  = text_field_tag "#{dom_id(question)}_other", ActiveadminSelleoCms::FormAnswer.value_for(params[:form_uuid], "#{dom_id(question)}_other"), data: {form_question_id: question.id} if question.has_other_option
+            - elsif [:file_field_tag].include? question.input_type
+              .file_upload
+                %ol
+                  - ActiveadminSelleoCms::FormAnswer.files_for(params[:form_uuid], dom_id(question)).each do |file|
+                    %li= link_to file.data_file_name, file.data.url
+            - elsif question.input_type == :legend
+              %legend= question.label
+            - else
+              = send(question.input_type, dom_id(question), ActiveadminSelleoCms::FormAnswer.value_for(params[:form_uuid], dom_id(question)), required: question.is_required, data: {form_question_id: question.id})

data/app/views/forms/_form.html.haml

@@ -0,0 +1,57 @@
+= button_to_function t("active_admin.cms.forms.submit"), "deliver(#{form.id}, '#{dom_id(form)}')", class: 'send'
+= form_tag '/forms', multipart: true, id: dom_id(form), data: {form_id: form.id} do
+  %ol.questions
+    - form.questions.each do |question|
+      %li{:class => "question #{question.input_type}"}
+        - unless question.input_type == :legend
+          .questions_labels
+            = label_tag dom_id(question), question.label
+            - if question.hint.present?
+              %p.hint= question.hint
+        - if [:check_box_tag].include? question.input_type
+          .questions_options
+            - question.options.each do |option|
+              = send(question.input_type, "#{dom_id(question)}[]", option.id, false, required: question.is_required, id: dom_id(option), data: {form_question_id: question.id} )
+              = label_tag dom_id(option), option.label
+            - if question.has_other_option
+              = label_tag "#{dom_id(question)}_other", t("active_admin.cms.forms.other")
+              = text_field_tag "#{dom_id(question)}_other", "", data: {form_question_id: question.id} if question.has_other_option
+        - elsif [:radio_button_tag].include? question.input_type
+          .questions_options
+            - question.options.each do |option|
+              = send(question.input_type, dom_id(question), option.id, false, required: question.is_required, id: dom_id(option), data: {form_question_id: question.id})
+              = label_tag dom_id(option), option.label
+            - if question.has_other_option
+              = label_tag "#{dom_id(question)}_other", t("active_admin.cms.forms.other")
+              = text_field_tag "#{dom_id(question)}_other", "", data: {form_question_id: question.id}
+        - elsif [:file_field_tag].include? question.input_type
+          .file_upload{"data-question-id" => question.id}
+            .files
+            = button_to_function t("active_admin.cms.forms.upload_new_file"), "fileUpload('#{dom_id(form)}', '#{dom_id(question)}', #{question.id})", style: "padding: 5px;"
+        - elsif question.input_type == :legend
+          %legend= question.label
+        - else
+          = send(question.input_type, dom_id(question), "", required: question.is_required, data: {form_question_id: question.id})
+
+= button_to_function "", "print(#{form.id}, '#{dom_id(form)}')", class: 'print', title: t("active_admin.cms.forms.print")
+= button_to_function "", "downloadPDF(#{form.id}, '#{dom_id(form)}')", class: 'save', title: t("active_admin.cms.forms.pdf")
+= button_to_function t("active_admin.cms.forms.submit"), "deliver(#{form.id}, '#{dom_id(form)}')", class: 'send'
+
+:javascript
+  $(function(){
+      setupCmsForm('#{dom_id(form)}');
+  });
+
+  function downloadPDF(form_id, form_dom_id){
+      window.location='/forms/'+form_id+'/download.pdf?form_uuid='+localStorage[form_dom_id];
+  }
+
+  function print(form_id, form_dom_id){
+      window.open('/forms/'+form_id+'/download?print=true&form_uuid='+localStorage[form_dom_id]);
+  }
+
+  function deliver(form_id, form_dom_id) {
+      if ($('#'+form_dom_id).valid() == true) {
+          window.location='/forms/'+form_id+'/deliver?form_uuid='+localStorage[form_dom_id];
+      }
+  }

data/config/locales/cms.en.yml

@@ -45,4 +45,5 @@ en:
         email_subject: "New form has been submitted"
         upload: "Upload"
         upload_new_file: "Upload new file"
-        uploaded_files: "Uploaded files"
+        uploaded_files: "Uploaded files"
+        delete: "(delete)"

data/config/routes.rb

@@ -13,6 +13,7 @@ Rails.application.routes.draw do
       post :find_or_create
       get :attachments
     end
+    resources :form_answer_attachments, only: :destroy
   end
 
   scope ":locale", :locale => /\w{2}/ do

data/db/migrate/20130815104316_forms_strings_to_text.rb

@@ -0,0 +1,6 @@
+class FormsStringsToText < ActiveRecord::Migration
+  def up
+    change_column :activeadmin_selleo_cms_form_questions, :hint, :text
+    change_column :activeadmin_selleo_cms_form_answers, :value, :text
+  end
+end

data/lib/activeadmin-selleo-cms/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminSelleoCms
-  VERSION = "0.0.54"
+  VERSION = "0.0.58"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-selleo-cms
 version: !ruby/object:Gem::Version
-  version: 0.0.54
+  version: 0.0.58
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -423,6 +423,7 @@ files:
 - app/controllers/cms_controller.rb
 - app/controllers/locales_controller.rb
 - app/controllers/form_answers_controller.rb
+- app/controllers/form_answer_attachments_controller.rb
 - app/controllers/searches_controller.rb
 - app/admin/translation.rb
 - app/admin/active_admin/views_helper.rb
@@ -441,6 +442,7 @@ files:
 - app/assets/stylesheets/active_admin/jquery-ui.css.scss
 - app/assets/stylesheets/active_admin/cms.css.scss
 - app/assets/stylesheets/active_admin/jquery.Jcrop.css
+- app/assets/images/ui-icons_cd0a0a_256x240.png
 - app/assets/images/admin/question_2.png
 - app/assets/images/admin/edit.png
 - app/assets/images/admin/question_0.png
@@ -448,7 +450,19 @@ files:
 - app/assets/images/admin/question_3.png
 - app/assets/images/admin/question_1.png
 - app/assets/images/admin/question_4.png
+- app/assets/images/ui-icons_222222_256x240.png
+- app/assets/images/ui-icons_454545_256x240.png
+- app/assets/images/ui-bg_glass_75_e6e6e6_1x400.png
+- app/assets/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+- app/assets/images/ui-bg_flat_0_aaaaaa_40x100.png
+- app/assets/images/ui-icons_2e83ff_256x240.png
+- app/assets/images/ui-bg_glass_55_fbf9ee_1x400.png
+- app/assets/images/ui-bg_flat_75_ffffff_40x100.png
+- app/assets/images/ui-bg_glass_95_fef1ec_1x400.png
 - app/assets/images/activeadmin-selleo-cms/Jcrop.gif
+- app/assets/images/ui-bg_glass_75_dadada_1x400.png
+- app/assets/images/ui-icons_888888_256x240.png
+- app/assets/images/ui-bg_glass_65_ffffff_1x400.png
 - app/assets/javascripts/active_admin.js
 - app/assets/javascripts/ckeditor/config.js
 - app/assets/javascripts/ckeditor/toolbars.js
@@ -468,10 +482,10 @@ files:
 - app/assets/javascripts/activeadmin-selleo-cms/jquery.browser.js
 - app/assets/javascripts/activeadmin-selleo-cms/inline-editing.js
 - app/assets/javascripts/activeadmin-selleo-cms/forms.js
+- app/views/forms/_form.html.haml
 - app/views/forms/download.html.erb
 - app/views/forms/deliver.html.erb
-- app/views/forms/_download.erb
-- app/views/forms/_form.html.erb
+- app/views/forms/_download.haml
 - app/views/forms/download.pdf.erb
 - app/views/admin/sections/_form.html.haml
 - app/views/admin/sections/update.js.erb
@@ -528,6 +542,7 @@ files:
 - app/views/form_answers/edit.html.haml
 - app/views/form_answers/_attachments.html.haml
 - app/views/activeadmin_selleo_cms/form_mailer/form_submission.html.erb
+- app/views/form_answer_attachments/destroy.js.erb
 - app/modules/activeadmin_selleo_cms/content_translation.rb
 - app/models/translation.rb
 - app/models/ckeditor/asset.rb
@@ -562,6 +577,7 @@ files:
 - db/migrate/20130625104333_create_activeadmin_selleo_cms_forms.rb
 - db/migrate/20121204112326_create_ckeditor_assets.rb
 - db/migrate/20130814151821_add_email_to_forms.rb
+- db/migrate/20130815104316_forms_strings_to_text.rb
 - db/migrate/20130102113712_create_activeadmin_selleo_cms_assets.rb
 - db/migrate/20130206173233_change_activeadmin_selleo_cms_searches.rb
 - db/migrate/20121129160200_create_activeadmin_selleo_cms_locales.rb

data/app/views/forms/_download.erb

@@ -1,55 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <%= wicked_pdf_stylesheet_link_tag "components/forms" -%>
-</head>
-<body>
-
-<%= form_tag '/forms', multipart: true, id: dom_id(@form), data: {form_id: @form.id} do %>
-<ol class="questions">
-  <% @form.questions.each do |question| %>
-      <li class="question <%= question.input_type %>">
-        <div class="questions_labels">
-          <%= label_tag dom_id(question), question.title %>
-          <% if question.hint.present? %>
-              <p class="hint"><%=  question.hint  %></p>
-          <% end %>
-        </div>
-        <% if [:check_box_tag].include? question.input_type %>
-            <div class="questions_options">
-              <% question.options.each do |option| %>
-                  <%= send(question.input_type, "#{dom_id(question)}[]", option.id, ActiveadminSelleoCms::FormAnswer.value_for(params[:form_uuid], dom_id(option))=="true", required: question.is_required, id: dom_id(option), data: {form_question_id: question.id} ) %>
-                  <%= label_tag dom_id(option), option.title %>
-              <% end %>
-              <%= text_field_tag "#{dom_id(question)}_other", ActiveadminSelleoCms::FormAnswer.value_for(params[:form_uuid], "#{dom_id(question)}_other"), data: {form_question_id: question.id} if question.has_other_option %>
-            </div>
-        <% elsif [:radio_button_tag].include? question.input_type %>
-            <div class="questions_options">
-              <% question.options.each do |option| %>
-                  <%= send(question.input_type, dom_id(question), option.id, ActiveadminSelleoCms::FormAnswer.value_for(params[:form_uuid], dom_id(option)), required: question.is_required, id: dom_id(option), data: {form_question_id: question.id}) %>
-                  <%= label_tag dom_id(option), option.title %>
-              <% end %>
-              <%= text_field_tag "#{dom_id(question)}_other", ActiveadminSelleoCms::FormAnswer.value_for(params[:form_uuid], "#{dom_id(question)}_other"), data: {form_question_id: question.id} if question.has_other_option %>
-            </div>
-        <% elsif [:file_field_tag].include? question.input_type %>
-            <div class="file_upload">
-                <ol>
-                  <% ActiveadminSelleoCms::FormAnswer.files_for(params[:form_uuid], dom_id(question)).each do |file| %>
-                      <li><%= file.data_file_name %></li>
-                  <% end %>
-                </ol>
-            </div>
-        <% elsif question.input_type == :legend %>
-            <legend><%= question.label %></legend>
-        <% else %>
-            <%= send(question.input_type, dom_id(question), ActiveadminSelleoCms::FormAnswer.value_for(params[:form_uuid], dom_id(question)), required: question.is_required, data: {form_question_id: question.id}) %>
-        <% end %>
-      </li>
-  <% end %>
-</ol>
-<% end %>
-
-</body>
-</html>

data/app/views/forms/_form.html.erb

@@ -1,71 +0,0 @@
-<%= button_to_function t("active_admin.cms.forms.submit"), "deliver(#{form.id}, '#{dom_id(form)}')", class: 'send' %>
-
-<%= form_tag '/forms', multipart: true, id: dom_id(form), data: {form_id: form.id} do %>
-  <ol class="questions">
-    <% form.questions.each do |question| %>
-      <li class="question <%= question.input_type %>">
-
-        <% unless question.input_type == :legend %>
-            <div class="questions_labels">
-                <%= label_tag dom_id(question), question.label %>
-                <% if question.hint.present? %>
-                    <p class="hint"><%=  question.hint  %></p>
-                <% end %>
-            </div>
-        <% end %>
-
-        <% if [:check_box_tag].include? question.input_type %>
-            <div class="questions_options">
-                <% question.options.each do |option| %>
-                    <%= send(question.input_type, "#{dom_id(question)}[]", option.id, false, required: question.is_required, id: dom_id(option), data: {form_question_id: question.id} ) %>
-                    <%= label_tag dom_id(option), option.label %>
-                <% end %>
-                <%= text_field_tag "#{dom_id(question)}_other", "", data: {form_question_id: question.id} if question.has_other_option %>
-            </div>
-      <% elsif [:radio_button_tag].include? question.input_type %>
-            <div class="questions_options">
-                <% question.options.each do |option| %>
-                    <%= send(question.input_type, dom_id(question), option.id, false, required: question.is_required, id: dom_id(option), data: {form_question_id: question.id}) %>
-                    <%= label_tag dom_id(option), option.label %>
-                <% end %>
-                <%= label_tag "#{dom_id(question)}_other", t("active_admin.cms.forms.other") %>
-                <%= text_field_tag "#{dom_id(question)}_other", "", data: {form_question_id: question.id} if question.has_other_option %>
-            </div>
-        <% elsif [:file_field_tag].include? question.input_type %>
-            <div class="file_upload" data-question-id="<%= question.id %>">
-              <div class="files"></div>
-              <%= button_to_function t("active_admin.cms.forms.upload_new_file"), "fileUpload('#{dom_id(form)}', '#{dom_id(question)}', #{question.id})", style: "padding: 5px;" %>
-            </div>
-        <% elsif question.input_type == :legend %>
-            <legend><%= question.label %></legend>
-        <% else %>
-            <%= send(question.input_type, dom_id(question), "", required: question.is_required, data: {form_question_id: question.id}) %>
-        <% end %>
-      </li>
-    <% end %>
-  </ol>
-<% end %>
-
-<%= button_to_function "", "print(#{form.id}, '#{dom_id(form)}')", class: 'print', title: t("active_admin.cms.forms.print") %>
-<%= button_to_function "", "downloadPDF(#{form.id}, '#{dom_id(form)}')", class: 'save', title: t("active_admin.cms.forms.pdf") %>
-<%= button_to_function t("active_admin.cms.forms.submit"), "deliver(#{form.id}, '#{dom_id(form)}')", class: 'send' %>
-
-<script>
-  $(function(){
-      setupCmsForm('<%= dom_id(form) %>');
-  });
-
-  function downloadPDF(form_id, form_dom_id){
-      window.location='/forms/'+form_id+'/download.pdf?form_uuid='+localStorage[form_dom_id];
-  }
-
-  function print(form_id, form_dom_id){
-      window.open('/forms/'+form_id+'/download?print=true&form_uuid='+localStorage[form_dom_id]);
-  }
-
-  function deliver(form_id, form_dom_id) {
-      if ($('#'+form_dom_id).valid() == true) {
-          window.location='/forms/'+form_id+'/deliver?form_uuid='+localStorage[form_dom_id];
-      }
-  }
-</script>