inline_forms 1.6.70 → 2.0

data/lib/app/controllers/inline_forms_application_controller.rb

@@ -9,8 +9,9 @@ class InlineFormsApplicationController < ActionController::Base
   #set the locale based on the subdomain
   def set_locale
     I18n.locale = extract_locale_from_subdomain || I18n.default_locale
+
   end
-  
+
   # Get locale code from request subdomain (like http://it.application.local:3000)
   def extract_locale_from_subdomain
     locale = request.subdomains.first

data/lib/app/controllers/inline_forms_controller.rb

@@ -113,7 +113,7 @@ class InlineFormsController < ApplicationController
     @update_span = params[:update]
     attributes = @inline_forms_attribute_list || @object.inline_forms_attribute_list
     attributes.each do | attribute, name, form_element |
-      send("#{form_element.to_s}_update", @object, attribute) unless form_element == :tree || form_element == :associated || (cancan_enabled? && cannot?(:read, @Klass.to_s.underscore.pluralize.to_sym, attribute))
+      send("#{form_element.to_s}_update", @object, attribute) unless form_element == :associated || (cancan_enabled? && cannot?(:read, @Klass.to_s.underscore.pluralize.to_sym, attribute))
     end
     @parent_class = params[:parent_class]
     @parent_id = params[:parent_id]
@@ -206,7 +206,7 @@ class InlineFormsController < ApplicationController
   # Thanks Ryan Bates: http://railscasts.com/episodes/255-undo-with-paper-trail
   def revert
     @update_span = params[:update]
-    @version = PaperTrail::Version.find(params[:id])
+    @version = Version.find(params[:id])
     @version.reify.save!
     @object = @Klass.find(@version.item_id)
     authorize!(:revert, @object) if cancan_enabled?

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

@@ -3,13 +3,14 @@ InlineForms::SPECIAL_COLUMN_TYPES[:check_list]=:no_migration
 
 # checklist
 def check_list_show(object, attribute)
-  out = ''
-  out = link_to_inline_edit(object, attribute, "<i class='fi-plus'></i>".html_safe) if object.send(attribute).empty?
+  out = '<ul class="checklist">'
+  out << link_to_inline_edit(object, attribute) if object.send(attribute).empty?
   object.send(attribute).sort.each do | item |
-    out << "<div class='row #{cycle('odd', 'even')}'>"
+    out << '<li>'
     out << link_to_inline_edit(object, attribute, item._presentation )
-    out << '</div>'
+    out << '</li>'
   end
+  out <<  '</ul>'
   out.html_safe
 end
 
@@ -20,13 +21,19 @@ 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 = ''
+  out = '<div class="edit_form_checklist">'
+  out << '<ul>'
   values.each do | item |
-    out << "<div class='row #{cycle('odd', 'even')}'>"
+    out << '<li>'
     out << check_box_tag( attribute.to_s + '[' + item.id.to_s + ']', 1, object.send(attribute.to_s.singularize + "_ids").include?(item.id) )
-    out << "<label for=#{attribute.to_s + '[' + item.id.to_s + ']'}>#{h(item._presentation)}</label>"
+    out << '<div class="edit_form_checklist_text">'
+    out << h(item._presentation)
     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,18 @@ InlineForms::SPECIAL_COLUMN_TYPES[:date_select]=:date
 
 # date
 def date_select_show(object, attribute)
-  link_to_inline_edit object, attribute, object.send(attribute).nil? ? "<i class='fi-plus'></i>".html_safe : object.send(attribute).strftime("%d-%m-%Y")
+  link_to_inline_edit object, attribute, object.send(attribute).nil? ? "" : 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}').datepicker();</script>".html_safe
+  out = text_field_tag attribute, ( object.send(attribute).nil? ? "" : object.send(attribute).strftime("%d-%m-%Y") ), :id => css_id
+  out << '<SCRIPT>'.html_safe
+  out << "$(function() { ".html_safe
+  out << '$("#'.html_safe + css_id.html_safe + '").datepicker({ yearRange: "-100:+5" });'.html_safe
+  out << '});'.html_safe
+  out << '</SCRIPT>'.html_safe
+  return out
 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  "<i class='fi-plus'></i>".html_safe
+  attribute_value = object.send(attribute)._presentation rescue  nil
   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] : "<i class='fi-plus'></i>".html_safe
