inline_forms 1.6.42 → 1.6.43

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDI4YThkNTYxYWU2YTI5MWIxNTYxM2Y4ZDU3YWViMjZkZDlhNjdjYw==
+    OTRlNjAzNDQ2YjYxY2YxNTBiMDgyN2M1ZWRkNGQ2N2E0ODhkOGMyOA==
   data.tar.gz: !binary |-
-    YzgxNjNmYzc5MDdhMTkxYzhhYzA3NmI3YzVmYWZjOWJmMDZhNjg0Nw==
+    MGE5MjJiYWU1YzQ2MzI0NWNkYmNiNjA3MDA5NjY4ODllNDBjYzA0OA==
 SHA512:
   metadata.gz: !binary |-
-    OWNmNDAzNzMwMWViMjAyOWIzZDY5ZDE2ZDkyZGIxZmUwMWFlMmZiYjJjNmVm
-    ODUxNDFiZWM0MTAzMWZmNGNkYzMxM2VjYWRjNGIzMDk1Mzc1NDc3N2YyMzhh
-    NDEzYWEzMGUzYWJjMzg0YTZiOTYxNGYxMzZmNTBlMTYzNzYxOTg=
+    Y2FhODZhMDFkZjY0ODk5NTU5NmI5NmEzMzY1OWI0ZWNiNDczNjg0ZmQ2ODA1
+    ODUyODg0ZGYyNjhhZGM1MGEwZTVkMDJlNjFmYzQzNjZiNDY2MzljZDA2YTky
+    Y2Q4ZDg4NjZjNTE4NDg0NjcwYmFmNjAzZDBmOThiYzQyNGMzNDI=
   data.tar.gz: !binary |-
-    YzQ0MmQ5MGNlNTcxMDdkNzgyYzI4N2Y1MTI4YTAzY2Y1ODIyZDc2ZjYyOGIy
-    YzNhMjQyZTk3NTQwYmVmNmNhNDNlZjdkMmI0MDFkOGZiODY2NjE0ZWM4ZDJk
-    YzJiZTY1OWZiNWRhMGI4ODZiMGZlNmI0NjFiODdhMGEwMmRlY2Y=
+    MTQwYWFjNGViOTcwYWY1Y2I0NTk1N2IzM2RhMGUzNTQ1YmFmNjI0NzMxMWNj
+    ZjUxMjY0OWQ0ZTU5ZWY3ZWMxMWI1OGQ1ZDUwNGI4NTFjNjJjNmQ3MGU3MDZk
+    ZmRkYjU3ZWE0ZTM2ZGRlYWRlYmUyY2E2ZGNmNjUyNGE4NGE3Njg=

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

@@ -6,7 +6,7 @@ def text_field_show(object, attribute)
 end
 
 def text_field_edit(object, attribute)
-  text_field_tag attribute, (object.send attribute.to_sym), :class => 'input_text_field'
+  text_field_tag attribute, (object.send attribute.to_sym), :class => 'input_text_field', :required => true
 end
 
 def text_field_update(object, attribute)

data/lib/app/helpers/inline_forms_helper.rb

@@ -45,15 +45,16 @@ module InlineFormsHelper
 
   # new link
   def link_to_new_record(model, path_to_new, update_span, parent_class = nil, parent_id = nil, html_class = 'button new_button')
-    out = ""
-    out << (link_to "<i class='fi-plus'></i>".html_safe,
-                    send(path_to_new, :update => update_span, 
-                                      :parent_class => parent_class, 
-                                      :parent_id => parent_id,
-                                       ),
-                    :remote => true,
-                    :class => html_class,
-                    :title => t('inline_forms.view.add_new', :model => model.model_name.human ) )
+    out = (link_to "<i class='fi-plus'></i>".html_safe,
+                   send(path_to_new, 
+                        :update => update_span, 
+                        :parent_class => parent_class, 
+                        :parent_id => parent_id,
+                       ),
+                   :remote => true,
+                   :class => html_class,
+                   :title => t('inline_forms.view.add_new', :model => model.model_name.human ) 
+          )
     if cancan_enabled?
       if can? :create, model.to_s.pluralize.underscore.to_sym
         if parent_class.nil?

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

@@ -5,6 +5,7 @@
     :method => :put, # this is going to the update method!
     :multipart => true,
     :class  => "edit_form",
+    :abide => true,
     :remote => true do -%>
   <div class="row collapse">
     <div class="small-9 columns">

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

@@ -43,7 +43,7 @@
   <% objects = objects.paginate  :page => params[:page], :per_page => @PER_PAGE || 5, :conditions => conditions %>
 <% end %>
 
-<%= raw "<div id=\"#{update_span}\">" if ul_needed -%>
+<%= raw "<div class=\"list_container\" id=\"#{update_span}\">" if ul_needed -%>
 <!--  # list of objects -->
 <% for object in objects %>
   <% if parent_class.nil?  %>

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

