inline_forms 1.6.50 → 1.6.51

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmM5OGMyYjhjODgxODNhNzk4MWQxZGUyZWYyMzlkZjExYmI5MDNjNg==
+    YzJiZTRmZmVlYzA5OTVkNGFhMDE4ZGZmMGI1MGI5MzY0MTA2N2QwYQ==
   data.tar.gz: !binary |-
-    MTcxMzM0NDI4MmFjOTFiNjZmOWRlOTQ5YmFkNWFkMjA4ZGIyNTk5Ng==
+    ZDIyZDhjMTUxNmQyOTk0M2ViNzkyY2M5YjFiZDhjYTY2NTA4Y2VhMQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDQ2ZTc1MWU0ZTVjOWMyM2NmODUyYzdiNWFhNGQ5YjE1MjEyYTUzNDlhOTgx
-    YzI2YWYwZTcwYmU5ZGM0MjY5NDgzYmQxMzZiNDcwMmRhYzIxNWFlYjJjMTlk
-    ZDA1OGJhNGE3NWE2NDFkZGQ2ZTkyY2IzY2E4YjY5NzdjMjY4NTI=
+    NGEyYWViNjA5YzE0MmZhYWFjM2ZkZDAxYjQyZTI4MjM1ZmZkYzdlNmVkYzlj
+    OWExZDg1NGE5NWM0NTE4YTI3ZGYxYThkNDY2YmVmYWU2NjQ1NjMxZTdlODc5
+    YjRlYjI2Mjg0YzMyNzBlOTkzZjA1YWYwZWRlNDA1Y2EzZThmNmM=
   data.tar.gz: !binary |-
-    ZDMxNjQ3YTJlZTQ3ZDVmZDZiNzRiMjRiNGJkMzdiMTY1YjE3NzUwMzI0MGVm
-    MTcwZTZjNDRlZTY4OTJkMGVlMzVkY2Y2NmI0M2ZhOWU3NmRiMmI4YzBiODhi
-    MDM2NjE0MTM2NjA1NDc0YTlkZTE0Mjc3MzVjMTJmZWYwNmM4YWE=
+    MDBlYmVhNWU1ZDBlOWQyNzQyMWMzYjBlZGM2MzY5ZDdkMmE1YTAxMjhhMTcz
+    MTE1MTNlYWRmOGQxOGFkNTJlOWQyMTcyYzk3M2YwOGU2YzJjYjE5ZTk4MWFk
+    MDVkOWJlNjU1ZjgwNTkxZDI4YWZhOWMzY2JmNTgwMmYwYTNhNDk=

data/lib/app/assets/javascripts/inline_forms.js

@@ -1,6 +1,14 @@
+$(document).foundation();
+
 $(document).ready(function() {
+  // initialize datepickers
+  $.datepicker.setDefaults({
+    changeMonth : true,
+    changeYear : true,
+    yearRange: '-100:+1'
+  });
   // get rid of translation_missing tooltips
-    $(this).on("mouseover", ".translation_missing",  function() {
-      $(this).attr('title', '');
-    });
+  $(this).on("mouseover", ".translation_missing", function() {
+    $(this).attr('title', '');
+  });
 });

data/lib/app/assets/javascripts/inline_forms_application.js

@@ -6,11 +6,11 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require jquery.ui.all
+//= require jquery.ui.datepicker-nl.js
 //= require foundation
-//= require foundation-datetimepicker
 //= require jquery-scrollto
 //= require jquery.remotipart
 //= require ckeditor/init
 //= require inline_forms
 
-$(document).foundation();

data/lib/app/assets/stylesheets/inline_forms.css

@@ -63,21 +63,6 @@
     font-family: monospace;
 }
 
-.ui-tooltip-content ul {
-    padding: 0;
-    margin: 0;
-    list-style-type: none;
-}
-
-.ui-tooltip-content ul li {
-    margin-left: 20px;
-}
-
-.ui-tooltip-content ul li:first-letter
-{
-    margin-left: -20px;
-}
-
 
 /* LEFT */
 

