inline_forms 0.9.24 → 0.9.25

data/VERSION

@@ -1 +1 @@
-0.9.24
+0.9.25

data/app/controllers/inline_forms_controller.rb

@@ -64,9 +64,8 @@ class InlineFormsController < ApplicationController
       @objects = @Klass.order(@Klass.order_by_clause).paginate :page => params[:page], :per_page => @PER_PAGE || 12, :conditions => conditions
     end
     respond_to do |format|
-      # found this here: http://www.ruby-forum.com/topic/211467
       format.html { render 'inline_forms/_list', :layout => 'inline_forms' } unless @Klass.not_accessible_through_html?
-      format.js { render(:update) {|page| page.replace_html update_span, :partial => 'inline_forms/list' } }
+      format.js { }
     end
   end
 
@@ -83,9 +82,7 @@ class InlineFormsController < ApplicationController
       @object[@parent_class.foreign_key] = @parent_id
     end
     respond_to do |format|
-      # found this here: http://www.ruby-forum.com/topic/211467
-      format.js { render(:update) {|page| page.replace_html @update_span, :partial => 'inline_forms/new'}
-      }
+      format.js { }
     end
   end
 
@@ -100,9 +97,7 @@ class InlineFormsController < ApplicationController
     @sub_id = params[:sub_id]
     @update_span = params[:update]
     respond_to do |format|
-      # found this here: http://www.ruby-forum.com/topic/211467
-      format.js { render(:update) {|page| page.replace_html @update_span, :partial => 'inline_forms/edit'}
-      }
+      format.js { }
     end
   end
 
@@ -131,9 +126,7 @@ class InlineFormsController < ApplicationController
         @objects = @Klass.order(@Klass.order_by_clause).paginate :page => params[:page], :per_page => @PER_PAGE || 12, :conditions => conditions
       end
       respond_to do |format|
-        # found this here: http://www.ruby-forum.com/topic/211467
-        format.js { render(:update) {|page| page.replace_html @update_span, :partial => 'inline_forms/list'}
-        }
+        format.js { render :list }
       end
     else
       flash.now[:error] = "Failed to create #{object.class.to_s.underscore}.".html_safe
@@ -142,8 +135,7 @@ class InlineFormsController < ApplicationController
       end
       respond_to do |format|
         @object = object
-        format.js { render(:update) {|page| page.replace_html @update_span, :partial => 'inline_forms/new'}
-        }
+        format.js { render :new}
       end
     end
   end
@@ -160,9 +152,7 @@ class InlineFormsController < ApplicationController
     send("#{@form_element.to_s}_update", @object, @attribute)
     @object.save
     respond_to do |format|
-      # found this here: http://www.ruby-forum.com/topic/211467
-      format.js { render(:update) {|page| page.replace_html @update_span, :inline => '<%= send("#{@form_element.to_s}_show", @object, @attribute) %>' }
-      }
+      format.js { }
     end
   end
 
@@ -187,30 +177,15 @@ class InlineFormsController < ApplicationController
     if @attribute.nil?
       respond_to do |format|
         @attributes = @object.inline_forms_attribute_list
-        # found this here: http://www.ruby-forum.com/topic/211467
         if close
-          format.js do
-            render(:update) do |page|
-              page.replace_html @update_span, :inline => '<%= link_to h(@object._presentation), send(@object.class.to_s.underscore + "_path", @object, :update => @update_span), :remote => true %>'
-            end
-          end
+          format.js { render :close }
         else
-          format.js do
-            render(:update) do |page|
-              page.replace_html @update_span, :partial => 'inline_forms/show'
-            end
-          end
-          #          format.js { render(:update) {|page| page.replace_html @update_span, :inline => '<%= send( "inline_forms_show_record", @object) %>' } }
+          format.js { }
         end
       end
     else
       respond_to do |format|
-        # found this here: http://www.ruby-forum.com/topic/211467
-        format.js do
-          render(:update) do |page|
-            page.replace_html @update_span, :inline => '<%= send("#{@form_element}_show", @object, @attribute) %>'
-          end
-        end
+        format.js { render :show_element }
       end
     end
   end

data/app/helpers/form_elements/text_area.rb

@@ -5,21 +5,20 @@ def text_area_show(object, attribute)
     link_to_inline_edit object,
       attribute,
       '<div class="ckeditor_area">'.html_safe +
-      ckeditor_textarea(
-        object.class,
-        attribute,
-        :value => object[attribute],
-        :id => "textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}",
-        :width => '100%',
-        :ckeditor_options => {
-          :height => '200px',
-          :toolbar => "None",
-          :readOnly => "true",
-          :resize_enabled => "false",
-          :toolbarCanCollapse => "false"
-        }
+      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"
     ) +
