inline_forms 2.23 → 3.0

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/slider_with_values.rb

@@ -24,7 +24,7 @@ def slider_with_values_show(object, attribute)
                     range: "min",
                     disabled: true,
                     min: 0,
-                    max: 5,
+                    max: ' + values.length + ',
                     step: 1,
                   }
                 );

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

@@ -9,13 +9,14 @@ def text_area_show(object, attribute)
       cktext_area_tag(
       attribute,
       object[attribute],
-      :input_html => { :id => "textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}",
-        :width => '100%' },
-      :height => '200px',
-      :toolbar => "None",
-      :readOnly => "true",
-      :resize_enabled => "false",
-      :toolbarCanCollapse => "false"
+      :id => "textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}",
+      :ckeditor => {  :width => '100%',
+                      :height => '200px',
+                      :toolbar => "None",
+                      :readOnly => "true",
+                      :resize_enabled => "false",
+                      :toolbarCanCollapse => "false"
+                    }
     ) +
       image_tag(  'glass_plate.gif',
       :class => "glass_plate",
@@ -31,9 +32,10 @@ def text_area_edit(object, attribute)
     cktext_area_tag(
       attribute,
       object[attribute],
-      :input_html => { :id => "textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}",
-        :width => '100%'},
-      :height => '200px'
+      :id => "textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}",
+      :ckeditor => {  :width => '100%',
+                      :height => '200px'
+                    }
     )
   else
     text_area_tag attribute, object[attribute], :class => 'attribute_text_area'

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,11 +2,11 @@
 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)
-  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'  # for abide: , :required => true
 end
 
 def text_field_update(object, attribute)

data/lib/app/helpers/inline_forms_helper.rb

@@ -19,35 +19,54 @@ module InlineFormsHelper
   end
 
   # close link
-  def close_link( object, update_span )
-    link_to image_tag(  'close.png',
-      :class => "close_icon",
-      :title => t('inline_forms.view.close') ),
+  def close_link( object, update_span, html_class = 'button close_button' )
+    link_to "<i class='fi-x'></i>".html_safe,
       send( object.class.to_s.underscore + '_path',
       object,
       :update => update_span,
       :close => true ),
-      :remote => true
+      :remote => true,
+      :class => html_class,
+      :title => t('inline_forms.view.close')
   end
 
   # destroy link
   def link_to_destroy( object, update_span )
     if cancan_disabled? || ( can? :delete, object )
-      link_to image_tag(  'trash.png',
-        :class => "trash_icon",
-        :title => t('inline_forms.view.trash') ),
+      link_to "<i class='fi-trash'></i>".html_safe,
         send( object.class.to_s.underscore + '_path',
         object,
         :update => update_span ),
         :method => :delete,
-        :remote => true
+        :remote => true,
+        :title => t('inline_forms.view.trash')
     end
   end
 
-  #  # undo link
-  #  def link_to_undo_destroy(object, update_span )
-  #    link_to(t('inline_forms.view.undo'), revert_version_path(object.versions.scoped.last), :method => :post)
-  #  end
+  # 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 = (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?
+          raw out
+        else
+          raw out if can? :update, parent_class.find(parent_id) # can update this specific parent object???
+        end
+      end
+    else
+      raw out
+    end
+  end
 
   # link_to_inline_edit
   def link_to_inline_edit(object, attribute, attribute_value='')
@@ -68,30 +87,6 @@ module InlineFormsHelper
     end
   end
 
-  # link to new record
-  def link_to_new_record(model, path_to_new, update_span, parent_class, parent_id)
-    out = ""
-    out << "<li class='new_record_link'>"
-    out << (link_to image_tag(  'add.png',
-        :class => "new_record_icon",
-        :title => t('inline_forms.view.add_new', :model => model.model_name.human ) ),
-      send(path_to_new, :update => update_span, :parent_class => parent_class, :parent_id => parent_id ),
-      :remote => true)
-    out << "<div style='clear: both;'></div>"
-    out << "</li>"
-    if cancan_enabled?
-      if can? :create, model.to_s.pluralize.underscore.to_sym
-        if parent_class.nil?
-          raw out
-        else
-          raw out if can? :update, parent_class.find(parent_id) # can update this specific parent object???
-        end
-      end
-    else
-      raw out
-    end
-  end
-
   # url to other language
   def locale_url(request, locale)
     subdomains = request.subdomains

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