data/lib/app/assets/stylesheets/inline_forms_application.css

@@ -2,5 +2,6 @@
  * This is a manifest file that'll automatically include all the stylesheets available in this directory
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
- *= require 'inline_forms'
+ * 
+ *= require inline_forms
 */

data/lib/app/helpers/form_elements/check_list.rb

@@ -4,7 +4,7 @@ InlineForms::SPECIAL_COLUMN_TYPES[:check_list]=:no_migration
 # checklist
 def check_list_show(object, attribute)
   out = '<ul class="checklist">'
-  out << link_to_inline_edit(object, attribute) if object.send(attribute).empty?
+  out << link_to_inline_edit(object, attribute, "<i class='fi-plus'></i>".html_safe) if object.send(attribute).empty?
   object.send(attribute).sort.each do | item |
     out << '<li>'
     out << link_to_inline_edit(object, attribute, item._presentation )
@@ -21,19 +21,13 @@ def check_list_edit(object, attribute)
   else
     values = object.send(attribute).first.class.name.constantize.order(attribute.to_s.singularize.camelcase.constantize.order_by_clause)
   end
-  out = '<div class="edit_form_checklist">'
-  out << '<ul>'
+  out = ''
   values.each do | item |
-    out << '<li>'
+    out << "<div class='row #{cycle('odd', 'even')}'>"
     out << check_box_tag( attribute.to_s + '[' + item.id.to_s + ']', 1, object.send(attribute.to_s.singularize + "_ids").include?(item.id) )
-    out << '<div class="edit_form_checklist_text">'
-    out << h(item._presentation)
+    out << "<label for=#{attribute.to_s + '[' + item.id.to_s + ']'}>#{h(item._presentation)}</label>"
     out << '</div>'
-    out << '<div style="clear: both;"></div>'
-    out << '</li>'
   end
-  out << '</ul>'
-  out << '</div>'
   out.html_safe
 end
 

data/lib/app/helpers/form_elements/date.rb

@@ -3,13 +3,13 @@ InlineForms::SPECIAL_COLUMN_TYPES[:date_select]=:date
 
 # date
 def date_select_show(object, attribute)
-  link_to_inline_edit object, attribute, object.send(attribute).nil? ? "" : object.send(attribute).strftime("%d-%m-%Y")
+  link_to_inline_edit object, attribute, object.send(attribute).nil? ? "<i class='fi-plus'></i>".html_safe : object.send(attribute).strftime("%d-%m-%Y")
 end
 
 def date_select_edit(object, attribute)
   css_id = 'datepicker_' + object.class.to_s.underscore + '_' + object.id.to_s + '_' + attribute.to_s
   out = text_field_tag attribute, ( object.send(attribute).nil? ? "" : object.send(attribute).strftime("%d-%m-%Y") ), :id => css_id, :class =>'datepicker'
-  out << "<script>$('##{css_id}').fdatepicker();</script>".html_safe
+  out << "<script>$('##{css_id}').datepicker();</script>".html_safe
 end
 
 def date_select_update(object, attribute)

data/lib/app/helpers/form_elements/dropdown.rb

@@ -3,7 +3,7 @@ InlineForms::SPECIAL_COLUMN_TYPES[:dropdown]=:belongs_to
 
 # dropdown
 def dropdown_show(object, attribute)
-  attribute_value = object.send(attribute)._presentation rescue  nil
+  attribute_value = object.send(attribute)._presentation rescue  "<i class='fi-plus'></i>".html_safe
   link_to_inline_edit object, attribute, attribute_value
 end
 

data/lib/app/helpers/form_elements/dropdown_with_values.rb

@@ -4,7 +4,7 @@ InlineForms::SPECIAL_COLUMN_TYPES[:dropdown_with_values]=:integer
 # dropdown_with_values
 def dropdown_with_values_show(object, attribute)
   values = attribute_values(object, attribute)