-      '<img class="glass_plate" src="images/glass_plate.gif" />'.html_safe +
+      image_tag(  'glass_plate.gif',
+      :class => "glass_plate",
+      :title => '' ) +
       '</div>'.html_safe
   else
     link_to_inline_edit object, attribute, object[attribute]
@@ -28,14 +27,12 @@ end
 
 def text_area_edit(object, attribute)
   if defined? Ckeditor
-    ckeditor_textarea(
-      object.class,
+    cktext_area_tag(
       attribute,
-      :value => object[attribute],
-      :id => "textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}",
-      :width => '100%',
-      :height => '200px',
-      :name => attribute
+      object[attribute],
+      :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/app/helpers/inline_forms_helper.rb

@@ -11,8 +11,9 @@ module InlineFormsHelper
 
   # close link
   def close_link( object, update_span )
-    link_to image_tag(  'css/close.png',
-      :class => "close_icon" ),
+    link_to image_tag(  'close.png',
+      :class => "close_icon",
+      :title => 'close' ),
       send( object.class.to_s.underscore + '_path',
       object,
       :update => update_span,

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

@@ -1,4 +1,4 @@
-<% form_tag send(@object.class.to_s.underscore + '_path', :update => @update_span ,
+<%= form_tag send(@object.class.to_s.underscore + '_path', :update => @update_span ,
   :attribute => @attribute,
   :form_element => @form_element,
   :sub_id => @sub_id ),

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

@@ -5,7 +5,7 @@
   <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,
+  <%= 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 -%>

data/app/views/inline_forms/close.js.erb

@@ -0,0 +1 @@
+$('#<%= @update_span %>').html('<%= escape_javascript(link_to h(@object._presentation), send(@object.class.to_s.underscore + "_path", @object, :update => @update_span), :remote => true)%>')

data/app/views/inline_forms/edit.js.erb

@@ -0,0 +1 @@
+$('#<%= @update_span %>').html('<%= escape_javascript(render(:partial => 'inline_forms/edit' ))%>')

data/app/views/inline_forms/list.js.erb

@@ -0,0 +1 @@
+$('#<%= @update_span %>').html('<%= escape_javascript(render(:partial => 'inline_forms/list' ))%>')

data/app/views/inline_forms/new.js.erb

@@ -0,0 +1 @@
+$('#<%= @update_span %>').html('<%= escape_javascript(render(:partial => 'inline_forms/new' ))%>')

data/app/views/inline_forms/show.js.erb

@@ -0,0 +1 @@
+$('#<%= @update_span %>').html('<%= escape_javascript(render(:partial => 'inline_forms/show' ))%>')

data/app/views/inline_forms/show_element.js.erb

@@ -0,0 +1 @@
+$('#<%= @update_span %>').html('<%= escape_javascript(send("#{@form_element}_show", @object, @attribute))%>')

data/app/views/inline_forms/update.js.erb

@@ -0,0 +1 @@
+$('#<%= @update_span %>').html('<%= escape_javascript(send("#{@form_element.to_s}_show", @object, @attribute))%>')

data/app/views/layouts/{inline_forms.rhtml → inline_forms.html.erb}

@@ -4,8 +4,8 @@
   <head>
     <title><%= h(yield(:title) || "xyxyxyx") %></title>
     <%= csrf_meta_tag %>
-    <%= stylesheet_link_tag 'inline_forms', 'jquery-ui-sunny' %>
-    <%= javascript_include_tag :defaults, 'jquery.form', 'jquery.remotipart', :ckeditor %>
+    <%= stylesheet_link_tag 'inline_forms' %>
+    <%= javascript_include_tag 'application' %>
     <%= yield(:head) %>
     <script>
       $.datepicker.setDefaults({

data/inline_forms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{inline_forms}
-  s.version = "0.9.24"
+  s.version = "0.9.25"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ace Suares"]
-  s.date = %q{2011-09-27}
+  s.date = %q{2011-10-03}
   s.description = %q{Inline Forms aims to ease the setup of forms that provide inline editing. The field list can be specified in the model.}
   s.email = %q{ace@suares.an}
   s.extra_rdoc_files = [
@@ -49,7 +49,14 @@ Gem::Specification.new do |s|
     "app/views/inline_forms/_list.html.erb",
     "app/views/inline_forms/_new.html.erb",
     "app/views/inline_forms/_show.html.erb",
-    "app/views/layouts/inline_forms.rhtml",
+    "app/views/inline_forms/close.js.erb",
+    "app/views/inline_forms/edit.js.erb",
+    "app/views/inline_forms/list.js.erb",
+    "app/views/inline_forms/new.js.erb",
+    "app/views/inline_forms/show.js.erb",
+    "app/views/inline_forms/show_element.js.erb",
+    "app/views/inline_forms/update.js.erb",
+    "app/views/layouts/inline_forms.html.erb",
     "inline_forms.gemspec",
     "lib/generators/inline_forms/USAGE",
     "lib/generators/inline_forms/inline_forms_generator.rb",
@@ -64,6 +71,7 @@ Gem::Specification.new do |s|
     "lib/otherstuff/diffie",
     "lib/otherstuff/mk-ice-ts",
     "lib/otherstuff/mk-new-app",
+    "lib/otherstuff/mk31-app",
     "lib/otherstuff/mkrole",
     "lib/otherstuff/roles_users.sql",
     "public/images/css/close.png",

data/lib/generators/inline_forms/inline_forms_generator.rb

@@ -72,10 +72,7 @@ module InlineForms
 
     source_root File.expand_path('../templates', __FILE__)
 
-    def copy_stylesheet
-      copy_file File.expand_path('../../../../public/stylesheets', __FILE__) + "/inline_forms.css", "public/stylesheets/inline_forms.css" unless File.exists?('public/stylesheets/inline_forms.css')
-    end
-    
+  
     # using flags.
     def set_some_flags
       @flag_not_accessible_through_html   = true

data/lib/otherstuff/Gemfile

@@ -1,19 +1,13 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.7'
+gem 'rails', "~> 3.1.0"
 
-# http://stackoverflow.com/questions/5287121/undefined-method-task-using-rake-0-9-0-beta-4
-gem 'rake' , '0.8.7'
+gem 'rake'
 
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
-
-gem 'mysql2', '~> 0.2.7'
+gem 'jquery-rails'
 
-# Use unicorn as the web server
-# gem 'unicorn'
+gem 'mysql2'
 
-# Deploy with Capistrano
 gem 'capistrano'
 
 gem 'devise'
@@ -28,31 +22,7 @@ gem 'will_paginate', :git => 'git://github.com/acesuares/will_paginate.git', :br
 
 gem 'tabs_on_rails'
 
-gem 'jrails'
-
-gem 'jquery-rails'
-
-gem 'remotipart', :git => 'git://github.com/JangoSteve/remotipart.git', :branch => 'latest-and-greatest'
-
-gem "ckeditor", "~> 3.5.4"
-#gem 'ckeditor', :git => 'git://github.com/galetahub/rails-ckeditor.git', :branch => 'rails3'
-#gem 'ckeditor', :git => 'git://github.com/acesuares/rails-ckeditor.git', :branch => 'rails3'
-
-#gem 'calendar_date_select' # not rails 3 compatible
-
-# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
-# gem 'ruby-debug'
-# gem 'ruby-debug19'
+gem 'ckeditor', :git => 'git://github.com/acesuares/ckeditor.git', :branch => 'master'
 
-# Bundle the extra gems:
-# gem 'bj'
-# gem 'nokogiri'
-# gem 'sqlite3-ruby', :require => 'sqlite3'
-# gem 'aws-s3', :require => 'aws/s3'
+gem 'carrierwave'
 
-# Bundle gems for the local environment. Make sure to
-# put test-only gems in this group so their generators
-# and rake tasks are available in development mode:
-# group :development, :test do
-#   gem 'webrat'
-# end

data/lib/otherstuff/mk31-app

@@ -0,0 +1,15 @@
+#/bin/bash
+APPNAME=$1
+echo "working directory is now `pwd`"
+rails new $APPNAME
+cat database.yml | sed "s/APPNAME/$APPNAME/g" > $APPNAME/config/database.yml
+cp -v Gemfile $APPNAME
+cd $APPNAME
+echo "working directory is now `pwd`"
+bundle install
+echo devise:install
+rails g devise:install
+echo devise User
+rails g devise User
+echo ckeditor:install
+rails g ckeditor:install

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_forms
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 9
-  - 24
-  version: 0.9.24
+  - 25
+  version: 0.9.25
 platform: ruby
 authors: 
 - Ace Suares
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-27 00:00:00 -04:00
+date: 2011-10-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -148,7 +148,14 @@ files:
 - app/views/inline_forms/_list.html.erb
 - app/views/inline_forms/_new.html.erb
 - app/views/inline_forms/_show.html.erb
-- app/views/layouts/inline_forms.rhtml
+- app/views/inline_forms/close.js.erb
+- app/views/inline_forms/edit.js.erb
+- app/views/inline_forms/list.js.erb
+- app/views/inline_forms/new.js.erb
+- app/views/inline_forms/show.js.erb
+- app/views/inline_forms/show_element.js.erb
+- app/views/inline_forms/update.js.erb
+- app/views/layouts/inline_forms.html.erb
 - inline_forms.gemspec
 - lib/generators/inline_forms/USAGE
 - lib/generators/inline_forms/inline_forms_generator.rb
@@ -163,6 +170,7 @@ files:
 - lib/otherstuff/diffie
 - lib/otherstuff/mk-ice-ts
 - lib/otherstuff/mk-new-app
+- lib/otherstuff/mk31-app
 - lib/otherstuff/mkrole
 - lib/otherstuff/roles_users.sql
 - public/images/css/close.png