@@ -1,2 +1,12 @@
-<%= link_to_destroy(@object, @update_span) -%>
-<%= link_to h(@object._presentation), send(@object.class.to_s.underscore + "_path", @object, :update => @update_span), :remote => true -%>
+<% if cancan_disabled? || ( can? :delete, @object ) %>
+  <div  class="small-1 column">
+    <%= link_to_destroy(@object, @update_span) -%>
+  </div>
+  <div  class="small-11 column">
+    <%= link_to h(@object._presentation), send(@object.class.to_s.underscore + "_path", @object, :update => @update_span), :remote => true -%>
+  </div>
+<% else %>
+  <div  class="small-12 column">
+    <%= link_to h(@object._presentation), send(@object.class.to_s.underscore + "_path", @object, :update => @update_span), :remote => true -%>
+  </div>
+<% end %>

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

@@ -1,23 +1,56 @@
+<%  @BUTTONS_UNDER = [ "text_area", "kansen_slider" ] %>
 <%= form_tag send(@object.class.to_s.underscore + '_path', :update => @update_span,
-  :attribute => @attribute,
-  :form_element => @form_element,
-  :sub_id => @sub_id ),
-  :method => :put, # this is going to the update method!
-  :multipart => true,
-  :class  => "edit_form",
-  :remote => true do -%>
-  <div class="edit_form_field">
-    <%= send("#{@form_element}_edit", @object, @attribute) %>
-  </div>
-  <%= link_to( send( @object.class.to_s.underscore + '_path', :update => @update_span || "field_#{@attribute}_#{@object.id.to_s}",
-      :attribute => @attribute,
-      :form_element => @form_element,
-      :sub_id => @sub_id ),
-    :method => :get, # this is going to the show method!
-    :class  => "edit_form_cancel",
-    :remote => true ) do %>
-    <input type="button" name="cancel" value="cancel" />
-  <% end %>
-  <%= submit_tag "ok", :class => "edit_form_submit"-%>
-  <div style="clear: both;"></div>
+    :attribute => @attribute,
+    :form_element => @form_element,
+    :sub_id => @sub_id ),
+    :method => :put, # this is going to the update method!
+    :multipart => true,
+    :class  => "edit_form",
+    :abide => true,
+    :remote => true do -%>
+  <% if @BUTTONS_UNDER.include? @form_element %>
+    <div class="row collapse">
+      <div class="small-12 columns">
+        <%= send("#{@form_element}_edit", @object, @attribute) %>
+      </div>
+    </div>
+    <div class="row collapse">
+      <div class="small-9 columns">
+        &nbsp;
+      </div>
+      <div class="small-1 columns">
+        <%= submit_tag "ok", :class => "postfix button"-%>
+      </div>
+      <div class="small-2 columns">
+        <%= link_to( send( @object.class.to_s.underscore + '_path', :update => @update_span || "field_#{@attribute}_#{@object.id.to_s}",
+        :attribute => @attribute,
+        :form_element => @form_element,
+        :sub_id => @sub_id ),
+        :method => :get, # this is going to the show method!
+        :remote => true ) do %>
+          <input type="button" name="cancel" value="cancel" class="button alert postfix radius" />
+        <% end %>
+      </div>
+    </div>
+  <% else %>
+    <div class="row collapse">
+      <div class="small-9 columns">
+        <%= send("#{@form_element}_edit", @object, @attribute) %>
+      </div>
+      <div class="small-1 columns">
+        <%= submit_tag "ok", :class => "postfix button"-%>
+      </div>
+      <div class="small-2 columns">
+        <%= link_to( send( @object.class.to_s.underscore + '_path', :update => @update_span || "field_#{@attribute}_#{@object.id.to_s}",
+        :attribute => @attribute,
+        :form_element => @form_element,
+        :sub_id => @sub_id ),
+        :method => :get, # this is going to the show method!
+        :remote => true ) do %>
+          <input type="button" name="cancel" value="cancel" class="button alert postfix radius" />
+        <% end %>
+      </div>
+    </div>
+  <% end%>
+
 <% end -%>

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