-  link_to_inline_edit object, attribute, object.send(attribute) ? values.assoc(object.send(attribute))[1] : ""
+  link_to_inline_edit object, attribute, object.send(attribute) ? values.assoc(object.send(attribute))[1] : "<i class='fi-plus'></i>".html_safe
 end
 def dropdown_with_values_edit(object, attribute)
   # the leading underscore is to avoid name conflicts, like 'email' and 'email_type' will result in 'email' and 'email[email_type_id]' in the form!

data/lib/app/helpers/form_elements/plain_text_area.rb

@@ -2,7 +2,7 @@
 InlineForms::SPECIAL_COLUMN_TYPES[:plain_text_area]=:text
 
 def plain_text_area_show(object, attribute)
-  link_to_inline_edit object, attribute, object[attribute]    #.empty? ? 'Click here to edit' : object[attribute]
+  link_to_inline_edit object, attribute, (object[attribute].nil? || object[attribute].empty?) ? "<i class='fi-plus'></i>".html_safe : object[attribute]
 end
 
 def plain_text_area_edit(object, attribute)

data/lib/app/helpers/form_elements/radio_button.rb

@@ -10,16 +10,15 @@ def radio_button_show(object, attribute)
 end
 
 def radio_button_edit(object, attribute)
-  out ='<ul class="radio_list">'
+  out =''
   values = attribute_values(object, attribute)
   values.each do |key,value|
-    out << '<li>'
+    out << "<div class='row #{cycle('odd', 'even')}'>"
     out << radio_button_tag(attribute.to_s, key, key == object.send(attribute))
-    out << value
-    out << '</li>'
+    out << "<label for=#{key}>#{value}</label>"
+    out << '</div>'
   end
-  out << '</ul>'
-  raw out
+  out.html_safe
 end
 
 def radio_button_update(object, attribute)

data/lib/app/helpers/form_elements/text_area_without_ckeditor.rb

@@ -2,7 +2,7 @@
 InlineForms::SPECIAL_COLUMN_TYPES[:text_area_without_ckeditor]=:text
 
 def text_area_without_ckeditor_show(object, attribute)
-  link_to_inline_edit object, attribute, object[attribute]
+  link_to_inline_edit object, attribute, (object[attribute].nil? || object[attribute].empty?) ? "<i class='fi-plus'></i>".html_safe : object[attribute]
 end
 
 def text_area_without_ckeditor_edit(object, attribute)

data/lib/app/helpers/form_elements/text_field.rb

@@ -2,7 +2,7 @@
 InlineForms::SPECIAL_COLUMN_TYPES[:text_field]=:string
 
 def text_field_show(object, attribute)
-  link_to_inline_edit object, attribute, (object.send attribute.to_sym)
+  link_to_inline_edit object, attribute, (object[attribute].nil? || object[attribute].empty?) ? "<i class='fi-plus'></i>".html_safe : object[attribute]
 end
 
 def text_field_edit(object, attribute)

data/lib/app/views/inline_forms/_new.html.erb

@@ -1,4 +1,4 @@
-<div class="new_record">
+<div class="new_record"">
   <% flash.each do |key, value| %>
     <div id="flash" class="flash <%= key %>">
       <ul>
@@ -10,16 +10,13 @@
       </ul>
     </div>
   <% end %>
-  <script type="text/javascript">
-    $(function() {
-      $("#flash").delay(1000).fadeTo('slow', 0.33);
-    });
-  </script>
+
   <div class="row" >
     <div class="large-12 column object_presentation" >
       <%= t('inline_forms.view.add_new', :model => @Klass.model_name.human ) -%>
     </div>
   </div>
+
   <%= form_tag  send(@Klass.to_s.underscore.pluralize + '_path',  :update => @update_span,
                                                                   :parent_class => @parent_class,
                                                                   :parent_id => @parent_id ),
@@ -61,9 +58,4 @@
     </div>
     <div class="row record_footer"></div>
   <% end %>
-  <script type="text/javascript">
-    $(function() {
-      $("#new_record").slideDown(4000);
-    }); 
-  </script>
 </div>