@@ -1,4 +1,4 @@
-<li id="newnew">
+  <div class="new_record">
   <% flash.each do |key, value| %>
     <div id="flash" class="flash <%= key %>">
       <ul>
@@ -15,32 +15,31 @@
       $("#flash").delay(1000).fadeTo('slow', 0.33);
     });
   </script>
-  <%= form_tag  send(@Klass.to_s.underscore.pluralize + '_path',  :update => @update_span,
-                                                                  :parent_class => @parent_class,
-                                                                  :parent_id => @parent_id ),
-                                                                  :multipart => true, :remote => true, :class  => "edit_form" do -%>
-    <div class="edit_form_field">
       <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 ),
+                                                                  :multipart => true, :remote => true, :class  => "edit_form" do -%>
       <% attributes = @inline_forms_attribute_list || @object.inline_forms_attribute_list -%>
       <% attributes.each do | attribute, name, form_element | -%>
         <% unless form_element.to_sym == :associated || (cancan_enabled? && cannot?(:read, @Klass.to_s.underscore.pluralize.to_sym, attribute)) -%>
           <% css_class_id = "attribute_#{attribute}_#{@object.id}" -%>
           <% if form_element == :header %>
-            <div class="row" >
+            <div class="row form_element_header" >
               <div class='large-12 column<%= " attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
                 <%= @object.class.human_attribute_name(attribute) -%>
               </div>
             </div>
           <% else %>
-            <div class="row <%= 'has_validations ' if @object.has_validations_for?(attribute) -%>" validation-hint="<%= validation_hints_as_list_for(@object, attribute) -%>">
-              <div class='large-4 column<%= " attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
+            <div class="row <%= cycle('odd', 'even') %><%= ' has_validations ' if @object.has_validations_for?(attribute) -%>" validation-hint="<%= validation_hints_as_list_for(@object, attribute) -%>">
+              <div class='medium-3 large-3 column<%= " attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
                 <%= @object.class.human_attribute_name(attribute) -%>
               </div>
-              <div class='large-8 column<%= " attribute_value attribute_#{attribute} form_element_#{form_element}" -%>' >
+              <div class='medium-9 large-9 column<%= " attribute_value attribute_#{attribute} form_element_#{form_element}" -%>' >
                 <span id="<%= css_class_id -%>" > <%= send("#{form_element}_edit", @object, attribute) -%> </span>
               </div>
             </div>
@@ -49,17 +48,19 @@
       <% end -%>
       <%= link_to( send(@Klass.to_s.underscore.pluralize + '_path', :update => @update_span,
                                                                     :parent_class => @parent_class,
-                                                                    :parent_id => @parent_id ),
+                                                                    :parent_id => @parent_id,
+                                                                    :ul_needed => true ),
                                                                     :remote => true,
-                                                                    :class  => "edit_form_cancel" ) do -%>
-        <input type="button" name="cancel" value="cancel" />
+                                                                  ) do -%>
+        <input type="button" name="cancel" value="cancel" class="button alert" />
       <% end %>
-      <%= submit_tag "ok", :class => "edit_form_submit"-%>
+      <%= submit_tag "ok", :class => "button "-%>
       <div style="clear: both;"></div>
     <% end %>
-</li>
+
 <script type="text/javascript">
   $(function() {
     $("#newnew").slideDown(4000);
   }); 
 </script>
+</div>

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

@@ -1,5 +1,5 @@
 <% unless @skip %>
-<div class="row">
+<div class="row object_presentation">
   <div class="small-11 column object_presentation">
     <%= h(@object._presentation) -%>
   </div>
@@ -14,30 +14,46 @@
     <% 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<%= " attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
+        <div class='large-12 column' >
           <%= @object.class.human_attribute_name(attribute) -%>
         </div>
       </div>
     <% else %>
-      <div class="row <%= cycle('odd', 'even') %><%= ' has_validations ' if @object.has_validations_for?(attribute) -%>" validation-hint="">
-        <div class='medium-3 large-3 column<%= " attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
-          <span data-tooltip class="has-tip tip-top" title="<%= validation_hints_as_list_for(@object, attribute) -%>">
-            <%= @object.class.human_attribute_name(attribute) -%>
-          </span>
-        </div>
-        <div class='medium-9 large-9 column<%= " attribute_value attribute_#{attribute} form_element_#{form_element}" -%>' >
-          <span id="<%= css_class_id -%>" >
-            <% if form_element == :associated -%>
-              <%= render  :partial => "inline_forms/list",
-                :locals => {  :parent_class => @object.class,
-                :parent_id    => @object.id,
-                :attribute    => attribute } %>
-            <% else -%>
+      <% if form_element == :associated -%>
+	      <div class="row form_element_header associated_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) -%>
-            <% end -%>
-          </span>
+            </span>
+          </div>
         </div>
-      </div>
+      <% end -%>
     <% end -%>
   <% end -%>
 <% end -%>

data/lib/inline_forms/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 1.6.42
+  version: 1.6.43
 platform: ruby
 authors:
 - Ace Suares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm