activeadmin-selleo-cms 0.0.51 → 0.0.52

data/app/admin/activeadmin_selleo_cms/page.rb

@@ -117,7 +117,6 @@ ActiveAdmin.register ActiveadminSelleoCms::Page, as: "Page", sort_order: "lft_as
         li t("active_admin.cms.no_sections_defined")
       end
     end
-    button_to_function(t("active_admin.cms.save_changes"), "savePage()")
   end
 
 end

data/app/admin/translation.rb

@@ -29,7 +29,14 @@ ActiveAdmin.register Translation do
 
   controller do
     def collection
-      (get_collection_ivar || set_collection_ivar(active_admin_collection)).reorder(:key).select("DISTINCT(key)")
+      _collection = get_collection_ivar
+
+      return _collection if _collection
+
+      _collection = find_collection.reorder(:key).select("DISTINCT(key)")
+      authorize! ActiveAdmin::Authorization::READ, active_admin_config.resource_class
+
+      set_collection_ivar _collection
     end
   end
 end

data/app/assets/javascripts/activeadmin-selleo-cms/custom.js

@@ -99,7 +99,7 @@ function update_positions(pagesArray) {
 }
 
 $(function(){
-    $('#translations.index input').blur(function(evt){
+    $('#index_table_translations.index input').blur(function(evt){
         $.ajax({
             url: $(evt.target).data('route') + '.js',
             type: 'PUT',

data/app/assets/javascripts/ckeditor/plugins/formswidget/dialogs/formswidget.js

@@ -5,11 +5,12 @@ CKEDITOR.dialog.add( 'formswidgetDialog', function ( editor ) {
         type: 'GET',
         async: false,
         success: function(resp){
-            items = [$.map(resp, function(obj, idx) {
-                return [obj.title, obj.id]
-            })]
+            items = $.map(resp, function(obj, idx) {
+                return [[obj.title, obj.id]]
+            })
         }
     });
+    debugger;
 
     return {
         title: 'Insert form',

data/app/models/activeadmin_selleo_cms/form_question.rb

@@ -4,8 +4,9 @@ module ActiveadminSelleoCms
     TYPE_TEXT = 0
     TYPE_SELECT = 1
     TYPE_FILE = 2
-    TYPES = [TYPE_TEXT, TYPE_SELECT, TYPE_FILE]
-    TYPE_NAMES = ["text question", "select question", "file upload"]
+    TYPE_LABEL = 3
+    TYPES = [TYPE_TEXT, TYPE_SELECT, TYPE_FILE, TYPE_LABEL]
+    TYPE_NAMES = ["text question", "select question", "file upload", "label"]
 
     belongs_to :form
     has_many :options, class_name: "FormQuestionOption", :order => "position"
@@ -25,7 +26,7 @@ module ActiveadminSelleoCms
       end
 
       def question_type_dictionary(int)
-        ["text question", "select question", "file upload"][int]
+        ["text question", "select question", "file upload", "label"][int]
       end
 
     end
@@ -57,6 +58,8 @@ module ActiveadminSelleoCms
         :radio_button_tag
       elsif question_type == TYPE_FILE
         :file_field_tag
+      elsif question_type == TYPE_LABEL
+        :legend
       end
     end
 
@@ -70,6 +73,10 @@ module ActiveadminSelleoCms
       end
     end
 
+    def label
+      "#{title}#{'<i>'+I18n.t("active_admin.cms.forms.required")+'</i>' if is_required}".html_safe
+    end
+
   end
 
 end

data/app/models/activeadmin_selleo_cms/form_question_option.rb

@@ -18,5 +18,9 @@ module ActiveadminSelleoCms
       end
     end
 
+    def label
+      title
+    end
+
   end
 end

data/app/views/admin/form_questions/_form.html.haml

@@ -1,14 +1,15 @@
 = semantic_nested_form_for [:admin, @form, @form_question], url: (@form_question.new_record? ? admin_form_form_questions_path(@form.id) : admin_form_form_question_path(@form.id, @form_question.id)), remote: true, html: {id: "form_question_form"} do |form|
   = form.inputs "Options" do
     = form.input :title
-    = form.input :hint
-    = form.input :is_required
-    - unless @form_question.is_type?('file')
-      = form.input :is_multi
     = form.input :question_type, as: :hidden
-    - if @form_question.is_type?('select')
-      = form.input :has_other_option
-      = form.input :order, as: :hidden
+    - unless @form_question.is_type?('label')
+      = form.input :hint
+      = form.input :is_required
+      - unless @form_question.is_type?('file')
+        = form.input :is_multi
+      - if @form_question.is_type?('select')
+        = form.input :has_other_option
+        = form.input :order, as: :hidden
 
   - if @form_question.is_type?('select')
     = form.inputs "Add options" do

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

@@ -24,7 +24,7 @@
           },
 
           receive:function (event, ui) {
-             $('#question_container').load("#{new_admin_form_form_question_url(@form)}?question_type="+$(ui.helper).attr("data-qtype")).dialog({modal:true, closeOnEscape: false});
+             $('#question_container').load("#{new_admin_form_form_question_url(@form)}?question_type="+$(ui.helper).attr("data-qtype")).dialog({modal:true, closeOnEscape: false, width: 800});
           }
       }).disableSelection();
 
@@ -46,5 +46,5 @@
   }
 
   function editQuestion(id){
-    $('#question_container').load("/admin/forms/#{@form.id}/form_questions/" + id + "/edit").dialog({modal:true, closeOnEscape: false});
+    $('#question_container').load("/admin/forms/#{@form.id}/form_questions/" + id + "/edit").dialog({modal:true, closeOnEscape: false, width: 800});
   }

data/app/views/admin/translations/update.js.haml

@@ -1,4 +1,4 @@
 - if @translation and @translation.update_attribute(:value, params[:value])
-    $('#translations.index input[data-locale="#{@translation.locale}"]').filter('[data-key="#{@translation.key}"]').closest('td').effect('highlight');
+    $('#index_table_translations.index input[data-locale="#{@translation.locale}"]').filter('[data-key="#{@translation.key}"]').closest('td').effect('highlight');
 - else
     alert('#{t("cms.errors.ajax.update.unknown_error")}');

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

@@ -1,18 +1,24 @@
+<%= 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 %>">
-        <div class="questions_labels">
-            <%= label_tag dom_id(question), question.title %>
-            <% if question.hint.present? %>
-                <p class="hint"><%=  question.hint  %></p>
-            <% end %>
-        </div>
+
+        <% 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.title %>
+                    <%= 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>
@@ -20,12 +26,18 @@
             <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.title %>
+                    <%= 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 %>
-            <%= button_to_function "Select file", "fileUpload('#{dom_id(form)}', '#{dom_id(question)}', #{question.id})", style: "padding: 5px;" %>
+            <div class="file_upload" data-question-id="<%= question.id %>">
+                <p></p>
+                <%= button_to_function t("active_admin.cms.forms.select_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 %>
@@ -34,9 +46,9 @@
   </ol>
 <% end %>
 
-<%= button_to_function "Print", "print(#{form.id}, '#{dom_id(form)}')", class: 'print', title: 'Print' %>
-<%= button_to_function "Download PDF", "downloadPDF(#{form.id}, '#{dom_id(form)}')", class: 'save', title: 'Download PDF' %>
-<%= button_to_function "Send to JIPS", "deliver(#{form.id}, '#{dom_id(form)}')", class: 'send' %>
+<%= 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(){

data/config/locales/cms.en.yml

@@ -34,4 +34,11 @@ en:
         edit_image: "Edit image"
         edit_related_item: "Edit related"
         hint: "Hint: drag and drop files to reorder them"
-        no_cover: "No cover image"
+        no_cover: "No cover image"
+      forms:
+        submit: "Submit form"
+        print: "Print"
+        pdf: "Download PDF"
+        select_file: "Select file"
+        other: "Other"
+        required: " (required)"

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

@@ -1,3 +1,3 @@
 module ActiveadminSelleoCms
-  VERSION = "0.0.51"
+  VERSION = "0.0.52"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-selleo-cms
 version: !ruby/object:Gem::Version
-  version: 0.0.51
+  version: 0.0.52
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -441,6 +441,12 @@ 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/admin/question_2.png
+- app/assets/images/admin/edit.png
+- app/assets/images/admin/question_0.png
+- app/assets/images/admin/remove.png
+- app/assets/images/admin/question_3.png
+- app/assets/images/admin/question_1.png
 - app/assets/images/activeadmin-selleo-cms/Jcrop.gif
 - app/assets/javascripts/active_admin.js
 - app/assets/javascripts/ckeditor/config.js