+  link_to_inline_edit object, attribute, object.send(attribute) ? values.assoc(object.send(attribute))[1] : ""
 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].nil? || object[attribute].empty?) ? "<i class='fi-plus'></i>".html_safe : object[attribute]
+  link_to_inline_edit object, attribute, object[attribute]    #.empty? ? 'Click here to edit' : object[attribute]
 end
 
 def plain_text_area_edit(object, attribute)

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

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

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

@@ -9,14 +9,13 @@ def text_area_show(object, attribute)
       cktext_area_tag(
       attribute,
       object[attribute],
-      :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"
-                    }
+      :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"
     ) +
       image_tag(  'glass_plate.gif',
       :class => "glass_plate",
@@ -32,10 +31,9 @@ def text_area_edit(object, attribute)
     cktext_area_tag(
       attribute,
       object[attribute],
-      :id => "textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}",
-      :ckeditor => {  :width => '100%',
-                      :height => '200px'
-                    }
+      :input_html => { :id => "textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}",
+        :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].nil? || object[attribute].empty?) ? "<i class='fi-plus'></i>".html_safe : object[attribute]
+  link_to_inline_edit object, attribute, 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[attribute].nil? || object[attribute].empty?) ? "<i class='fi-plus'></i>".html_safe : object[attribute]
+  link_to_inline_edit object, attribute, (object.send attribute.to_sym)
 end
 
 def text_field_edit(object, attribute)
-  text_field_tag attribute, (object.send attribute.to_sym), :class => 'input_text_field'  # for abide: , :required => true
+  text_field_tag attribute, (object.send attribute.to_sym), :class => 'input_text_field'
 end
 
 def text_field_update(object, attribute)

data/lib/app/helpers/inline_forms_helper.rb

@@ -19,54 +19,35 @@ module InlineFormsHelper
   end
 
   # close link
-  def close_link( object, update_span, html_class = 'button close_button' )
-    link_to "<i class='fi-x'></i>".html_safe,
+  def close_link( object, update_span )
+    link_to image_tag(  'close.png',
+      :class => "close_icon",
+      :title => t('inline_forms.view.close') ),
       send( object.class.to_s.underscore + '_path',
       object,
       :update => update_span,
       :close => true ),
-      :remote => true,
-      :class => html_class,
-      :title => t('inline_forms.view.close')
+      :remote => true
   end
 
   # destroy link
   def link_to_destroy( object, update_span )
     if cancan_disabled? || ( can? :delete, object )
-      link_to "<i class='fi-trash'></i>".html_safe,
+      link_to image_tag(  'trash.png',
+        :class => "trash_icon",
+        :title => t('inline_forms.view.trash') ),
         send( object.class.to_s.underscore + '_path',
         object,
         :update => update_span ),
         :method => :delete,
-        :remote => true,
-        :title => t('inline_forms.view.trash')
+        :remote => true
     end
   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
+  #  # 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
 
   # link_to_inline_edit
   def link_to_inline_edit(object, attribute, attribute_value='')
@@ -87,6 +68,30 @@ 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,12 +1,2 @@
-<% 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 %>
+<%= link_to_destroy(@object, @update_span) -%>
+<%= link_to h(@object._presentation), send(@object.class.to_s.underscore + "_path", @object, :update => @update_span), :remote => true -%>

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

@@ -1,56 +1,23 @@
-<%  @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",
-    :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%>
-
+  :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>
 <% end -%>

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

@@ -0,0 +1 @@
+<div id="Header">Inline Forms</div>

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

@@ -1,3 +1,16 @@
+<% 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 %>
@@ -34,8 +47,9 @@
   <% objects = objects.paginate  :page => params[:page], :per_page => @PER_PAGE || 5, :conditions => conditions %>
 <% end %>
 
-<%= raw "<div class=\"list_container\" id=\"#{update_span}\">" if ul_needed -%>
-
+<%= 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) -%>
 <!--  # list of objects -->
 <% for object in objects %>
   <% if parent_class.nil?  %>
@@ -45,24 +59,12 @@
     <% 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 %>
-  <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>
+  <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>
 <% end -%>
 <!--  # pagination -->
 <% if parent_id.nil? -%>
@@ -70,11 +72,5 @@
 <% 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 %>
-<% 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 -%>
+<%= raw "<li class=\"#{cycle('odd', 'even')}\">" + pagination + "</li>" if pagination -%>
+<%= raw "</ul>" if ul_needed -%>