inline_forms 1.6.57 → 1.6.58

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTM0NGNlYzlmMjI5OTg1YWNjNGZkNjRjNGNhM2RhOGE4YzMzMWUwYg==
+    NmM0ZjljOTYxMzQzYzUwODczYmNlMzZmN2I3ZmJhY2IyYTYxYmQyNg==
   data.tar.gz: !binary |-
-    MTU2NTJjY2IzNmRhNjVhMzhhN2IzN2FmNGQ4MjM4ZjE5ZWI5OTgwNw==
-!binary "U0hBNTEy":
+    NjNhYTM2MTQwZTZmNTZmNmU5ZjM3NTk2N2ViZjgzMWE5MzJhYjc4MA==
+SHA512:
   metadata.gz: !binary |-
-    ZDI4OThmM2VkMWVjYmViNjFlYmNiYWU2ZTQ3ZWY0MWQxM2U3OWNlMjJlMzc2
-    MjdlYjMwZDVjNGM4ZmQ3ZjliNzk3MWZmZjNjOGM0OTQwMjcwOTBmOTExMGRj
-    NWU1OWIwMTJkZjU2YjljODQ3YTExNDhjMjgzMDMxMzc3MTgyODk=
+    MWM1YWMzY2Q3OWFjZDE5NmJhMWE1MDY5NjUxMjZlZjkxYmZhMzNiM2JlMDhh
+    OGNiODM5NDIzODFhMjcxZTQ5YzM5ZjE1YzM4OTQ2MzhmNjZiZjA4ZTkwN2M3
+    YTg3NmUyZjljNzNjM2M0YWQ3NDRiMmUzOWY5NzE1NDhmOGNhMzg=
   data.tar.gz: !binary |-
-    YzIzOWYxOTNhOTI2YzkwNmRkODk1NWMzNWQyOTY2MzJjMzI3NDRkMGZmODZh
-    N2JhOTc1ZWRjNTNkMTI3ODQwZjdlMTYxM2QyZTI5MmFkZTBlMTVhNTk0ZTAw
-    MjExOTczZjcwNDAzY2E3ZWQ3OWUzYTFkNjAzZDZmZTQyNWRkNDk=
+    MzU0YzA4YTE1MzVlYjdjYzUxOGYzMzhlMDk4YjU2NGZhOGQ5YTdmY2NlNTUy
+    ZmQxZDVjOTU2MTI4OGRiYzRlZTkxZjQ3MDEwODIyNGQ3ZGQ5M2YzYTRiYzU0
+    ZWZiNTJhYzQyZGJkZDI4ZGZhYjg0MjIxZmI2OGY1ZTAxMTY3MWM=

data/lib/app/controllers/inline_forms_application_controller.rb

@@ -9,9 +9,8 @@ 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/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/views/inline_forms/_edit.html.erb

@@ -1,3 +1,4 @@
+<%  @BUTTONS_UNDER = [ "text_area" ] %>
 <%= form_tag send(@object.class.to_s.underscore + '_path', :update => @update_span,
     :attribute => @attribute,
     :form_element => @form_element,
@@ -7,23 +8,49 @@
     :class  => "edit_form",
     :abide => true,
     :remote => true do -%>
-  <div class="row collapse">
-    <div class="small-9 columns">
-      <%= send("#{@form_element}_edit", @object, @attribute) %>
+  <% 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="small-1 columns">
-      <%= submit_tag "ok", :class => "postfix button"-%>
+    <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>
-    <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 %>
+  <% 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>
-  </div>
+  <% end%>
 
 <% end -%>

data/lib/inline_forms/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 1.6.57
+  version: 1.6.58
 platform: ruby
 authors:
 - Ace Suares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm
@@ -288,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: inline_forms
-rubygems_version: 2.0.3
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: Inline editing of forms.