@@ -0,0 +1,13 @@
+<% unless flash.empty? %>
+  <% identifier = Time.now.to_i.to_s %>
+  <div class="row" id="flash_<%= identifier %>">
+  <% flash.each do |key, value| %>
+    <%= value %>
+  <% end %>
+  <script>
+    $("#<%= "#{update_span}_auto_header" %>").ScrollTo();
+    $("#flash_<%= identifier %>").delay(1000).fadeToggle('2000');
+  </script>
+  </div>
+<% end %>
+

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

@@ -1,16 +1,3 @@
-<% flash.each do |key, value| %>
-  <div id="flash" class="flash <%= key %>"><%= value %></div>
-  <%#*<script type="text/javascript">%>
-    <%#*$(function() { $("#flash").delay(1000).fadeToggle('2000'); } );%>
-  <%#*</script>%>
-<% end %>
-
-<!-- purpose: list objects. we come here from #index and from #new.
-If we come here for the 'first' time, we dont' have parents; its just a list of objects.
-But if we come here because we are called from the show partial, then we have to deal wits some parent object.
-Unfortaunatlly, the way :locals work, these are local variables, like object, but if we come from a controller,
-they are @object. We need this magic here to rewrite all the @variables to variables. Ugh. -->
-
 <% ul_needed = true %>
 <% if not defined?(parent_class)  %>
   <%   # we didn't come here via _show.html.erb %>
@@ -47,9 +34,8 @@ they are @object. We need this magic here to rewrite all the @variables to varia
   <% objects = objects.paginate  :page => params[:page], :per_page => @PER_PAGE || 5, :conditions => conditions %>
 <% end %>
 
-<%= raw "<ul id=\"#{update_span}\" class=\"inline_forms_list\">" if ul_needed -%>
-<!--  # link to new -->
-<%= link_to_new_record(model, path_to_new, update_span, parent_class, parent_id) -%>
+<%= raw "<div class=\"list_container\" id=\"#{update_span}\">" if ul_needed -%>
+
 <!--  # list of objects -->
 <% for object in objects %>
   <% if parent_class.nil?  %>
@@ -59,12 +45,24 @@ they are @object. We need this magic here to rewrite all the @variables to varia
     <% css_class_id = parent_class.to_s.underscore + '_' + parent_id.to_s + '_' + attribute.to_s.singularize.underscore + "_" + object.id.to_s -%>
     <% path_to_object = attribute.to_s.singularize.underscore + "_path" %>
   <% end %>
-  <li id="<%= css_class_id -%>" class="<%= cycle('odd', 'even') -%>" >
-    <%= link_to_destroy(object, css_class_id) -%>
-    <%= link_to h(object._presentation),
-      send( path_to_object, object, :update => css_class_id),
-      :remote => true -%>
-  </li>
+  <div class="row <%= cycle('odd', 'even') %><%= " top-level" if parent_class.nil? %>" id="<%= css_class_id -%>">
+    <% if cancan_disabled? || ( can? :delete, object ) %>
+      <div  class="small-1 column">
+        <%= link_to_destroy(object, css_class_id) -%>
+      </div>
+      <div  class="small-11 column">
+        <%= link_to h(object._presentation),
+          send( path_to_object, object, :update => css_class_id),
+          :remote => true -%>
+      </div>
+    <% else %>
+      <div  class="small-12 column">
+        <%= link_to h(object._presentation),
+          send( path_to_object, object, :update => css_class_id),
+          :remote => true -%>
+      </div>
+    <% end %>
+  </div>
 <% end -%>
 <!--  # pagination -->
 <% if parent_id.nil? -%>
@@ -72,5 +70,11 @@ they are @object. We need this magic here to rewrite all the @variables to varia
 <% else %>
   <% pagination = will_paginate objects, :remote => true, :params => {:controller => attribute, :action => :index, :id => nil, :parent_class => parent_class, :parent_id => parent_id, :update => "#{parent_class.to_s.underscore}_#{parent_id}_#{attribute}", :ul_needed => true  } -%>
 <% end %>
-<%= raw "<li class=\"#{cycle('odd', 'even')}\">" + pagination + "</li>" if pagination -%>
-<%= raw "</ul>" if ul_needed -%>
+<% if pagination %>
+  <div class="row <%= cycle('odd', 'even') %>">
+    <div class='small-11 small-centered column'>
+      <%= raw pagination %>
+    </div>
+  </div>
+<% end %>
+<%= raw "</div>" if ul_needed -%>

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

@@ -1,72 +1,64 @@
-<li id="newnew">
+<div class="new_record"">
   <% flash.each do |key, value| %>
     <div id="flash" class="flash <%= key %>">
       <ul>
         <% value.each do |m| %>
-          <li><%= m %></li>
+        <li>
+          <%= m %>
+        </li>
         <% end %>
       </ul>
     </div>
   <% end %>
-  <script type="text/javascript">
-    $(function() { $("#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">
-      <table cellspacing="0" cellpadding="0">
-        <tr>
-          <th colspan="2" valign="top">
-            <div class="object_presentation" >
-              <%= t('inline_forms.view.add_new', :model => @Klass.model_name.human ) -%>
+
+  <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 || form_element.to_sym == :tree || (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 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 <%= cycle('odd', 'even') %>">
+            <div class='medium-5 large-5 column' >
+              <%= @object.class.human_attribute_name(attribute) -%>
             </div>
-          </th>
-        </tr>
-        <% 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 %>
-              <tr>
-                <td valign="top" class="header" colspan="2">
-                  <div class='<%= "attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
-                    <%= @object.class.human_attribute_name(attribute) -%>
-                  </div>
-                </td>
-              </tr>
-            <% else %>
-              <tr>
-                <td valign="top" class="<%= 'has_validations ' if @object.has_validations_for?(attribute) -%>" validation-hint="<%= validation_hints_as_list_for(@object, attribute) -%>">
-                  <div class='<%= "attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
-                    <%= @object.class.human_attribute_name(attribute) -%>
-                  </div>
-                </td>
-                <td valign="top">
-                  <div class='<%= "attribute_value attribute_#{attribute} form_element_#{form_element}" -%>' >
-                    <span id="<%= css_class_id -%>" >
-                      <%= send("#{form_element}_edit", @object, attribute) -%>
-                    </span>
-                  </div>
-                </td>
-              </tr>
-            <% end -%>
-          <% end -%>
+            <div class='medium-7 large-7 column' >
+              <span id="<%= css_class_id -%>" > <%= send("#{form_element}_edit", @object, attribute) -%> </span>
+            </div>
+          </div>
         <% end -%>
-      </table>
+      <% end -%>
+    <% end -%>
+    <div class="row <%= cycle('odd', 'even') %>">
+                  <div class='medium-1 large-1 column'>
+                  &nbsp;
+                </div>
+    <div class='small-11  column' >
+        <%= link_to( send(@Klass.to_s.underscore.pluralize + '_path', :update => @update_span,
+                                                                      :parent_class => @parent_class,
+                                                                      :parent_id => @parent_id,
+                                                                      :ul_needed => true ),
+                                                                      :remote => true,
+                   ) do -%>
+          <input type="button" name="cancel" value="cancel" class="button alert" />
+        <% end %>
+        <%= submit_tag "ok", :class => "button "-%>
+      </div>
     </div>
-    <%= link_to( send(@Klass.to_s.underscore.pluralize + '_path', :update => @update_span,
-        :parent_class => @parent_class,
-        :parent_id => @parent_id ),
-      :remote => true,
-      :class  => "edit_form_cancel" ) do  %>
-      <input type="button" name="cancel" value="cancel" />
-    <% end %>
-    <%= submit_tag "ok", :class => "edit_form_submit"-%>
-    <div style="clear: both;"></div>
+    <div class="row record_footer"></div>
   <% end %>
-</li>
-<script type="text/javascript">
-  $(function() { $("#newnew").slideDown(4000); } );
-</script>
+</div>