data/lib/app/views/inline_forms/_new_nested.html.erb

@@ -0,0 +1,43 @@
+This goes in _new.html.erb
+      <% if form_element.to_sym == :associated  -%>
+        <% @nested_model = @object.send(attribute) %>
+        <%= render 'new_nested' %>
+      <% end %>
+********
+
+<% @nested_object = @nested_model.build %>
+
+<div class="new_nested_record">
+  <div class="row" >
+    <div class="large-12 column object_presentation" >
+      <%= t('inline_forms.view.add_new', :model => @nested_object.class ) -%>
+    </div>
+  </div>
+    <% nested_attributes = @nested_object.inline_forms_attribute_list -%>
+    <% nested_attributes.each do | nested_attribute, nested_name, nested_form_element | -%>
+    <% @nested_form_element = nested_form_element %>
+    <% @nested_attribute = nested_attribute %>
+      <% unless @nested_form_element.to_sym == :associated -%>
+        <% if @nested_form_element == :header %>
+          <div class="row form_element_header" >
+            <div class='large-12 column' >
+              <%= @nested_object.class.human_attribute_name(@nested_attribute) -%>
+            </div>
+          </div>
+        <% else %>
+          <div class="row <%= cycle('odd', 'even') %>">
+            <div class='medium-3 large-3 column' >
+              <%= @nested_object.class.human_attribute_name(@nested_attribute) -%>
+            </div>
+            <div class='medium-9 large-9 column' >
+              <%= send("#{@nested_form_element}_edit", @nested_object, @nested_attribute) -%>
+            </div>
+          </div>
+        <% end -%>
+      <% end -%>
+    <% end -%>
+    <% if @nested_form_element.to_sym == :associated  -%>
+      <%= render 'new_nested' %>
+    <% end %>
+    <div class="row record_footer"></div>
+</div>

data/lib/app/views/inline_forms/_show.html.erb

@@ -1,60 +1,64 @@
-<% unless @skip %>
-<div class="row object_presentation">
-  <div class="small-11 column object_presentation">
-    <%= h(@object._presentation) -%>
-  </div>
-  <div class="small-1 column close_link" >
-    <%= close_link(@object, @update_span) -%>
-  </div>
-</div>
-<% end %>
-<% attributes = @inline_forms_attribute_list || @object.inline_forms_attribute_list -%>
-<% attributes.each do | attribute, name, form_element | -%>
-  <% if cancan_disabled? || can?(:read, @object, attribute) %>
-    <% css_class_id = "#{@object.class.name.underscore}_#{@object.id}_#{attribute}" -%>
-    <% if form_element == :header %>
-      <div class="row form_element_header">
-        <div class='large-12 column' >
-          <%= @object.class.human_attribute_name(attribute) -%>
-        </div>
+<div class="row">
+  <div class='small-11 small-centered column'>
+    <% unless @skip %>
+    <div class="row object_presentation">
+      <div class="small-11 column object_presentation">
+        <%= h(@object._presentation) -%>
+      </div>
+      <div class="small-1 column close_link" >
+        <%= close_link(@object, @update_span) -%>
       </div>
-    <% else %>
-      <% if form_element == :associated -%>
-	      <div class="row form_element_header associated_auto_header" id="<%= css_class_id -%>_list_auto_header" >
-	        <div class='medium-11 large-11 column' >
-	          <%= @object.class.human_attribute_name(attribute) -%>
-	        </div>
-	        <div class='medium-1 large-1 column'>
-	          <%= link_to_new_record(attribute.to_s.singularize.camelcase.constantize, "new_#{attribute.to_s.underscore.singularize}_path", css_class_id, @object.class, @object.id) -%>
-	        </div>
-	      </div>
-	      <div class="row <%= cycle('odd', 'even') %>">
-	        <div id="<%= css_class_id -%>" class='small-11 small-centered column' >
-	          <%= render  :partial => "inline_forms/list",
-	            :locals => {  :parent_class => @object.class,
-								            :parent_id    => @object.id,
-								            :attribute    => attribute } %>
-	        </div>
-	      </div>
-      <% else -%>
-        <div class="row <%= cycle('odd', 'even') %>">
-          <div class='medium-3 large-3 column' >
-            <% if @object.has_validations_for?(attribute) -%>
-              <span data-tooltip class="has-tip tip-top" title="<%= validation_hints_as_list_for(@object, attribute) -%>">
-                <%= @object.class.human_attribute_name(attribute) -%>
-              </span>
-            <% else %>
+    </div>
+    <% end %>
+    <% attributes = @inline_forms_attribute_list || @object.inline_forms_attribute_list -%>
+    <% attributes.each do | attribute, name, form_element | -%>
+      <% if cancan_disabled? || can?(:read, @object, attribute) %>
+        <% css_class_id = "#{@object.class.name.underscore}_#{@object.id}_#{attribute}" -%>
+        <% if form_element == :header %>
+          <div class="row form_element_header">
+            <div class='large-12 column' >
               <%= @object.class.human_attribute_name(attribute) -%>
-            <% end %>
+            </div>
           </div>
-          <div class='medium-9 large-9 column' >
-            <span id="<%= css_class_id -%>" >
-              <%= send("#{form_element}_show", @object, attribute) -%>
-            </span>
-          </div>
-        </div>
+        <% else %>
+          <% if form_element == :associated -%>
+    	      <div class="row form_element_header associated_auto_header" id="<%= css_class_id -%>_list_auto_header" >
+    	        <div class='medium-11 large-11 column' >
+    	          <%= @object.class.human_attribute_name(attribute) -%>
+    	        </div>
+    	        <div class='medium-1 large-1 column'>
+    	          <%= link_to_new_record(attribute.to_s.singularize.camelcase.constantize, "new_#{attribute.to_s.underscore.singularize}_path", css_class_id, @object.class, @object.id) -%>
+    	        </div>
+    	      </div>
+    	      <div class="row <%= cycle('odd', 'even') %>">
+    	        <div id="<%= css_class_id -%>" class='small-11 small-centered column' >
+    	          <%= render  :partial => "inline_forms/list",
+    	            :locals => {  :parent_class => @object.class,
+    								            :parent_id    => @object.id,
+    								            :attribute    => attribute } %>
+    	        </div>
+    	      </div>
+          <% else -%>
+            <div class="row <%= cycle('odd', 'even') %>">
+              <div class='medium-3 large-3 column' >
+                <% if @object.has_validations_for?(attribute) -%>
+                  <span data-tooltip class="has-tip tip-top" title="<%= validation_hints_as_list_for(@object, attribute) -%>">
+                    <%= @object.class.human_attribute_name(attribute) -%>
+                  </span>
+                <% else %>
+                  <%= @object.class.human_attribute_name(attribute) -%>
+                <% end %>
+              </div>
+              <div class='medium-9 large-9 column' >
+                <span id="<%= css_class_id -%>" >
+                  <%= send("#{form_element}_show", @object, attribute) -%>
+                </span>
+              </div>
+            </div>
+          <% end -%>
+        <% end -%>
       <% end -%>
     <% end -%>
-  <% end -%>
-<% end -%>
-<div class="record_footer"></div>
+    <div class="record_footer"></div>
+  </div>
+</div>

data/lib/inline_forms/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module InlineForms
-  VERSION = "1.6.50"
+  VERSION = "1.6.51"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 1.6.50
+  version: 1.6.51
 platform: ruby
 authors:
 - Ace Suares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm
@@ -232,6 +232,7 @@ files:
 - lib/app/views/inline_forms/_header.html.erb
 - lib/app/views/inline_forms/_list.html.erb
 - lib/app/views/inline_forms/_new.html.erb
+- lib/app/views/inline_forms/_new_nested.html.erb
 - lib/app/views/inline_forms/_show.html.erb
 - lib/app/views/inline_forms/close.js.erb
 - lib/app/views/inline_forms/edit.js.erb